diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 07:46:14 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 07:46:14 +0000 |
| commit | 7289dd6e049a7a062eb7b5647790d5c9f25ce0ec (patch) | |
| tree | 7730994c04a3666e6ee9fd76cc79cc224719a516 /sw/source/core/edit/ednumber.cxx | |
| parent | 009b98a1efa49bc684e2c8933ff2e8c9f98c7a9e (diff) | |
INTEGRATION: CWS swwarnings (1.21.222); FILE MERGED
2007/05/29 11:24:55 os 1.21.222.3: RESYNC: (1.21-1.22); FILE MERGED
2007/04/03 12:59:49 tl 1.21.222.2: #i69287# warning-free code
2007/03/08 15:00:50 fme 1.21.222.1: #i69287# Warning free code
Diffstat (limited to 'sw/source/core/edit/ednumber.cxx')
| -rw-r--r-- | sw/source/core/edit/ednumber.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx index 28e3eb15d38a..34aa0a127eb7 100644 --- a/sw/source/core/edit/ednumber.cxx +++ b/sw/source/core/edit/ednumber.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ednumber.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: rt $ $Date: 2007-04-25 09:03:24 $ + * last change: $Author: hr $ $Date: 2007-09-27 08:46:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -508,7 +508,7 @@ BYTE SwEditShell::GetOutlineLevel( USHORT nIdx ) const { const SwNodes& rNds = GetDoc()->GetNodes(); - return rNds.GetOutLineNds()[ nIdx ]->GetTxtNode()->GetOutlineLevel(); + return static_cast<BYTE>(rNds.GetOutLineNds()[ nIdx ]->GetTxtNode()->GetOutlineLevel()); } @@ -568,8 +568,8 @@ BOOL SwEditShell::IsProtectedOutlinePara() const for( ; nPos < rOutlNd.Count(); ++nPos ) { - SwNodePtr pNd = rOutlNd[ nPos ]; - BYTE nTmpLvl = GetRealLevel( pNd->GetTxtNode()-> + SwNodePtr pTmpNd = rOutlNd[ nPos ]; + BYTE nTmpLvl = GetRealLevel( pTmpNd->GetTxtNode()-> GetTxtColl()->GetOutlineLevel() ); if( bFirst ) { @@ -579,7 +579,7 @@ BOOL SwEditShell::IsProtectedOutlinePara() const else if( nLvl >= nTmpLvl ) break; - if( pNd->IsProtect() ) + if( pTmpNd->IsProtect() ) { bRet = TRUE; break; @@ -637,7 +637,7 @@ BOOL SwEditShell::NumOrNoNum( BOOL bNumOn, BOOL bChkStart ) // #115901# return bRet; } -BOOL SwEditShell::IsNoNum( BOOL bChkStart, BOOL bOutline ) const +BOOL SwEditShell::IsNoNum( BOOL bChkStart ) const { // ein Backspace im Absatz ohne Nummer wird zum Delete BOOL bResult = FALSE; @@ -680,7 +680,7 @@ BYTE SwEditShell::GetNumLevel( BOOL* pHasChilds ) const const SwNumRule* pRule = pTxtNd->GetNumRule(); if(pRule) { - nLevel = pTxtNd->GetLevel(); + nLevel = static_cast<BYTE>(pTxtNd->GetLevel()); if( pHasChilds ) { *pHasChilds = FALSE; @@ -836,7 +836,7 @@ USHORT SwEditShell::IsNodeNumStart() const { const SwTxtNode* pTxtNd = GetCrsr()->GetNode()->GetTxtNode(); if( pTxtNd ) - return pTxtNd->GetStart(); + return static_cast<USHORT>(pTxtNd->GetStart()); return FALSE; } |