loplugin:loopvartoosmall

Change-Id: I1e9768c08af0bc7caac6a39c13842ee9d8ad962c

55 files changed, 123 insertions, 124 deletions

diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 5392c54af73b..1a67b3dd4ca9 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -278,7 +278,7 @@ void SAL_CALL AccessibleGridControlTable::selectAllAccessibleChildren()
 
     ensureIsAlive();
     Sequence< sal_Int32 > selectedRows = getSelectedAccessibleRows();
-    for(int i=0;i<m_aTable.GetRowCount();i++)
+    for(long i=0; i<m_aTable.GetRowCount(); i++)
         selectedRows[i]=i;
 }
 sal_Int32 SAL_CALL AccessibleGridControlTable::getSelectedAccessibleChildCount()
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 20b1fda7ac6c..adfac826b078 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -225,7 +225,7 @@ bool PropertySetInfoImpl::hasPropertyByName(const OUString& Name) throw( Runtime
 SbPropertySetInfo::SbPropertySetInfo( const SbPropertyValueArr_Impl &rPropVals )
 {
     aImpl._aProps.realloc( rPropVals.size() );
-    for ( sal_uInt16 n = 0; n < rPropVals.size(); ++n )
+    for ( size_t n = 0; n < rPropVals.size(); ++n )
     {
         Property &rProp = aImpl._aProps.getArray()[n];
         const PropertyValue &rPropVal = rPropVals[n];
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 8e9a3d4d94f8..ca2587f3078e 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -2002,7 +2002,7 @@ OUString Impl_DumpMethods( SbUnoObject* pUnoObj )
 
             if( nParamCount > 0 )
             {
-                for( sal_uInt16 j = 0; j < nParamCount; j++ )
+                for( sal_uInt32 j = 0; j < nParamCount; j++ )
                 {
                     aRet.append ( Dbg_SbxDataType2String( unoToSbxType( pParams[ j ] ) ) );
                     if( j < nParamCount - 1 )
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index b30173fb48ff..90b555353637 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -249,7 +249,7 @@ sal_uInt32 SbiSymPool::Reference( const OUString& rName )
 
 void SbiSymPool::CheckRefs()
 {
-    for( sal_uInt16 i = 0; i < aData.size(); i++ )
+    for( size_t i = 0; i < aData.size(); i++ )
     {
         SbiSymDef &r = aData[ i ];
         if( !r.IsDefined() )
diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx
index 0d77d4d9a6b8..18b3c6ae2658 100644
--- a/basic/source/sbx/sbxarray.cxx
+++ b/basic/source/sbx/sbxarray.cxx
@@ -63,7 +63,7 @@ SbxArray& SbxArray::operator=( const SbxArray& rArray )
         eType = rArray.eType;
         Clear();
         VarEntriesType* pSrc = rArray.mpVarEntries;
-        for( sal_uInt32 i = 0; i < pSrc->size(); i++ )
+        for( size_t i = 0; i < pSrc->size(); i++ )
         {
             SbxVarEntry* pSrcRef = (*pSrc)[i];
             SbxVariableRef pSrc_ = pSrcRef->mpVar;
@@ -325,7 +325,7 @@ void SbxArray::Remove( SbxVariable* pVar )
 {
     if( pVar )
     {
-        for( sal_uInt32 i = 0; i < mpVarEntries->size(); i++ )
+        for( size_t i = 0; i < mpVarEntries->size(); i++ )
         {
             SbxVarEntry* pRef = (*mpVarEntries)[i];
             if (&pRef->mpVar == pVar)
diff --git a/basic/source/sbx/sbxstr.cxx b/basic/source/sbx/sbxstr.cxx
index d6b9f30e663f..de1c4858239f 100644
--- a/basic/source/sbx/sbxstr.cxx
+++ b/basic/source/sbx/sbxstr.cxx
@@ -279,7 +279,7 @@ SbxArray* StringToByteArray(const OUString& rStr)
         pArray->unoAddDim( 0, -1 );
     }
 
-    for( sal_uInt16 i=0; i< nArraySize; i++)
+    for( sal_Int32 i=0; i< nArraySize; i++)
     {
         SbxVariable* pNew = new SbxVariable( SbxBYTE );
         sal_uInt8 aByte = static_cast< sal_uInt8 >( (i%2) ? ((*pSrc) >> 8) & 0xff : (*pSrc) & 0xff );
diff --git a/compilerplugins/clang/loopvartoosmall.cxx b/compilerplugins/clang/loopvartoosmall.cxx
index 9cfa9f272444..2fd53e44dd64 100644
--- a/compilerplugins/clang/loopvartoosmall.cxx
+++ b/compilerplugins/clang/loopvartoosmall.cxx
@@ -18,7 +18,8 @@
 // revealed by the terminating condition.
 // If not, we might end up in an endless loop, or just not process certain parts.
 
-namespace {
+namespace
+{
 
 class LoopVarTooSmall:
     public RecursiveASTVisitor<LoopVarTooSmall>, public loplugin::Plugin
@@ -26,7 +27,9 @@ class LoopVarTooSmall:
 public:
     explicit LoopVarTooSmall(InstantiationData const & data): Plugin(data) {}
 
-    virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
+    virtual void run() override {
+        TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+    }
 
     bool VisitForStmt( const ForStmt* stmt );
 
@@ -76,8 +79,7 @@ bool LoopVarTooSmall::VisitForStmt( const ForStmt* stmt )
     // ignore complex expressions for now
     if (isa<BinaryOperator>(binOpRHS))
         return true;
-    if (isa<ImplicitCastExpr>(binOpRHS))
-    {
+    if (isa<ImplicitCastExpr>(binOpRHS)) {
         const ImplicitCastExpr* castExpr = dyn_cast<ImplicitCastExpr>(binOpRHS);
         binOpRHS = castExpr->getSubExpr();
     }
@@ -90,22 +92,19 @@ bool LoopVarTooSmall::VisitForStmt( const ForStmt* stmt )
     if (binOpRHS->EvaluateAsInt(aIntResult, compiler.getASTContext())) {
         if (aIntResult.getSExtValue() > 0 && aIntResult.getSExtValue() < 1<<7) {
             qt2BitWidth = 8;
-        }
-        else if (aIntResult.getSExtValue() > 0 && aIntResult.getSExtValue() < 1<<15) {
+        } else if (aIntResult.getSExtValue() > 0 && aIntResult.getSExtValue() < 1<<15) {
             qt2BitWidth = 16;
-        }
-        else if (aIntResult.getSExtValue() > 0 && aIntResult.getSExtValue() < 1L<<31) {
+        } else if (aIntResult.getSExtValue() > 0 && aIntResult.getSExtValue() < 1L<<31) {
             qt2BitWidth = 32;
         }
     }
 
-    if (qt1BitWidth < qt2BitWidth)
-    {
+    if (qt1BitWidth < qt2BitWidth) {
         report(
             DiagnosticsEngine::Warning,
-            "loop index variable is shorter than length type. " + qt.getAsString() + " < " + qt2.getAsString(),
+            "loop index type is smaller than length type. " + qt.getAsString() + " < " + qt2.getAsString(),
             stmt->getLocStart())
-          << stmt->getSourceRange();
+                << stmt->getSourceRange();
 //        stmt->getCond()->dump();
     }
     return true;
diff --git a/drawinglayer/source/animation/animationtiming.cxx b/drawinglayer/source/animation/animationtiming.cxx
index be4d23b5021a..2e5f6040df07 100644
--- a/drawinglayer/source/animation/animationtiming.cxx
+++ b/drawinglayer/source/animation/animationtiming.cxx
@@ -182,7 +182,7 @@ namespace drawinglayer
 
         AnimationEntryList::~AnimationEntryList()
         {
-            for(sal_uInt32 a(0L); a < maEntries.size(); a++)
+            for(size_t a(0); a < maEntries.size(); a++)
             {
                 delete maEntries[a];
             }
@@ -192,7 +192,7 @@ namespace drawinglayer
         {
             AnimationEntryList* pNew = new AnimationEntryList();
 
-            for(sal_uInt32 a(0L); a < maEntries.size(); a++)
+            for(size_t a(0); a < maEntries.size(); a++)
             {
                 pNew->append(*maEntries[a]);
             }
@@ -206,7 +206,7 @@ namespace drawinglayer
 
             if(pCompare && mfDuration == pCompare->mfDuration)
             {
-                for(sal_uInt32 a(0L); a < maEntries.size(); a++)
+                for(size_t a(0); a < maEntries.size(); a++)
                 {
                     if(!(*maEntries[a] == *pCompare->maEntries[a]))
                     {
@@ -286,7 +286,7 @@ namespace drawinglayer
         {
             AnimationEntryLoop* pNew = new AnimationEntryLoop(mnRepeat);
 
-            for(sal_uInt32 a(0L); a < maEntries.size(); a++)
+            for(size_t a(0); a < maEntries.size(); a++)
             {
                 pNew->append(*maEntries[a]);
             }
diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
index 8f7fb120d3a9..744d007cf269 100644
--- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
@@ -166,7 +166,7 @@ namespace drawinglayer
                     rOuterColor));
 
             // create solid fill steps
-            for(sal_uInt32 a(0); a < rEntries.size(); a++)
+            for(size_t a(0); a < rEntries.size(); a++)
             {
                 // create part polygon
                 basegfx::B2DPolygon aNewPoly(rUnitPolygon);
diff --git a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx
index e174322cc8ee..0bb39f53494e 100644
--- a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx
@@ -73,7 +73,7 @@ namespace drawinglayer
                                 rGraphic,
                                 basegfx::B2DHomMatrix());
 
-                            for(sal_uInt32 a(0); a < aMatrices.size(); a++)
+                            for(size_t a(0); a < aMatrices.size(); a++)
                             {
                                 aRetval[a] = new TransformPrimitive2D(
                                     getTransformation() * aMatrices[a],
diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
index 758a707516a6..886c1b26327f 100644
--- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
@@ -122,7 +122,7 @@ namespace drawinglayer
                 const basegfx::B2DPoint aStart(0.0, 0.0);
                 const basegfx::B2DPoint aEnd(1.0, 0.0);
 
-                for(sal_uInt32 a(0L); a < aMatrices.size(); a++)
+                for(size_t a(0); a < aMatrices.size(); a++)
                 {
                     const basegfx::B2DHomMatrix& rMatrix = aMatrices[a];
                     basegfx::B2DPolygon aNewLine;
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index 7ed0045f778a..843ba43ba1c8 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -107,7 +107,7 @@ namespace
             aVirtualDevice->Erase();
             aVirtualDeviceMask->Erase();
 
-            for(sal_uInt16 a(0L); a < maAnimation.Count(); a++)
+            for(size_t a(0); a < maAnimation.Count(); a++)
             {
                 animationStep aNextStep;
                 aNextStep.mnTime = generateStepTime(a);
diff --git a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx
index 59397a6a6b0f..3962f65c0f8b 100644
--- a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx
@@ -132,7 +132,7 @@ namespace drawinglayer
             // prepare return value
             Primitive2DSequence aRetval(aTempPrimitiveTarget.size());
 
-            for(sal_uInt32 a(0L); a < aTempPrimitiveTarget.size(); a++)
+            for(size_t a(0); a < aTempPrimitiveTarget.size(); a++)
             {
                 const Primitive2DReference xRef(aTempPrimitiveTarget[a]);
                 aRetval[a] = xRef;
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index e718176c2cd5..9762a5bb5428 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -612,7 +612,7 @@ namespace
             {
                 std::vector< basegfx::B2DPoint > aPositions(rPositions);
 
-                for(sal_uInt32 a(0); a < aPositions.size(); a++)
+                for(size_t a(0); a < aPositions.size(); a++)
                 {
                     aPositions[a] = rProperties.getTransformation() * aPositions[a];
                 }
@@ -1567,7 +1567,7 @@ namespace
                     // add created text primitive to target
                     if(rProperty.getTransformation().isIdentity())
                     {
-                        for(sal_uInt32 a(0); a < aTargetVector.size(); a++)
+                        for(size_t a(0); a < aTargetVector.size(); a++)
                         {
                             rTarget.append(aTargetVector[a]);
                         }
@@ -1577,7 +1577,7 @@ namespace
                         // when a transformation is set, embed to it
                         drawinglayer::primitive2d::Primitive2DSequence xTargets(aTargetVector.size());
 
-                        for(sal_uInt32 a(0); a < aTargetVector.size(); a++)
+                        for(size_t a(0); a < aTargetVector.size(); a++)
                         {
                             xTargets[a] = drawinglayer::primitive2d::Primitive2DReference(aTargetVector[a]);
                         }
@@ -2065,7 +2065,7 @@ namespace
                                 {
                                     // when derivation is more than 3,5% from default text size,
                                     // scale the DXArray
-                                    for(sal_uInt32 a(0); a < aTextArray.size(); a++)
+                                    for(size_t a(0); a < aTextArray.size(); a++)
                                     {
                                         aTextArray[a] *= fRelative;
                                     }
diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
index 6476c6de8054..2e4357e76c4e 100644
--- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
@@ -73,7 +73,7 @@ namespace drawinglayer
                         aRetval.realloc(aMatrices.size());
 
                         // create one primitive for each matrix
-                        for(sal_uInt32 a(0); a < aMatrices.size(); a++)
+                        for(size_t a(0); a < aMatrices.size(); a++)
                         {
                             aRetval[a] = new TransformPrimitive2D(
                                 aMatrices[a],
diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx
index 1554a685859d..7751aba3c37a 100644
--- a/drawinglayer/source/primitive2d/textprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx
@@ -130,7 +130,7 @@ namespace drawinglayer
                         ::std::vector< double > aScaledDXArray = getDXArray();
                         const double fDXArrayScale(1.0 / aScale.getX());
 
-                        for(sal_uInt32 a(0); a < aScaledDXArray.size(); a++)
+                        for(size_t a(0); a < aScaledDXArray.size(); a++)
                         {
                             aScaledDXArray[a] *= fDXArrayScale;
                         }
diff --git a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
index 204932f78126..c191db51b19f 100644
--- a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
@@ -183,7 +183,7 @@ namespace drawinglayer
                                             a2DUnitLine.append(basegfx::B2DPoint(0.0, 0.0));
                                             a2DUnitLine.append(basegfx::B2DPoint(1.0, 0.0));
 
-                                            for(sal_uInt32 c(0); c < aMatrices.size(); c++)
+                                            for(size_t c(0); c < aMatrices.size(); c++)
                                             {
                                                 const basegfx::B2DHomMatrix& rMatrix = aMatrices[c];
                                                 basegfx::B2DPolygon aNewLine(a2DUnitLine);
diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
index 578026ba055c..4bcf43602d23 100644
--- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
@@ -498,7 +498,7 @@ namespace drawinglayer
 
                 Primitive3DSequence aRetval(aResultVector.size());
 
-                for(sal_uInt32 a(0L); a < aResultVector.size(); a++)
+                for(size_t a(0); a < aResultVector.size(); a++)
                 {
                     aRetval[a] = Primitive3DReference(aResultVector[a]);
                 }
@@ -732,7 +732,7 @@ namespace drawinglayer
             // prepare return value
             Primitive3DSequence aRetval(aResultVector.size());
 
-            for(sal_uInt32 a(0L); a < aResultVector.size(); a++)
+            for(size_t a(0); a < aResultVector.size(); a++)
             {
                 aRetval[a] = Primitive3DReference(aResultVector[a]);
             }
diff --git a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
index 700d038a23a2..9a92be08e88b 100644
--- a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
@@ -50,7 +50,7 @@ namespace drawinglayer
         {
             basegfx::B3DRange aRetval;
 
-            for(sal_uInt32 a(0); a < rFill.size(); a++)
+            for(size_t a(0); a < rFill.size(); a++)
             {
                 aRetval.expand(basegfx::tools::getRange(rFill[a]));
             }
@@ -63,7 +63,7 @@ namespace drawinglayer
             // create sphere normals
             const basegfx::B3DPoint aCenter(rRange.getCenter());
 
-            for(sal_uInt32 a(0); a < rFill.size(); a++)
+            for(size_t a(0); a < rFill.size(); a++)
             {
                 rFill[a] = basegfx::tools::applyDefaultNormalsSphere(rFill[a], aCenter);
             }
@@ -71,7 +71,7 @@ namespace drawinglayer
 
         void applyNormalsKindFlatTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill)
         {
-            for(sal_uInt32 a(0); a < rFill.size(); a++)
+            for(size_t a(0); a < rFill.size(); a++)
             {
                 rFill[a].clearNormals();
             }
@@ -80,7 +80,7 @@ namespace drawinglayer
         void applyNormalsInvertTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill)
         {
             // invert normals
-            for(sal_uInt32 a(0); a < rFill.size(); a++)
+            for(size_t a(0); a < rFill.size(); a++)
             {
                 rFill[a] = basegfx::tools::invertNormals(rFill[a]);
             }
@@ -180,7 +180,7 @@ namespace drawinglayer
                 // create list of simple fill primitives
                 aRetval.realloc(r3DPolyPolygonVector.size());
 
-                for(sal_uInt32 a(0L); a < r3DPolyPolygonVector.size(); a++)
+                for(size_t a(0); a < r3DPolyPolygonVector.size(); a++)
                 {
                     // get scaled PolyPolygon
                     basegfx::B3DPolyPolygon aScaledPolyPolygon(r3DPolyPolygonVector[a]);
diff --git a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
index c68f84e44c0d..0a58349118d0 100644
--- a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
@@ -57,7 +57,7 @@ namespace drawinglayer
 
             if(!rSlices.empty())
             {
-                for(sal_uInt32 a(0L); a < rSlices.size(); a++)
+                for(size_t a(0); a < rSlices.size(); a++)
                 {
                     aRetval.expand(basegfx::tools::getRange(rSlices[a].getB3DPolyPolygon()));
                 }
diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx b/drawinglayer/source/processor3d/shadow3dextractor.cxx
index d025a27d2167..7598fe44bc53 100644
--- a/drawinglayer/source/processor3d/shadow3dextractor.cxx
+++ b/drawinglayer/source/processor3d/shadow3dextractor.cxx
@@ -253,7 +253,7 @@ namespace drawinglayer
         {
             OSL_ENSURE(0 == maPrimitive2DSequence.size(),
                 "OOps, someone used Shadow3DExtractingProcessor, but did not fetch the results (!)");
-            for(sal_uInt32 a(0); a < maPrimitive2DSequence.size(); a++)
+            for(size_t a(0); a < maPrimitive2DSequence.size(); a++)
             {
                 delete maPrimitive2DSequence[a];
             }
diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx
index a3f09309b51f..5b1e15fa1e89 100644
--- a/framework/source/fwi/helper/mischelper.cxx
+++ b/framework/source/fwi/helper/mischelper.cxx
@@ -200,7 +200,7 @@ void FillLangItems( std::set< OUString > &rLangItems,
         Sequence< Locale > rLocales( xDocumentLanguages->getDocumentLanguages( static_cast<sal_Int16>(nScriptType), nMaxCount ));
         if ( rLocales.getLength() > 0 )
         {
-            for ( sal_uInt16 i = 0; i < rLocales.getLength(); ++i )
+            for ( sal_Int32 i = 0; i < rLocales.getLength(); ++i )
             {
                 if ( rLangItems.size() == static_cast< size_t >(nMaxCount) )
                     break;
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 320faa9d3ffe..4f09643363c6 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -338,7 +338,7 @@ void SvMetaClass::FillClasses( SvMetaClassList & rList )
     rList.push_back( this );
 
     // my imports
-    for( sal_uInt32 n = 0; n < aClassList.size(); n++ )
+    for( size_t n = 0; n < aClassList.size(); n++ )
     {
         SvClassElement * pEle = aClassList[n];
         SvMetaClass * pCl = pEle->GetClass();
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 73bef4f5f3af..f7821911b6a0 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -771,7 +771,7 @@ OString SvMetaAttribute::Compare( SvMetaAttribute* pAttr )
                 }
                 else
                 {
-                    for ( sal_uInt16 n=0; n<nCount; n++ )
+                    for ( sal_uLong n=0; n<nCount; n++ )
                     {
                         SvMetaAttribute *pAttr1 = rList[n];
                         SvMetaAttribute *pAttr2 = rOtherList[n];
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 7ee853254c77..e9d25ab3d08a 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -930,7 +930,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
 
                     aOStm.WriteLine(OString("FileList = {"));
 
-                    for( sal_uInt32 i = 0; i < aEntryVector.size(); ++i )
+                    for( size_t i = 0; i < aEntryVector.size(); ++i )
                     {
                         OStringBuffer aEntryString("< \"");
 
@@ -956,7 +956,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
     {
         OStringBuffer aImagesStr;
 
-        for( sal_uInt32 i = 0; i < aMissingImages.size(); ++i )
+        for( size_t i = 0; i < aMissingImages.size(); ++i )
         {
             if( i )
                 aImagesStr.append(' ');
diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx
index c2730348e8b0..f317ad4b0b82 100644
--- a/sfx2/source/appl/appchild.cxx
+++ b/sfx2/source/appl/appchild.cxx
@@ -48,7 +48,7 @@ void SfxApplication::RegisterChildWindow_Impl( SfxModule *pMod, SfxChildWinFacto
     if (!pAppData_Impl->pFactArr)
         pAppData_Impl->pFactArr = new SfxChildWinFactArr_Impl;
 
-    for (sal_uInt16 nFactory=0; nFactory<pAppData_Impl->pFactArr->size(); ++nFactory)
+    for (size_t nFactory=0; nFactory<pAppData_Impl->pFactArr->size(); ++nFactory)
     {
         if (pFact->nId ==  (*pAppData_Impl->pFactArr)[nFactory].nId)
         {
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index dc25cc26be30..0b618ce5dbe8 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -75,7 +75,7 @@ void SfxApplication::RegisterToolBoxControl_Impl( SfxModule *pMod, SfxTbxCtrlFac
     }
 
 #ifdef DBG_UTIL
-    for ( sal_uInt16 n=0; n<pAppData_Impl->pTbxCtrlFac->size(); n++ )
+    for ( size_t n=0; n<pAppData_Impl->pTbxCtrlFac->size(); n++ )
     {
         SfxTbxCtrlFactory *pF = &(*pAppData_Impl->pTbxCtrlFac)[n];
         if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
@@ -100,7 +100,7 @@ void SfxApplication::RegisterStatusBarControl_Impl( SfxModule *pMod, SfxStbCtrlF
     }
 
 #ifdef DBG_UTIL
-    for ( sal_uInt16 n=0; n<pAppData_Impl->pStbCtrlFac->size(); n++ )
+    for ( size_t n=0; n<pAppData_Impl->pStbCtrlFac->size(); n++ )
     {
         SfxStbCtrlFactory *pF = &(*pAppData_Impl->pStbCtrlFac)[n];
         if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
@@ -125,7 +125,7 @@ void SfxApplication::RegisterMenuControl_Impl( SfxModule *pMod, SfxMenuCtrlFacto
     }
 
 #ifdef DBG_UTIL
-    for ( sal_uInt16 n=0; n<pAppData_Impl->pMenuCtrlFac->size(); n++ )
+    for ( size_t n=0; n<pAppData_Impl->pMenuCtrlFac->size(); n++ )
     {
         SfxMenuCtrlFactory *pF = &(*pAppData_Impl->pMenuCtrlFac)[n];
         if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 29e0892dce4c..28e826c009d3 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -251,7 +251,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
 #endif
             // complex property; collect sub items from the parameter set and reconstruct complex item
             sal_uInt16 nFound=0;
-            for ( sal_uInt16 n=0; n<nCount; n++ )
+            for ( sal_Int32 n=0; n<nCount; n++ )
             {
                 const beans::PropertyValue& rPropValue = pPropsVal[n];
                 sal_uInt16 nSub;
@@ -329,7 +329,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
         if ( nSubCount == 0 )
         {
             // "simple" (base type) argument
-            for ( sal_uInt16 n=0; n<nCount; n++ )
+            for ( sal_Int32 n=0; n<nCount; n++ )
             {
                 const beans::PropertyValue& rProp = pPropsVal[n];
                 OUString aName = rProp.Name;
@@ -357,7 +357,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
         {
             // complex argument, could be passed in one struct
             bool bAsWholeItem = false;
-            for ( sal_uInt16 n=0; n<nCount; n++ )
+            for ( sal_Int32 n=0; n<nCount; n++ )
             {
                 const beans::PropertyValue& rProp = pPropsVal[n];
                 OUString aName = rProp.Name;
@@ -387,7 +387,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
                 // only put item if at least one member was found and had the correct type
                 // (is this a good idea?! Should we ask for *all* members?)
                 bool bRet = false;
-                for ( sal_uInt16 n=0; n<nCount; n++ )
+                for ( sal_Int32 n=0; n<nCount; n++ )
                 {
                     const beans::PropertyValue& rProp = pPropsVal[n];
                     for ( sal_uInt16 nSub=0; nSub<nSubCount; nSub++ )
@@ -436,7 +436,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
     // f.e. "SaveAs" shouldn't support parameters not in the slot definition!)
     if ( nSlotId == SID_NEWWINDOW )
     {
-        for ( sal_uInt16 n=0; n<nCount; n++ )
+        for ( sal_Int32 n=0; n<nCount; n++ )
         {
             const beans::PropertyValue& rProp = pPropsVal[n];
             OUString aName = rProp.Name;
@@ -457,7 +457,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
     }
     else if ( bIsMediaDescriptor )
     {
-        for ( sal_uInt16 n=0; n<nCount; n++ )
+        for ( sal_Int32 n=0; n<nCount; n++ )
         {
 #ifdef DBG_UTIL
             ++nFoundArgs;
@@ -887,7 +887,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
         OUString sPropName( "OptionsPageURL" );
         if ( sSlotName == OUString( pSlot->pUnoName, strlen(pSlot->pUnoName), RTL_TEXTENCODING_UTF8 ) )
         {
-            for ( sal_uInt16 n = 0; n < nCount; ++n )
+            for ( sal_Int32 n = 0; n < nCount; ++n )
             {
                 const PropertyValue& rProp = pPropsVal[n];
                 OUString sName( rProp.Name );
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 125a69bd06f8..673b0c171616 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -217,7 +217,7 @@ SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId,
     SfxApplication *pApp = SfxGetpApp();
     {
         SfxChildWinFactArr_Impl &rFactories = pApp->GetChildWinFactories_Impl();
-        for ( sal_uInt16 nFactory = 0; nFactory < rFactories.size(); ++nFactory )
+        for ( size_t nFactory = 0; nFactory < rFactories.size(); ++nFactory )
         {
             pFact = &rFactories[nFactory];
             if ( pFact->nId == nId )
@@ -248,7 +248,7 @@ SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId,
         if ( pFactories )
         {
             SfxChildWinFactArr_Impl &rFactories = *pFactories;
-            for ( sal_uInt16 nFactory = 0; nFactory < rFactories.size(); ++nFactory )
+            for ( size_t nFactory = 0; nFactory < rFactories.size(); ++nFactory )
             {
                 pFact = &rFactories[nFactory];
                 if ( pFact->nId == nId )
@@ -440,7 +440,7 @@ void SfxChildWindow::CreateContext( sal_uInt16 nContextId, SfxBindings& rBinding
         if ( pFactories )
         {
             SfxChildWinFactArr_Impl &rFactories = *pFactories;
-            for ( sal_uInt16 nFactory = 0; nFactory < rFactories.size(); ++nFactory )
+            for ( size_t nFactory = 0; nFactory < rFactories.size(); ++nFactory )
             {
                 pFact = &rFactories[nFactory];
                 if ( pFact->nId == GetType() )
@@ -449,7 +449,7 @@ void SfxChildWindow::CreateContext( sal_uInt16 nContextId, SfxBindings& rBinding
                     if ( !pFact->pArr )
                         break;
 
-                    for ( sal_uInt16 n=0; n<pFact->pArr->size(); ++n )
+                    for ( size_t n=0; n<pFact->pArr->size(); ++n )
                     {
                         SfxChildWinContextFactory *pConFact = &(*pFact->pArr)[n];
                         rBindings.ENTERREGISTRATIONS();
@@ -471,7 +471,7 @@ void SfxChildWindow::CreateContext( sal_uInt16 nContextId, SfxBindings& rBinding
     if ( !pCon )
     {
         SfxChildWinFactArr_Impl &rFactories = pApp->GetChildWinFactories_Impl();
-        for ( sal_uInt16 nFactory = 0; nFactory < rFactories.size(); ++nFactory )
+        for ( size_t nFactory = 0; nFactory < rFactories.size(); ++nFactory )
         {
             pFact = &rFactories[nFactory];
             if ( pFact->nId == GetType() )
@@ -480,7 +480,7 @@ void SfxChildWindow::CreateContext( sal_uInt16 nContextId, SfxBindings& rBinding
                 if ( !pFact->pArr )
                     break;
 
-                for ( sal_uInt16 n=0; n<pFact->pArr->size(); ++n )
+                for ( size_t n=0; n<pFact->pArr->size(); ++n )
                 {
                     SfxChildWinContextFactory *pConFact = &(*pFact->pArr)[n];
                     rBindings.ENTERREGISTRATIONS();
diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx
index 7f4418771d82..b71803252d08 100644
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.cxx
@@ -163,7 +163,7 @@ Sequence < Reference < XDispatch > > SAL_CALL HelpInterceptor_Impl::queryDispatc
     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/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index c87e2713581b..63b72900b7ca 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -219,7 +219,7 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
     if (!pImpl->pFactArr)
         pImpl->pFactArr = new SfxChildWinFactArr_Impl;
 
-    for (sal_uInt16 nFactory=0; nFactory<pImpl->pFactArr->size(); ++nFactory)
+    for (size_t nFactory=0; nFactory<pImpl->pFactArr->size(); ++nFactory)
     {
         if (pFact->nId ==  (*pImpl->pFactArr)[nFactory].nId)
         {
@@ -240,7 +240,7 @@ void SfxModule::RegisterToolBoxControl( SfxTbxCtrlFactory *pFact )
         pImpl->pTbxCtrlFac = new SfxTbxCtrlFactArr_Impl;
 
 #ifdef DBG_UTIL
-    for ( sal_uInt16 n=0; n<pImpl->pTbxCtrlFac->size(); n++ )
+    for ( size_t n=0; n<pImpl->pTbxCtrlFac->size(); n++ )
     {
         SfxTbxCtrlFactory *pF = &(*pImpl->pTbxCtrlFac)[n];
         if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
@@ -262,7 +262,7 @@ void SfxModule::RegisterStatusBarControl( SfxStbCtrlFactory *pFact )
         pImpl->pStbCtrlFac = new SfxStbCtrlFactArr_Impl;
 
 #ifdef DBG_UTIL
-    for ( sal_uInt16 n=0; n<pImpl->pStbCtrlFac->size(); n++ )
+    for ( size_t n=0; n<pImpl->pStbCtrlFac->size(); n++ )
     {
         SfxStbCtrlFactory *pF = &(*pImpl->pStbCtrlFac)[n];
         if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
@@ -284,7 +284,7 @@ void SfxModule::RegisterMenuControl( SfxMenuCtrlFactory *pFact )
         pImpl->pMenuCtrlFac = new SfxMenuCtrlFactArr_Impl;
 
 #ifdef DBG_UTIL
-    for ( sal_uInt16 n=0; n<pImpl->pMenuCtrlFac->size(); n++ )
+    for ( size_t n=0; n<pImpl->pMenuCtrlFac->size(); n++ )
     {
         SfxMenuCtrlFactory *pF = &(*pImpl->pMenuCtrlFac)[n];
         if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 6db90217c368..717a813d9c14 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -963,7 +963,7 @@ SearchTabPage_Impl::SearchTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_
             bChecked = aUserData.getToken(1, ';').toInt32() == 1;
             m_pScopeCB->Check( bChecked );
 
-            for ( sal_uInt16 i = 2; i < comphelper::string::getTokenCount(aUserData, ';'); ++i )
+            for ( sal_Int32 i = 2; i < comphelper::string::getTokenCount(aUserData, ';'); ++i )
             {
                 OUString aToken = aUserData.getToken(i, ';');
                 m_pSearchED->InsertEntry( INetURLObject::decode(
@@ -1028,7 +1028,7 @@ void SearchTabPage_Impl::ClearSearchResults()
 
 void SearchTabPage_Impl::RememberSearchText( const OUString& rSearchText )
 {
-    for ( sal_uInt16 i = 0; i < m_pSearchED->GetEntryCount(); ++i )
+    for ( sal_Int32 i = 0; i < m_pSearchED->GetEntryCount(); ++i )
     {
         if ( rSearchText == m_pSearchED->GetEntry(i) )
         {
@@ -1488,7 +1488,7 @@ void SfxHelpIndexWindow_Impl::dispose()
     pSPage.disposeAndClear();
     pBPage.disposeAndClear();
 
-    for ( sal_uInt16 i = 0; i < m_pActiveLB->GetEntryCount(); ++i )
+    for ( sal_Int32 i = 0; i < m_pActiveLB->GetEntryCount(); ++i )
         delete static_cast<OUString*>(m_pActiveLB->GetEntryData(i));
 
     SvtViewOptions aViewOpt( E_TABDIALOG, CONFIGNAME_INDEXWIN );
@@ -1536,7 +1536,7 @@ void SfxHelpIndexWindow_Impl::SetActiveFactory()
         InitHdl( NULL );
     }
 
-    for ( sal_uInt16 i = 0; i < m_pActiveLB->GetEntryCount(); ++i )
+    for ( sal_Int32 i = 0; i < m_pActiveLB->GetEntryCount(); ++i )
     {
         OUString* pFactory = static_cast<OUString*>(m_pActiveLB->GetEntryData(i));
         *pFactory = pFactory->toAsciiLowerCase();
@@ -1788,7 +1788,7 @@ void SfxHelpIndexWindow_Impl::AddBookmarks( const OUString& rTitle, const OUStri
 bool SfxHelpIndexWindow_Impl::IsValidFactory( const OUString& _rFactory )
 {
     bool bValid = false;
-    for ( sal_uInt16 i = 0; i < m_pActiveLB->GetEntryCount(); ++i )
+    for ( sal_Int32 i = 0; i < m_pActiveLB->GetEntryCount(); ++i )
     {
         OUString* pFactory = static_cast<OUString*>(m_pActiveLB->GetEntryData(i));
         if ( *pFactory == _rFactory )
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 4ef292182a1b..7e59beb047e7 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -144,7 +144,7 @@ namespace
 void SfxPickList::RemovePickListEntries()
 {
     ::osl::MutexGuard aGuard( thePickListMutex::get() );
-    for ( sal_uInt32 i = 0; i < m_aPicklistVector.size(); i++ )
+    for ( size_t i = 0; i < m_aPicklistVector.size(); i++ )
         delete m_aPicklistVector[i];
     m_aPicklistVector.clear();
 }
@@ -319,7 +319,7 @@ void SfxPickList::CreateMenuEntries( Menu* pMenu )
         pMenu->InsertSeparator();
 
     OUString aEmptyString;
-    for ( sal_uInt32 i = 0; i < m_aPicklistVector.size(); i++ )
+    for ( size_t i = 0; i < m_aPicklistVector.size(); i++ )
     {
         PickListEntry* pEntry = GetPickListEntry( i );
 
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 8766b25d2a83..cb431171041c 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -520,7 +520,7 @@ sal_uInt16 ChildTravelValue( SfxChildAlignment eAlign )
 void SfxWorkWindow::Sort_Impl()
 {
     aSortedList.clear();
-    for (sal_uInt16 i = 0; i < aChildren.size(); ++i)
+    for (size_t i = 0; i < aChildren.size(); ++i)
     {
         SfxChild_Impl *pCli = aChildren[i];
         if (pCli)
@@ -733,7 +733,7 @@ void SfxWorkWindow::DeleteControllers_Impl()
 
         // Delete ObjectBars (this is done last, so that aChildren does not
         // receive dead Pointers)
-        for ( sal_uInt16 i = 0; i < aObjBarList.size(); i++ )
+        for ( size_t i = 0; i < aObjBarList.size(); i++ )
         {
             // Not every position must be occupied
             sal_uInt16 nId = aObjBarList[i].nId;
@@ -823,7 +823,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
     Size aSize;
     Rectangle aTmp( aClientArea );
 
-    for ( sal_uInt16 n=0; n<aSortedList.size(); ++n )
+    for ( size_t n=0; n<aSortedList.size(); ++n )
     {
         SfxChild_Impl* pCli = aChildren[aSortedList[n]];
         if ( !pCli->pWin )
@@ -950,7 +950,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
 
 bool SfxWorkWindow::PrepareClose_Impl()
 {
-    for (sal_uInt16 n=0; n<aChildWins.size(); n++)
+    for (size_t n=0; n<aChildWins.size(); n++)
     {
         SfxChildWin_Impl *pCW  = aChildWins[n];
         SfxChildWindow *pChild = pCW->pWin;
@@ -1033,7 +1033,7 @@ void SfxWorkWindow::ShowChildren_Impl()
 
     bool bInvisible = ( !IsVisible_Impl() || ( !pWorkWin->IsReallyVisible() && !pWorkWin->IsReallyShown() ));
 
-    for ( sal_uInt16 nPos = 0; nPos < aChildren.size(); ++nPos )
+    for ( size_t nPos = 0; nPos < aChildren.size(); ++nPos )
     {
         SfxChildWin_Impl* pCW = 0;
         SfxChild_Impl *pCli = aChildren[nPos];
@@ -1042,7 +1042,7 @@ void SfxWorkWindow::ShowChildren_Impl()
         {
             // We have to find the SfxChildWin_Impl to retrieve the
             // SFX_CHILDWIN flags that can influence visibility.
-            for (sal_uInt16 n=0; n<aChildWins.size(); n++)
+            for (size_t n=0; n<aChildWins.size(); n++)
             {
                 SfxChildWin_Impl* pCWin = aChildWins[n];
                 SfxChild_Impl*    pChild  = pCWin->pCli;
@@ -1150,7 +1150,7 @@ void SfxWorkWindow::SetObjectBar_Impl(sal_uInt16 nPos, sal_uInt32 nResId,
     aObjBar.nPos = nRealPos;
     aObjBar.nMode = (nPos & SFX_VISIBILITY_MASK);
 
-    for ( sal_uInt16 n=0; n<aObjBarList.size(); n++ )
+    for ( size_t n=0; n<aObjBarList.size(); n++ )
     {
         if ( aObjBarList[n].nId == aObjBar.nId )
         {
@@ -1175,7 +1175,7 @@ bool SfxWorkWindow::KnowsObjectBar_Impl( sal_uInt16 nPos ) const
     if ( pParent && IsAppWorkWinToolbox_Impl( nRealPos ) )
         return pParent->KnowsObjectBar_Impl( nPos );
 
-    for ( sal_uInt16 n=0; n<aObjBarList.size(); n++ )
+    for ( size_t n=0; n<aObjBarList.size(); n++ )
     {
         if ( aObjBarList[n].nPos == nRealPos )
             return true;
@@ -1412,7 +1412,7 @@ bool SfxWorkWindow::AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW
 void SfxWorkWindow::UpdateChildWindows_Impl()
 {
     // any current or in the context available Childwindows
-    for ( sal_uInt16 n=0; n<aChildWins.size(); n++ )
+    for ( size_t n=0; n<aChildWins.size(); n++ )
     {
         SfxChildWin_Impl *pCW = aChildWins[n];
         SfxChildWindow *pChildWin = pCW->pWin;
@@ -1656,7 +1656,7 @@ bool SfxWorkWindow::IsVisible_Impl()
 
 void SfxWorkWindow::HidePopups_Impl(bool bHide, bool bParent, sal_uInt16 nId )
 {
-    for ( sal_uInt16 n = 0; n < aChildWins.size(); ++n )
+    for ( size_t n = 0; n < aChildWins.size(); ++n )
     {
         SfxChildWindow *pCW = aChildWins[n]->pWin;
         if (pCW && pCW->GetAlignment() == SfxChildAlignment::NOALIGNMENT && pCW->GetType() != nId)
@@ -1695,7 +1695,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
         return;
 
     // configure direct childwindow
-    for (sal_uInt16 n=0; n<aChildWins.size(); n++)
+    for (size_t n=0; n<aChildWins.size(); n++)
     {
         pCW = aChildWins[n];
         SfxChildWindow *pChild = pCW->pWin;
@@ -1782,7 +1782,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
 
             // The current affected window is included in the calculation of
             // the inner rectangle!
-            for ( sal_uInt16 m=0; m<aSortedList.size(); ++m )
+            for ( size_t m=0; m<aSortedList.size(); ++m )
             {
                 sal_uInt16 i=aSortedList[m];
                 SfxChild_Impl* pCli = aChildren[i];
@@ -2349,7 +2349,7 @@ SfxChildWindow* SfxWorkWindow::GetChildWindow_Impl(sal_uInt16 nId)
 
 void SfxWorkWindow::ResetChildWindows_Impl()
 {
-    for ( sal_uInt16 n = 0; n < aChildWins.size(); ++n )
+    for ( size_t n = 0; n < aChildWins.size(); ++n )
     {
         aChildWins[n]->nId = 0;
         aChildWins[n]->bEnable = false;
@@ -2422,7 +2422,7 @@ void SfxWorkWindow::InitializeChild_Impl(SfxChildWin_Impl *pCW)
     SfxApplication *pApp = SfxGetpApp();
     {
         SfxChildWinFactArr_Impl &rFactories = pApp->GetChildWinFactories_Impl();
-        for ( sal_uInt16 nFactory = 0; nFactory < rFactories.size(); ++nFactory )
+        for ( size_t nFactory = 0; nFactory < rFactories.size(); ++nFactory )
         {
             pFact = &rFactories[nFactory];
             if ( pFact->nId == pCW->nSaveId )
@@ -2451,7 +2451,7 @@ void SfxWorkWindow::InitializeChild_Impl(SfxChildWin_Impl *pCW)
         if ( pFactories )
         {
             SfxChildWinFactArr_Impl &rFactories = *pFactories;
-            for ( sal_uInt16 nFactory = 0; nFactory < rFactories.size(); ++nFactory )
+            for ( size_t nFactory = 0; nFactory < rFactories.size(); ++nFactory )
             {
                 pFact = &rFactories[nFactory];
                 if ( pFact->nId == pCW->nSaveId )
@@ -2509,7 +2509,7 @@ void SfxWorkWindow::MakeChildrenVisible_Impl( bool bVis )
     {
         if ( !bSorted )
             Sort_Impl();
-        for ( sal_uInt16 n=0; n<aSortedList.size(); ++n )
+        for ( size_t n=0; n<aSortedList.size(); ++n )
         {
             SfxChild_Impl* pCli = aChildren[aSortedList[n]];
             if ( (pCli->eAlign == SfxChildAlignment::NOALIGNMENT) || (IsDockingAllowed() && bInternalDockingAllowed) )
@@ -2520,7 +2520,7 @@ void SfxWorkWindow::MakeChildrenVisible_Impl( bool bVis )
     {
         if ( !bSorted )
             Sort_Impl();
-        for ( sal_uInt16 n=0; n<aSortedList.size(); ++n )
+        for ( size_t n=0; n<aSortedList.size(); ++n )
         {
             SfxChild_Impl* pCli = aChildren[aSortedList[n]];
             pCli->nVisible &= ~SfxChildVisibility::ACTIVE;
@@ -2729,7 +2729,7 @@ bool SfxWorkWindow::ActivateNextChild_Impl( bool bForward )
 {
     // Sort all children under list
     std::vector<sal_uInt16> aList;
-    for ( sal_uInt16 i=SFX_OBJECTBAR_MAX; i<aChildren.size(); i++)
+    for ( size_t i=SFX_OBJECTBAR_MAX; i<aChildren.size(); i++)
     {
         SfxChild_Impl *pCli = aChildren[i];
         if ( pCli && pCli->bCanGetFocus && pCli->pWin )
@@ -2746,7 +2746,7 @@ bool SfxWorkWindow::ActivateNextChild_Impl( bool bForward )
         return false;
 
     sal_uInt16 nTopValue  = ChildTravelValue( SfxChildAlignment::LOWESTTOP );
-    for ( sal_uInt16 i=0; i<aList.size(); i++ )
+    for ( size_t i=0; i<aList.size(); i++ )
     {
         SfxChild_Impl* pCli = aChildren[aList[i]];
         if ( pCli->pWin && ChildTravelValue( pCli->eAlign ) > nTopValue )
diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index bff716d0a487..64c0dcbaae4f 100644
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -298,7 +298,7 @@ sal_uInt16 BitSet::CountBits(sal_uInt32 nBits)
 
 sal_uInt16 IndexBitSet::GetFreeIndex()
 {
-  for(sal_uInt16 i=0;i<USHRT_MAX;i++)
+  for(int i=0;i<USHRT_MAX;i++)
     if(!Contains(i))
       {
         *this|=i;
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() )
diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx
index edc301474144..30ba414527b7 100644
--- a/toolkit/source/awt/animatedimagespeer.cxx
+++ b/toolkit/source/awt/animatedimagespeer.cxx
@@ -203,7 +203,7 @@ namespace toolkit
                 else
                 {
                     ::std::vector< Size > aImageSizes( nImageSetCount );
-                    for ( sal_Int32 nImageSet = 0; size_t( nImageSet ) < nImageSetCount; ++nImageSet )
+                    for ( size_t nImageSet = 0; nImageSet < nImageSetCount; ++nImageSet )
                     {
                         ::std::vector< CachedImage > const& rImageSet( i_data.aCachedImageSets[ nImageSet ] );
                         if  (   ( rImageSet.empty() )
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index d5fb69ef01ee..22bdcb4f9df7 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -4237,7 +4237,7 @@ void VCLXComboBox::addItems( const ::com::sun::star::uno::Sequence< OUString>& a
     if ( pBox )
     {
         sal_uInt16 nP = nPos;
-        for ( sal_uInt16 n = 0; n < aItems.getLength(); n++ )
+        for ( sal_Int32 n = 0; n < aItems.getLength(); n++ )
         {
             pBox->InsertEntry( aItems.getConstArray()[n], nP );
             if ( nP == 0xFFFF )
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index b0c2a8b281b9..5bfbc0d6a8a1 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -588,7 +588,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
             while ( pLangDepProp->pPropName != 0 )
             {
                 bool bMustBeInserted( true );
-                for ( sal_uInt32 i = 0; i < aPeerPropertiesToSet.size(); i++ )
+                for ( size_t i = 0; i < aPeerPropertiesToSet.size(); i++ )
                 {
                     if ( aPeerPropertiesToSet[i].Name.equalsAsciiL(
                             pLangDepProp->pPropName, pLangDepProp->nPropNameLength ))
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 8e5949fe4f2a..da993516c86c 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -1314,7 +1314,7 @@ void UnoControlModel::setPropertyValues( const ::com::sun::star::uno::Sequence<
         // if somebody sets properties which are single aspects of a font descriptor,
         // remove them, and build a font descriptor instead
         boost::scoped_ptr< awt::FontDescriptor > pFD;
-        for ( sal_uInt16 n = 0; n < nProps; ++n )
+        for ( sal_Int32 n = 0; n < nProps; ++n )
         {
             if ( ( pHandles[n] >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( pHandles[n] <= BASEPROPERTY_FONTDESCRIPTORPART_END ) )
             {
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index d8245c88fcaf..53cf47473005 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -173,11 +173,11 @@ OutputDevice* VCLUnoHelper::GetOutputDevice( const ::com::sun::star::uno::Refere
 
 Polygon VCLUnoHelper::CreatePolygon( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY )
 {
-    sal_uInt32 nLen = DataX.getLength();
+    sal_Int32 nLen = DataX.getLength();
     const sal_Int32* pDataX = DataX.getConstArray();
     const sal_Int32* pDataY = DataY.getConstArray();
     Polygon aPoly( (sal_uInt16) nLen );
-    for ( sal_uInt16 n = 0; n < nLen; n++ )
+    for ( sal_Int32 n = 0; n < nLen; n++ )
     {
         Point aPnt;
         aPnt.X() = pDataX[n];
diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx
index 06f279b7c9bf..d97ab1f3b122 100644
--- a/xmlscript/source/xml_helper/xml_impctx.cxx
+++ b/xmlscript/source/xml_helper/xml_impctx.cxx
@@ -392,7 +392,7 @@ inline ExtendedAttributes::ExtendedAttributes(
 {
     m_pHandler->acquire();
 
-    for ( sal_Int16 nPos = 0; nPos < nAttributes; ++nPos )
+    for ( sal_Int32 nPos = 0; nPos < nAttributes; ++nPos )
     {
         m_pValues[ nPos ] = xAttributeList->getValueByIndex( nPos );
     }