diff options
author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-04-23 07:46:57 +0200 |
---|---|---|
committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-05-03 22:31:56 +0200 |
commit | 9fbb74b5b688eb51bf3b849e56841a00b836628c (patch) | |
tree | 9d8085d38e5b470d78e38cd87c0752ddb7f07816 /sw/source/core/edit/ednumber.cxx | |
parent | f66572b2ff5f27ab938edbe3a2329395aae43c2d (diff) |
sal_uInt16 to size_type
Change-Id: Ib6715c5b61c718302b910a19ef557960e0f7aa93
Diffstat (limited to 'sw/source/core/edit/ednumber.cxx')
-rw-r--r-- | sw/source/core/edit/ednumber.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx index c4e1ab482c9f..0617ef2d3698 100644 --- a/sw/source/core/edit/ednumber.cxx +++ b/sw/source/core/edit/ednumber.cxx @@ -41,7 +41,7 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 ) { aRg.nStart = aRg.nEnd; aRg.nEnd = rIdx1.GetIndex(); } _SwPamRanges::const_iterator it = lower_bound(aRg); //search Insert Position - sal_uInt16 nPos = it - begin(); + size_type nPos = it - begin(); if (!empty() && (it != end()) && (*it) == aRg) { // is the one in the Array smaller? @@ -95,7 +95,7 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 ) _SwPamRanges::insert( aRg ); } -SwPaM& SwPamRanges::SetPam( sal_uInt16 nArrPos, SwPaM& rPam ) +SwPaM& SwPamRanges::SetPam( size_type nArrPos, SwPaM& rPam ) { OSL_ASSERT( nArrPos < Count() ); const SwPamRange& rTmp = (*this)[ nArrPos ]; @@ -136,7 +136,7 @@ bool SwEditShell::NoNum() GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL ); SwPamRanges aRangeArr( *pCrsr ); SwPaM aPam( *pCrsr->GetPoint() ); - for( sal_uInt16 n = 0; n < aRangeArr.Count(); ++n ) + for( SwPamRanges::size_type n = 0; n < aRangeArr.Count(); ++n ) bRet = bRet && GetDoc()->NoNum( aRangeArr.SetPam( n, aPam )); GetDoc()->GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL ); } @@ -155,7 +155,7 @@ bool SwEditShell::SelectionHasNumber() const if (!bResult && pTxtNd && pTxtNd->Len()==0 && !pTxtNd->GetNumRule()) { SwPamRanges aRangeArr( *GetCrsr() ); SwPaM aPam( *GetCrsr()->GetPoint() ); - for( sal_uInt16 n = 0; n < aRangeArr.Count(); ++n ) + for( SwPamRanges::size_type n = 0; n < aRangeArr.Count(); ++n ) { aRangeArr.SetPam( n, aPam ); { @@ -201,7 +201,7 @@ bool SwEditShell::SelectionHasBullet() const if (!bResult && pTxtNd && pTxtNd->Len()==0 && !pTxtNd->GetNumRule()) { SwPamRanges aRangeArr( *GetCrsr() ); SwPaM aPam( *GetCrsr()->GetPoint() ); - for( sal_uInt16 n = 0; n < aRangeArr.Count(); ++n ) + for( SwPamRanges::size_type n = 0; n < aRangeArr.Count(); ++n ) { aRangeArr.SetPam( n, aPam ); { @@ -281,7 +281,7 @@ void SwEditShell::DelNumRules() GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL ); SwPamRanges aRangeArr( *pCrsr ); SwPaM aPam( *pCrsr->GetPoint() ); - for( sal_uInt16 n = 0; n < aRangeArr.Count(); ++n ) + for( SwPamRanges::size_type n = 0; n < aRangeArr.Count(); ++n ) { GetDoc()->DelNumRules( aRangeArr.SetPam( n, aPam ) ); } @@ -314,7 +314,7 @@ bool SwEditShell::NumUpDown( bool bDown ) GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL ); SwPamRanges aRangeArr( *pCrsr ); SwPaM aPam( *pCrsr->GetPoint() ); - for( sal_uInt16 n = 0; n < aRangeArr.Count(); ++n ) + for( SwPamRanges::size_type n = 0; n < aRangeArr.Count(); ++n ) bRet = bRet && GetDoc()->NumUpDown( aRangeArr.SetPam( n, aPam ), bDown ); GetDoc()->GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL ); } @@ -535,7 +535,7 @@ bool SwEditShell::OutlineUpDown( short nOffset ) GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL ); SwPamRanges aRangeArr( *pCrsr ); SwPaM aPam( *pCrsr->GetPoint() ); - for( sal_uInt16 n = 0; n < aRangeArr.Count(); ++n ) + for( SwPamRanges::size_type n = 0; n < aRangeArr.Count(); ++n ) bRet = bRet && GetDoc()->OutlineUpDown( aRangeArr.SetPam( n, aPam ), nOffset ); GetDoc()->GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL ); @@ -745,7 +745,7 @@ void SwEditShell::SetCurNumRule( const SwNumRule& rRule, SwPamRanges aRangeArr( *pCrsr ); SwPaM aPam( *pCrsr->GetPoint() ); OUString sContinuedListId(rContinuedListId); - for( sal_uInt16 n = 0; n < aRangeArr.Count(); ++n ) + for( SwPamRanges::size_type n = 0; n < aRangeArr.Count(); ++n ) { aRangeArr.SetPam( n, aPam ); OUString sListId = GetDoc()->SetNumRule( aPam, rRule, @@ -804,7 +804,7 @@ void SwEditShell::SetNumRuleStart( bool bFlag, SwPaM* pPaM ) GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL ); SwPamRanges aRangeArr( *pCrsr ); SwPaM aPam( *pCrsr->GetPoint() ); - for( sal_uInt16 n = 0; n < aRangeArr.Count(); ++n ) + for( SwPamRanges::size_type n = 0; n < aRangeArr.Count(); ++n ) GetDoc()->SetNumRuleStart( *aRangeArr.SetPam( n, aPam ).GetPoint(), bFlag ); GetDoc()->GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL ); } @@ -831,7 +831,7 @@ void SwEditShell::SetNodeNumStart( sal_uInt16 nStt, SwPaM* pPaM ) GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL ); SwPamRanges aRangeArr( *pCrsr ); SwPaM aPam( *pCrsr->GetPoint() ); - for( sal_uInt16 n = 0; n < aRangeArr.Count(); ++n ) + for( SwPamRanges::size_type n = 0; n < aRangeArr.Count(); ++n ) GetDoc()->SetNodeNumStart( *aRangeArr.SetPam( n, aPam ).GetPoint(), nStt ); GetDoc()->GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL ); } |