commit 651e60f73a677844de3f87055c07093a1d59ea5a
author Rüdiger Timm <rt@openoffice.org> Fri Oct 22 07:15:19 2004 +0000
committer Rüdiger Timm <rt@openoffice.org> Fri Oct 22 07:15:19 2004 +0000
tree e6157237d3162f72f6bc1d17d1fe91d566e5d91f
parent b7ef0ff2f21b7320383b6eb8e8ebd64eb3657698

INTEGRATION: CWS swqbugfixes07 (1.35.18); FILE MERGED
2004/10/12 14:32:32 fme 1.35.18.5: #i30314# Minor corrections for the convert-tab-stops-into-numbering-indent feature
2004/10/12 14:21:58 fme 1.35.18.4: #i30314# Minor corrections for the convert-tab-stops-into-numbering-indent feature
2004/10/11 11:47:12 fme 1.35.18.3: RESYNC: (1.37-1.38); FILE MERGED
2004/09/20 14:24:52 hbrinkm 1.35.18.2: RESYNC: (1.35-1.37); FILE MERGED
2004/09/20 10:26:29 hbrinkm 1.35.18.1: #i30314# convert tabs to numindent

sw/source/ui/wrtsh/wrtsh1.cxx

diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index 5987eafc..18461c8 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -2,9 +2,9 @@
 *
 *  $RCSfile: wrtsh1.cxx,v $
 *
 *  $Revision: 1.38 $
 *  $Revision: 1.39 $
 *
 *  last change: $Author: kz $ $Date: 2004-10-04 19:36:21 $
 *  last change: $Author: rt $ $Date: 2004-10-22 08:15:19 $
 *
 *  The Contents of this file are made available subject to the terms of
 *  either of the following licenses
@@ -1128,6 +1128,9 @@ void SwWrtShell::SplitNode( BOOL bAutoFmt, BOOL bCheckTableStart )
void SwWrtShell::NumOrBulletOn(BOOL bNum)
{
    const SwNumRule* pCurRule = GetCurNumRule();

    StartUndo(UNDO_NUMORNONUM);

    if( !pCurRule || !pCurRule->IsOutlineRule())
    {
        const SwNumRule * pNumRule =
@@ -1153,6 +1156,11 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
                pChrFmt = GetCharFmtFromPool( RES_POOLCHR_BUL_LEVEL );
            }

            SwTxtNode * pTxtNode =
                GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
            USHORT nWidthOfTabs = pTxtNode->GetWidthOfLeadingTabs();
            GetDoc()->RemoveLeadingChars(*GetCrsr()->GetPoint(), '\t');

            BOOL bHtml = 0 != PTR_CAST(SwWebDocShell, pDocSh);
            for( BYTE nLvl = 0; nLvl < MAXLEVEL; ++nLvl )
            {
@@ -1172,6 +1180,11 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
                    aFmt.SetLSpace(720);
                    aFmt.SetAbsLSpace(nLvl * 720);
                }
                else if ( nWidthOfTabs > 0 )
                {
                    aFmt.SetAbsLSpace(nWidthOfTabs + nLvl * 720);
                }

                aNumRule.Set( nLvl, aFmt );
            }
            SetCurNumRule( aNumRule );
@@ -1207,6 +1220,8 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
            }
        }
    }

    EndUndo(UNDO_NUMORNONUM);
}

void SwWrtShell::NumOn()