Fix for the annoying post-3.0 ruler behaviour

From: Thorsten Behrens <thb@openoffice.org>


---

 sd/source/ui/view/drviews3.cxx |   66 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 65 insertions(+), 1 deletions(-)


diff --git sd/source/ui/view/drviews3.cxx sd/source/ui/view/drviews3.cxx
index 1491ee0..f5ec10f 100644
--- sd/source/ui/view/drviews3.cxx
+++ sd/source/ui/view/drviews3.cxx
@@ -40,6 +40,7 @@
 #include <svx/protitem.hxx>
 #include <svx/frmdiritem.hxx>
 #include <svx/ruler.hxx>
+#include <svx/numitem.hxx>
 #ifndef _SVX_RULERITEM_HXX
 #include <svx/rulritem.hxx>
 #endif
@@ -692,12 +693,61 @@ void  DrawViewShell::ExecRuler(SfxRequest& rReq)
 				const SvxLRSpaceItem& rItem = (const SvxLRSpaceItem&)
 							pArgs->Get( nId );
 
-                SfxItemSet aEditAttr( GetPool(), EE_PARA_LRSPACE, EE_PARA_LRSPACE );
+                static const USHORT aWhichTable[]=
+                {
+                    EE_PARA_OUTLLEVEL, EE_PARA_OUTLLEVEL,
+                    EE_PARA_LRSPACE, EE_PARA_LRSPACE,
+                    EE_PARA_NUMBULLET, EE_PARA_NUMBULLET,
+                    0, 0
+                };
+
+				SfxItemSet aEditAttr( GetDoc()->GetPool(),
+                                      aWhichTable );
+				mpDrawView->GetAttributes( aEditAttr );
 
                 nId = EE_PARA_LRSPACE;
 				SvxLRSpaceItem aLRSpaceItem( rItem.GetLeft(),
 						rItem.GetRight(), rItem.GetTxtLeft(),
 						rItem.GetTxtFirstLineOfst(), nId );
+
+                const INT16 nOutlineLevel = ((const SfxInt16Item&)aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue();
+                const SvxLRSpaceItem& rOrigLRSpaceItem = (const SvxLRSpaceItem&) aEditAttr.Get( EE_PARA_LRSPACE );
+                const SvxNumBulletItem& rNumBulletItem = (const SvxNumBulletItem&) aEditAttr.Get( EE_PARA_NUMBULLET );
+                if( nOutlineLevel != -1 && 
+                    rNumBulletItem.GetNumRule() &&
+                    rNumBulletItem.GetNumRule()->GetLevelCount() > nOutlineLevel )
+                {
+                    const SvxNumberFormat& rFormat = rNumBulletItem.GetNumRule()->GetLevel(nOutlineLevel);
+                    SvxNumberFormat aFormat(rFormat);
+
+                    // left margin always controls number format
+                    aFormat.SetAbsLSpace(rItem.GetTxtLeft() - rOrigLRSpaceItem.GetTxtLeft());
+                    aLRSpaceItem.SetTxtLeft(rOrigLRSpaceItem.GetTxtLeft());
+
+                    // negative indent goes to the number format,
+                    // positive to the lrSpace item
+                    if( rItem.GetTxtFirstLineOfst() < 0 )
+                    {
+                        aFormat.SetFirstLineOffset(
+                            rItem.GetTxtFirstLineOfst() 
+                            - rOrigLRSpaceItem.GetTxtFirstLineOfst() 
+                            + aFormat.GetCharTextDistance());
+                        aLRSpaceItem.SetTxtFirstLineOfst(0);
+                    }
+                    else
+                    {
+                        aFormat.SetFirstLineOffset(0);
+                        aLRSpaceItem.SetTxtFirstLineOfst(
+                            rItem.GetTxtFirstLineOfst()
+                            - aFormat.GetFirstLineOffset()
+                            + aFormat.GetCharTextDistance());
+                    }
+
+                    SvxNumBulletItem aNumBulletItem(rNumBulletItem);
+                    aNumBulletItem.GetNumRule()->SetLevel(nOutlineLevel,aFormat);
+                    aEditAttr.Put( aNumBulletItem );
+                }
+
 				aEditAttr.Put( aLRSpaceItem );
 				mpDrawView->SetAttributes( aEditAttr );
 
@@ -785,6 +835,20 @@ void  DrawViewShell::GetRulerState(SfxItemSet& rSet)
 					SvxLRSpaceItem aLRSpaceItem( rLRSpaceItem.GetLeft(),
 							rLRSpaceItem.GetRight(), rLRSpaceItem.GetTxtLeft(),
 							rLRSpaceItem.GetTxtFirstLineOfst(), nId );
+
+                    const INT16 nOutlineLevel = ((const SfxInt16Item&)aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue();
+                    const SvxNumBulletItem& rNumBulletItem = (const SvxNumBulletItem&) aEditAttr.Get( EE_PARA_NUMBULLET );
+                    if( nOutlineLevel != -1 && 
+                        rNumBulletItem.GetNumRule() &&
+                        rNumBulletItem.GetNumRule()->GetLevelCount() > nOutlineLevel )
+                    {
+                        const SvxNumberFormat& rFormat = rNumBulletItem.GetNumRule()->GetLevel(nOutlineLevel);
+                        aLRSpaceItem.SetTxtLeft(rFormat.GetAbsLSpace() + rLRSpaceItem.GetTxtLeft());
+                        aLRSpaceItem.SetTxtFirstLineOfst(
+                            rLRSpaceItem.GetTxtFirstLineOfst() + rFormat.GetFirstLineOffset() 
+                            - rFormat.GetCharTextDistance());
+                    }
+
 					rSet.Put( aLRSpaceItem );
 
 					Point aPos( aPagePos + maMarkRect.TopLeft() );