diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-06-27 21:52:53 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-06-28 11:17:55 +0200 |
| commit | bd479676f275dd96df497a5098951ab45165335d (patch) | |
| tree | dc0dca3684cddefe0ae84bd18c1a8496064439b5 | |
| parent | 5247da4e4a821ca9c1336ffc9169b970cd547baf (diff) | |
sal_uInt16 to size_t
Change-Id: I8b045cf44b3e62616c8c3e0a896524af13310dd3
| -rw-r--r-- | sw/source/core/undo/docundo.cxx | 8 | ||||
| -rw-r--r-- | sw/source/core/undo/rolbck.cxx | 3 | ||||
| -rw-r--r-- | sw/source/core/undo/unattr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/undo/undel.cxx | 4 |
4 files changed, 8 insertions, 9 deletions
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx index 845dfb764ef0..f097c2147075 100644 --- a/sw/source/core/undo/docundo.cxx +++ b/sw/source/core/undo/docundo.cxx @@ -308,8 +308,8 @@ SwUndoComments_t UndoManager::GetUndoComments() const "GetUndoComments() called while in list action?"); SwUndoComments_t ret; - sal_uInt16 const nUndoCount(SdrUndoManager::GetUndoActionCount(TopLevel)); - for (sal_uInt16 n = 0; n < nUndoCount; ++n) + const size_t nUndoCount(SdrUndoManager::GetUndoActionCount(TopLevel)); + for (size_t n = 0; n < nUndoCount; ++n) { OUString const comment( SdrUndoManager::GetUndoActionComment(n, TopLevel)); @@ -352,8 +352,8 @@ SwUndoComments_t UndoManager::GetRedoComments() const "GetRedoComments() called while in list action?"); SwUndoComments_t ret; - sal_uInt16 const nRedoCount(SdrUndoManager::GetRedoActionCount(TopLevel)); - for (sal_uInt16 n = 0; n < nRedoCount; ++n) + const size_t nRedoCount(SdrUndoManager::GetRedoActionCount(TopLevel)); + for (size_t n = 0; n < nRedoCount; ++n) { OUString const comment( SdrUndoManager::GetRedoActionComment(n, TopLevel)); diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index c5cfc3409597..44079f8fb2f7 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -1127,8 +1127,7 @@ bool SwHistory::Rollback( SwDoc* pDoc, sal_uInt16 nStart ) return false; SwHistoryHint * pHHt; - sal_uInt16 i; - for ( i = Count(); i > nStart ; ) + for ( sal_uInt16 i = Count(); i > nStart ; ) { pHHt = m_SwpHstry[ --i ]; pHHt->SetInDoc( pDoc, false ); diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx index ed0ac1ce43c9..3df0fc96f009 100644 --- a/sw/source/core/undo/unattr.cxx +++ b/sw/source/core/undo/unattr.cxx @@ -924,7 +924,7 @@ void SwUndoAttr::RemoveIdx( SwDoc& rDoc ) if ( COMPLETE_STRING != nCntnt ) { const std::vector<sal_uInt16>& rArr = pHistoryHint->GetArr(); - for ( sal_uInt16 i = rArr.size(); i; ) + for ( size_t i = rArr.size(); i; ) { if ( RES_TXTATR_FTN == rArr[ --i ] ) { diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx index 7e1074cb7fcd..cb3180292e10 100644 --- a/sw/source/core/undo/undel.cxx +++ b/sw/source/core/undo/undel.cxx @@ -54,7 +54,7 @@ static void lcl_MakeAutoFrms( const SwFrmFmts& rSpzArr, sal_uLong nMovedIndex ) { SwFlyFrmFmt* pFmt; const SwFmtAnchor* pAnchor; - for( sal_uInt16 n = 0; n < rSpzArr.size(); ++n ) + for( size_t n = 0; n < rSpzArr.size(); ++n ) { pFmt = (SwFlyFrmFmt*)rSpzArr[n]; pAnchor = &pFmt->GetAnchor(); @@ -720,7 +720,7 @@ static void lcl_ReAnchorAtCntntFlyFrames( const SwFrmFmts& rSpzArr, SwPosition & SwFlyFrmFmt* pFmt; const SwFmtAnchor* pAnchor; const SwPosition* pAPos; - for( sal_uInt16 n = 0; n < rSpzArr.size(); ++n ) + for( size_t n = 0; n < rSpzArr.size(); ++n ) { pFmt = (SwFlyFrmFmt*)rSpzArr[n]; pAnchor = &pFmt->GetAnchor(); |