diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-03-08 11:25:53 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-03-08 11:25:53 +0000 |
| commit | ac7efb7fb951fc0ca9b54f4700232815b0926fb5 (patch) | |
| tree | b94085ba5f0709d921c10237b6d1595f82a6d586 /sw/source/core/edit | |
| parent | 5fd7e55ae51f042fc7717389bd793471380d39b0 (diff) | |
INTEGRATION: CWS swnum01 (1.5.52); FILE MERGED
2003/08/18 12:21:04 hbrinkm 1.5.52.1: #111856#
Diffstat (limited to 'sw/source/core/edit')
| -rw-r--r-- | sw/source/core/edit/ednumber.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx index bbfc1e058803..86f31567d11c 100644 --- a/sw/source/core/edit/ednumber.cxx +++ b/sw/source/core/edit/ednumber.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ednumber.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: vg $ $Date: 2003-06-10 13:17:53 $ + * last change: $Author: hr $ $Date: 2004-03-08 12:25:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -365,7 +365,7 @@ BOOL SwEditShell::MoveNumParas( BOOL bUpperLower, BOOL bUpperLeft ) ( pNd->IsEndNode() && pNd->FindStartNode()->IsSectionNode()) || ( pNd->IsTxtNode() && pOrig == ((SwTxtNode*)pNd)->GetNumRule() && ((SwTxtNode*)pNd)->GetNum() && - (((SwTxtNode*)pNd)->GetNum()->GetLevel() & ~NO_NUMLEVEL) > nUpperLevel )) ) + ((SwTxtNode*)pNd)->GetNum()->GetRealLevel() > nUpperLevel )) ) ++nIdx; if( nStt == nIdx || !GetDoc()->GetNodes()[ nIdx ]->IsTxtNode() ) nOffset = 1; @@ -550,7 +550,7 @@ BOOL SwEditShell::IsNoNum( BOOL bChkStart, BOOL bOutline ) const 0 != (pNum = pTxtNd->GetOutlineNum() )) : (pTxtNd->GetNumRule() && 0 != (pNum = pTxtNd->GetNum() ) )) && - 0 != ( pNum->GetLevel() & NO_NUMLEVEL ); + ! pNum->IsNum(); } @@ -579,7 +579,7 @@ BYTE SwEditShell::GetNumLevel( BOOL* pHasChilds ) const // zuerst ueber alle TextNodes und falls da nichts gefunden // wurde, ueber die Formate und deren GetInfo bis zu den Nodes - BYTE nLvl = nLevel & ~NO_NUMLEVEL; + BYTE nLvl = GetRealLevel(nLevel); if( nLvl + 1 < MAXLEVEL ) { const String& rRule = pRule->GetName(); @@ -594,7 +594,7 @@ BYTE SwEditShell::GetNumLevel( BOOL* pHasChilds ) const pMod->IsA( TYPE( SwTxtNode )) && ((SwTxtNode*)pMod)->GetNodes().IsDocNodes() && ((SwTxtNode*)pMod)->GetNum() && - nLvl < ( ((SwTxtNode*)pMod)->GetNum()->GetLevel() & ~NO_NUMLEVEL) ) + nLvl < ((SwTxtNode*)pMod)->GetNum()->GetRealLevel() ) { *pHasChilds = TRUE; break; |