loplugin:loopvartoosmall

Change-Id: Icbe68b31d4ab04ca3cd9f572e3598413946a75c7

24 files changed, 49 insertions, 49 deletions

diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 4d6debd44b3d..dbd51ee7b0d1 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1452,9 +1452,9 @@ namespace
             {
                 const Size aBitmapSize(rBitmapEx.GetSizePixel());
 
-                for(sal_Int32 y(0); y < rSize.Height(); y += aBitmapSize.Height())
+                for(long y(0); y < rSize.Height(); y += aBitmapSize.Height())
                 {
-                    for(sal_Int32 x(0); x < rSize.Width(); x += aBitmapSize.Width())
+                    for(long x(0); x < rSize.Width(); x += aBitmapSize.Width())
                     {
                         pVirtualDevice->DrawBitmapEx(
                             Point(x, y),
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index 6f8a35612540..ed6126898ea3 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -289,7 +289,7 @@ void SvxPageWindow::DrawPage(vcl::RenderContext& rRenderContext, const Point& rO
             break;
         }
         sText += OUString(cArrow);
-        for (sal_uInt16 i = 0; i < sText.getLength(); i++)
+        for (sal_Int32 i = 0; i < sText.getLength(); i++)
         {
             OUString sDraw(sText.copy(i,1));
             long nHDiff = 0;
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index b22e5f834dda..af49dcd5954b 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -309,7 +309,7 @@ void SvxRubyDialog::dispose()
 
 void SvxRubyDialog::ClearCharStyleList()
 {
-    for (sal_uInt16 i = 0; i < m_pCharStyleLB->GetEntryCount(); i++)
+    for (sal_Int32 i = 0; i < m_pCharStyleLB->GetEntryCount(); i++)
     {
         void* pData = m_pCharStyleLB->GetEntryData(i);
         delete static_cast<OUString*>(pData);
@@ -528,7 +528,7 @@ void SvxRubyDialog::Update()
         sCharStyleName = cRubies;
     if (!sCharStyleName.isEmpty())
     {
-        for (sal_uInt16 i = 0; i < m_pCharStyleLB->GetEntryCount(); i++)
+        for (sal_Int32 i = 0; i < m_pCharStyleLB->GetEntryCount(); i++)
         {
             const OUString* pCoreName = static_cast<const OUString*>(m_pCharStyleLB->GetEntryData(i));
             if (pCoreName && sCharStyleName == *pCoreName)
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 33dbbb806797..7b2b7e6343c8 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -142,7 +142,7 @@ void ListToStrArr_Impl( sal_uInt16 nId, std::vector<OUString>& rStrLst, ComboBox
     {
         std::vector<OUString> aLst = pSrchItem->GetList();
 
-        for ( sal_uInt16 i = 0; i < aLst.size(); ++i )
+        for ( size_t i = 0; i < aLst.size(); ++i )
         {
             rStrLst.push_back(aLst[i]);
             rCBox.InsertEntry(aLst[i]);
@@ -159,7 +159,7 @@ void StrArrToList_Impl( sal_uInt16 nId, const std::vector<OUString>& rStrLst )
 SearchAttrItemList::SearchAttrItemList( const SearchAttrItemList& rList ) :
     SrchAttrItemList(rList)
 {
-    for ( sal_uInt16 i = 0; i < size(); ++i )
+    for ( size_t i = 0; i < size(); ++i )
         if ( !IsInvalidItem( (*this)[i].pItem ) )
             (*this)[i].pItem = (*this)[i].pItem->Clone();
 }
@@ -213,7 +213,7 @@ SfxItemSet& SearchAttrItemList::Get( SfxItemSet& rSet )
 {
     SfxItemPool* pPool = rSet.GetPool();
 
-    for ( sal_uInt16 i = 0; i < size(); ++i )
+    for ( size_t i = 0; i < size(); ++i )
         if ( IsInvalidItem( (*this)[i].pItem ) )
             rSet.InvalidateItem( pPool->GetWhich( (*this)[i].nSlot ) );
         else
@@ -225,7 +225,7 @@ SfxItemSet& SearchAttrItemList::Get( SfxItemSet& rSet )
 
 void SearchAttrItemList::Clear()
 {
-    for ( sal_uInt16 i = 0; i < size(); ++i )
+    for ( size_t i = 0; i < size(); ++i )
         if ( !IsInvalidItem( (*this)[i].pItem ) )
             delete (*this)[i].pItem;
     SrchAttrItemList::clear();
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index e392e7ab0998..8242a78fd037 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -440,7 +440,7 @@ void SvxNumValueSet::SetNumberingSettings(
     aLocale = rLocale;
     if(aNum.getLength() > 8)
             SetStyle( GetStyle()|WB_VSCROLL);
-    for ( sal_uInt16 i = 0; i < aNum.getLength(); i++ )
+    for ( sal_Int32 i = 0; i < aNum.getLength(); i++ )
     {
             InsertItem( i + 1, i );
             if( i < 8 )
@@ -458,7 +458,7 @@ void SvxNumValueSet::SetOutlineNumberingSettings(
     aLocale = rLocale;
     if(aOutlineSettings.getLength() > 8)
         SetStyle( GetStyle() | WB_VSCROLL );
-    for ( sal_uInt16 i = 0; i < aOutlineSettings.getLength(); i++ )
+    for ( sal_Int32 i = 0; i < aOutlineSettings.getLength(); i++ )
     {
         InsertItem( i + 1, i );
         if( i < 8 )
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index cbca4a2f42b9..2565c95b656a 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -291,7 +291,7 @@ SvxRuler::SvxRuler(
 
         mpIndents.resize(5 + INDENT_GAP);
 
-        for(sal_uInt32 nIn = 0; nIn < mpIndents.size(); nIn++)
+        for(size_t nIn = 0; nIn < mpIndents.size(); nIn++)
         {
             mpIndents[nIn].nPos = 0;
             mpIndents[nIn].nStyle = RULER_STYLE_DONTKNOW;
@@ -3681,7 +3681,7 @@ long SvxRuler::CalcPropMaxRight(sal_uInt16 nCol) const
         if(mxColumnItem->IsTable())
         {
             sal_uInt16 nVisCols = 0;
-            for(sal_uInt16 i = GetActRightColumn(false, nCol); i < mpBorders.size();)
+            for(size_t i = GetActRightColumn(false, nCol); i < mpBorders.size();)
             {
                 if((*mxColumnItem.get())[i].bVisible)
                     nVisCols++;
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 413bae057c39..95f466d27f50 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -724,7 +724,7 @@ void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMe
             // check for hidden cols
             Reference< ::com::sun::star::beans::XPropertySet >  xCurCol;
             Any aHidden,aName;
-            for (sal_uInt16 i=0; i<xCols->getCount(); ++i)
+            for (sal_Int32 i=0; i<xCols->getCount(); ++i)
             {
                 xCurCol.set(xCols->getByIndex(i), css::uno::UNO_QUERY);
                 DBG_ASSERT(xCurCol.is(), "FmGridHeader::PreExecuteColumnContextMenu : the Peer has invalid columns !");
@@ -879,7 +879,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
         {
             // just iterate through all the cols ...
             Reference< ::com::sun::star::beans::XPropertySet >  xCurCol;
-            for (sal_uInt16 i=0; i<xCols->getCount(); ++i)
+            for (sal_Int32 i=0; i<xCols->getCount(); ++i)
             {
                 xCurCol.set(xCols->getByIndex(i), css::uno::UNO_QUERY);
                 xCurCol->setPropertyValue(FM_PROP_HIDDEN, makeAny(false));
@@ -1097,7 +1097,7 @@ void FmGridControl::SetDesignMode(bool bMode)
                 if (aSelection.getValueType().getTypeClass() == TypeClass_INTERFACE)
                     xColumn.set(aSelection, css::uno::UNO_QUERY);
                 Reference< XInterface >  xCurrent;
-                for (sal_uInt16 i=0; i<xColumns->getCount(); ++i)
+                for (sal_Int32 i=0; i<xColumns->getCount(); ++i)
                 {
                     xCurrent.set(xColumns->getByIndex(i), css::uno::UNO_QUERY);
                     if (xCurrent == xColumn)
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 5adf0c81f191..48bd74eccf9d 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -2665,7 +2665,7 @@ Sequence<sal_uInt16>& FmXGridPeer::getSupportedGridSlots()
         };
         aSupported.realloc(sizeof(nSupported)/sizeof(nSupported[0]));
         sal_uInt16* pSupported = aSupported.getArray();
-        for (sal_uInt16 i=0; i<aSupported.getLength(); ++i, ++pSupported)
+        for (sal_Int32 i=0; i<aSupported.getLength(); ++i, ++pSupported)
             *pSupported = nSupported[i];
     }
     return aSupported;
@@ -2716,7 +2716,7 @@ void FmXGridPeer::UpdateDispatches()
     const Sequence< ::com::sun::star::util::URL>& aSupportedURLs = getSupportedURLs();
     const ::com::sun::star::util::URL* pSupportedURLs = aSupportedURLs.getConstArray();
     Reference< ::com::sun::star::frame::XDispatch >  xNewDispatch;
-    for (sal_uInt16 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs)
+    for (sal_Int32 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs)
     {
         xNewDispatch = queryDispatch(*pSupportedURLs, OUString(), 0);
         if (xNewDispatch != m_pDispatchers[i])
@@ -2758,7 +2758,7 @@ void FmXGridPeer::ConnectToDispatcher()
 
     sal_uInt16 nDispatchersGot = 0;
     const ::com::sun::star::util::URL* pSupportedURLs = aSupportedURLs.getConstArray();
-    for (sal_uInt16 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs)
+    for (sal_Int32 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs)
     {
         m_pStateCache[i] = false;
         m_pDispatchers[i] = queryDispatch(*pSupportedURLs, OUString(), 0);
@@ -2787,7 +2787,7 @@ void FmXGridPeer::DisConnectFromDispatcher()
 
     const Sequence< ::com::sun::star::util::URL>& aSupportedURLs = getSupportedURLs();
     const ::com::sun::star::util::URL* pSupportedURLs = aSupportedURLs.getConstArray();
-    for (sal_uInt16 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs)
+    for (sal_Int32 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs)
     {
         if (m_pDispatchers[i].is())
             m_pDispatchers[i]->removeStatusListener((::com::sun::star::frame::XStatusListener*)this, *pSupportedURLs);
@@ -2810,7 +2810,7 @@ IMPL_LINK(FmXGridPeer, OnQueryGridSlotState, void*, pSlot)
     // search the given slot with our supported sequence
     Sequence<sal_uInt16>& aSupported = getSupportedGridSlots();
     const sal_uInt16* pSlots = aSupported.getConstArray();
-    for (sal_uInt16 i=0; i<aSupported.getLength(); ++i)
+    for (sal_Int32 i=0; i<aSupported.getLength(); ++i)
     {
         if (pSlots[i] == nSlot)
         {
@@ -2839,7 +2839,7 @@ IMPL_LINK(FmXGridPeer, OnExecuteGridSlot, void*, pSlot)
     DBG_ASSERT(aSlots.getLength() == aUrls.getLength(), "FmXGridPeer::OnExecuteGridSlot : inconstent data returned by getSupportedURLs/getSupportedGridSlots !");
 
     sal_uInt16 nSlot = (sal_uInt16)reinterpret_cast<sal_uIntPtr>(pSlot);
-    for (sal_uInt16 i=0; i<aSlots.getLength(); ++i, ++pUrls, ++pSlots)
+    for (sal_Int32 i=0; i<aSlots.getLength(); ++i, ++pUrls, ++pSlots)
     {
         if (*pSlots == nSlot)
         {
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 3ea3c5479efd..4e7cb83a9ae3 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -4100,7 +4100,7 @@ void SAL_CALL FmXListBoxCell::addItems(const ::comphelper::StringSequence& aItem
     if (m_pBox)
     {
         sal_uInt16 nP = nPos;
-        for ( sal_uInt16 n = 0; n < aItems.getLength(); n++ )
+        for ( sal_Int32 n = 0; n < aItems.getLength(); n++ )
         {
             m_pBox->InsertEntry( aItems.getConstArray()[n], nP );
             if ( nPos != -1 )    // Nicht wenn 0xFFFF, weil LIST_APPEND
@@ -4430,7 +4430,7 @@ void SAL_CALL FmXComboBoxCell::addItems( const Sequence< OUString >& _Items, sal
     if ( m_pComboBox )
     {
         sal_uInt16 nP = _Pos;
-        for ( sal_uInt16 n = 0; n < _Items.getLength(); n++ )
+        for ( sal_Int32 n = 0; n < _Items.getLength(); n++ )
         {
             m_pComboBox->InsertEntry( _Items.getConstArray()[n], nP );
             if ( _Pos != -1 )
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 0c119475d1f1..574e935e23a9 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1341,7 +1341,7 @@ void FmXFormShell::LoopGrids(sal_Int16 nWhat)
     Reference< XIndexContainer> xControlModels(m_xActiveForm, UNO_QUERY);
     if (xControlModels.is())
     {
-        for (sal_Int16 i=0; i<xControlModels->getCount(); ++i)
+        for (sal_Int32 i=0; i<xControlModels->getCount(); ++i)
         {
             Reference< XPropertySet> xModelSet;
             xControlModels->getByIndex(i) >>= xModelSet;
@@ -2422,7 +2422,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn
                     DBG_ASSERT(xModelColumns->getCount() >= xPeerContainer->getCount(), "FmXFormShell::OnSearchContextRequest : impossible : have more view than model columns !");
 
                     Reference< XInterface> xCurrentColumn;
-                    for (sal_Int16 nViewPos=0; nViewPos<xPeerContainer->getCount(); ++nViewPos)
+                    for (sal_Int32 nViewPos=0; nViewPos<xPeerContainer->getCount(); ++nViewPos)
                     {
                         xPeerContainer->getByIndex(nViewPos) >>= xCurrentColumn;
                         if (!xCurrentColumn.is())
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index a3ed1a342843..9d4db969a7a5 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -791,7 +791,7 @@ void FmSearchEngine::fillControlTexts(const InterfaceArray& arrFields)
 {
     clearControlTexts();
     Reference< XInterface >  xCurrent;
-    for (sal_uInt32 i=0; i<arrFields.size(); ++i)
+    for (size_t i=0; i<arrFields.size(); ++i)
     {
         xCurrent = arrFields.at(i);
         DBG_ASSERT(xCurrent.is(), "FmSearchEngine::fillControlTexts : invalid field interface !");
diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx
index 2fae8dbac936..8e11b18ae175 100644
--- a/svx/source/form/formdispatchinterceptor.cxx
+++ b/svx/source/form/formdispatchinterceptor.cxx
@@ -100,7 +100,7 @@ namespace svxform
         Sequence< Reference< XDispatch> > aReturn(aDescripts.getLength());
         Reference< XDispatch>* pReturn = aReturn.getArray();
         const DispatchDescriptor* pDescripts = aDescripts.getConstArray();
-        for (sal_Int16 i=0; i<aDescripts.getLength(); ++i, ++pReturn, ++pDescripts)
+        for (sal_Int32 i=0; i<aDescripts.getLength(); ++i, ++pReturn, ++pDescripts)
         {
             *pReturn = queryDispatch(pDescripts->FeatureURL, pDescripts->FrameName, pDescripts->SearchFlags);
         }
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index ceb5dfbe6b44..e4d86feb13f4 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -1566,7 +1566,7 @@ sal_uInt16 SvxNumberFormatShell::FindCurrencyFormat( const OUString& rFmtString
         {
             nStart=nCount;
         }
-        for(sal_uInt16 j=nStart;j<aCurCurrencyList.size();j++)
+        for(size_t j=nStart;j<aCurCurrencyList.size();j++)
         {
             if(aCurCurrencyList[j]==nPos) return j;
         }
@@ -1649,7 +1649,7 @@ sal_uInt16 SvxNumberFormatShell::FindCurrencyFormat(const NfCurrencyEntry* pTmpC
     {
         nStart=nCount;
     }
-    for(sal_uInt16 j=nStart;j<aCurCurrencyList.size();j++)
+    for(size_t j=nStart;j<aCurCurrencyList.size();j++)
     {
         if(aCurCurrencyList[j]==nPos) return j;
     }
@@ -1677,7 +1677,7 @@ bool SvxNumberFormatShell::IsInTable(sal_uInt16 const nPos,
                 pFormatter->GetCurrencyFormatStrings( aWSStringsDtor,
                                 *pTmpCurrencyEntry, bTmpBanking );
 
-                for(sal_uInt16 i=0;i<aWSStringsDtor.size();i++)
+                for(size_t i=0;i<aWSStringsDtor.size();i++)
                 {
                     if (aWSStringsDtor[i] == rFmtString)
                     {
diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx
index 5a855d5a7e4a..fe378314c421 100644
--- a/svx/source/items/numinf.cxx
+++ b/svx/source/items/numinf.cxx
@@ -101,7 +101,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) :
     {
         pDelFormatArr = new sal_uInt32[ rItem.nDelCount ];
 
-        for ( sal_uInt16 i = 0; i < rItem.nDelCount; ++i )
+        for ( sal_uInt32 i = 0; i < rItem.nDelCount; ++i )
             pDelFormatArr[i] = rItem.pDelFormatArr[i];
     }
 }
@@ -202,7 +202,7 @@ void SvxNumberInfoItem::SetDelFormatArray( const sal_uInt32* pData,
 
         if ( pData != NULL )
         {
-            for ( sal_uInt16 i = 0; i < nCount; ++i )
+            for ( sal_uInt32 i = 0; i < nCount; ++i )
                 pDelFormatArr[i] = pData[i];
         }
     }
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index 71e917c29993..97b887fb42d4 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -71,7 +71,7 @@ void SvxSmartTagsControl::FillMenu()
     const Reference<text::XTextRange>& xTextRange = mpSmartTagItem->GetTextRange();
     const Reference<frame::XController>& xController = mpSmartTagItem->GetController();
 
-    for ( sal_uInt16 j = 0; j < rActionComponentsSequence.getLength(); ++j )
+    for ( sal_Int32 j = 0; j < rActionComponentsSequence.getLength(); ++j )
     {
         Reference< container::XStringKeyMap > xSmartTagProperties = rStringKeyMaps[j];
 
@@ -109,7 +109,7 @@ void SvxSmartTagsControl::FillMenu()
         pSbMenu->InsertSeparator(OString(), nSubMenuPos++);
 
         // Add subitem for every action reference for the current smart tag type:
-        for ( sal_uInt16 i = 0; i < rActionComponents.getLength(); ++i )
+        for ( sal_Int32 i = 0; i < rActionComponents.getLength(); ++i )
         {
             xAction = rActionComponents[i];
 
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 7c7e2c491f7a..d70386aa4215 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -557,7 +557,7 @@ void GraphyicBulletsTypeMgr::Init()
 {
     std::vector<OUString> aGrfNames;
     GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames);
-    for(sal_uInt16 i = 0; i < aGrfNames.size(); i++)
+    for(size_t i = 0; i < aGrfNames.size(); i++)
     {
         OUString sGrfNm = aGrfNames[i];
         INetURLObject aObj(sGrfNm);
@@ -599,7 +599,7 @@ sal_uInt16 GraphyicBulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uI
     if ( pGrf )
     {
         Graphic aGraphic;
-        for (sal_uInt16 i=0; i < aGrfDataLst.size(); ++i)
+        for (size_t i=0; i < aGrfDataLst.size(); ++i)
         {
             GrfBulDataRelation* pEntry = aGrfDataLst[i];
             bool bExist = false;
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index df96a6b84d9c..f4ba7045c059 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -91,7 +91,7 @@ void SmartTagMgr::RecognizeString( const OUString& rText,
                              const lang::Locale& rLocale,
                              sal_uInt32 nStart, sal_uInt32 nLen ) const
 {
-    for ( sal_uInt32 i = 0; i < maRecognizerList.size(); i++ )
+    for ( size_t i = 0; i < maRecognizerList.size(); i++ )
     {
         Reference < smarttags::XSmartTagRecognizer > xRecognizer = maRecognizerList[i];
 
@@ -121,7 +121,7 @@ void SmartTagMgr::RecognizeTextRange(const Reference< text::XTextRange>& xRange,
                              const Reference< text::XTextMarkup >& xMarkup,
                              const Reference< frame::XController >& xController) const
 {
-    for ( sal_uInt32 i = 0; i < maRecognizerList.size(); i++ )
+    for ( size_t i = 0; i < maRecognizerList.size(); i++ )
     {
         Reference < smarttags::XSmartTagRecognizer > xRecognizer = maRecognizerList[i];
 
@@ -159,7 +159,7 @@ void SmartTagMgr::GetActionSequences( Sequence < OUString >& rSmartTagTypes,
     rActionComponentsSequence.realloc( rSmartTagTypes.getLength() );
     rActionIndicesSequence.realloc( rSmartTagTypes.getLength() );
 
-    for ( sal_uInt16 j = 0; j < rSmartTagTypes.getLength(); ++j )
+    for ( sal_Int32 j = 0; j < rSmartTagTypes.getLength(); ++j )
     {
         const OUString& rSmartTagType = rSmartTagTypes[j];
 
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index 0bb522c5d5dc..81f2b23f8476 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -218,7 +218,7 @@ void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eStat
 
         // get all snapping points:
         std::set< sal_uInt16 > aTmpSnappingPoints;
-        for ( sal_uInt16 j = 0; j < rSnappingPoints.getLength(); ++j )
+        for ( sal_Int32 j = 0; j < rSnappingPoints.getLength(); ++j )
         {
             const sal_Int32 nSnappingPoint = rSnappingPoints[j];
             aTmpSnappingPoints.insert( (sal_uInt16)nSnappingPoint );
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index e84014baa5bc..f589d3fb9fb7 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -617,7 +617,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
 
         if(aDelta.X() || aDelta.Y())
         {
-            for(sal_uInt32 a(0); a < mpSdrPathDragData->maHandles.size(); a++)
+            for(size_t a(0); a < mpSdrPathDragData->maHandles.size(); a++)
             {
                 SdrHdl* pHandle = mpSdrPathDragData->maHandles[a];
                 const sal_uInt16 nPolyIndex((sal_uInt16)pHandle->GetPolyNum());
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index a96a714ab36b..5a7ca174da82 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -219,7 +219,7 @@ namespace
             drawinglayer::primitive2d::TextLayouterDevice aTextLayouter;
             double fRetval(0.0);
 
-            for(sal_uInt32 a(0L); a < rTextPortions.size(); a++)
+            for(size_t a(0); a < rTextPortions.size(); a++)
             {
                 const impPathTextPortion* pCandidate = rTextPortions[a];
 
@@ -595,7 +595,7 @@ namespace
     {
         std::vector< drawinglayer::primitive2d::BasePrimitive2D* > aNewPrimitives;
 
-        for(sal_uInt32 a(0L); a < rSource.size(); a++)
+        for(size_t a(0); a < rSource.size(); a++)
         {
             const drawinglayer::primitive2d::TextSimplePortionPrimitive2D* pTextCandidate = dynamic_cast< const drawinglayer::primitive2d::TextSimplePortionPrimitive2D* >(rSource[a]);
 
@@ -722,7 +722,7 @@ void SdrTextObj::impDecomposePathTextPrimitive(
                 // filter text portions for this paragraph
                 ::std::vector< const impPathTextPortion* > aParagraphTextPortions;
 
-                for(sal_uInt32 b(0L); b < rPathTextPortions.size(); b++)
+                for(size_t b(0); b < rPathTextPortions.size(); b++)
                 {
                     const impPathTextPortion& rCandidate = rPathTextPortions[b];
 
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 9f4bd1c51443..b915c097cd67 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -745,7 +745,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
         // New mechanism to re-create the connections of cloned connectors
         CloneList aCloneList;
 
-        for( sal_uInt32 i(0); i < aSdrObjects.size(); i++ )
+        for( size_t i(0); i < aSdrObjects.size(); i++ )
         {
             const SdrObject*    pObj = aSdrObjects[i];
             SdrObject*          pNeuObj;
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index b4f09219c24f..505077b8613c 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -298,7 +298,7 @@ VclPtr<SfxPopupWindow> SvxUndoRedoControl::CreatePopupWindow()
     ListBox &rListBox = pPopupWin->GetListBox();
     rListBox.SetSelectHdl( LINK( this, SvxUndoRedoControl, SelectHdl ) );
 
-    for( sal_uInt32 n = 0; n < aUndoRedoList.size(); n++ )
+    for( size_t n = 0; n < aUndoRedoList.size(); n++ )
         rListBox.InsertEntry( aUndoRedoList[n] );
 
     rListBox.SelectEntryPos( 0 );
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index ea9519f4e071..7e7463615ff3 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -290,7 +290,7 @@ void SearchToolbarControllersManager::saveSearchHistory(const FindTextFieldContr
 
 void SearchToolbarControllersManager::loadSearchHistory(FindTextFieldControl* pFindTextFieldControl)
 {
-    for( sal_uInt16 i=0; i<m_aSearchStrings.size(); ++i )
+    for( size_t i=0; i<m_aSearchStrings.size(); ++i )
     {
         pFindTextFieldControl->InsertEntry(m_aSearchStrings[i],i);
     }
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index e553fec4e1d8..cc82ef006882 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -114,7 +114,7 @@ Bitmap XDashList::ImpCreateBitmapForXDash(const XDash* pDash)
 
         if(!aDotDashArray.empty())
         {
-            for(sal_uInt32 a(0); a < aDotDashArray.size(); a++)
+            for(size_t a(0); a < aDotDashArray.size(); a++)
             {
                 aDotDashArray[a] *= fScaleValue;
             }