diff options
| -rw-r--r-- | svtools/source/brwbox/brwbox3.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/text/itrpaint.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/text/porlay.cxx | 9 |
3 files changed, 8 insertions, 9 deletions
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index 6facb704f34b..ea8a201ff086 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -511,8 +511,8 @@ void BrowseBox::GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int3 _rColumns.realloc( nCount ); sal_Int32 nIndex = 0; - sal_uInt32 nRangeCount = pColumnSel->GetRangeCount(); - for( sal_uInt32 nRange = 0; nRange < nRangeCount; ++nRange ) + const size_t nRangeCount = pColumnSel->GetRangeCount(); + for( size_t nRange = 0; nRange < nRangeCount; ++nRange ) { const Range& rRange = pColumnSel->GetRange( nRange ); // loop has to include aRange.Max() diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx index 85c84e00124b..a96299756953 100644 --- a/sw/source/core/text/itrpaint.cxx +++ b/sw/source/core/text/itrpaint.cxx @@ -535,10 +535,10 @@ void SwTxtPainter::CheckSpecialUnderline( const SwLinePortion* pPor, const sal_Int32 nIndx = GetInfo().GetIdx(); long nUnderStart = 0; long nUnderEnd = 0; - const MSHORT nCnt = (MSHORT)aUnderMulti.GetRangeCount(); + const size_t nCnt = aUnderMulti.GetRangeCount(); // find the underline range the current portion is contained in - for( MSHORT i = 0; i < nCnt; ++i ) + for( size_t i = 0; i < nCnt; ++i ) { const Range& rRange = aUnderMulti.GetRange( i ); if( nUnderEnd == rRange.Min() ) diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index 29861ebf53cf..851aba81d56e 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -687,8 +687,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL ) CalcHiddenRanges( rNode, aHiddenMulti ); aHiddenChg.clear(); - sal_uInt16 i = 0; - for( i = 0; i < aHiddenMulti.GetRangeCount(); ++i ) + for( size_t i = 0; i < aHiddenMulti.GetRangeCount(); ++i ) { const Range& rRange = aHiddenMulti.GetRange( i ); const sal_Int32 nStart = rRange.Min(); @@ -1159,7 +1158,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL ) // check kashida data long nTmpKashidaPos = -1; bool bWrongKash = false; - for (i = 0; i < aKashida.size(); ++i ) + for (size_t i = 0; i < aKashida.size(); ++i ) { long nCurrKashidaPos = GetKashida( i ); if ( nCurrKashidaPos <= nTmpKashidaPos ) @@ -1478,7 +1477,7 @@ bool SwScriptInfo::GetBoundsOfHiddenRange( const SwTxtNode& rNode, sal_Int32 nPo : 0); MultiSelection aHiddenMulti( aRange ); SwScriptInfo::CalcHiddenRanges( rNode, aHiddenMulti ); - for( sal_uInt16 i = 0; i < aHiddenMulti.GetRangeCount(); ++i ) + for( size_t i = 0; i < aHiddenMulti.GetRangeCount(); ++i ) { const Range& rRange = aHiddenMulti.GetRange( i ); const sal_Int32 nHiddenStart = rRange.Min(); @@ -1497,7 +1496,7 @@ bool SwScriptInfo::GetBoundsOfHiddenRange( const SwTxtNode& rNode, sal_Int32 nPo if ( pList ) { - for( sal_uInt16 i = 0; i < aHiddenMulti.GetRangeCount(); ++i ) + for( size_t i = 0; i < aHiddenMulti.GetRangeCount(); ++i ) { const Range& rRange = aHiddenMulti.GetRange( i ); pList->push_back( rRange.Min() ); |