loplugin: loopvartoosmall

Change-Id: Icb30dac9cdcba493752623ccafff5f06ccafc31f

44 files changed, 75 insertions, 75 deletions

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index 99892d69b102..02dcdf8a3e47 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -1782,7 +1782,7 @@ void DocumentRedlineManager::CompressRedlines()
     }
 
     // Try to merge identical ones
-    for( sal_uInt16 n = 1; n < mpRedlineTable->size(); ++n )
+    for( size_t n = 1; n < mpRedlineTable->size(); ++n )
     {
         SwRangeRedline* pPrev = (*mpRedlineTable)[ n-1 ],
                     * pCur = (*mpRedlineTable)[ n ];
@@ -2003,7 +2003,7 @@ bool DocumentRedlineManager::DeleteRedline( const SwStartNode& rNode, bool bSave
 sal_uInt16 DocumentRedlineManager::GetRedlinePos( const SwNode& rNd, sal_uInt16 nType ) const
 {
     const sal_uLong nNdIdx = rNd.GetIndex();
-    for( sal_uInt16 n = 0; n < mpRedlineTable->size() ; ++n )
+    for( size_t n = 0; n < mpRedlineTable->size() ; ++n )
     {
         const SwRangeRedline* pTmp = (*mpRedlineTable)[ n ];
         sal_uLong nPt = pTmp->GetPoint()->nNode.GetIndex(),
@@ -2606,7 +2606,7 @@ sal_uInt16 DocumentRedlineManager::InsertRedlineAuthor( const OUString& rNew )
 void DocumentRedlineManager::UpdateRedlineAttr()
 {
     const SwRedlineTable& rTable = GetRedlineTable();
-    for( sal_uInt16 n = 0; n < rTable.size(); ++n )
+    for( size_t n = 0; n < rTable.size(); ++n )
     {
         SwRangeRedline* pRedl = rTable[ n ];
         if( pRedl->IsVisible() )
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index f652f56d1670..e8d4b6405e0a 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -287,7 +287,7 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
 
     SwTextFormatColl* pNewColl;
     sal_uInt16 nOutLvlBits = 0;
-    for( sal_uInt16 n = 0; n < m_rDoc.GetTextFormatColls()->size(); ++n )
+    for( size_t n = 0; n < m_rDoc.GetTextFormatColls()->size(); ++n )
     {
         if( nId == ( pNewColl = (*m_rDoc.GetTextFormatColls())[ n ] )->GetPoolFormatId() )
         {
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index f23053b3d070..011714ba931e 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1346,7 +1346,7 @@ void SwDoc::DelNumRules( const SwPaM& rPam )
 
 void SwDoc::InvalidateNumRules()
 {
-    for (sal_uInt16 n = 0; n < mpNumRuleTable->size(); ++n)
+    for (size_t n = 0; n < mpNumRuleTable->size(); ++n)
         (*mpNumRuleTable)[n]->SetInvalidRule(true);
 }
 
@@ -1924,7 +1924,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
 
                 // All, that are in the to-be-deleted Node, need to be
                 // moved to the next Node
-                for( sal_uInt16 n = 0; n < getIDocumentRedlineAccess().GetRedlineTable().size(); ++n )
+                for( size_t n = 0; n < getIDocumentRedlineAccess().GetRedlineTable().size(); ++n )
                 {
                     SwRangeRedline* pTmp = getIDocumentRedlineAccess().GetRedlineTable()[ n ];
 
@@ -2104,7 +2104,7 @@ SwNumRule* SwDoc::FindNumRulePtr( const OUString& rName ) const
 
     if ( !pResult )
     {
-        for (sal_uInt16 n = 0; n < mpNumRuleTable->size(); ++n)
+        for (size_t n = 0; n < mpNumRuleTable->size(); ++n)
         {
             if ((*mpNumRuleTable)[n]->GetName() == rName)
             {
@@ -2274,7 +2274,7 @@ OUString SwDoc::GetUniqueNumRuleName( const OUString* pChkStr, bool bAutoNum ) c
 void SwDoc::UpdateNumRule()
 {
     const SwNumRuleTable& rNmTable = GetNumRuleTable();
-    for( sal_uInt16 n = 0; n < rNmTable.size(); ++n )
+    for( size_t n = 0; n < rNmTable.size(); ++n )
         if( rNmTable[ n ]->IsInvalidRule() )
             rNmTable[ n ]->Validate();
 }
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index 7173e13f010b..de772cdf31bb 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -166,7 +166,7 @@ bool SwSortElement::operator==(const SwSortElement& ) const
 bool SwSortElement::operator<(const SwSortElement& rCmp) const
 {
     // The actual comparison
-    for(sal_uInt16 nKey = 0; nKey < pOptions->aKeys.size(); ++nKey)
+    for(size_t nKey = 0; nKey < pOptions->aKeys.size(); ++nKey)
     {
         int nCmp = keycompare(rCmp, nKey);
 
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 988c70eed5cd..324af8688742 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1818,7 +1818,7 @@ void SwTOXBaseSection::_UpdatePageNum( SwTextNode* pNd,
         // find the page numbers in aNumStr and set the character style
         sal_Int32 nOffset = pNd->GetText().getLength() - aNumStr.getLength();
         SwFormatCharFormat aCharFormat(pCharFormat);
-        for (sal_uInt16 j = 0; j < xCharStyleIdx->size(); j += 2)
+        for (size_t j = 0; j < xCharStyleIdx->size(); j += 2)
         {
             sal_Int32 nStartIdx = (*xCharStyleIdx)[j] + nOffset;
             sal_Int32 nEndIdx   = (*xCharStyleIdx)[j + 1]  + nOffset;
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 052df8f41511..cfec58e3cf7d 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -2546,7 +2546,7 @@ static bool lcl_InsSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                             SwTwips nDist, bool bCheck )
 {
     SwTableBoxes& rBoxes = pLine->GetTabBoxes();
-    for( sal_uInt16 n = 0; n < rBoxes.size(); ++n )
+    for( size_t n = 0; n < rBoxes.size(); ++n )
     {
         SwTableBox* pBox = rBoxes[ n ];
         SwTableBoxFormat* pFormat = static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat());
@@ -2557,7 +2557,7 @@ static bool lcl_InsSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
 
         if( bCheck )
         {
-            for( sal_uInt16 i = 0; i < pBox->GetTabLines().size(); ++i )
+            for( size_t i = 0; i < pBox->GetTabLines().size(); ++i )
                 if( !::lcl_InsSelBox( pBox->GetTabLines()[ i ], rParam,
                                             nDist, true ))
                     return false;
@@ -3505,7 +3505,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                         // Break down to USHRT_MAX / 2
                         CR_SetBoxWidth aTmpPara( 0, aSz.GetWidth() / 2,
                                         0, aSz.GetWidth(), aSz.GetWidth(), aParam.pTableNd );
-                        for( sal_uInt16 nLn = 0; nLn < aLines.size(); ++nLn )
+                        for( size_t nLn = 0; nLn < aLines.size(); ++nLn )
                             ::lcl_AjustLines( aLines[ nLn ], aTmpPara );
                         aSz.SetWidth( aSz.GetWidth() / 2 );
                         aParam.nDiff = nRelDiff /= 2;
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index f8f8ad5998e0..f520aea67c11 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -371,7 +371,7 @@ void SwGetRefField::UpdateField( const SwTextField* pFieldTextAttr )
             case REF_FOOTNOTE:
             case REF_ENDNOTE:
                 // get number or numString
-                for( unsigned i = 0; i < pDoc->GetFootnoteIdxs().size(); ++i )
+                for( size_t i = 0; i < pDoc->GetFootnoteIdxs().size(); ++i )
                 {
                     SwTextFootnote* const pFootnoteIdx = pDoc->GetFootnoteIdxs()[i];
                     if( nSeqNo == pFootnoteIdx->GetSeqRefNo() )
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index ec5275813a2f..ab12724f2871 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -635,7 +635,7 @@ void SwFEShell::StartCropImage()
     // If more than a single SwVirtFlyDrawObj is selected, select only the first SwVirtFlyDrawObj
     if ( rMarkList.GetMarkCount() > 1 )
     {
-        for ( sal_uInt16 i = 0; i < rMarkList.GetMarkCount(); ++i )
+        for ( size_t i = 0; i < rMarkList.GetMarkCount(); ++i )
         {
             SdrObject *pTmpObj = rMarkList.GetMark( i )->GetMarkedSdrObj();
             bool bForget = pTmpObj->ISA(SwVirtFlyDrawObj);
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index 15dd6d36a5b1..190887aa53d8 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -139,7 +139,7 @@ sal_uInt16 SwImpBlocks::GetIndex( const OUString& rShort ) const
 {
     const OUString s( GetAppCharClass().uppercase( rShort ) );
     const sal_uInt16 nHash = Hash( s );
-    for( sal_uInt16 i = 0; i < aNames.size(); i++ )
+    for( size_t i = 0; i < aNames.size(); i++ )
     {
         const SwBlockName* pName = aNames[ i ];
         if( pName->nHashS == nHash
@@ -152,7 +152,7 @@ sal_uInt16 SwImpBlocks::GetIndex( const OUString& rShort ) const
 sal_uInt16 SwImpBlocks::GetLongIndex( const OUString& rLong ) const
 {
     sal_uInt16 nHash = Hash( rLong );
-    for( sal_uInt16 i = 0; i < aNames.size(); i++ )
+    for( size_t i = 0; i < aNames.size(); i++ )
     {
         const SwBlockName* pName = aNames[ i ];
         if( pName->nHashL == nHash
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index b1e27b2c9fa9..8a6c40f42aad 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -3407,7 +3407,7 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl(
         }
     }
 
-    for(sal_Int16 nProp = 0; nProp < rPropertyNames.getLength(); nProp++)
+    for(sal_Int32 nProp = 0; nProp < rPropertyNames.getLength(); nProp++)
     {
         const OUString& rPropName = pNames[nProp];
         const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(rPropName);
diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx
index be5d9ebc5e48..f2e1a637d90d 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -210,7 +210,7 @@ void SwFltControlStack::MoveAttrs( const SwPosition& rPos )
 void SwFltControlStack::MarkAllAttrsOld()
 {
     size_t nCnt = maEntries.size();
-    for (sal_uInt16 i=0; i < nCnt; ++i)
+    for (size_t i=0; i < nCnt; ++i)
         maEntries[i].bOld = true;
 }
 
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index cc96e6e795ef..603a603d5cc7 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -3596,7 +3596,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
                         // verschoben. Deshalb entfernen wir alle harten
                         // Attribute des Absatzes
 
-                        for( sal_uInt16 i=0; i<aParaAttrs.size(); i++ )
+                        for( size_t i=0; i<aParaAttrs.size(); i++ )
                             aParaAttrs[i]->Invalidate();
                     }
 
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index f5f501e23d91..0fe96ddc1794 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -4470,7 +4470,7 @@ bool SwHTMLParser::HasCurrentParaFlys( bool bNoSurroundOnly,
     const SwFrameFormats& rFrameFormatTable = *pDoc->GetSpzFrameFormats();
 
     bool bFound = false;
-    for ( sal_uInt16 i=0; i<rFrameFormatTable.size(); i++ )
+    for ( size_t i=0; i<rFrameFormatTable.size(); i++ )
     {
         const SwFrameFormat *const pFormat = rFrameFormatTable[i];
         SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor();
@@ -5111,7 +5111,7 @@ void SwHTMLParser::InsertLineBreak()
         {
             const SwFrameFormats& rFrameFormatTable = *pDoc->GetSpzFrameFormats();
 
-            for( sal_uInt16 i=0; i<rFrameFormatTable.size(); i++ )
+            for( size_t i=0; i<rFrameFormatTable.size(); i++ )
             {
                 SwFrameFormat *const pFormat = rFrameFormatTable[i];
                 SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor();
diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx
index 44595b7a9215..9bc6304b2063 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -129,7 +129,7 @@ long SwWriteTable::GetLineHeight( const SwTableLine *pLine )
         {
             long nTmp = 0;
             const SwTableLines &rLines = pBox->GetTabLines();
-            for( sal_uInt16 nLine=0; nLine<rLines.size(); nLine++ )
+            for( size_t nLine=0; nLine<rLines.size(); nLine++ )
             {
                 nTmp += GetLineHeight( rLines[nLine] );
             }
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx
index 1ff3298ee7fc..4ccb45eb5bc5 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -760,7 +760,7 @@ WW8TableInfo::processTableBox(const SwTable * pTable,
         if (bEndOfLine)
             pNodeInfo->setEndOfLine(true);
 
-        for (sal_uInt32 n = 0; n < rLines.size(); n++)
+        for (size_t n = 0; n < rLines.size(); n++)
         {
             const SwTableLine * pLine = rLines[n];
 
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 360b087c271e..8d7632a8aea0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6540,7 +6540,7 @@ void DocxAttributeOutput::WritePostitFieldReference()
 
 void DocxAttributeOutput::WritePostitFields()
 {
-    for( unsigned int i = 0;
+    for( size_t i = 0;
          i < m_postitFields.size();
          ++i )
     {
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 3080d01d7df4..45f84e20a55f 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -603,7 +603,7 @@ void RtfAttributeOutput::TableDefinition(ww8::WW8TableNodeInfoInner::Pointer_t p
     // Not using m_nTableDepth, which is not yet incremented here.
     sal_uInt32 nCurrentDepth = pTableTextNodeInfoInner->getDepth();
     m_aCells[nCurrentDepth] = pRow->GetCells().size();
-    for (sal_uInt16 i = 0; i < m_aCells[nCurrentDepth]; i++)
+    for (sal_uInt32 i = 0; i < m_aCells[nCurrentDepth]; i++)
     {
         const SwWriteTableCell* pCell = &pRow->GetCells()[ i ];
         const SwFrameFormat* pCellFormat = pCell->GetBox()->GetFrameFormat();
@@ -929,7 +929,7 @@ void RtfAttributeOutput::EndTableRow()
     SAL_INFO("sw.rtf", OSL_THIS_FUNC << ", (depth is " << m_nTableDepth << ")");
 
     // Trying to end the row without writing the required number of cells? Fill with empty ones.
-    for (sal_uInt16 i = 0; i < m_aCells[m_nTableDepth]; i++)
+    for (sal_uInt32 i = 0; i < m_aCells[m_nTableDepth]; i++)
         m_aAfterRuns.append(OOO_STRING_SVTOOLS_RTF_CELL);
 
     if (m_nTableDepth > 1)
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 6c7da6aac393..45dc232d6722 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -258,7 +258,7 @@ void RtfExport::WriteRevTab()
     // RTF always seems to use Unknown as the default first entry
     GetRedline(OUString("Unknown"));
 
-    for (sal_uInt16 i = 0; i < m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().size(); ++i)
+    for (size_t i = 0; i < m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().size(); ++i)
     {
         const SwRangeRedline* pRedl = m_pDoc->getIDocumentRedlineAccess().GetRedlineTable()[ i ];
 
@@ -267,7 +267,7 @@ void RtfExport::WriteRevTab()
 
     // Now write the table
     Strm().WriteChar('{').WriteCharPtr(OOO_STRING_SVTOOLS_RTF_IGNORE).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_REVTBL).WriteChar(' ');
-    for (sal_uInt16 i = 0; i < m_aRedlineTable.size(); ++i)
+    for (size_t i = 0; i < m_aRedlineTable.size(); ++i)
     {
         const OUString* pAuthor = GetRedline(i);
         Strm().WriteChar('{');
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 64919a112ab9..6d914368c440 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1255,7 +1255,7 @@ int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos)
 bool SwWW8AttrIter::IncludeEndOfParaCRInRedlineProperties( sal_Int32 nEnd ) const
 {
     // search next Redline
-    for( sal_uInt16 nPos = nCurRedlinePos;
+    for( size_t nPos = nCurRedlinePos;
         nPos < m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().size(); ++nPos )
     {
         const SwRangeRedline *pRange = m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTable()[nPos];
@@ -1313,7 +1313,7 @@ const SwRedlineData* SwWW8AttrIter::GetParagraphLevelRedline( )
     pCurRedline = NULL;
 
     // ToDo : this is not the most ideal ... should start maybe from 'nCurRedlinePos'
-    for( sal_uInt16 nRedlinePos = 0; nRedlinePos < m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().size(); ++nRedlinePos )
+    for( size_t nRedlinePos = 0; nRedlinePos < m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().size(); ++nRedlinePos )
     {
         const SwRangeRedline* pRedl = m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTable()[ nRedlinePos ];
 
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 237a9a9681b8..0ed89171b3f1 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -278,7 +278,7 @@ void MSWordStyles::BuildStylesTable()
                                         // Standard und HeadingX u.a.
     const SwCharFormats& rArr = *m_rExport.m_pDoc->GetCharFormats();       // first CharFormat
     // das Default-ZeichenStyle ( 0 ) wird nicht mit ausgegeben !
-    for( sal_uInt16 n = 1; n < rArr.size(); n++ )
+    for( size_t n = 1; n < rArr.size(); n++ )
     {
         SwCharFormat* pFormat = rArr[n];
         m_pFormatA[ BuildGetSlot( *pFormat ) ] = pFormat;
@@ -286,7 +286,7 @@ void MSWordStyles::BuildStylesTable()
 
     const SwTextFormatColls& rArr2 = *m_rExport.m_pDoc->GetTextFormatColls();   // then TextFormatColls
     // das Default-TextStyle ( 0 ) wird nicht mit ausgegeben !
-    for( sal_uInt16 n = 1; n < rArr2.size(); n++ )
+    for( size_t n = 1; n < rArr2.size(); n++ )
     {
         SwTextFormatColl* pFormat = rArr2[n];
         m_pFormatA[ BuildGetSlot( *pFormat ) ] = pFormat;
@@ -1891,7 +1891,7 @@ bool WW8_WrPlcSepx::WriteKFText( WW8Export& rWrt )
     unsigned int nOldIndex = rWrt.GetHdFtIndex();
     rWrt.SetHdFtIndex( 0 );
 
-    for ( sal_uInt16 i = 0; i < aSects.size(); ++i )
+    for ( size_t i = 0; i < aSects.size(); ++i )
     {
         ::boost::shared_ptr<WW8_PdAttrDesc> const pAttrDesc(new WW8_PdAttrDesc);
         m_SectionAttributes.push_back(pAttrDesc);
@@ -2115,7 +2115,7 @@ bool WW8_WrPlcAnnotations::IsNewRedlineComment( const SwRedlineData *pRedline )
 
 WW8_WrPlcAnnotations::~WW8_WrPlcAnnotations()
 {
-    for( sal_uInt16 n=0; n < aContent.size(); n++ )
+    for( size_t n=0; n < aContent.size(); n++ )
         delete static_cast<WW8_Annotation const *>(aContent[n]);
 }
 
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index c7883a6f6fa0..78168f3caae4 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -725,7 +725,7 @@ void WW8_WrPlc1::Finish( sal_uLong nLastCp, sal_uLong nSttCp )
     {
         aPos.push_back( nLastCp );
         if( nSttCp )
-            for( sal_uInt32 n = 0; n < aPos.size(); ++n )
+            for( size_t n = 0; n < aPos.size(); ++n )
                 aPos[ n ] -= nSttCp;
     }
 }
@@ -929,7 +929,7 @@ void WW8_WrPlcPn::WriteFkps()
 {
     nFkpStartPage = (sal_uInt16) ( SwWW8Writer::FillUntil( rWrt.Strm() ) >> 9 );
 
-    for( sal_uInt16 i = 0; i < aFkps.size(); i++ )
+    for( size_t i = 0; i < aFkps.size(); i++ )
         aFkps[ i ].Write( rWrt.Strm(), *rWrt.m_pGrf );
 
     if( CHP == ePlc )
@@ -1333,7 +1333,7 @@ void WW8Export::AppendBookmarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_I
     if( GetWriter().GetBookmarks( rNd, nAktPos, nAktEnd, aArr ))
     {
         sal_uLong nNd = rNd.GetIndex(), nSttCP = Fc2Cp( Strm().Tell() );
-        for( sal_uInt16 n = 0; n < aArr.size(); ++n )
+        for( size_t n = 0; n < aArr.size(); ++n )
         {
             const ::sw::mark::IMark& rBkmk = *(aArr[ n ]);
             if(dynamic_cast< const ::sw::mark::IFieldmark *>(&rBkmk))
@@ -2973,7 +2973,7 @@ void MSWordExportBase::CollectOutlineBookmarks(const SwDoc &rDoc)
         if (!pIMap)
             continue;
 
-        for (sal_uInt16 i=0; i < pIMap->GetIMapObjectCount(); ++i)
+        for (size_t i=0; i < pIMap->GetIMapObjectCount(); ++i)
         {
             const IMapObject* pObj = pIMap->GetIMapObject(i);
             if (!pObj)
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 42e0a42e90ea..37f2a106c23d 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -5547,7 +5547,7 @@ void AttributeOutputBase::FormatCharBorder( const SvxBoxItem& rBox )
 const SwRedlineData* AttributeOutputBase::GetParagraphMarkerRedline( const SwTextNode& rNode, RedlineType_t aRedlineType)
 {
     // ToDo : this is not the most ideal ... should start maybe from 'nCurRedlinePos'
-    for( sal_uInt16 nRedlinePos = 0; nRedlinePos < GetExport().m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().size(); ++nRedlinePos )
+    for( size_t nRedlinePos = 0; nRedlinePos < GetExport().m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().size(); ++nRedlinePos )
     {
         const SwRangeRedline* pRedl = GetExport().m_pDoc->getIDocumentRedlineAccess().GetRedlineTable()[ nRedlinePos ];
 
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 2b8065f2251e..9a1165e7c0a6 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5322,7 +5322,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
                         }
                     }
                     // Remove additional pictures
-                    for (sal_uInt16 i = 0; i < vecFrameFormat.size(); ++i)
+                    for (size_t i = 0; i < vecFrameFormat.size(); ++i)
                     {
                         m_rDoc.getIDocumentLayoutAccess().DelLayoutFormat(vecFrameFormat[i]);
                     }
@@ -5784,7 +5784,7 @@ void SwWW8ImplReader::SetOutlineStyles()
     const SwNumRule* pChosenWW8ListStyle = NULL;
     {
         std::map<const SwNumRule*, int> aWW8ListStyleCounts;
-        for (sal_uInt16 nI = 0; nI < m_vColl.size(); ++nI)
+        for (size_t nI = 0; nI < m_vColl.size(); ++nI)
         {
             SwWW8StyInf& rSI = m_vColl[nI];
 
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index f1ad71a739a7..2079de69ef90 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1246,7 +1246,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
         std::deque<bool> aNotReallyThere;
         aNotReallyThere.resize(nMaxLevel);
         pListInfo->maParaSprms.resize(nMaxLevel);
-        for (sal_uInt8 nLevel = 0; nLevel < nLvlCount; ++nLevel)
+        for (sal_uInt16 nLevel = 0; nLevel < nLvlCount; ++nLevel)
         {
             SwNumFormat aNumFormat( rMyNumRule.Get( nLevel ) );
             // LVLF einlesen
@@ -1264,7 +1264,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
         // 1.2.2 die ItemPools mit den CHPx Einstellungen der verschiedenen
         //       Level miteinander vergleichen und ggfs. Style(s) erzeugen
 
-        for (sal_uInt8 nLevel = 0; nLevel < nLvlCount; ++nLevel)
+        for (sal_uInt16 nLevel = 0; nLevel < nLvlCount; ++nLevel)
         {
             bool bDummy;
             AdjustLVL( nLevel, rMyNumRule, pListInfo->aItemSet,
@@ -1273,7 +1273,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
 
         // 1.2.3 ItemPools leeren und loeschen
 
-        for (sal_uInt8 nLevel = 0; nLevel < nLvlCount; ++nLevel)
+        for (sal_uInt16 nLevel = 0; nLevel < nLvlCount; ++nLevel)
             delete pListInfo->aItemSet[ nLevel ];
     }
 
@@ -1293,7 +1293,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
 
     // 2.1 alle LFO einlesen
 
-    for (sal_uInt16 nLfo = 0; nLfo < nLfoCount; ++nLfo)
+    for (sal_Int32 nLfo = 0; nLfo < nLfoCount; ++nLfo)
     {
         bOk = false;
 
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 0d62c9a106ed..c5f99bbc45cc 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -3184,7 +3184,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr )
                             // the entry correctly, but I currently have no clue how to obtain
                             // the tab stop position. It is _not_ set at the paragraph style.
                             SwForm* pForm = 0;
-                            for (sal_uInt16 nI = 0; nI < m_vColl.size(); ++nI)
+                            for (size_t nI = 0; nI < m_vColl.size(); ++nI)
                             {
                                 const SwWW8StyInf& rSI = m_vColl[nI];
                                 if (rSI.IsOutlineNumbered())
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 86da07785385..758e53bd7301 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -559,7 +559,7 @@ void SwAddPrinterTabPage::PageCreated( const SfxAllItemSet& aSet)
     {
         std::vector<OUString> aFaxList;
         const std::vector<OUString>& rPrinters = Printer::GetPrinterQueues();
-        for (unsigned int i = 0; i < rPrinters.size(); ++i)
+        for (size_t i = 0; i < rPrinters.size(); ++i)
             aFaxList.insert(aFaxList.begin(), rPrinters[i]);
         SetFax( aFaxList );
     }
@@ -2031,7 +2031,7 @@ void SwRedlineOptionsTabPage::Reset( const SfxItemSet*  )
     pChangedColorLB->InsertEntry(sAuthor);
 
     XColorListRef pColorLst = XColorList::GetStdColorList();
-    for( sal_Int32 i = 0; i < pColorLst->Count(); ++i )
+    for( long i = 0; i < pColorLst->Count(); ++i )
     {
         XColorEntry* pEntry = pColorLst->GetColor( i );
         Color aColor = pEntry->GetColor();
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 41ba1dcaf749..76eba6969af3 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -217,7 +217,7 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) :
     }
 
     nCount = pMgr->GetFormatCount(TYP_SEQFLD, false);
-    for ( sal_uInt16 i = 0; i < nCount; ++i )
+    for ( size_t i = 0; i < nCount; ++i )
     {
         m_pFormatBox->InsertEntry( pMgr->GetFormatStr(TYP_SEQFLD, i) );
         const sal_uInt16 nFormatId = pMgr->GetFormatId(TYP_SEQFLD, i);
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index f324eb0b08ce..2521c995a0a2 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -308,9 +308,9 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
                 aFrmVertOrient.SetVertOrient( text::VertOrientation::TOP );
                 pFormat->SetFormatAttr(aFrmVertOrient);
 
-                for ( sal_uInt16 i = 0; i < rItem.nRows; ++i )
+                for ( sal_Int32 i = 0; i < rItem.nRows; ++i )
                 {
-                    for ( sal_uInt16 j = 0; j < rItem.nCols; ++j )
+                    for ( sal_Int32 j = 0; j < rItem.nCols; ++j )
                     {
                         pSh->Push();
                         const SwFrameFormat *pTmp = ( bLabel ?
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index d75d1604e91a..9eafac523a17 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -964,7 +964,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                         const SwOutlineNodes& rOutlNds = m_pDoc->GetNodes().GetOutLineNds();
                         if( !rOutlNds.empty() )
                         {
-                            for(sal_uInt16 n = 0; n < rOutlNds.size(); ++n )
+                            for( size_t n = 0; n < rOutlNds.size(); ++n )
                             {
                                 const int nLevel = rOutlNds[n]->GetTextNode()->GetAttrOutlineLevel();
                                 if( nLevel > 0 && ! bOutline[nLevel-1] )
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index f6c210956cad..578445b7779d 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -2887,7 +2887,7 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
         nSearchFamily == SFX_STYLE_FAMILY_ALL )
     {
         const SwNumRuleTable& rNumTable = rDoc.GetNumRuleTable();
-        for(sal_uInt16 i = 0; i < rNumTable.size(); ++i)
+        for(size_t i = 0; i < rNumTable.size(); ++i)
         {
             const SwNumRule& rRule = *rNumTable[ i ];
             if( !rRule.IsAutoRule() )
diff --git a/sw/source/uibase/app/mainwn.cxx b/sw/source/uibase/app/mainwn.cxx
index db6f6166e9e4..707f368831ca 100644
--- a/sw/source/uibase/app/mainwn.cxx
+++ b/sw/source/uibase/app/mainwn.cxx
@@ -38,7 +38,7 @@ static std::vector<SwProgress*> *pProgressContainer = 0;
 
 static SwProgress *lcl_SwFindProgress( SwDocShell *pDocShell )
 {
-    for ( sal_uInt16 i = 0; i < pProgressContainer->size(); ++i )
+    for ( size_t i = 0; i < pProgressContainer->size(); ++i )
     {
         SwProgress *pTmp = (*pProgressContainer)[i];
         if ( pTmp->pDocShell == pDocShell )
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 38996db38074..db84bae5c212 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -725,7 +725,7 @@ SwDBManager::SwDBManager()
 
 SwDBManager::~SwDBManager()
 {
-    for(sal_uInt16 nPos = 0; nPos < aDataSourceParams.size(); nPos++)
+    for(size_t nPos = 0; nPos < aDataSourceParams.size(); nPos++)
     {
         SwDSParam* pParam = &aDataSourceParams[nPos];
         if(pParam->xConnection.is())
@@ -2283,7 +2283,7 @@ void    SwDBManager::CloseAll(bool bIncludingMerge)
 {
     //the only thing done here is to reset the selection index
     //all connections stay open
-    for(sal_uInt16 nPos = 0; nPos < aDataSourceParams.size(); nPos++)
+    for(size_t nPos = 0; nPos < aDataSourceParams.size(); nPos++)
     {
         SwDSParam* pParam = &aDataSourceParams[nPos];
         if(bIncludingMerge || pParam != pImpl->pMergeData)
@@ -2359,7 +2359,7 @@ SwDSParam*  SwDBManager::FindDSConnection(const OUString& rDataSource, bool bCre
          return pImpl->pMergeData;
     }
     SwDSParam* pFound = 0;
-    for(sal_uInt16 nPos = 0; nPos < aDataSourceParams.size(); nPos++)
+    for(size_t nPos = 0; nPos < aDataSourceParams.size(); nPos++)
     {
         SwDSParam* pParam = &aDataSourceParams[nPos];
         if(rDataSource == pParam->sDataSource)
@@ -2824,7 +2824,7 @@ void SwDBManager::ExecuteFormLetter( SwWrtShell& rSh,
     }
     if(pFound)
     {
-        for(sal_uInt16 nPos = 0; nPos < aDataSourceParams.size(); nPos++)
+        for(size_t nPos = 0; nPos < aDataSourceParams.size(); nPos++)
         {
             SwDSParam* pParam = &aDataSourceParams[nPos];
             if(pParam == pFound)
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index cec51c7d9292..8523fac38a6b 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -389,7 +389,7 @@ static void lcl_ConvertToNumbers(OUString& rBlock, const ResStringArray& rHeader
 {
     //convert the strings used for UI to numbers used for the configuration
     OUString sBlock(rBlock.replaceAll("\n", OUString("\\n")));
-    for(sal_uInt16 i = 0; i < rHeaders.Count(); ++i)
+    for(sal_uInt32 i = 0; i < rHeaders.Count(); ++i)
     {
         OUString sHeader = "<" + rHeaders.GetString( i ) + ">";
         OUString sReplace = "<" + OUString('0' + i) + ">";
@@ -619,7 +619,7 @@ const Sequence< OUString> SwMailMergeConfigItem_Impl::GetAddressBlocks(
 {
     Sequence< OUString> aRet(aAddressBlocks.size());
     OUString* pRet = aRet.getArray();
-    for(sal_uInt32 nBlock = 0; nBlock < aAddressBlocks.size(); nBlock++)
+    for(size_t nBlock = 0; nBlock < aAddressBlocks.size(); nBlock++)
     {
         pRet[nBlock] = aAddressBlocks[nBlock];
         if(bConvertToConfig)
@@ -653,7 +653,7 @@ const Sequence< OUString>   SwMailMergeConfigItem_Impl::GetGreetings(
                                 aNeutralGreetingLines;
     Sequence< OUString> aRet(rGreetings.size());
     OUString* pRet = aRet.getArray();
-    for(sal_uInt32 nGreeting = 0; nGreeting < rGreetings.size(); nGreeting++)
+    for(size_t nGreeting = 0; nGreeting < rGreetings.size(); nGreeting++)
     {
         pRet[nGreeting] = rGreetings[nGreeting];
         if(bConvertToConfig)
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index 7f0067250974..a370117a9c18 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -447,7 +447,7 @@ bool SwGlossaryHdl::Expand( const OUString& rShortName,
 
                 boost::scoped_ptr<AbstractSwSelGlossaryDlg> pDlg(pFact->CreateSwSelGlossaryDlg(0, aShortName));
                 assert(pDlg && "Dialog creation failed!");
-                for(sal_uInt16 i = 0; i < aFoundArr.size(); ++i)
+                for(size_t i = 0; i < aFoundArr.size(); ++i)
                 {
                     TextBlockInfo_Impl* pData = &aFoundArr[i];
                     pDlg->InsertGlos(pData->sTitle, pData->sLongName);
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 53e7cebe51a2..0ac4bfcd752e 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -5951,7 +5951,7 @@ void QuickHelpData::FillStrArr( SwWrtShell& rSh, const OUString& rWord )
 
     if ( rACList.GetWordsMatching( rWord, strings ) )
     {
-        for (unsigned int i= 0; i<strings.size(); i++)
+        for (size_t i= 0; i<strings.size(); i++)
         {
             OUString aCompletedString = strings[i];
             //fdo#61251 if it's an exact match, ensure unchanged replacement
diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx
index 77c0adc07063..f53e3eae52f5 100644
--- a/sw/source/uibase/docvw/romenu.cxx
+++ b/sw/source/uibase/docvw/romenu.cxx
@@ -138,7 +138,7 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
             pMenu->CheckItem( MN_READONLY_TOGALLERYLINK,  bGrfToGalleryAsLnk );
             pMenu->CheckItem( MN_READONLY_TOGALLERYCOPY, !bGrfToGalleryAsLnk );
 
-            for ( sal_uInt16 i=0; i < aThemeList.size(); ++i )
+            for ( size_t i=0; i < aThemeList.size(); ++i )
                 pMenu->InsertItem( MN_READONLY_GRAPHICTOGALLERY+i + 3, aThemeList[ i ] );
         }
         else
@@ -169,7 +169,7 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
                 pMenu->CheckItem( MN_READONLY_TOGALLERYCOPY, !bGrfToGalleryAsLnk );
                 bEnableBackGallery = true;
 
-                for ( sal_uInt16 i=0; i < aThemeList.size(); ++i )
+                for ( size_t i=0; i < aThemeList.size(); ++i )
                     pMenu->InsertItem( MN_READONLY_GRAPHICTOGALLERY+i + 3, aThemeList[ i ] );
             }
         }
diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index b74693bb501a..d04ef90da678 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -181,7 +181,7 @@ void SwSpellPopup::fillLangPopupMenu(
         uno::Sequence< lang::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 (aLangItems.size() == (size_t)nMaxCount)
                     break;
@@ -514,7 +514,7 @@ m_aInfo16( SW_RES(IMG_INFO_16) )
         }
 
         sal_uInt16 nItemId = MN_SUGGESTION_START;
-        for (sal_uInt16 i = 0;  i < nStringCount;  ++i)
+        for (sal_Int32 i = 0;  i < nStringCount;  ++i)
         {
             const OUString aEntry = m_aSuggestions[ i ];
             InsertItem(nItemId, aEntry, MenuItemBits::NONE, OString(), nPos++);
diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx
index 52847602751f..7e76bc6b26fa 100644
--- a/sw/source/uibase/misc/numberingtypelistbox.cxx
+++ b/sw/source/uibase/misc/numberingtypelistbox.cxx
@@ -89,7 +89,7 @@ void SwNumberingTypeListBox::Reload(sal_uInt16 nTypeFlags)
     }
     SwOLENames aNames(SW_RES(STRRES_NUMTYPES));
     ResStringArray& rNames = aNames.GetNames();
-    for(sal_uInt16 i = 0; i < rNames.Count(); i++)
+    for(size_t i = 0; i < rNames.Count(); i++)
     {
         sal_IntPtr nValue = rNames.GetValue(i);
         bool bInsert = true;
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 0a9c64f1f2b3..5adf4ed726d4 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -2600,7 +2600,7 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
                     {
                         SwTableAutoFormatTable aTableTable;
                         aTableTable.Load();
-                        for ( sal_uInt16 n=0; n<aTableTable.size(); n++ )
+                        for ( size_t n=0; n<aTableTable.size(); n++ )
                         {
                             if ( aTableTable[n].GetName() == aAutoName )
                             {
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 55abe1001d4f..b1a6fc0c8c8d 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -846,7 +846,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
                     long minX = std::numeric_limits<long>::max();
                     long minY = std::numeric_limits<long>::max();
                     long nbBoxes = aBoxes.size();
-                    for ( int i = 0; i < nbBoxes; i++ )
+                    for ( long i = 0; i < nbBoxes; i++ )
                     {
                         Point aCoord ( aBoxes[i]->GetCoordinates() );
                         if ( aCoord.X() < minX ) minX = aCoord.X();
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 97044dc2eb26..c767a6af5ad5 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -1263,7 +1263,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
                  bGotZoomFactor = false, bGotIsSelectedFrame = false,
                  bGotViewLayoutColumns = false, bGotViewLayoutBookMode = false;
 
-        for (sal_Int16 i = 0 ; i < nLength; i++)
+        for (sal_Int32 i = 0 ; i < nLength; i++)
         {
             if ( pValue->Name == "ViewLeft" )
             {
diff --git a/sw/source/uibase/uno/unodispatch.cxx b/sw/source/uibase/uno/unodispatch.cxx
index 07f783ae3bbf..139af7861efa 100644
--- a/sw/source/uibase/uno/unodispatch.cxx
+++ b/sw/source/uibase/uno/unodispatch.cxx
@@ -95,7 +95,7 @@ uno::Sequence< uno::Reference< frame::XDispatch > > SwXDispatchProviderIntercept
     uno::Sequence< uno::Reference< frame::XDispatch> > aReturn(aDescripts.getLength());
     uno::Reference< frame::XDispatch>* pReturn = aReturn.getArray();
     const 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/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 8c21898740c6..0f6a93b88264 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -1055,7 +1055,7 @@ static OUString lcl_CreateOutlineString( size_t nIndex,
     const SwTextNode * pTextNd = rOutlineNodes[ nIndex ]->GetTextNode();
     SwNumberTree::tNumberVector aNumVector = pTextNd->GetNumberVector();
     if( pOutlRule && pTextNd->GetNumRule())
-        for( sal_Int8 nLevel = 0;
+        for( int nLevel = 0;
              nLevel <= pTextNd->GetActualListLevel();
              nLevel++ )
         {
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 5e3ca2be83ae..95281f806b5f 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1789,7 +1789,7 @@ bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer,
                 {
                     SwNumberTree::tNumberVector aNumVector =
                         pTextNd->GetNumberVector();
-                    for( sal_Int8 nLevel = 0;
+                    for( int nLevel = 0;
                          nLevel <= pTextNd->GetActualListLevel();
                          nLevel++ )
                     {