loplugin:loopvartoosmall

Change-Id: I809e408c994222cfa95ba8f56e4db7bd96be7080

47 files changed, 80 insertions, 80 deletions

diff --git a/sc/source/core/opencl/op_statistical.cxx b/sc/source/core/opencl/op_statistical.cxx
index fcfb774874fc..d9a16f7a7a13 100644
--- a/sc/source/core/opencl/op_statistical.cxx
+++ b/sc/source/core/opencl/op_statistical.cxx
@@ -7624,7 +7624,7 @@ void OpHypGeomDist::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -7749,7 +7749,7 @@ void OpMinA::GenSlidingWindowFunction(
     int isMixed = 0;
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -7899,7 +7899,7 @@ vSubArguments)
     int isMixed = 0;
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -8039,7 +8039,7 @@ vSubArguments)
     int isMixed = 0;
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -8190,7 +8190,7 @@ vSubArguments)
     int isMixed = 0;
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -8342,7 +8342,7 @@ void OpVarA::GenSlidingWindowFunction(std::stringstream &ss,
     int isMixedSV = 0;
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -8712,7 +8712,7 @@ void OpVarPA::GenSlidingWindowFunction(std::stringstream &ss,
     int isMixedSV = 0;
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -9079,7 +9079,7 @@ void OpStDevA::GenSlidingWindowFunction(std::stringstream &ss,
     int isMixedSV = 0;
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -9447,7 +9447,7 @@ void OpStDevPA::GenSlidingWindowFunction(std::stringstream &ss,
     int isMixedSV = 0;
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -9813,7 +9813,7 @@ void OpAveDev:: GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"( ";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -9826,7 +9826,7 @@ void OpAveDev:: GenSlidingWindowFunction(std::stringstream &ss,
     ss << "    double length;\n";
     ss << "    double totallength=0;\n";
     ss << "    double tmp = 0;\n";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         FormulaToken *pCur = vSubArguments[i]->GetFormulaToken();
         assert(pCur);
@@ -9876,7 +9876,7 @@ void OpAveDev:: GenSlidingWindowFunction(std::stringstream &ss,
     }
     ss << "    double mean = sum * pow(totallength,-1);\n";
     ss << "    sum = 0.0;\n";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         FormulaToken *pCur = vSubArguments[i]->GetFormulaToken();
         assert(pCur);
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index 08399552c2a3..f965021d0dc2 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -1946,7 +1946,7 @@ void ExcelToSc::ReadExtensions( const ExtensionTypeVec& rExtensions,
 {
     unsigned int nArray = 0;
 
-    for( unsigned int i = 0 ; i < rExtensions.size() ; i++ )
+    for( size_t i = 0 ; i < rExtensions.size() ; i++ )
     {
         ExtensionType eType = rExtensions[i];
 
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 230ece2b1c84..2ce7195ef4d9 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -1358,7 +1358,7 @@ void XclExpOutlineBuffer::UpdateColRow( SCCOLROW nScPos )
         if( nNewLevel >= mnCurrLevel )
         {
             // new level(s) opened, or no level closed - update all level infos
-            for( sal_uInt16 nScLevel = 0; nScLevel <= nNewOpenScLevel; ++nScLevel )
+            for( size_t nScLevel = 0; nScLevel <= nNewOpenScLevel; ++nScLevel )
             {
                 /*  In each level: check if a new group is started (there may be
                     neighbored groups without gap - therefore check ALL levels). */
diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx
index cdf1c17bb195..1309d040e913 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -170,7 +170,7 @@ EditTextObject* lclCreateTextObject( const XclImpRoot& rRoot,
             aNextRun.mnChar = 0xFFFF;
 
         sal_Int32 nLen = rString.GetText().getLength();
-        for( sal_uInt16 nChar = 0; nChar < nLen; ++nChar )
+        for( sal_Int32 nChar = 0; nChar < nLen; ++nChar )
         {
             // reached new different formatted text portion
             if( nChar >= aNextRun.mnChar )
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 57d0743f1642..ce19c0b35387 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1412,7 +1412,7 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo )
     if ( pActEntry->maImageList.size() > 0 )
     {
         long nWidth = 0;
-        for ( sal_uInt32 i=0; i < pActEntry->maImageList.size(); ++i )
+        for ( size_t i=0; i < pActEntry->maImageList.size(); ++i )
         {
             ScHTMLImage* pI = &pActEntry->maImageList[ i ];
             if ( pI->nDir & nHorizontal )
diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index c72336d30938..080a1340456f 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -477,7 +477,7 @@ bool ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, SCTAB /*nTab*/, ScEEParseE
     long nWidth, nHeight;
     nWidth = nHeight = 0;
     sal_Char nDir = nHorizontal;
-    for ( sal_uInt32 i = 0; i < pE->maImageList.size() ; ++i )
+    for ( size_t i = 0; i < pE->maImageList.size() ; ++i )
     {
         ScHTMLImage* pI = &pE->maImageList[ i ];
         if ( pI->pGraphic )
@@ -553,7 +553,7 @@ void ScEEImport::InsertGraphic( SCCOL nCol, SCROW nRow, SCTAB nTab,
     Point aSpace;
     Size aLogicSize;
     sal_Char nDir = nHorizontal;
-    for ( sal_uInt32 i = 0; i < pE->maImageList.size(); ++i )
+    for ( size_t i = 0; i < pE->maImageList.size(); ++i )
     {
         ScHTMLImage* pI = &pE->maImageList[ i ];
         if ( nDir & nHorizontal )
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index 5f19fba45fb6..f5cd27c21a14 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -2106,7 +2106,7 @@ void Complex::Csch() throw( uno::RuntimeException, lang::IllegalArgumentExceptio
 
 ComplexList::~ComplexList()
 {
-    for( sal_uInt32 i = 0; i < maVector.size(); ++i )
+    for( size_t i = 0; i < maVector.size(); ++i )
         delete maVector[i];
 }
 
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index adfd32fda859..d6305b2a179c 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -108,7 +108,7 @@ ScaFuncData::ScaFuncData( const ScaFuncDataBase& rBaseData, ResMgr& rResMgr ) :
     ScaResStringArrLoader aArrLoader( RID_DATE_DEFFUNCTION_NAMES, nCompListID, rResMgr );
     const ResStringArray& rArr = aArrLoader.GetStringArray();
 
-    for( sal_uInt16 nIndex = 0; nIndex < rArr.Count(); nIndex++ )
+    for( sal_uInt32 nIndex = 0; nIndex < rArr.Count(); nIndex++ )
         aCompList.Append( rArr.GetString( nIndex ) );
 }
 
diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx
index ee23ef4dd36a..3e74ac473a8b 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -113,7 +113,7 @@ ScaFuncData::ScaFuncData( const ScaFuncDataBase& rBaseData, ResMgr& rResMgr ) :
     ScaResStringArrLoader aArrLoader( RID_PRICING_DEFFUNCTION_NAMES, nCompListID, rResMgr );
     const ResStringArray& rArr = aArrLoader.GetStringArray();
 
-    for( sal_uInt16 nIndex = 0; nIndex < rArr.Count(); nIndex++ )
+    for( sal_uInt32 nIndex = 0; nIndex < rArr.Count(); nIndex++ )
         aCompList.Append( rArr.GetString( nIndex ) );
 }
 
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index 855cb9fad204..cc5c20c74857 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -1406,7 +1406,7 @@ void EffectMigration::CreateAnimatedGroup(SdrObjGroup& rGroupObj, SdPage& rPage)
             const double fDurationShow(0.2);
             const double fDurationHide(0.001);
 
-            for(sal_uInt32 a(0); a < aObjects.size(); a++)
+            for(size_t a(0); a < aObjects.size(); a++)
             {
                 SdrObject* pLast = pNext;
                 pNext = aObjects[a];
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index a1f7fca04035..6c080b8178b2 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -816,7 +816,7 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes()
                 {
                     sValue += "note:";
                     const EditTextObject& rEdit = pPara->GetTextObject();
-                    for (sal_uInt16 i=0;i<rEdit.GetParagraphCount();i++)
+                    for (sal_Int32 i=0;i<rEdit.GetParagraphCount();i++)
                     {
                         OUString strNote = rEdit.GetText(i);
                         strNote = strNote.replaceFirst( "\\", "\\\\" );
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx
index f64bcd5f9346..82878ed9509a 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -170,7 +170,7 @@ Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources (
 
     // Copy the resources from the vector into a new sequence.
     Sequence<Reference<XResourceId> > aResult (aResources.size());
-    for (sal_uInt32 nIndex=0; nIndex<aResources.size(); ++nIndex)
+    for (size_t nIndex=0; nIndex<aResources.size(); ++nIndex)
         aResult[nIndex] = aResources[nIndex];
 
     return aResult;
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index dd440ad449fc..0d731a5458ed 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -567,7 +567,7 @@ void LayoutMenu::Fill()
 
 void LayoutMenu::Clear()
 {
-    for (sal_uInt16 nId=1; nId<=GetItemCount(); nId++)
+    for (size_t nId=1; nId<=GetItemCount(); nId++)
         delete static_cast<AutoLayout*>(GetItemData(nId));
     ValueSet::Clear();
 }
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 0ac4680fbf5d..2dcf5c278d86 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -573,7 +573,7 @@ void MasterPagesSelector::InvalidatePreview (const SdPage* pPage)
 {
     const ::osl::MutexGuard aGuard (maMutex);
 
-    for (sal_uInt16 nIndex=1; nIndex<=PreviewValueSet::GetItemCount(); nIndex++)
+    for (size_t nIndex=1; nIndex<=PreviewValueSet::GetItemCount(); nIndex++)
     {
         UserData* pData = GetUserData(nIndex);
         if (pData != NULL)
@@ -593,7 +593,7 @@ void MasterPagesSelector::UpdateAllPreviews()
 {
     const ::osl::MutexGuard aGuard (maMutex);
 
-    for (sal_uInt16 nIndex=1; nIndex<=PreviewValueSet::GetItemCount(); nIndex++)
+    for (size_t nIndex=1; nIndex<=PreviewValueSet::GetItemCount(); nIndex++)
     {
         UserData* pData = GetUserData(nIndex);
         if (pData != NULL)
@@ -613,7 +613,7 @@ void MasterPagesSelector::ClearPageSet()
 {
     const ::osl::MutexGuard aGuard (maMutex);
 
-    for (sal_uInt16 nIndex=1; nIndex<=PreviewValueSet::GetItemCount(); nIndex++)
+    for (size_t nIndex=1; nIndex<=PreviewValueSet::GetItemCount(); nIndex++)
     {
         UserData* pData = GetUserData(nIndex);
         if (pData != NULL)
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index adce12becdba..dfc7a998d262 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2406,7 +2406,7 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow()
 
 void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide )
 {
-    const long nSlideCount = mpDoc->GetSdPageCount( PK_STANDARD );
+    const sal_uInt16 nSlideCount = mpDoc->GetSdPageCount( PK_STANDARD );
 
     if( nSlideCount )
     {
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 7dfc356a77b1..6511aa06909c 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -360,7 +360,7 @@ void Clipboard::SelectPageRange (sal_Int32 nFirstIndex, sal_Int32 nPageCount)
     // after the nInsertIndex position.
     PageSelector& rSelector (mrController.GetPageSelector());
     rSelector.DeselectAllPages();
-    for (sal_uInt16 i=0; i<nPageCount; i++)
+    for (sal_Int32 i=0; i<nPageCount; i++)
     {
         model::SharedPageDescriptor pDescriptor (
             mrSlideSorter.GetModel().GetPageDescriptor(nFirstIndex + i));
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index c1428c874c59..1661844100c8 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -469,7 +469,7 @@ void SlideSorterView::DeterminePageObjectVisibilities()
             mbPreciousFlagUpdatePending |= true;
 
         model::SharedPageDescriptor pDescriptor;
-        for (int nIndex=aUnion.Min(); nIndex<=aUnion.Max(); nIndex++)
+        for (long nIndex=aUnion.Min(); nIndex<=aUnion.Max(); nIndex++)
         {
             pDescriptor = mrModel.GetPageDescriptor(nIndex);
             if (pDescriptor.get() != NULL)
@@ -675,7 +675,7 @@ void SlideSorterView::Paint (
     // Paint all page objects that are fully or partially inside the
     // repaint region.
     const Range aRange (mpLayouter->GetRangeOfVisiblePageObjects(rRepaintArea));
-    for (sal_Int32 nIndex=aRange.Min(); nIndex<=aRange.Max(); ++nIndex)
+    for (long nIndex=aRange.Min(); nIndex<=aRange.Max(); ++nIndex)
     {
         model::SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(nIndex));
         if (!pDescriptor || ! pDescriptor->HasState(PageDescriptor::ST_Visible))
diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
index dd0c03fcdcfc..f89330eee447 100644
--- a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
@@ -218,8 +218,8 @@ void FramePainter::OffsetBitmap::PaintCenter (
     const Rectangle& rBox) const
 {
     const Size aBitmapSize (maBitmap.GetSizePixel());
-    for (sal_Int32 nY=rBox.Top(); nY<=rBox.Bottom(); nY+=aBitmapSize.Height())
-        for (sal_Int32 nX=rBox.Left(); nX<=rBox.Right(); nX+=aBitmapSize.Width())
+    for (long nY=rBox.Top(); nY<=rBox.Bottom(); nY+=aBitmapSize.Height())
+        for (long nX=rBox.Left(); nX<=rBox.Right(); nX+=aBitmapSize.Width())
             rDevice.DrawBitmapEx(
                 Point(nX,nY),
                 Size(
diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
index cb237454d009..d10615fc3b86 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
@@ -199,8 +199,8 @@ Point InsertionIndicatorOverlay::PaintRepresentatives (
             const sal_Int32 nIconHeight (aExclusionOverlay.GetSizePixel().Height());
             if (nIconWidth>0 && nIconHeight>0)
             {
-                for (sal_Int32 nX=0; nX<rPreviewSize.Width(); nX+=nIconWidth)
-                    for (sal_Int32 nY=0; nY<rPreviewSize.Height(); nY+=nIconHeight)
+                for (long nX=0; nX<rPreviewSize.Width(); nX+=nIconWidth)
+                    for (long nY=0; nY<rPreviewSize.Height(); nY+=nIconHeight)
                         rContent.DrawBitmapEx(Point(nX,nY)+aPageOffset, aExclusionOverlay);
             }
             rContent.SetClipRegion(aSavedClipRegion);
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
index d22f5cf801ac..72cecd66c482 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
@@ -187,13 +187,13 @@ void LayeredDevice::Invalidate (
 
 void LayeredDevice::InvalidateAllLayers (const Rectangle& rInvalidationArea)
 {
-    for (sal_uInt32 nLayer=0; nLayer<mpLayers->size(); ++nLayer)
+    for (size_t nLayer=0; nLayer<mpLayers->size(); ++nLayer)
         (*mpLayers)[nLayer]->InvalidateRectangle(rInvalidationArea);
 }
 
 void LayeredDevice::InvalidateAllLayers (const vcl::Region& rInvalidationRegion)
 {
-    for (sal_uInt32 nLayer=0; nLayer<mpLayers->size(); ++nLayer)
+    for (size_t nLayer=0; nLayer<mpLayers->size(); ++nLayer)
         (*mpLayers)[nLayer]->InvalidateRegion(rInvalidationRegion);
 }
 
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index 79eea5518bc7..91b7e8ef3346 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
@@ -174,8 +174,8 @@ Bitmap PageObjectPainter::CreateMarkedPreview (
     const sal_Int32 nIconHeight (rOverlay.GetSizePixel().Height());
     if (nIconWidth>0 && nIconHeight>0)
     {
-        for (sal_Int32 nX=0; nX<rSize.Width(); nX+=nIconWidth)
-            for (sal_Int32 nY=0; nY<rSize.Height(); nY+=nIconHeight)
+        for (long nX=0; nX<rSize.Width(); nX+=nIconWidth)
+            for (long nY=0; nY<rSize.Height(); nY+=nIconHeight)
                 pDevice->DrawBitmapEx(Point(nX,nY), rOverlay);
     }
     return pDevice->GetBitmap(Point(0,0), rSize);
diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx
index 565a152e3135..29c237bf01b8 100644
--- a/sd/source/ui/tools/ConfigurationAccess.cxx
+++ b/sd/source/ui/tools/ConfigurationAccess.cxx
@@ -147,7 +147,7 @@ void ConfigurationAccess::ForAll (
             {
                 // Get from the current item of the container the children
                 // that match the names in the rArguments list.
-                for (sal_uInt32 nValueIndex=0; nValueIndex<aValues.size(); ++nValueIndex)
+                for (size_t nValueIndex=0; nValueIndex<aValues.size(); ++nValueIndex)
                     aValues[nValueIndex] = xSetItem->getByName(rArguments[nValueIndex]);
             }
             rFunctor(rsKey, aValues);
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index e12a15bc75c6..fed8f315d8c9 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -684,7 +684,7 @@ IPropertyArrayHelper & DrawController::getInfoHelper()
         ::std::vector<beans::Property> aProperties;
         FillPropertyTable (aProperties);
         Sequence<beans::Property> aPropertySequence (aProperties.size());
-        for (unsigned int i=0; i<aProperties.size(); i++)
+        for (size_t i=0; i<aProperties.size(); i++)
             aPropertySequence[i] = aProperties[i];
         mpPropertyArrayHelper.reset(new OPropertyArrayHelper(aPropertySequence, sal_False));
     }
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index c32b92ff43ae..181fa15a2c5e 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -483,7 +483,7 @@ bool ViewTabBar::HasTabBarButton (
 {
     bool bResult (false);
 
-    for (sal_uInt32 nIndex=0; nIndex<maTabBarButtons.size(); ++nIndex)
+    for (size_t nIndex=0; nIndex<maTabBarButtons.size(); ++nIndex)
     {
         if (IsEqual(maTabBarButtons[nIndex], rButton))
         {
@@ -517,7 +517,7 @@ void ViewTabBar::UpdateActiveButton()
     if (xView.is())
     {
         Reference<XResourceId> xViewId (xView->getResourceId());
-        for (sal_uInt16 nIndex=0; nIndex<maTabBarButtons.size(); ++nIndex)
+        for (size_t nIndex=0; nIndex<maTabBarButtons.size(); ++nIndex)
         {
             if (maTabBarButtons[nIndex].ResourceId->compareTo(xViewId) == 0)
             {
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 030c676bc3db..1c34b1797583 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -466,7 +466,7 @@ void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence
 
     const sal_Int32 nLength = rSequence.getLength();
     const com::sun::star::beans::PropertyValue *pValue = rSequence.getConstArray();
-    for (sal_Int16 i = 0 ; i < nLength; i++, pValue++ )
+    for (sal_Int32 i = 0 ; i < nLength; i++, pValue++ )
     {
         if ( pValue->Name == sUNO_View_ZoomOnPage )
         {
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 329fa9cff449..fe12af267d53 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -566,7 +566,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
         sal_Int32 aSnapGridWidthYDom = GetSnapGridWidthY().GetDenominator();
 
         const com::sun::star::beans::PropertyValue *pValue = rSequence.getConstArray();
-        for (sal_Int16 i = 0 ; i < nLength; i++, pValue++ )
+        for (sal_Int32 i = 0 ; i < nLength; i++, pValue++ )
         {
             if ( pValue->Name == sUNO_View_ViewId )
             {
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 277d262fc163..455640e1a0e1 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1086,7 +1086,7 @@ void OutlineView::FillOutliner()
     mrOutliner.SetUpdateMode(false);
 
     Paragraph* pTitleToSelect = NULL;
-    sal_uLong nPageCount = mrDoc.GetSdPageCount(PK_STANDARD);
+    sal_uInt16 nPageCount = mrDoc.GetSdPageCount(PK_STANDARD);
 
     // fill outliner with paragraphs from slides title & (outlines|subtitles)
     for (sal_uInt16 nPage = 0; nPage < nPageCount; nPage++)
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index a02ec4e709bd..f0dd92267b69 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -105,7 +105,7 @@ struct ImpRememberOrigAndClone
 
 SdrObject* ImpGetClone(std::vector<ImpRememberOrigAndClone*>& aConnectorContainer, SdrObject* pConnObj)
 {
-    for(sal_uInt32 a(0); a < aConnectorContainer.size(); a++)
+    for(size_t a(0); a < aConnectorContainer.size(); a++)
     {
         if(pConnObj == aConnectorContainer[a]->pOrig)
             return aConnectorContainer[a]->pClone;
diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx
index c2c5b6b16deb..f6341f6fd7d3 100644
--- a/sdext/source/minimizer/pppoptimizer.cxx
+++ b/sdext/source/minimizer/pppoptimizer.cxx
@@ -70,7 +70,7 @@ Sequence< Reference< com::sun::star::frame::XDispatch > > SAL_CALL PPPOptimizer:
     Sequence< Reference< com::sun::star::frame::XDispatch> > aReturn( aDescripts.getLength() );
     Reference< com::sun::star::frame::XDispatch>* pReturn = aReturn.getArray();
     const com::sun::star::frame::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/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx
index 49064f1812f1..67e5613d0aed 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -86,7 +86,7 @@ Sequence< Reference< com::sun::star::frame::XDispatch > > SAL_CALL PPPOptimizerD
     Sequence< Reference< com::sun::star::frame::XDispatch> > aReturn( aDescripts.getLength() );
     Reference< com::sun::star::frame::XDispatch>* pReturn = aReturn.getArray();
     const com::sun::star::frame::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/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index 16914a9e917b..96e0da6508db 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -203,7 +203,7 @@ void PresenterConfigurationAccess::ForAll (
             {
                 // Get from the current item of the container the children
                 // that match the names in the rArguments list.
-                for (sal_uInt32 nValueIndex=0; nValueIndex<aValues.size(); ++nValueIndex)
+                for (size_t nValueIndex=0; nValueIndex<aValues.size(); ++nValueIndex)
                 {
                     if ( ! xSetItem->hasByName(rArguments[nValueIndex]))
                         bHasAllValues = false;
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index 87680d2ca974..a74de6975705 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -287,7 +287,7 @@ void SmElementsControl::Paint(vcl::RenderContext& rRenderContext, const Rectangl
     else
         boxX = nControlWidth / perLine;
 
-    for (sal_uInt16 i = 0; i < maElementList.size() ; i++)
+    for (size_t i = 0; i < maElementList.size() ; i++)
     {
         SmElement* element = maElementList[i].get();
         if (element->isSeparator())
@@ -390,7 +390,7 @@ void SmElementsControl::MouseMove( const MouseEvent& rMouseEvent )
     OUString tooltip;
     if (Rectangle(Point(0, 0), GetOutputSizePixel()).IsInside(rMouseEvent.GetPosPixel()))
     {
-        for (sal_uInt16 i = 0; i < maElementList.size() ; i++)
+        for (size_t i = 0; i < maElementList.size() ; i++)
         {
             SmElement* element = maElementList[i].get();
             Rectangle rect(element->mBoxLocation, element->mBoxSize);
@@ -419,7 +419,7 @@ void SmElementsControl::MouseButtonDown(const MouseEvent& rMouseEvent)
 
     if (rMouseEvent.IsLeft() && Rectangle(Point(0, 0), GetOutputSizePixel()).IsInside(rMouseEvent.GetPosPixel()))
     {
-        for (sal_uInt16 i = 0; i < maElementList.size() ; i++)
+        for (size_t i = 0; i < maElementList.size() ; i++)
         {
             SmElement* element = maElementList[i].get();
             Rectangle rect(element->mBoxLocation, element->mBoxSize);
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 5754b8377bf2..dad3302b7a34 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -1148,7 +1148,7 @@ void SmShowSymbolSetWindow::Paint(vcl::RenderContext& rRenderContext, const Rect
     size_t nSymbols = aSymbolSet.size();
 
     Color aTxtColor(rRenderContext.GetTextColor());
-    for (sal_uInt16 i = v; i < nSymbols ; i++)
+    for (size_t i = v; i < nSymbols ; i++)
     {
         SmSym aSymbol(*aSymbolSet[i]);
         vcl::Font aFont(aSymbol.GetFace());
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 09eb7e1a23d3..b3dccf7d42a8 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -2078,12 +2078,12 @@ void MathType::HandleSmMatrix(SmMatrixNode *pMatrix,int nLevel)
     int nBytes=(pMatrix->GetNumRows()+1)*2/8;
     if (((pMatrix->GetNumRows()+1)*2)%8)
         nBytes++;
-    for (sal_uInt16 j = 0; j < nBytes; j++)
+    for (int j = 0; j < nBytes; j++)
         pS->WriteUChar( 0x00 ); //row_parts
     nBytes=(pMatrix->GetNumCols()+1)*2/8;
     if (((pMatrix->GetNumCols()+1)*2)%8)
         nBytes++;
-    for (sal_uInt16 k = 0; k < nBytes; k++)
+    for (int k = 0; k < nBytes; k++)
         pS->WriteUChar( 0x00 ); //col_parts
     sal_uInt16  nSize = pMatrix->GetNumSubNodes();
     for (sal_uInt16 i = 0; i < nSize; i++)
diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx
index 9cccd7431a21..0573e6478798 100644
--- a/starmath/source/ooxmlexport.cxx
+++ b/starmath/source/ooxmlexport.cxx
@@ -496,7 +496,7 @@ void SmOoxmlExport::HandleBrace( const SmBraceNode* pNode, int nLevel )
             FSNS( XML_m, XML_val ), mathSymbolToString( pNode->ClosingBrace()).getStr(), FSEND );
 
     m_pSerializer->endElementNS( XML_m, XML_dPr );
-    for( unsigned int i = 0; i < subnodes.size(); ++i )
+    for( size_t i = 0; i < subnodes.size(); ++i )
     {
         m_pSerializer->startElementNS( XML_m, XML_e, FSEND );
         HandleNode( subnodes[ i ], nLevel + 1 );
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index d70ca9dacb4f..04843d091c19 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1235,7 +1235,7 @@ void SmParser::SubSup(sal_uLong nActiveGroup)
     SmNodeArray  aSubNodes;
     aSubNodes.resize(1 + SUBSUP_NUM_ENTRIES);
     aSubNodes[0] = popOrZero(m_aNodeStack);
-    for (sal_uInt16 i = 1;  i < aSubNodes.size();  i++)
+    for (size_t i = 1;  i < aSubNodes.size();  i++)
         aSubNodes[i] = NULL;
 
     // process all sub-/supscripts
diff --git a/starmath/source/rtfexport.cxx b/starmath/source/rtfexport.cxx
index 5c38a4eead8f..bb08685b4d65 100644
--- a/starmath/source/rtfexport.cxx
+++ b/starmath/source/rtfexport.cxx
@@ -433,7 +433,7 @@ void SmRtfExport::HandleBrace(const SmBraceNode* pNode, int nLevel)
     m_pBuffer->append(mathSymbolToString(pNode->ClosingBrace(), m_nEncoding));
     m_pBuffer->append("}"); // mendChr
     m_pBuffer->append("}"); // mdPr
-    for (unsigned int i = 0; i < subnodes.size(); ++i)
+    for (size_t i = 0; i < subnodes.size(); ++i)
     {
         m_pBuffer->append("{" LO_STRING_SVTOOLS_RTF_ME " ");
         HandleNode(subnodes[ i ], nLevel + 1);
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index 00485da3dfb0..8814636f0968 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -60,7 +60,7 @@ SmFontPickList& SmFontPickList::operator = (const SmFontPickList& rList)
 {
     Clear();
     nMaxItems = rList.nMaxItems;
-    for (sal_uInt16 nPos = 0; nPos < rList.aFontVec.size(); nPos++)
+    for (size_t nPos = 0; nPos < rList.aFontVec.size(); nPos++)
         aFontVec.push_back( rList.aFontVec[nPos] );
 
     return *this;
@@ -116,7 +116,7 @@ void SmFontPickList::Insert(const vcl::Font &rFont)
 
 void SmFontPickList::Update(const vcl::Font &rFont, const vcl::Font &rNewFont)
 {
-    for (sal_uInt16 nPos = 0; nPos < aFontVec.size(); nPos++)
+    for (size_t nPos = 0; nPos < aFontVec.size(); nPos++)
         if (CompareItem( aFontVec[nPos], rFont ))
         {
             aFontVec[nPos] = rNewFont;
@@ -126,7 +126,7 @@ void SmFontPickList::Update(const vcl::Font &rFont, const vcl::Font &rNewFont)
 
 void SmFontPickList::Remove(const vcl::Font &rFont)
 {
-    for (sal_uInt16 nPos = 0; nPos < aFontVec.size(); nPos++)
+    for (size_t nPos = 0; nPos < aFontVec.size(); nPos++)
         if (CompareItem( aFontVec[nPos], rFont))
         {
             aFontVec.erase( aFontVec.begin() + nPos );
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index b6b2d52234bd..a216b1e87af6 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -51,7 +51,7 @@ static OUString createIndex(const vector< OUString >& lines)
 {
     OString aResult;
 
-    for( unsigned int i = 0; i < lines.size(); i++ )
+    for( size_t i = 0; i < lines.size(); i++ )
     {
         if( i )
             aResult += OString( "__" );
@@ -180,7 +180,7 @@ static ::rtl::ByteSequence getBufFromAsciiLine( const OUString& line )
 static Sequence< OUString > copyVectorToSequence( const vector< OUString >& original )
 {
     Sequence< OUString > newOne ( original.size() );
-    for( unsigned int i = 0; i < original.size() ; i++ )
+    for( size_t i = 0; i < original.size() ; i++ )
         newOne[i] = original[i];
 
     return newOne;
diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx
index cec061212223..842badc8f277 100644
--- a/sw/source/core/access/accselectionhelper.cxx
+++ b/sw/source/core/access/accselectionhelper.cxx
@@ -130,8 +130,8 @@ static bool lcl_getSelectedState(const SwAccessibleChild& aChild,
         if( pRStateSet.is() )
         {
             Sequence<short> pStates = pRStateSet->getStates();
-            long count = pStates.getLength();
-            for( int i = 0; i < count; i++ )
+            sal_Int32 count = pStates.getLength();
+            for( sal_Int32 i = 0; i < count; i++ )
             {
                 if( pStates[i] == AccessibleStateType::SELECTED)
                     return true;
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index a31a4b29b82a..35afa610333e 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -246,7 +246,7 @@ bool FTPContentProvider::forHost( const OUString& host,
                                   OUString& account)
 {
     osl::MutexGuard aGuard(m_aMutex);
-    for(unsigned int i = 0; i < m_ServerInfo.size(); ++i)
+    for(size_t i = 0; i < m_ServerInfo.size(); ++i)
         if(host == m_ServerInfo[i].host &&
            port == m_ServerInfo[i].port &&
            username == m_ServerInfo[i].username )
@@ -274,7 +274,7 @@ bool  FTPContentProvider::setHost( const OUString& host,
 
     bool present(false);
     osl::MutexGuard aGuard(m_aMutex);
-    for(unsigned int i = 0; i < m_ServerInfo.size(); ++i)
+    for(size_t i = 0; i < m_ServerInfo.size(); ++i)
         if(host == m_ServerInfo[i].host &&
            port == m_ServerInfo[i].port &&
            username == m_ServerInfo[i].username)
diff --git a/ucb/source/ucp/ftp/ftpresultsetI.cxx b/ucb/source/ucp/ftp/ftpresultsetI.cxx
index 1bfcddc3a3e5..89e1367b04c8 100644
--- a/ucb/source/ucp/ftp/ftpresultsetI.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetI.cxx
@@ -46,7 +46,7 @@ ResultSetI::ResultSetI(const Reference<XComponentContext>&  rxContext,
                        const std::vector<FTPDirentry>&  dirvec)
     : ResultSetBase(rxContext,xProvider,nOpenMode,seqProp,seqSort)
 {
-    for( unsigned int i = 0; i < dirvec.size(); ++i)
+    for( size_t i = 0; i < dirvec.size(); ++i)
         m_aPath.push_back(dirvec[i].m_aURL);
 
     // m_aIdents holds the contentidentifiers
@@ -54,7 +54,7 @@ ResultSetI::ResultSetI(const Reference<XComponentContext>&  rxContext,
     m_aItems.resize( m_aPath.size() );
     m_aIdents.resize( m_aPath.size() );
 
-    for(unsigned n = 0; n < m_aItems.size(); ++n) {
+    for(size_t n = 0; n < m_aItems.size(); ++n) {
         rtl::Reference<ucbhelper::PropertyValueSet> xRow =
             new ucbhelper::PropertyValueSet(rxContext);
 
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 8bbcfbdfba7e..8ede7cd2b068 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -275,7 +275,7 @@ OUString FTPURL::ident(bool withslash,bool internal) const
     else
         bff.append('/');
 
-    for(unsigned i = 0; i < m_aPathSegmentVec.size(); ++i)
+    for(size_t i = 0; i < m_aPathSegmentVec.size(); ++i)
         if(i == 0)
             bff.append(m_aPathSegmentVec[i]);
         else
@@ -323,7 +323,7 @@ OUString FTPURL::parent(bool internal) const
 
     OUString last;
 
-    for(unsigned int i = 0; i < m_aPathSegmentVec.size(); ++i)
+    for(size_t i = 0; i < m_aPathSegmentVec.size(); ++i)
         if(1+i == m_aPathSegmentVec.size())
             last = m_aPathSegmentVec[i];
         else if(i == 0)
@@ -614,7 +614,7 @@ FTPDirentry FTPURL::direntry() const
 
         std::vector<FTPDirentry> aList = aURL.list(OpenMode::ALL);
 
-        for(unsigned i = 0; i < aList.size(); ++i) {
+        for(size_t i = 0; i < aList.size(); ++i) {
             if(aList[i].m_aName == nettitle) { // the relevant file is found
                 aDirentry = aList[i];
                 break;
@@ -778,7 +778,7 @@ void FTPURL::del() const
 
     if(aDirentry.m_nMode & INETCOREFTP_FILEMODE_ISDIR) {
         std::vector<FTPDirentry> vec = list(sal_Int16(OpenMode::ALL));
-        for( unsigned int i = 0; i < vec.size(); ++i )
+        for( size_t i = 0; i < vec.size(); ++i )
             try {
                 FTPURL url(vec[i].m_aURL,m_pFCP);
                 url.del();
diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
index 8f718a015b6c..6df724cd341f 100644
--- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
@@ -398,7 +398,7 @@ bool DataSupplier::getData()
                 aPath = NeonUri::unescape( aPath );
                 bool bFoundParent = false;
 
-                for ( sal_uInt32 n = 0; n < resources.size(); ++n )
+                for ( size_t n = 0; n < resources.size(); ++n )
                 {
                     const DAVResource & rRes = resources[ n ];
 
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 98a6bb281d43..19a28f9a9928 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -741,7 +741,7 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,helpdatafileproxy:
     listAnchor.realloc( id.size() );
     listTitle.realloc( id.size() );
 
-    for( sal_uInt32 i = 0; i < id.size(); ++i )
+    for( size_t i = 0; i < id.size(); ++i )
     {
         listId[i] = id[i];
         listAnchor[i] = anchor[i];
@@ -771,7 +771,7 @@ KeywordInfo::KeywordInfo( const std::vector< KeywordElement >& aVec )
       listAnchor( aVec.size() ),
       listTitle( aVec.size() )
 {
-    for( unsigned int i = 0; i < aVec.size(); ++i )
+    for( size_t i = 0; i < aVec.size(); ++i )
     {
         listKey[i] = aVec[i].key;
         listId[i] = aVec[i].listId;
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index dbb3cea9ed81..bd6ebaaad0aa 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -180,7 +180,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
                 if( nQueryListSize > 1 )
                     aSet.clear();
 
-                for (unsigned j = 0; j < aPathVector.size(); ++j) {
+                for (size_t j = 0; j < aPathVector.size(); ++j) {
                     pQueryResultVector->push_back(HitItem(aPathVector[j], aScoreVector[j]));
                     if (nQueryListSize > 1)
                         aSet.insert(aPathVector[j]);
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
index c269d579da86..46645b64a146 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
@@ -49,7 +49,7 @@ ResultSetForRoot::ResultSetForRoot( const uno::Reference< uno::XComponentContext
     aCommand.Name = "getPropertyValues";
     aCommand.Argument <<= m_sProperty;
 
-    for( sal_uInt32 i = 0; i < m_aPath.size(); ++i )
+    for( size_t i = 0; i < m_aPath.size(); ++i )
     {
         m_aPath[i] =
             "vnd.sun.star.help://" +