loplugin:loopvartoosmall

Change-Id: I1e9768c08af0bc7caac6a39c13842ee9d8ad962c

10 files changed, 49 insertions, 49 deletions

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;