loplugin:loopvartoosmall

Change-Id: I1e9768c08af0bc7caac6a39c13842ee9d8ad962c

14 files changed, 19 insertions, 19 deletions

diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index de5d309b1481..d2da96c815f9 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -628,7 +628,7 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth )
         {
             // get X-Pos of the column changed
             long nX = 0;
-            for ( sal_uInt16 nCol = 0; nCol < nItemPos; ++nCol )
+            for ( size_t nCol = 0; nCol < nItemPos; ++nCol )
             {
                 BrowserColumn *pCol = (*pCols)[ nCol ];
                 if ( pCol->IsFrozen() || nCol >= nFirstCol )
@@ -1272,7 +1272,7 @@ void BrowseBox::RowInserted( long nRow, long nNumRows, bool bDoPaint, bool bKeep
             Any()
         );
 
-        for (sal_Int32 i = nRow+1 ; i <= nRowCount ; ++i)
+        for (long i = nRow+1 ; i <= nRowCount ; ++i)
         {
             commitHeaderBarEvent(
                 CHILD,
@@ -1443,7 +1443,7 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, bool bDoPaint )
                 Any()
             );
 
-            for (sal_Int32 i = nRow+1 ; i <= (nRow+nNumRows) ; ++i)
+            for (long i = nRow+1 ; i <= (nRow+nNumRows) ; ++i)
             {
                 commitHeaderBarEvent(
                     CHILD,
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index ff53f441b32a..8414279dfb3c 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -450,7 +450,7 @@ sal_uInt16 BrowseBox::GetColumnId( sal_uInt16 nPos ) const
 sal_uInt16 BrowseBox::GetColumnPos( sal_uInt16 nId ) const
 {
 
-    for ( sal_uInt16 nPos = 0; nPos < pCols->size(); ++nPos )
+    for ( size_t nPos = 0; nPos < pCols->size(); ++nPos )
         if ( (*pCols)[ nPos ]->GetId() == nId )
             return nPos;
     return BROWSER_INVALIDID;
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index d2a44ffe8464..bae84d2d906a 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -515,7 +515,7 @@ void BrowseBox::GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int3
         {
             const Range& rRange = pColumnSel->GetRange( nRange );
             // loop has to include aRange.Max()
-            for( sal_Int32 nCol = rRange.Min(); nCol <= rRange.Max(); ++nCol )
+            for( sal_Int32 nCol = rRange.Min(); nCol <= (sal_Int32)rRange.Max(); ++nCol )
             {
                 DBG_ASSERT( nIndex < nCount,
                     "GetAllSelectedColumns - range overflow" );
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 5d516b6228d5..3fe79c84a2ec 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -841,7 +841,7 @@ void ViewTabListBox_Impl::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEn
 
 void ViewTabListBox_Impl::ClearAll()
 {
-    for ( sal_uInt16 i = 0; i < GetEntryCount(); ++i )
+    for ( sal_uLong i = 0; i < GetEntryCount(); ++i )
         delete static_cast<SvtContentEntry*>(GetEntry(i)->GetUserData());
     Clear();
 }
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index ca994b6956a9..c19c9cbd75a7 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -2815,7 +2815,7 @@ void SvxIconChoiceCtrl_Impl::AdjustAtGrid( const SvxIconChoiceCtrlEntryPtrVec& r
         bGo = false;
 
     long nCurRight = 0;
-    for( sal_uInt16 nCur = 0; nCur < rRow.size(); nCur++ )
+    for( size_t nCur = 0; nCur < rRow.size(); nCur++ )
     {
         SvxIconChoiceCtrlEntry* pCur = rRow[ nCur ];
         if( !bGo && pCur == pStart )
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 0d67e2a0142d..e5bc545a3c92 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -3012,7 +3012,7 @@ void SvImpLBox::Command( const CommandEvent& rCEvt )
                 bClickedIsFreePlace = true;
                 sal_Int32               nSelectedEntries = pView->GetSelectionCount();
                 SvTreeListEntry*        pSelected = pView->FirstSelected();
-                for(sal_uInt16 nSel = 0; nSel < nSelectedEntries; nSel++ )
+                for(sal_Int32 nSel = 0; nSel < nSelectedEntries; nSel++ )
                 {
                     aSelRestore.push(pSelected);
                     pSelected = pView->NextSelected( pSelected );
@@ -3224,7 +3224,7 @@ SvLBoxTab* SvImpLBox::NextTab( SvLBoxTab* pTab )
     sal_uInt16 nTabCount = pView->TabCount();
     if( nTabCount <= 1 )
         return 0;
-    for( sal_uInt16 nTab=0; nTab < (nTabCount-1); nTab++)
+    for( int nTab=0; nTab < (nTabCount-1); nTab++)
     {
         if( pView->aTabs[nTab]==pTab )
             return (SvLBoxTab*)(pView->aTabs[nTab+1]);
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index e9d60b306e0d..9f6a7e9ccb32 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -1925,7 +1925,7 @@ Rectangle Calendar::GetDateRect( const Date& rDate ) const
             aRect = GetDateRect( aLastDate );
             nDaysOff = rDate-aLastDate;
             nDayIndex = 0;
-            for ( sal_uInt16 i = 0; i <= nDaysOff; i++ )
+            for ( sal_uLong i = 0; i <= nDaysOff; i++ )
             {
                 if ( aLastDate == rDate )
                 {
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 0e68c79c57fe..33d92f063d6f 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -422,7 +422,7 @@ void Ruler::ImplInvertLines(vcl::RenderContext& rRenderContext, bool bErase)
             aRect.Right() = nY;
 
         // Draw lines
-        for (sal_uInt32 i = 0; i < mpData->pLines.size(); i++)
+        for (size_t i = 0; i < mpData->pLines.size(); i++)
         {
             const long n = mpData->pLines[i].nPos + nNullWinOff;
             if ((n >= nRulX1) && (n < nRulX2))
@@ -1022,7 +1022,7 @@ void Ruler::ImplDrawTab(vcl::RenderContext& rRenderContext, const Point& rPos, s
 
 void Ruler::ImplDrawTabs(vcl::RenderContext& /*rRenderContext*/, long nMin, long nMax, long nVirTop, long nVirBottom)
 {
-    for (sal_uInt32 i = 0; i < mpData->pTabs.size(); i++)
+    for (size_t i = 0; i < mpData->pTabs.size(); i++)
     {
         if (mpData->pTabs[i].nStyle & RULER_STYLE_INVISIBLE)
             continue;
diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx
index 6e6965890d4e..a28d573953cd 100644
--- a/svtools/source/edit/editsyntaxhighlighter.cxx
+++ b/svtools/source/edit/editsyntaxhighlighter.cxx
@@ -160,7 +160,7 @@ void MultiLineEditSyntaxHighlight::UpdateData()
     // syntax highlighting
     // this must be possible improved by using notifychange correctly
     bool bTempModified = GetTextEngine()->IsModified();
-    for (unsigned int nLine=0; nLine < GetTextEngine()->GetParagraphCount(); nLine++)
+    for (sal_uLong nLine=0; nLine < GetTextEngine()->GetParagraphCount(); nLine++)
     {
         OUString aLine( GetTextEngine()->GetText( nLine ) );
         GetTextEngine()->RemoveAttribs( nLine, true );
diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx
index 9be39c0beba8..46fe571ab296 100644
--- a/svtools/source/graphic/transformer.cxx
+++ b/svtools/source/graphic/transformer.cxx
@@ -60,9 +60,9 @@ void setAlpha( Bitmap& rBitmap, AlphaMask& rAlpha, sal_uInt8 cIndexFrom, sal_Int
     BitmapReadAccess* pReadAccess = rBitmap.AcquireReadAccess();
     if ( pReadAccess && pWriteAccess )
     {
-        for ( sal_Int32 nY = 0; nY < pReadAccess->Height(); nY++ )
+        for ( long nY = 0; nY < pReadAccess->Height(); nY++ )
         {
-            for ( sal_Int32 nX = 0; nX < pReadAccess->Width(); nX++ )
+            for ( long nX = 0; nX < pReadAccess->Width(); nX++ )
             {
                 const sal_uInt8 cIndex = pReadAccess->GetPixelIndex( nY, nX );
                 if ( cIndex == cIndexFrom )
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index b88d3880b236..b79fcd97ec1d 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -629,7 +629,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
     Out_String( rStream, rOutName, eDestEnc, pNonConvertableChars );
     rStream.WriteCharPtr( "\">" );
 
-    for( sal_uInt16 i=0U; i<rIMap.GetIMapObjectCount(); i++ )
+    for( size_t i=0; i<rIMap.GetIMapObjectCount(); i++ )
     {
         const IMapObject* pObj = rIMap.GetIMapObject( i );
         DBG_ASSERT( pObj, "Wo ist das ImageMap-Object?" );
diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx
index 8173c10d1ad7..76166716bb50 100644
--- a/svtools/source/uno/framestatuslistener.cxx
+++ b/svtools/source/uno/framestatuslistener.cxx
@@ -283,7 +283,7 @@ void FrameStatusListener::bindListener()
     {
         try
         {
-            for ( sal_uInt32 i = 0; i < aDispatchVector.size(); i++ )
+            for ( size_t i = 0; i < aDispatchVector.size(); i++ )
             {
                 Listener& rListener = aDispatchVector[i];
                 if ( rListener.xDispatch.is() )
diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx
index 88f10265e99e..06bac92e65d3 100644
--- a/svtools/source/uno/statusbarcontroller.cxx
+++ b/svtools/source/uno/statusbarcontroller.cxx
@@ -482,7 +482,7 @@ void StatusbarController::bindListener()
     if ( !xStatusListener.is() )
         return;
 
-    for ( sal_uInt32 i = 0; i < aDispatchVector.size(); i++ )
+    for ( size_t i = 0; i < aDispatchVector.size(); i++ )
     {
         try
         {
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index 7086a34dcc84..99f7a57360ef 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -545,7 +545,7 @@ void ToolboxController::bindListener()
     {
         try
         {
-            for ( sal_uInt32 i = 0; i < aDispatchVector.size(); i++ )
+            for ( size_t i = 0; i < aDispatchVector.size(); i++ )
             {
                 Listener& rListener = aDispatchVector[i];
                 if ( rListener.xDispatch.is() )