loplugin:loopvartoosmall

Change-Id: Icbe68b31d4ab04ca3cd9f572e3598413946a75c7

51 files changed, 104 insertions, 103 deletions

diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index 1d00867f3894..fee62f94e420 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -156,7 +156,7 @@ AccessibleDialogWindow::~AccessibleDialogWindow()
 
 void AccessibleDialogWindow::UpdateFocused()
 {
-    for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+    for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
     {
         Reference< XAccessible > xChild( m_aAccessibleChildren[i].rxAccessible );
         if ( xChild.is() )
@@ -174,7 +174,7 @@ void AccessibleDialogWindow::UpdateSelected()
 {
     NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
 
-    for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+    for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
     {
         Reference< XAccessible > xChild( m_aAccessibleChildren[i].rxAccessible );
         if ( xChild.is() )
@@ -190,7 +190,7 @@ void AccessibleDialogWindow::UpdateSelected()
 
 void AccessibleDialogWindow::UpdateBounds()
 {
-    for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+    for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
     {
         Reference< XAccessible > xChild( m_aAccessibleChildren[i].rxAccessible );
         if ( xChild.is() )
@@ -436,7 +436,7 @@ void AccessibleDialogWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindo
                 m_pDlgEdModel = NULL;
 
                 // dispose all children
-                for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+                for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
                 {
                     Reference< XComponent > xComponent( m_aAccessibleChildren[i].rxAccessible, UNO_QUERY );
                     if ( xComponent.is() )
@@ -586,7 +586,7 @@ void AccessibleDialogWindow::disposing()
         m_pDlgEdModel = NULL;
 
         // dispose all children
-        for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+        for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
         {
             Reference< XComponent > xComponent( m_aAccessibleChildren[i].rxAccessible, UNO_QUERY );
             if ( xComponent.is() )
@@ -787,7 +787,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt
     OExternalLockGuard aGuard( this );
 
     Reference< XAccessible > xChild;
-    for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+    for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
     {
         Reference< XAccessible > xAcc = getAccessibleChild( i );
         if ( xAcc.is() )
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 2c98fdea94d5..658b9b9c1058 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -899,7 +899,7 @@ void EditorWindow::SetupAndShowCodeCompleteWnd( const std::vector< OUString >& a
     // clear the listbox
     pCodeCompleteWnd->ClearListBox();
     // fill the listbox
-    for(unsigned int l = 0; l < aEntryVect.size(); ++l)
+    for(size_t l = 0; l < aEntryVect.size(); ++l)
     {
         pCodeCompleteWnd->InsertEntry( aEntryVect[l] );
     }
@@ -1013,7 +1013,7 @@ void EditorWindow::CreateEditEngine()
     aSyntaxIdle.Stop();
     bDoSyntaxHighlight = bWasDoSyntaxHighlight;
 
-    for (sal_uInt16 nLine = 0; nLine < nLines; nLine++)
+    for (sal_Int32 nLine = 0; nLine < nLines; nLine++)
         aSyntaxLineTable.insert(nLine);
     ForceSyntaxTimeout();
 
@@ -2669,7 +2669,7 @@ void CodeCompleteListBox::InsertSelectedEntry()
 
 void CodeCompleteListBox::SetMatchingEntries()
 {
-    for(sal_uInt16 i=0; i< GetEntryCount(); ++i)
+    for(sal_Int32 i=0; i< GetEntryCount(); ++i)
     {
         OUString sEntry = GetEntry(i);
         if( sEntry.startsWithIgnoreAsciiCase( aFuncBuffer.toString() ) )
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 987c1aa65ae8..ce19f5c3338e 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -72,7 +72,7 @@ void Organize( sal_Int16 tabId )
 
 bool IsValidSbxName( const OUString& rName )
 {
-    for ( sal_uInt16 nChar = 0; nChar < rName.getLength(); nChar++ )
+    for ( sal_Int32 nChar = 0; nChar < rName.getLength(); nChar++ )
     {
         sal_Unicode c = rName[nChar];
         bool bValid = (
diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx
index 12ad6277055b..43813e267770 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -381,7 +381,7 @@ IMPL_LINK(Layout::SplittedSide, SplitHdl, Splitter*, pSplitter)
     else
     {
         // Item::nStartPos, Item::nLength
-        for (unsigned i = 1; i < vItems.size(); ++i)
+        for (size_t i = 1; i < vItems.size(); ++i)
         {
             if (vItems[i].pSplit.get() == pSplitter)
             {
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 23e2597c413f..9c340239773e 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -586,7 +586,7 @@ IMPL_LINK( MacroChooser, EditModifyHdl, Edit *, pEdit )
         {
             OUString aEdtText( m_pMacroNameEdit->GetText() );
             bool bFound = false;
-            for ( sal_uInt16 n = 0; n < m_pMacroBox->GetEntryCount(); n++ )
+            for ( sal_uLong n = 0; n < m_pMacroBox->GetEntryCount(); n++ )
             {
                 SvTreeListEntry* pEntry = m_pMacroBox->GetEntry( n );
                 DBG_ASSERT( pEntry, "Entry ?!" );
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 70c4f583d4cc..822c0657f777 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -872,7 +872,7 @@ void LibPage::InsertLib()
                     bool bRemove = false;
                     bool bReplace = pLibDlg->IsReplace();
                     bool bReference = pLibDlg->IsReference();
-                    for ( sal_uInt16 nLib = 0; nLib < pLibDlg->GetLibBox().GetEntryCount(); nLib++ )
+                    for ( sal_uLong nLib = 0; nLib < pLibDlg->GetLibBox().GetEntryCount(); nLib++ )
                     {
                         if ( pLibDlg->GetLibBox().IsChecked( nLib ) )
                         {
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index e4647ebdbb90..66a49a2a4501 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -1444,7 +1444,7 @@ void DlgEdForm::UpdateTabIndices()
 
         // create a map of tab indices and control names, sorted by tab index
         IndexToNameMap aIndexToNameMap;
-        for ( sal_Int16 i = 0; i < nCtrls; ++i )
+        for ( sal_Int32 i = 0; i < nCtrls; ++i )
         {
             // get name
             OUString aName( pNames[i] );
diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx
index cc25ea084bc9..26a26cf08a5d 100644
--- a/canvas/source/vcl/impltools.cxx
+++ b/canvas/source/vcl/impltools.cxx
@@ -330,7 +330,7 @@ namespace vclcanvas
                     aTransform.invert();
 
                     // for the time being, always read as ARGB
-                    for( int y=0; y<aDestBmpSize.Height(); ++y )
+                    for( long y=0; y<aDestBmpSize.Height(); ++y )
                     {
                         if( bModulateColors )
                         {
@@ -346,7 +346,7 @@ namespace vclcanvas
                             if( rBitmap.IsTransparent() )
                             {
                                 // Handling alpha and mask just the same...
-                                for( int x=0; x<aDestBmpSize.Width(); ++x )
+                                for( long x=0; x<aDestBmpSize.Width(); ++x )
                                 {
                                     ::basegfx::B2DPoint aPoint(x,y);
                                     aPoint *= aTransform;
@@ -392,7 +392,7 @@ namespace vclcanvas
                             }
                             else
                             {
-                                for( int x=0; x<aDestBmpSize.Width(); ++x )
+                                for( long x=0; x<aDestBmpSize.Width(); ++x )
                                 {
                                     ::basegfx::B2DPoint aPoint(x,y);
                                     aPoint *= aTransform;
@@ -449,7 +449,7 @@ namespace vclcanvas
                             if( rBitmap.IsTransparent() )
                             {
                                 // Handling alpha and mask just the same...
-                                for( int x=0; x<aDestBmpSize.Width(); ++x )
+                                for( long x=0; x<aDestBmpSize.Width(); ++x )
                                 {
                                     ::basegfx::B2DPoint aPoint(x,y);
                                     aPoint *= aTransform;
@@ -471,7 +471,7 @@ namespace vclcanvas
                             }
                             else
                             {
-                                for( int x=0; x<aDestBmpSize.Width(); ++x )
+                                for( long x=0; x<aDestBmpSize.Width(); ++x )
                                 {
                                     ::basegfx::B2DPoint aPoint(x,y);
                                     aPoint *= aTransform;
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 274791694edb..ac0f1fd70163 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -127,7 +127,7 @@ void DrawCommandDispatch::setAttributes( SdrObject* pObj )
                 ::std::vector< OUString > aObjList;
                 if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) )
                 {
-                    for ( sal_uInt16 i = 0; i < aObjList.size(); ++i )
+                    for ( size_t i = 0; i < aObjList.size(); ++i )
                     {
                         if ( aObjList[ i ].equalsIgnoreAsciiCase( m_aCustomShapeType ) )
                         {
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index 1b7f67acc2c1..93164ba00000 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -568,7 +568,7 @@ void OpenGL3DRenderer::CreateActualRoundedCube(float fRadius, int iSubDivY, int
     {
         m_RoundBarMesh.iElementSizes[k] = indices[k].size() - m_RoundBarMesh.iElementStartIndices[k];
         m_RoundBarMesh.iElementStartIndices[k] = m_Indices.size() * sizeof(unsigned short);
-        for (unsigned int IdxCnt = 0; IdxCnt < indices[k].size(); IdxCnt++)
+        for (size_t IdxCnt = 0; IdxCnt < indices[k].size(); IdxCnt++)
         {
             m_Indices.push_back(indices[k][IdxCnt]);
         }
diff --git a/compilerplugins/clang/loopvartoosmall.cxx b/compilerplugins/clang/loopvartoosmall.cxx
index cee6f0247e54..a742af61fb12 100644
--- a/compilerplugins/clang/loopvartoosmall.cxx
+++ b/compilerplugins/clang/loopvartoosmall.cxx
@@ -49,7 +49,7 @@ bool LoopVarTooSmall::VisitForStmt( const ForStmt* stmt )
 {
     if (ignoreLocation( stmt ))
         return true;
-    // ignore SAL for now
+    // ignore sal/ module for now
     StringRef aFileName = getFilename(stmt->getLocStart());
     if (aFileName.startswith(SRCDIR "/sal/")) {
         return true;
@@ -76,8 +76,9 @@ bool LoopVarTooSmall::VisitForStmt( const ForStmt* stmt )
     if (binOp->getOpcode() != BO_LT && binOp->getOpcode() != BO_LE)
         return true;
     const Expr* binOpRHS = binOp->getRHS();
-    // ignore complex expressions for now
-    if (isa<BinaryOperator>(binOpRHS))
+    // ignore complex expressions for now, promotion rules on conditions like "i < (size()+1)"
+    // make it hard to guess at a correct type.
+    if (isa<BinaryOperator>(binOpRHS) || isa<ParenExpr>(binOpRHS))
         return true;
     if (isa<ImplicitCastExpr>(binOpRHS)) {
         const ImplicitCastExpr* castExpr = dyn_cast<ImplicitCastExpr>(binOpRHS);
@@ -105,13 +106,13 @@ bool LoopVarTooSmall::VisitForStmt( const ForStmt* stmt )
             "loop index type is smaller than length type. " + qt.getAsString() + " < " + qt2.getAsString(),
             stmt->getInit()->getLocStart())
           << stmt->getInit()->getSourceRange();
-//        stmt->getCond()->dump();
+        //stmt->getCond()->dump();
     }
     return true;
 }
 
 
-loplugin::Plugin::Registration< LoopVarTooSmall > X("loopvartoosmall", false);
+loplugin::Plugin::Registration< LoopVarTooSmall > X("loopvartoosmall", true);
 
 }
 
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 3f05fe671f69..cc4202e3d470 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -1604,7 +1604,7 @@ bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
     Reference<XPropertySet> xCol;
     OUString aColName;
     ::comphelper::UStringMixEqual aCase(isCaseSensitive());
-    for (sal_uInt16 i = 0; i < m_pColumns->getCount(); i++)
+    for (sal_Int32 i = 0; i < m_pColumns->getCount(); i++)
     {
         Reference<XPropertySet> xIndex = isUniqueByColumnName(i);
         if (xIndex.is())
diff --git a/connectivity/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx
index 70f5dfb0d8db..ad2b150dc9b1 100644
--- a/connectivity/source/drivers/file/FNoException.cxx
+++ b/connectivity/source/drivers/file/FNoException.cxx
@@ -83,7 +83,7 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector<
     }
 
     // Further descend in Parse Tree
-    for (sal_uInt32 i = 0; i < pParseNode->count(); i++)
+    for (size_t i = 0; i < pParseNode->count(); i++)
         scanParameter(pParseNode->getChild(i),_rParaNodes);
 }
 
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 3dedc867a44f..ce34129bacdd 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1359,8 +1359,8 @@ bool OResultSet::OpenImpl()
                     // order of columns that are not specified in ORDER BY
                     // clause is undefined, so it doesn't hurt to sort on
                     // these; pad the vectors to include them.
-                    for (sal_Int32 i = 1; // 0: bookmark (see setBoundedColumns)
-                         static_cast<size_t>(i) < m_aColMapping.size(); ++i)
+                    for (size_t i = 1; // 0: bookmark (see setBoundedColumns)
+                         i < m_aColMapping.size(); ++i)
                     {
                         if (::std::find(m_aOrderbyColumnNumber.begin(),
                                         m_aOrderbyColumnNumber.end(), i)
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index f3b3e5d6f6db..7833200bf5aa 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -341,7 +341,7 @@ void OStatement_Base::anylizeSQL()
         OSQLParseNode * pOrderingSpecCommalist = pOrderbyClause->getChild(2);
         OSL_ENSURE(SQL_ISRULE(pOrderingSpecCommalist,ordering_spec_commalist),"OResultSet: Fehler im Parse Tree");
 
-        for (sal_uInt32 m = 0; m < pOrderingSpecCommalist->count(); m++)
+        for (size_t m = 0; m < pOrderingSpecCommalist->count(); m++)
         {
             OSQLParseNode * pOrderingSpec = pOrderingSpecCommalist->getChild(m);
             OSL_ENSURE(SQL_ISRULE(pOrderingSpec,ordering_spec),"OResultSet: Fehler im Parse Tree");
@@ -548,7 +548,7 @@ void OStatement_Base::GetAssignValues()
             OSL_ENSURE(pColumnCommalist->count() > 0,"OResultSet: Fehler im Parse Tree");
 
             // All Columns in the column_commalist ...
-            for (sal_uInt32 i = 0; i < pColumnCommalist->count(); i++)
+            for (size_t i = 0; i < pColumnCommalist->count(); i++)
             {
                 OSQLParseNode * pCol = pColumnCommalist->getChild(i);
                 OSL_ENSURE(pCol != NULL,"OResultSet: Fehler im Parse Tree");
@@ -576,7 +576,7 @@ void OStatement_Base::GetAssignValues()
         OSL_ENSURE(pInsertAtomCommalist->count() > 0,"OResultSet: pInsertAtomCommalist <= 0");
 
         sal_Int32 nIndex=0;
-        for (sal_uInt32 i = 0; i < pInsertAtomCommalist->count(); i++)
+        for (size_t i = 0; i < pInsertAtomCommalist->count(); i++)
         {
             OSQLParseNode * pRow_Value_Const = pInsertAtomCommalist->getChild(i); // row_value_constructor
             OSL_ENSURE(pRow_Value_Const != NULL,"OResultSet: pRow_Value_Const darf nicht NULL sein!");
@@ -590,7 +590,7 @@ void OStatement_Base::GetAssignValues()
             {
                 if(pRow_Value_Const->count() == aColumnNameList.size())
                 {
-                    for (sal_uInt32 j = 0; j < pRow_Value_Const->count(); ++j)
+                    for (size_t j = 0; j < pRow_Value_Const->count(); ++j)
                         ParseAssignValues(aColumnNameList,pRow_Value_Const->getChild(j),nIndex++);
                 }
                 else
@@ -618,7 +618,7 @@ void OStatement_Base::GetAssignValues()
 
         // work on all assignments (commalist) ...
         ::std::vector< OUString> aList(1);
-        for (sal_uInt32 i = 0; i < pAssignmentCommalist->count(); i++)
+        for (size_t i = 0; i < pAssignmentCommalist->count(); i++)
         {
             OSQLParseNode * pAssignment = pAssignmentCommalist->getChild(i);
             OSL_ENSURE(pAssignment != NULL,"OResultSet: pAssignment == NULL");
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index 3c01fabca4bc..00e9f387d2d7 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -64,7 +64,7 @@ void OSQLAnalyzer::start(OSQLParseNode* pSQLParseNode)
         OSQLParseNode* pSelection = pSQLParseNode->getChild(2);
         if ( SQL_ISRULE(pSelection,scalar_exp_commalist) )
         {
-            for (sal_uInt32 i = 0; i < pSelection->count(); i++)
+            for (size_t i = 0; i < pSelection->count(); i++)
             {
                 OSQLParseNode *pColumnRef = pSelection->getChild(i)->getChild(0);
                 if (    ( SQL_ISRULE(pColumnRef,set_fct_spec) && pColumnRef->count() == 4 )
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index 682e5d992971..69168cf20b9b 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -88,7 +88,7 @@ void OPredicateCompiler::start(OSQLParseNode* pSQLParseNode)
         OSQLParseNode* pSelection = pSQLParseNode->getChild(2);
         if ( SQL_ISRULE(pSelection,scalar_exp_commalist) )
         {
-            for (sal_uInt32 i = 0; i < pSelection->count(); i++)
+            for (size_t i = 0; i < pSelection->count(); i++)
             {
                 OSQLParseNode *pColumnRef = pSelection->getChild(i)->getChild(0);
                 if ( SQL_ISRULE(pColumnRef,general_set_fct) && pColumnRef->count() != 4 )
@@ -797,7 +797,7 @@ OOperand* OPredicateCompiler::executeFunction(OSQLParseNode* pPredicateNode)
             {
                 m_aCodeList.push_back(new OStopOperand);
                 OSQLParseNode* pList = pPredicateNode->getChild(2);
-                for (sal_uInt32 i=0; i < pList->count(); ++i)
+                for (size_t i=0; i < pList->count(); ++i)
                     execute(pList->getChild(i));
 
                 switch( nTokenId )
@@ -869,7 +869,7 @@ OOperand* OPredicateCompiler::executeFunction(OSQLParseNode* pPredicateNode)
             if ( pPredicateNode->count() == 4 ) //char_substring_fct
             {
                 OSQLParseNode* pList = pPredicateNode->getChild(2);
-                for (sal_uInt32 i=0; i < pList->count(); ++i)
+                for (size_t i=0; i < pList->count(); ++i)
                     execute(pList->getChild(i));
             }
             else
@@ -886,7 +886,7 @@ OOperand* OPredicateCompiler::executeFunction(OSQLParseNode* pPredicateNode)
             if ( pPredicateNode->count() == 4 ) //position_exp
             {
                 OSQLParseNode* pList = pPredicateNode->getChild(2);
-                for (sal_uInt32 i=0; i < pList->count(); ++i)
+                for (size_t i=0; i < pList->count(); ++i)
                     execute(pList->getChild(i));
             }
             else
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx
index 0124eafa4a1c..ead3e77d60cd 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx
@@ -500,7 +500,7 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector<
     }
 
     // Search on in Parse Tree
-    for (sal_uInt32 i = 0; i < pParseNode->count(); i++)
+    for (size_t i = 0; i < pParseNode->count(); i++)
         scanParameter(pParseNode->getChild(i),_rParaNodes);
 }
 
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index ff5351a9701f..bea2b0f295ae 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -1543,7 +1543,7 @@ void OResultSet::setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMappin
 {
     m_aColMapping = _aColumnMapping;
 #if OSL_DEBUG_LEVEL > 0
-    for ( sal_uInt32 i = 0; i < m_aColMapping.size(); i++ )
+    for ( size_t i = 0; i < m_aColMapping.size(); i++ )
         SAL_INFO(
             "connectivity.mork",
             "Set Mapped: " << i << " -> " << m_aColMapping[i]);
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index 7989c75bf5c5..8645c38cd99f 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -476,7 +476,7 @@ void OCommonStatement::analyseSQL()
         OSQLParseNode * pOrderingSpecCommalist = pOrderbyClause->getChild(2);
         OSL_ENSURE(SQL_ISRULE(pOrderingSpecCommalist,ordering_spec_commalist),"OResultSet: Fehler im Parse Tree");
 
-        for (sal_uInt32 m = 0; m < pOrderingSpecCommalist->count(); m++)
+        for (size_t m = 0; m < pOrderingSpecCommalist->count(); m++)
         {
             OSQLParseNode * pOrderingSpec = pOrderingSpecCommalist->getChild(m);
             OSL_ENSURE(SQL_ISRULE(pOrderingSpec,ordering_spec),"OResultSet: Fehler im Parse Tree");
diff --git a/cpputools/source/sp2bv/sp2bv.cxx b/cpputools/source/sp2bv/sp2bv.cxx
index b3853fc07985..f3b913586429 100644
--- a/cpputools/source/sp2bv/sp2bv.cxx
+++ b/cpputools/source/sp2bv/sp2bv.cxx
@@ -112,7 +112,7 @@ int main(int argc, char **argv)
 static bool hasOption(char const * szOption, int argc, char** argv)
 {
     bool retVal = false;
-    for(sal_Int16 i= 1; i < argc; i++)
+    for(int i= 1; i < argc; i++)
     {
         if( ! strcmp(argv[i], szOption))
         {
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 75faa0925fd1..d07b692f5758 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -204,7 +204,7 @@ PptSlidePersistList::~PptSlidePersistList() {}
 
 sal_uInt16 PptSlidePersistList::FindPage(sal_uInt32 nId) const
 {
-    for ( sal_uInt16 i=0; i < mvEntries.size(); i++ )
+    for ( size_t i=0; i < mvEntries.size(); i++ )
     {
         if (mvEntries[ i ].GetSlideId()==nId) return i;
     }
@@ -1543,7 +1543,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
             for ( nPageListNum = 0; nPageListNum < 3; nPageListNum++ )
             {
                 PptSlidePersistList* pPageList = GetPageList( PptPageKind( nPageListNum ) );
-                for ( sal_uInt16 nPageNum = 0; nPageNum < pPageList->size(); nPageNum++ )
+                for ( size_t nPageNum = 0; nPageNum < pPageList->size(); nPageNum++ )
                 {
                     PptSlidePersistEntry& rE2 = (*pPageList)[ nPageNum ];
                     sal_uLong nPersist = rE2.aPersistAtom.nPsrReference;
@@ -1618,7 +1618,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
                     else if ( pHeadersFootersHd->nRecInstance == 4 )    // notes master
                         ImportHeaderFooterContainer( *pHeadersFootersHd, aNotesMaster );
                 }
-                for ( sal_uInt16 i = 0; i < pMasterPages->size(); i++ )
+                for ( size_t i = 0; i < pMasterPages->size(); i++ )
                 {
                     if ( (*pMasterPages)[ i ].bNotesMaster )
                         (*pMasterPages)[ i ].pHeaderFooterEntry = new HeaderFooterEntry( aNotesMaster );
diff --git a/helpcompiler/source/HelpSearch.cxx b/helpcompiler/source/HelpSearch.cxx
index c5d1e4ee15ba..6b0c4202c9cc 100644
--- a/helpcompiler/source/HelpSearch.cxx
+++ b/helpcompiler/source/HelpSearch.cxx
@@ -39,7 +39,7 @@ bool HelpSearch::query(OUString const &queryStr, bool captionOnly,
         pQuery = _CLNEW lucene::search::TermQuery(_CLNEW lucene::index::Term(field, &aQueryStr[0]));
 
     lucene::search::Hits *hits = searcher.search(pQuery);
-    for (unsigned i = 0; i < hits->length(); ++i) {
+    for (size_t i = 0; i < hits->length(); ++i) {
         lucene::document::Document &doc = hits->doc(i); // Document* belongs to Hits.
         wchar_t const *path = doc.get(L"path");
         rDocuments.push_back(TCHARArrayToOUString(path != 0 ? path : L""));
diff --git a/oox/source/crypto/Standard2007Engine.cxx b/oox/source/crypto/Standard2007Engine.cxx
index bcaba3052aeb..09035d7409f8 100644
--- a/oox/source/crypto/Standard2007Engine.cxx
+++ b/oox/source/crypto/Standard2007Engine.cxx
@@ -138,7 +138,7 @@ bool Standard2007Engine::calculateEncryptionKey(const OUString& rPassword)
 
     // derive key
     vector<sal_uInt8> buffer(64, 0x36);
-    for( sal_uInt32 i = 0; i < hash.size(); ++i )
+    for( size_t i = 0; i < hash.size(); ++i )
         buffer[i] ^= hash[i];
 
     Digest::sha1(hash, buffer);
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 8edffb9dd2aa..034a76a1e896 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -339,12 +339,12 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
             const sal_Int32 nHackyFontHeight=50;
             const sal_Int32 nHackyFontWidth=20;
             awt::Size aTotalSize;
-            for( sal_uInt32 nPara=0; nPara<pTextBody->getParagraphs().size(); ++nPara )
+            for( size_t nPara=0; nPara<pTextBody->getParagraphs().size(); ++nPara )
             {
                 aTotalSize.Height += nHackyFontHeight;
 
                 sal_Int32 nLocalWidth=0;
-                for( sal_uInt32 nRun=0; nRun<pTextBody->getParagraphs().at(nPara)->getRuns().size(); ++nRun )
+                for( size_t nRun=0; nRun<pTextBody->getParagraphs().at(nPara)->getRuns().size(); ++nRun )
                     nLocalWidth +=
                         pTextBody->getParagraphs().at(nPara)->getRuns().at(nRun)->getText().getLength()
                         * nHackyFontWidth;
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 1f10a7460a46..f4e2e41cb730 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -915,7 +915,7 @@ Reference< XShape > Shape::createAndInsert(
             {
                 Sequence< PropertyValue > aGradientStops( aFillProperties.maGradientProps.maGradientStops.size() );
                 ::std::map< double, Color >::iterator aIt = aFillProperties.maGradientProps.maGradientStops.begin();
-                for( sal_uInt32 i = 0; i < aFillProperties.maGradientProps.maGradientStops.size(); ++i )
+                for( size_t i = 0; i < aFillProperties.maGradientProps.maGradientStops.size(); ++i )
                 { // for each stop in the gradient definition:
 
                     // save position
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 6342140dc49a..55b17d99a741 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -939,11 +939,11 @@ Reference< XShape > BezierShape::implConvertAndInsert( const Reference< XShapes
         }
 
         aBezierCoords.Coordinates.realloc( aCoordLists.size() );
-        for ( unsigned int i = 0; i < aCoordLists.size(); i++ )
+        for ( size_t i = 0; i < aCoordLists.size(); i++ )
             aBezierCoords.Coordinates[i] = ContainerHelper::vectorToSequence( aCoordLists[i] );
 
         aBezierCoords.Flags.realloc( aFlagLists.size() );
-        for ( unsigned int i = 0; i < aFlagLists.size(); i++ )
+        for ( size_t i = 0; i < aFlagLists.size(); i++ )
             aBezierCoords.Flags[i] = ContainerHelper::vectorToSequence( aFlagLists[i] );
 
         if( !aCoordLists.front().empty() && !aCoordLists.back().empty()
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 4d6debd44b3d..dbd51ee7b0d1 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1452,9 +1452,9 @@ namespace
             {
                 const Size aBitmapSize(rBitmapEx.GetSizePixel());
 
-                for(sal_Int32 y(0); y < rSize.Height(); y += aBitmapSize.Height())
+                for(long y(0); y < rSize.Height(); y += aBitmapSize.Height())
                 {
-                    for(sal_Int32 x(0); x < rSize.Width(); x += aBitmapSize.Width())
+                    for(long x(0); x < rSize.Width(); x += aBitmapSize.Width())
                     {
                         pVirtualDevice->DrawBitmapEx(
                             Point(x, y),
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index 6f8a35612540..ed6126898ea3 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -289,7 +289,7 @@ void SvxPageWindow::DrawPage(vcl::RenderContext& rRenderContext, const Point& rO
             break;
         }
         sText += OUString(cArrow);
-        for (sal_uInt16 i = 0; i < sText.getLength(); i++)
+        for (sal_Int32 i = 0; i < sText.getLength(); i++)
         {
             OUString sDraw(sText.copy(i,1));
             long nHDiff = 0;
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index b22e5f834dda..af49dcd5954b 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -309,7 +309,7 @@ void SvxRubyDialog::dispose()
 
 void SvxRubyDialog::ClearCharStyleList()
 {
-    for (sal_uInt16 i = 0; i < m_pCharStyleLB->GetEntryCount(); i++)
+    for (sal_Int32 i = 0; i < m_pCharStyleLB->GetEntryCount(); i++)
     {
         void* pData = m_pCharStyleLB->GetEntryData(i);
         delete static_cast<OUString*>(pData);
@@ -528,7 +528,7 @@ void SvxRubyDialog::Update()
         sCharStyleName = cRubies;
     if (!sCharStyleName.isEmpty())
     {
-        for (sal_uInt16 i = 0; i < m_pCharStyleLB->GetEntryCount(); i++)
+        for (sal_Int32 i = 0; i < m_pCharStyleLB->GetEntryCount(); i++)
         {
             const OUString* pCoreName = static_cast<const OUString*>(m_pCharStyleLB->GetEntryData(i));
             if (pCoreName && sCharStyleName == *pCoreName)
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 33dbbb806797..7b2b7e6343c8 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -142,7 +142,7 @@ void ListToStrArr_Impl( sal_uInt16 nId, std::vector<OUString>& rStrLst, ComboBox
     {
         std::vector<OUString> aLst = pSrchItem->GetList();
 
-        for ( sal_uInt16 i = 0; i < aLst.size(); ++i )
+        for ( size_t i = 0; i < aLst.size(); ++i )
         {
             rStrLst.push_back(aLst[i]);
             rCBox.InsertEntry(aLst[i]);
@@ -159,7 +159,7 @@ void StrArrToList_Impl( sal_uInt16 nId, const std::vector<OUString>& rStrLst )
 SearchAttrItemList::SearchAttrItemList( const SearchAttrItemList& rList ) :
     SrchAttrItemList(rList)
 {
-    for ( sal_uInt16 i = 0; i < size(); ++i )
+    for ( size_t i = 0; i < size(); ++i )
         if ( !IsInvalidItem( (*this)[i].pItem ) )
             (*this)[i].pItem = (*this)[i].pItem->Clone();
 }
@@ -213,7 +213,7 @@ SfxItemSet& SearchAttrItemList::Get( SfxItemSet& rSet )
 {
     SfxItemPool* pPool = rSet.GetPool();
 
-    for ( sal_uInt16 i = 0; i < size(); ++i )
+    for ( size_t i = 0; i < size(); ++i )
         if ( IsInvalidItem( (*this)[i].pItem ) )
             rSet.InvalidateItem( pPool->GetWhich( (*this)[i].nSlot ) );
         else
@@ -225,7 +225,7 @@ SfxItemSet& SearchAttrItemList::Get( SfxItemSet& rSet )
 
 void SearchAttrItemList::Clear()
 {
-    for ( sal_uInt16 i = 0; i < size(); ++i )
+    for ( size_t i = 0; i < size(); ++i )
         if ( !IsInvalidItem( (*this)[i].pItem ) )
             delete (*this)[i].pItem;
     SrchAttrItemList::clear();
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index e392e7ab0998..8242a78fd037 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -440,7 +440,7 @@ void SvxNumValueSet::SetNumberingSettings(
     aLocale = rLocale;
     if(aNum.getLength() > 8)
             SetStyle( GetStyle()|WB_VSCROLL);
-    for ( sal_uInt16 i = 0; i < aNum.getLength(); i++ )
+    for ( sal_Int32 i = 0; i < aNum.getLength(); i++ )
     {
             InsertItem( i + 1, i );
             if( i < 8 )
@@ -458,7 +458,7 @@ void SvxNumValueSet::SetOutlineNumberingSettings(
     aLocale = rLocale;
     if(aOutlineSettings.getLength() > 8)
         SetStyle( GetStyle() | WB_VSCROLL );
-    for ( sal_uInt16 i = 0; i < aOutlineSettings.getLength(); i++ )
+    for ( sal_Int32 i = 0; i < aOutlineSettings.getLength(); i++ )
     {
         InsertItem( i + 1, i );
         if( i < 8 )
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index cbca4a2f42b9..2565c95b656a 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -291,7 +291,7 @@ SvxRuler::SvxRuler(
 
         mpIndents.resize(5 + INDENT_GAP);
 
-        for(sal_uInt32 nIn = 0; nIn < mpIndents.size(); nIn++)
+        for(size_t nIn = 0; nIn < mpIndents.size(); nIn++)
         {
             mpIndents[nIn].nPos = 0;
             mpIndents[nIn].nStyle = RULER_STYLE_DONTKNOW;
@@ -3681,7 +3681,7 @@ long SvxRuler::CalcPropMaxRight(sal_uInt16 nCol) const
         if(mxColumnItem->IsTable())
         {
             sal_uInt16 nVisCols = 0;
-            for(sal_uInt16 i = GetActRightColumn(false, nCol); i < mpBorders.size();)
+            for(size_t i = GetActRightColumn(false, nCol); i < mpBorders.size();)
             {
                 if((*mxColumnItem.get())[i].bVisible)
                     nVisCols++;
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 413bae057c39..95f466d27f50 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -724,7 +724,7 @@ void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMe
             // check for hidden cols
             Reference< ::com::sun::star::beans::XPropertySet >  xCurCol;
             Any aHidden,aName;
-            for (sal_uInt16 i=0; i<xCols->getCount(); ++i)
+            for (sal_Int32 i=0; i<xCols->getCount(); ++i)
             {
                 xCurCol.set(xCols->getByIndex(i), css::uno::UNO_QUERY);
                 DBG_ASSERT(xCurCol.is(), "FmGridHeader::PreExecuteColumnContextMenu : the Peer has invalid columns !");
@@ -879,7 +879,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
         {
             // just iterate through all the cols ...
             Reference< ::com::sun::star::beans::XPropertySet >  xCurCol;
-            for (sal_uInt16 i=0; i<xCols->getCount(); ++i)
+            for (sal_Int32 i=0; i<xCols->getCount(); ++i)
             {
                 xCurCol.set(xCols->getByIndex(i), css::uno::UNO_QUERY);
                 xCurCol->setPropertyValue(FM_PROP_HIDDEN, makeAny(false));
@@ -1097,7 +1097,7 @@ void FmGridControl::SetDesignMode(bool bMode)
                 if (aSelection.getValueType().getTypeClass() == TypeClass_INTERFACE)
                     xColumn.set(aSelection, css::uno::UNO_QUERY);
                 Reference< XInterface >  xCurrent;
-                for (sal_uInt16 i=0; i<xColumns->getCount(); ++i)
+                for (sal_Int32 i=0; i<xColumns->getCount(); ++i)
                 {
                     xCurrent.set(xColumns->getByIndex(i), css::uno::UNO_QUERY);
                     if (xCurrent == xColumn)
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 5adf0c81f191..48bd74eccf9d 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -2665,7 +2665,7 @@ Sequence<sal_uInt16>& FmXGridPeer::getSupportedGridSlots()
         };
         aSupported.realloc(sizeof(nSupported)/sizeof(nSupported[0]));
         sal_uInt16* pSupported = aSupported.getArray();
-        for (sal_uInt16 i=0; i<aSupported.getLength(); ++i, ++pSupported)
+        for (sal_Int32 i=0; i<aSupported.getLength(); ++i, ++pSupported)
             *pSupported = nSupported[i];
     }
     return aSupported;
@@ -2716,7 +2716,7 @@ void FmXGridPeer::UpdateDispatches()
     const Sequence< ::com::sun::star::util::URL>& aSupportedURLs = getSupportedURLs();
     const ::com::sun::star::util::URL* pSupportedURLs = aSupportedURLs.getConstArray();
     Reference< ::com::sun::star::frame::XDispatch >  xNewDispatch;
-    for (sal_uInt16 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs)
+    for (sal_Int32 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs)
     {
         xNewDispatch = queryDispatch(*pSupportedURLs, OUString(), 0);
         if (xNewDispatch != m_pDispatchers[i])
@@ -2758,7 +2758,7 @@ void FmXGridPeer::ConnectToDispatcher()
 
     sal_uInt16 nDispatchersGot = 0;
     const ::com::sun::star::util::URL* pSupportedURLs = aSupportedURLs.getConstArray();
-    for (sal_uInt16 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs)
+    for (sal_Int32 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs)
     {
         m_pStateCache[i] = false;
         m_pDispatchers[i] = queryDispatch(*pSupportedURLs, OUString(), 0);
@@ -2787,7 +2787,7 @@ void FmXGridPeer::DisConnectFromDispatcher()
 
     const Sequence< ::com::sun::star::util::URL>& aSupportedURLs = getSupportedURLs();
     const ::com::sun::star::util::URL* pSupportedURLs = aSupportedURLs.getConstArray();
-    for (sal_uInt16 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs)
+    for (sal_Int32 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs)
     {
         if (m_pDispatchers[i].is())
             m_pDispatchers[i]->removeStatusListener((::com::sun::star::frame::XStatusListener*)this, *pSupportedURLs);
@@ -2810,7 +2810,7 @@ IMPL_LINK(FmXGridPeer, OnQueryGridSlotState, void*, pSlot)
     // search the given slot with our supported sequence
     Sequence<sal_uInt16>& aSupported = getSupportedGridSlots();
     const sal_uInt16* pSlots = aSupported.getConstArray();
-    for (sal_uInt16 i=0; i<aSupported.getLength(); ++i)
+    for (sal_Int32 i=0; i<aSupported.getLength(); ++i)
     {
         if (pSlots[i] == nSlot)
         {
@@ -2839,7 +2839,7 @@ IMPL_LINK(FmXGridPeer, OnExecuteGridSlot, void*, pSlot)
     DBG_ASSERT(aSlots.getLength() == aUrls.getLength(), "FmXGridPeer::OnExecuteGridSlot : inconstent data returned by getSupportedURLs/getSupportedGridSlots !");
 
     sal_uInt16 nSlot = (sal_uInt16)reinterpret_cast<sal_uIntPtr>(pSlot);
-    for (sal_uInt16 i=0; i<aSlots.getLength(); ++i, ++pUrls, ++pSlots)
+    for (sal_Int32 i=0; i<aSlots.getLength(); ++i, ++pUrls, ++pSlots)
     {
         if (*pSlots == nSlot)
         {
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 3ea3c5479efd..4e7cb83a9ae3 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -4100,7 +4100,7 @@ void SAL_CALL FmXListBoxCell::addItems(const ::comphelper::StringSequence& aItem
     if (m_pBox)
     {
         sal_uInt16 nP = nPos;
-        for ( sal_uInt16 n = 0; n < aItems.getLength(); n++ )
+        for ( sal_Int32 n = 0; n < aItems.getLength(); n++ )
         {
             m_pBox->InsertEntry( aItems.getConstArray()[n], nP );
             if ( nPos != -1 )    // Nicht wenn 0xFFFF, weil LIST_APPEND
@@ -4430,7 +4430,7 @@ void SAL_CALL FmXComboBoxCell::addItems( const Sequence< OUString >& _Items, sal
     if ( m_pComboBox )
     {
         sal_uInt16 nP = _Pos;
-        for ( sal_uInt16 n = 0; n < _Items.getLength(); n++ )
+        for ( sal_Int32 n = 0; n < _Items.getLength(); n++ )
         {
             m_pComboBox->InsertEntry( _Items.getConstArray()[n], nP );
             if ( _Pos != -1 )
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 0c119475d1f1..574e935e23a9 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1341,7 +1341,7 @@ void FmXFormShell::LoopGrids(sal_Int16 nWhat)
     Reference< XIndexContainer> xControlModels(m_xActiveForm, UNO_QUERY);
     if (xControlModels.is())
     {
-        for (sal_Int16 i=0; i<xControlModels->getCount(); ++i)
+        for (sal_Int32 i=0; i<xControlModels->getCount(); ++i)
         {
             Reference< XPropertySet> xModelSet;
             xControlModels->getByIndex(i) >>= xModelSet;
@@ -2422,7 +2422,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn
                     DBG_ASSERT(xModelColumns->getCount() >= xPeerContainer->getCount(), "FmXFormShell::OnSearchContextRequest : impossible : have more view than model columns !");
 
                     Reference< XInterface> xCurrentColumn;
-                    for (sal_Int16 nViewPos=0; nViewPos<xPeerContainer->getCount(); ++nViewPos)
+                    for (sal_Int32 nViewPos=0; nViewPos<xPeerContainer->getCount(); ++nViewPos)
                     {
                         xPeerContainer->getByIndex(nViewPos) >>= xCurrentColumn;
                         if (!xCurrentColumn.is())
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index a3ed1a342843..9d4db969a7a5 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -791,7 +791,7 @@ void FmSearchEngine::fillControlTexts(const InterfaceArray& arrFields)
 {
     clearControlTexts();
     Reference< XInterface >  xCurrent;
-    for (sal_uInt32 i=0; i<arrFields.size(); ++i)
+    for (size_t i=0; i<arrFields.size(); ++i)
     {
         xCurrent = arrFields.at(i);
         DBG_ASSERT(xCurrent.is(), "FmSearchEngine::fillControlTexts : invalid field interface !");
diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx
index 2fae8dbac936..8e11b18ae175 100644
--- a/svx/source/form/formdispatchinterceptor.cxx
+++ b/svx/source/form/formdispatchinterceptor.cxx
@@ -100,7 +100,7 @@ namespace svxform
         Sequence< Reference< XDispatch> > aReturn(aDescripts.getLength());
         Reference< XDispatch>* pReturn = aReturn.getArray();
         const DispatchDescriptor* pDescripts = aDescripts.getConstArray();
-        for (sal_Int16 i=0; i<aDescripts.getLength(); ++i, ++pReturn, ++pDescripts)
+        for (sal_Int32 i=0; i<aDescripts.getLength(); ++i, ++pReturn, ++pDescripts)
         {
             *pReturn = queryDispatch(pDescripts->FeatureURL, pDescripts->FrameName, pDescripts->SearchFlags);
         }
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index ceb5dfbe6b44..e4d86feb13f4 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -1566,7 +1566,7 @@ sal_uInt16 SvxNumberFormatShell::FindCurrencyFormat( const OUString& rFmtString
         {
             nStart=nCount;
         }
-        for(sal_uInt16 j=nStart;j<aCurCurrencyList.size();j++)
+        for(size_t j=nStart;j<aCurCurrencyList.size();j++)
         {
             if(aCurCurrencyList[j]==nPos) return j;
         }
@@ -1649,7 +1649,7 @@ sal_uInt16 SvxNumberFormatShell::FindCurrencyFormat(const NfCurrencyEntry* pTmpC
     {
         nStart=nCount;
     }
-    for(sal_uInt16 j=nStart;j<aCurCurrencyList.size();j++)
+    for(size_t j=nStart;j<aCurCurrencyList.size();j++)
     {
         if(aCurCurrencyList[j]==nPos) return j;
     }
@@ -1677,7 +1677,7 @@ bool SvxNumberFormatShell::IsInTable(sal_uInt16 const nPos,
                 pFormatter->GetCurrencyFormatStrings( aWSStringsDtor,
                                 *pTmpCurrencyEntry, bTmpBanking );
 
-                for(sal_uInt16 i=0;i<aWSStringsDtor.size();i++)
+                for(size_t i=0;i<aWSStringsDtor.size();i++)
                 {
                     if (aWSStringsDtor[i] == rFmtString)
                     {
diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx
index 5a855d5a7e4a..fe378314c421 100644
--- a/svx/source/items/numinf.cxx
+++ b/svx/source/items/numinf.cxx
@@ -101,7 +101,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) :
     {
         pDelFormatArr = new sal_uInt32[ rItem.nDelCount ];
 
-        for ( sal_uInt16 i = 0; i < rItem.nDelCount; ++i )
+        for ( sal_uInt32 i = 0; i < rItem.nDelCount; ++i )
             pDelFormatArr[i] = rItem.pDelFormatArr[i];
     }
 }
@@ -202,7 +202,7 @@ void SvxNumberInfoItem::SetDelFormatArray( const sal_uInt32* pData,
 
         if ( pData != NULL )
         {
-            for ( sal_uInt16 i = 0; i < nCount; ++i )
+            for ( sal_uInt32 i = 0; i < nCount; ++i )
                 pDelFormatArr[i] = pData[i];
         }
     }
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index 71e917c29993..97b887fb42d4 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -71,7 +71,7 @@ void SvxSmartTagsControl::FillMenu()
     const Reference<text::XTextRange>& xTextRange = mpSmartTagItem->GetTextRange();
     const Reference<frame::XController>& xController = mpSmartTagItem->GetController();
 
-    for ( sal_uInt16 j = 0; j < rActionComponentsSequence.getLength(); ++j )
+    for ( sal_Int32 j = 0; j < rActionComponentsSequence.getLength(); ++j )
     {
         Reference< container::XStringKeyMap > xSmartTagProperties = rStringKeyMaps[j];
 
@@ -109,7 +109,7 @@ void SvxSmartTagsControl::FillMenu()
         pSbMenu->InsertSeparator(OString(), nSubMenuPos++);
 
         // Add subitem for every action reference for the current smart tag type:
-        for ( sal_uInt16 i = 0; i < rActionComponents.getLength(); ++i )
+        for ( sal_Int32 i = 0; i < rActionComponents.getLength(); ++i )
         {
             xAction = rActionComponents[i];
 
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 7c7e2c491f7a..d70386aa4215 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -557,7 +557,7 @@ void GraphyicBulletsTypeMgr::Init()
 {
     std::vector<OUString> aGrfNames;
     GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames);
-    for(sal_uInt16 i = 0; i < aGrfNames.size(); i++)
+    for(size_t i = 0; i < aGrfNames.size(); i++)
     {
         OUString sGrfNm = aGrfNames[i];
         INetURLObject aObj(sGrfNm);
@@ -599,7 +599,7 @@ sal_uInt16 GraphyicBulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uI
     if ( pGrf )
     {
         Graphic aGraphic;
-        for (sal_uInt16 i=0; i < aGrfDataLst.size(); ++i)
+        for (size_t i=0; i < aGrfDataLst.size(); ++i)
         {
             GrfBulDataRelation* pEntry = aGrfDataLst[i];
             bool bExist = false;
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index df96a6b84d9c..f4ba7045c059 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -91,7 +91,7 @@ void SmartTagMgr::RecognizeString( const OUString& rText,
                              const lang::Locale& rLocale,
                              sal_uInt32 nStart, sal_uInt32 nLen ) const
 {
-    for ( sal_uInt32 i = 0; i < maRecognizerList.size(); i++ )
+    for ( size_t i = 0; i < maRecognizerList.size(); i++ )
     {
         Reference < smarttags::XSmartTagRecognizer > xRecognizer = maRecognizerList[i];
 
@@ -121,7 +121,7 @@ void SmartTagMgr::RecognizeTextRange(const Reference< text::XTextRange>& xRange,
                              const Reference< text::XTextMarkup >& xMarkup,
                              const Reference< frame::XController >& xController) const
 {
-    for ( sal_uInt32 i = 0; i < maRecognizerList.size(); i++ )
+    for ( size_t i = 0; i < maRecognizerList.size(); i++ )
     {
         Reference < smarttags::XSmartTagRecognizer > xRecognizer = maRecognizerList[i];
 
@@ -159,7 +159,7 @@ void SmartTagMgr::GetActionSequences( Sequence < OUString >& rSmartTagTypes,
     rActionComponentsSequence.realloc( rSmartTagTypes.getLength() );
     rActionIndicesSequence.realloc( rSmartTagTypes.getLength() );
 
-    for ( sal_uInt16 j = 0; j < rSmartTagTypes.getLength(); ++j )
+    for ( sal_Int32 j = 0; j < rSmartTagTypes.getLength(); ++j )
     {
         const OUString& rSmartTagType = rSmartTagTypes[j];
 
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index 0bb522c5d5dc..81f2b23f8476 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -218,7 +218,7 @@ void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eStat
 
         // get all snapping points:
         std::set< sal_uInt16 > aTmpSnappingPoints;
-        for ( sal_uInt16 j = 0; j < rSnappingPoints.getLength(); ++j )
+        for ( sal_Int32 j = 0; j < rSnappingPoints.getLength(); ++j )
         {
             const sal_Int32 nSnappingPoint = rSnappingPoints[j];
             aTmpSnappingPoints.insert( (sal_uInt16)nSnappingPoint );
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index e84014baa5bc..f589d3fb9fb7 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -617,7 +617,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
 
         if(aDelta.X() || aDelta.Y())
         {
-            for(sal_uInt32 a(0); a < mpSdrPathDragData->maHandles.size(); a++)
+            for(size_t a(0); a < mpSdrPathDragData->maHandles.size(); a++)
             {
                 SdrHdl* pHandle = mpSdrPathDragData->maHandles[a];
                 const sal_uInt16 nPolyIndex((sal_uInt16)pHandle->GetPolyNum());
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index a96a714ab36b..5a7ca174da82 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -219,7 +219,7 @@ namespace
             drawinglayer::primitive2d::TextLayouterDevice aTextLayouter;
             double fRetval(0.0);
 
-            for(sal_uInt32 a(0L); a < rTextPortions.size(); a++)
+            for(size_t a(0); a < rTextPortions.size(); a++)
             {
                 const impPathTextPortion* pCandidate = rTextPortions[a];
 
@@ -595,7 +595,7 @@ namespace
     {
         std::vector< drawinglayer::primitive2d::BasePrimitive2D* > aNewPrimitives;
 
-        for(sal_uInt32 a(0L); a < rSource.size(); a++)
+        for(size_t a(0); a < rSource.size(); a++)
         {
             const drawinglayer::primitive2d::TextSimplePortionPrimitive2D* pTextCandidate = dynamic_cast< const drawinglayer::primitive2d::TextSimplePortionPrimitive2D* >(rSource[a]);
 
@@ -722,7 +722,7 @@ void SdrTextObj::impDecomposePathTextPrimitive(
                 // filter text portions for this paragraph
                 ::std::vector< const impPathTextPortion* > aParagraphTextPortions;
 
-                for(sal_uInt32 b(0L); b < rPathTextPortions.size(); b++)
+                for(size_t b(0); b < rPathTextPortions.size(); b++)
                 {
                     const impPathTextPortion& rCandidate = rPathTextPortions[b];
 
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 9f4bd1c51443..b915c097cd67 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -745,7 +745,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
         // New mechanism to re-create the connections of cloned connectors
         CloneList aCloneList;
 
-        for( sal_uInt32 i(0); i < aSdrObjects.size(); i++ )
+        for( size_t i(0); i < aSdrObjects.size(); i++ )
         {
             const SdrObject*    pObj = aSdrObjects[i];
             SdrObject*          pNeuObj;
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index b4f09219c24f..505077b8613c 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -298,7 +298,7 @@ VclPtr<SfxPopupWindow> SvxUndoRedoControl::CreatePopupWindow()
     ListBox &rListBox = pPopupWin->GetListBox();
     rListBox.SetSelectHdl( LINK( this, SvxUndoRedoControl, SelectHdl ) );
 
-    for( sal_uInt32 n = 0; n < aUndoRedoList.size(); n++ )
+    for( size_t n = 0; n < aUndoRedoList.size(); n++ )
         rListBox.InsertEntry( aUndoRedoList[n] );
 
     rListBox.SelectEntryPos( 0 );
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index ea9519f4e071..7e7463615ff3 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -290,7 +290,7 @@ void SearchToolbarControllersManager::saveSearchHistory(const FindTextFieldContr
 
 void SearchToolbarControllersManager::loadSearchHistory(FindTextFieldControl* pFindTextFieldControl)
 {
-    for( sal_uInt16 i=0; i<m_aSearchStrings.size(); ++i )
+    for( size_t i=0; i<m_aSearchStrings.size(); ++i )
     {
         pFindTextFieldControl->InsertEntry(m_aSearchStrings[i],i);
     }
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index e553fec4e1d8..cc82ef006882 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -114,7 +114,7 @@ Bitmap XDashList::ImpCreateBitmapForXDash(const XDash* pDash)
 
         if(!aDotDashArray.empty())
         {
-            for(sal_uInt32 a(0); a < aDotDashArray.size(); a++)
+            for(size_t a(0); a < aDotDashArray.size(); a++)
             {
                 aDotDashArray[a] *= fScaleValue;
             }