convert xub_StrLen to sal_Int32

Convert code like:
xub_StrLen nLen = aStr.getLength();
into
sal_Int32 nLen = aStr.getLength();

Change-Id: Ib0af6b747068257478918fd1cc93e4925f32ac47

44 files changed, 94 insertions, 99 deletions

diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index fffb3fcfd8ca..ca461304a57b 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -76,11 +76,10 @@ void HyphenEdit::KeyInput( const KeyEvent& rKEvt )
 void SvxHyphenWordDialog::EnableLRBtn_Impl()
 {
     OUString  aTxt( aEditWord );
-    xub_StrLen nLen = aTxt.getLength();
-    xub_StrLen i;
+    sal_Int32 nLen = aTxt.getLength();
 
     m_pRightBtn->Disable();
-    for ( i = nOldPos + 2; i < nLen; ++i )
+    for ( sal_Int32 i = nOldPos + 2; i < nLen; ++i )
     {
         if ( aTxt[ i ] == sal_Unicode( HYPH_POS_CHAR ) )
         {
@@ -93,7 +92,7 @@ void SvxHyphenWordDialog::EnableLRBtn_Impl()
     if (nOldPos >= aTxt.getLength())
         nOldPos = aTxt.getLength() - 1;
     m_pLeftBtn->Disable();
-    for ( i = nOldPos;  i-- > 0; )
+    for ( sal_Int32 i = nOldPos;  i-- > 0; )
     {
         if ( aTxt[ i ] == sal_Unicode( HYPH_POS_CHAR ) )
         {
@@ -328,7 +327,7 @@ void SvxHyphenWordDialog::SelLeft()
 void SvxHyphenWordDialog::SelRight()
 {
     OUString aTxt( aEditWord );
-    for ( xub_StrLen i = nOldPos + 1;  i < aTxt.getLength();  ++i )
+    for ( sal_Int32 i = nOldPos + 1;  i < aTxt.getLength();  ++i )
     {
         if (aTxt[ i ] == sal_Unicode( HYPH_POS_CHAR ))
         {
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 9f3ea3e06f75..adc1a5dbd9af 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -201,7 +201,7 @@ IMPL_LINK_NOARG(SvxPostItDialog, Stamp)
     aStr = convertLineEnd(aStr, GetSystemLineEnd());
 
     m_pEditED->SetText(aStr);
-    xub_StrLen nLen = aStr.getLength();
+    sal_Int32 nLen = aStr.getLength();
     m_pEditED->GrabFocus();
     m_pEditED->SetSelection( Selection( nLen, nLen ) );
     return 0;
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 4479705cb11c..a459c67a9010 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1048,7 +1048,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
 
         // Remove all non alphanumeric characters towards the end up until
         // the last one.
-        xub_StrLen nLen = sTmp.getLength();
+        sal_Int32 nLen = sTmp.getLength();
         while( nLen && !rCC.isLetterNumeric( sTmp, nLen-1 ) )
             --nLen;
         if( nLen + 1 < sTmp.getLength() )
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index dfaf45053248..29e60f881ace 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -193,7 +193,7 @@ xub_StrLen FormulaHelper::GetFunctionStart( const OUString&   rFormula,
                                             sal_Bool          bBack,
                                             OUString*         pFuncName ) const
 {
-    xub_StrLen nStrLen = rFormula.getLength();
+    sal_Int32 nStrLen = rFormula.getLength();
 
     if ( nStrLen < nStart )
         return nStart;
@@ -284,7 +284,7 @@ xub_StrLen FormulaHelper::GetFunctionStart( const OUString&   rFormula,
 
 xub_StrLen  FormulaHelper::GetFunctionEnd( const OUString& rStr, xub_StrLen nStart ) const
 {
-    xub_StrLen nStrLen = rStr.getLength();
+    sal_Int32 nStrLen = rStr.getLength();
 
     if ( nStrLen < nStart )
         return nStart;
@@ -342,7 +342,7 @@ xub_StrLen  FormulaHelper::GetFunctionEnd( const OUString& rStr, xub_StrLen nSta
 
 xub_StrLen FormulaHelper::GetArgStart( const OUString& rStr, xub_StrLen nStart, sal_uInt16 nArg ) const
 {
-    xub_StrLen nStrLen = rStr.getLength();
+    sal_Int32 nStrLen = rStr.getLength();
 
     if ( nStrLen < nStart )
         return nStart;
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index d979d531969e..a590af82e484 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -706,12 +706,11 @@ sal_Bool IsNumeric( const OUString &rText )
     sal_Bool bRes = sal_False;
     if (!rText.isEmpty())
     {
-        xub_StrLen nLen = rText.getLength();
+        sal_Int32 nLen = rText.getLength();
         bRes = sal_True;
-        xub_StrLen i = 0;
-        while (i < nLen)
+        for(sal_Int32 i = 0; i < nLen; ++i)
         {
-            sal_Unicode cChar = rText[ i++ ];
+            sal_Unicode cChar = rText[ i ];
             if ( !((sal_Unicode)'0' <= cChar  &&  cChar <= (sal_Unicode)'9') )
             {
                 bRes = sal_False;
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index e57683e40871..5e1f1c978e09 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -1323,9 +1323,9 @@ void ScDPResultMember::ProcessData( const vector< SCROW >& aChildMembers, const
 static OUString lcl_parseSubtotalName(const OUString& rSubStr, const OUString& rCaption)
 {
     OUStringBuffer aNewStr;
-    xub_StrLen n = rSubStr.getLength();
+    sal_Int32 n = rSubStr.getLength();
     bool bEscaped = false;
-    for (xub_StrLen i = 0; i < n; ++i)
+    for (sal_Int32 i = 0; i < n; ++i)
     {
         sal_Unicode c = rSubStr[i];
         if (!bEscaped && c == sal_Unicode('\\'))
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 4f465f9aa3bb..7426f95f45ef 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -2043,8 +2043,8 @@ void ScColToAlpha( OUStringBuffer& rBuf, SCCOL nCol )
 bool AlphaToCol( SCCOL& rCol, const OUString& rStr)
 {
     SCCOL nResult = 0;
-    xub_StrLen nStop = rStr.getLength();
-    xub_StrLen nPos = 0;
+    sal_Int32 nStop = rStr.getLength();
+    sal_Int32 nPos = 0;
     sal_Unicode c;
     while (nResult <= MAXCOL && nPos < nStop && (c = rStr[nPos]) != 0 &&
             rtl::isAsciiAlpha(c))
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index f640455ed730..2dab6fda6f1f 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -597,7 +597,7 @@ static bool lcl_parseExternalName(
         return false;
     }
 
-    xub_StrLen nNameLen = aTmpName.getLength();
+    sal_Int32 nNameLen = aTmpName.getLength();
     if (nNameLen < 2)
     {
         // Name must be at least 2-char long (separator plus name).
@@ -3303,7 +3303,7 @@ void ScCompiler::AutoCorrectParsedSymbol()
                 bColons = true;
                 sal_Int32 nIndex = 0;
                 OUString aTmp1( aSymbol.getToken( 0, ':', nIndex ) );
-                xub_StrLen nLen1 = aTmp1.getLength();
+                sal_Int32 nLen1 = aTmp1.getLength();
                 OUString aSym, aTmp2;
                 bool bLastAlp, bNextNum;
                 bLastAlp = bNextNum = true;
@@ -3312,7 +3312,7 @@ void ScCompiler::AutoCorrectParsedSymbol()
                 for ( xub_StrLen j=1; j<nCount; j++ )
                 {
                     aTmp2 = aSymbol.getToken( 0, ':', nIndex );
-                    xub_StrLen nLen2 = aTmp2.getLength();
+                    sal_Int32 nLen2 = aTmp2.getLength();
                     if ( nLen1 || nLen2 )
                     {
                         if ( nLen1 )
@@ -3332,9 +3332,7 @@ void ScCompiler::AutoCorrectParsedSymbol()
                             }
                             else
                             {
-                                xub_StrLen nSymLen = aSym.getLength();
-                                if ( nSymLen
-                                  && (aSym[ nSymLen - 1 ] != ':') )
+                                if ( !aSym.isEmpty() && !aSym.endsWith(":"))
                                     aSym += ":";
                                 nStrip = 0;
                             }
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 4389a4b137e6..6096ecfddd51 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -433,7 +433,7 @@ void ScRangeData::MakeValidName( OUString& rName )
 
     // strip leading invalid characters
     xub_StrLen nPos = 0;
-    xub_StrLen nLen = rName.getLength();
+    sal_Int32 nLen = rName.getLength();
     while ( nPos < nLen && !ScCompiler::IsCharFlagAllConventions( rName, nPos, SC_COMPILER_C_NAME) )
         ++nPos;
     if ( nPos>0 )
@@ -480,7 +480,7 @@ bool ScRangeData::IsNameValid( const OUString& rName, ScDocument* pDoc )
     if (rName.indexOf(a) != -1)
         return false;
     xub_StrLen nPos = 0;
-    xub_StrLen nLen = rName.getLength();
+    sal_Int32 nLen = rName.getLength();
     if ( !nLen || !ScCompiler::IsCharFlagAllConventions( rName, nPos++, SC_COMPILER_C_CHAR_NAME ) )
         return false;
     while ( nPos < nLen )
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index d4d4cc59552a..5b4ba0d1ed83 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -525,10 +525,10 @@ static void ExcelQueryToOooQuery( OUString& aStr, ScQueryEntry& rEntry )
     if (rEntry.eOp != SC_EQUAL && rEntry.eOp != SC_NOT_EQUAL)
         return;
 
-    xub_StrLen nLen = aStr.getLength();
+    sal_Int32   nLen = aStr.getLength();
     sal_Unicode nStart = aStr[0];
     sal_Unicode nEnd   = aStr[ nLen-1 ];
-    if( nLen >2 && nStart == '*' && nEnd == '*' )
+    if( nLen > 2 && nStart == '*' && nEnd == '*' )
     {
         aStr = aStr.copy( 1, nLen-2 );
         rEntry.eOp = ( rEntry.eOp == SC_EQUAL ) ? SC_CONTAINS : SC_DOES_NOT_CONTAIN;
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index 7a0a2f29395f..1e7d368e3ecf 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -342,7 +342,7 @@ OUString XclImpHyperlink::ReadEmbeddedData( XclImpStream& rStrm )
 
 void XclImpHyperlink::ConvertToValidTabName(OUString& rUrl)
 {
-    xub_StrLen n = rUrl.getLength();
+    sal_Int32 n = rUrl.getLength();
     if (n < 4)
         // Needs at least 4 characters.
         return;
diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx
index 5b841e0babf7..a399702165f8 100644
--- a/sc/source/filter/ftools/ftools.cxx
+++ b/sc/source/filter/ftools/ftools.cxx
@@ -155,7 +155,7 @@ OUString ScfTools::ConvertToScDefinedName(const OUString& rName )
     //fdo#37872: we don't allow points in range names any more
     OUString sName = rName.replace(static_cast<sal_Unicode>('.'),
         static_cast<sal_Unicode>('_'));
-    xub_StrLen nLen = sName.getLength();
+    sal_Int32 nLen = sName.getLength();
     if( nLen && !ScCompiler::IsCharFlagAllConventions( sName, 0, SC_COMPILER_C_CHAR_NAME ) )
         sName = sName.replaceAt( 0, 1, "_" );
     for( xub_StrLen nPos = 1; nPos < nLen; ++nPos )
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index f838c49bc25a..e9987ee20bff 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -439,7 +439,7 @@ xub_StrLen lcl_MatchParenthesis( const OUString& rStr, xub_StrLen nPos )
     }
     if ( !nDir )
         return STRING_NOTFOUND;
-    xub_StrLen nLen = rStr.getLength();
+    sal_Int32 nLen = rStr.getLength();
     const sal_Unicode* p0 = rStr.getStr();
     const sal_Unicode* p;
     const sal_Unicode* p1;
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 1fa2ca516684..69bcec78fa60 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -1355,11 +1355,11 @@ void ScContentTree::SelectDoc(const OUString& rName)      // rName wie im Menue/
     //  "aktiv" oder "inaktiv" weglassen
 
     OUString aRealName = rName;
-    xub_StrLen nLen = rName.getLength();
-    xub_StrLen nActiveStart = nLen - pParentWindow->aStrActive.getLength();
+    sal_Int32 nLen = rName.getLength();
+    sal_Int32 nActiveStart = nLen - pParentWindow->aStrActive.getLength();
     if ( rName.copy( nActiveStart ) == pParentWindow->aStrActive )
         aRealName = rName.copy( 0, nActiveStart );
-    xub_StrLen nNotActiveStart = nLen - pParentWindow->aStrNotActive.getLength();
+    sal_Int32 nNotActiveStart = nLen - pParentWindow->aStrNotActive.getLength();
     if ( rName.copy( nNotActiveStart ) == pParentWindow->aStrNotActive )
         aRealName = rName.copy( 0, nNotActiveStart );
 
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index cf16ad40e2e7..2b986ce09c9d 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -324,12 +324,12 @@ void ScTpUserLists::MakeListStr( OUString& rListStr )
     }
 
     aStr = comphelper::string::strip(aStr, cDelimiter);
-    xub_StrLen nLen = aStr.getLength();
+    sal_Int32 nLen = aStr.getLength();
 
     rListStr = "";
 
     // Alle Doppelten cDelimiter entfernen:
-    xub_StrLen c = 0;
+    sal_Int32 c = 0;
     while ( c < nLen )
     {
         rListStr += OUString(aStr[c]);
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index 2c071e86d48f..b58154e13c39 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -225,7 +225,7 @@ void ScPrintAreasDlg::AddRefEntry()
         aVal += OUString(sep);
         pEdPrintArea->SetText(aVal);
 
-        xub_StrLen nLen = aVal.getLength();
+        sal_Int32 nLen = aVal.getLength();
         pEdPrintArea->SetSelection( Selection( nLen, nLen ) );
 
         Impl_ModifyHdl( pEdPrintArea );
@@ -681,8 +681,8 @@ static bool lcl_CheckOne_OOO( const OUString& rStr, bool bIsRow, SCCOLROW& rVal
     // Row: [$]1-MAXTAB
     // Col: [$]A-IV
 
-    OUString  aStr    = rStr;
-    xub_StrLen nLen = aStr.getLength();
+    OUString    aStr    = rStr;
+    sal_Int32   nLen    = aStr.getLength();
     SCCOLROW    nNum    = 0;
     sal_Bool    bStrOk  = ( nLen > 0 ) && ( bIsRow ? ( nLen < 6 ) : ( nLen < 4 ) );
 
@@ -725,7 +725,7 @@ static bool lcl_CheckOne_XL_A1( const OUString& rStr, bool bIsRow, SCCOLROW& rVa
 
 static bool lcl_CheckOne_XL_R1C1( const OUString& rStr, bool bIsRow, SCCOLROW& rVal )
 {
-    xub_StrLen nLen = rStr.getLength();
+    sal_Int32 nLen = rStr.getLength();
     if (nLen <= 1)
         // There must be at least two characters.
         return false;
@@ -788,7 +788,7 @@ static bool lcl_CheckRepeatString( const OUString& rStr, ScDocument* pDoc, bool
 
     OUString aBuf;
     SCCOLROW nVal = 0;
-    xub_StrLen nLen = rStr.getLength();
+    sal_Int32 nLen = rStr.getLength();
     bool bEndPos = false;
     for (xub_StrLen i = 0; i < nLen; ++i)
     {
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index d1333050b685..d725a525bd05 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -2020,7 +2020,7 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
                                     mpRefDevice->GetOutDevType() == OUTDEV_PRINTER )
                             {
                                 double fMul = GetStretch();
-                                xub_StrLen nLen = aString.getLength();
+                                sal_Int32 nLen = aString.getLength();
                                 for (xub_StrLen i=0; i<nLen; i++)
                                     pDX[i] = (long)(pDX[i] / fMul + 0.5);
                             }
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index ec2abd28caf7..cff2302479e7 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -375,14 +375,13 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab,
             else if ( rString[0] == '+' || rString[0] == '-' )
             {
                 // if there is more than one leading '+' or '-' character, remove the additional ones
-                OUString aString( rString );
-                xub_StrLen nIndex = 1;
-                xub_StrLen nLen = aString.getLength();
-                while ( nIndex < nLen && ( aString[ nIndex ] == '+' || aString[ nIndex ] == '-' ) )
+                sal_Int32 nIndex = 1;
+                sal_Int32 nLen = rString.getLength();
+                while ( nIndex < nLen && ( rString[ nIndex ] == '+' || rString[ nIndex ] == '-' ) )
                 {
                     ++nIndex;
                 }
-                aString = aString.replaceAt( 1, nIndex - 1, "" );
+                OUString aString = rString.replaceAt( 1, nIndex - 1, "" );
 
                 // if the remaining part without the leading '+' or '-' character
                 // is non-empty and not a number, handle as formula
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index b7823fc925fb..22d816550d23 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -251,7 +251,7 @@ bool SwAutoCompleteWord::InsertWord( const OUString& rWord, SwDoc& rDoc )
 
     pImpl->AddDocument(rDoc);
     bool bRet = false;
-    xub_StrLen nWrdLen = aNewWord.getLength();
+    sal_Int32 nWrdLen = aNewWord.getLength();
     while( nWrdLen && '.' == aNewWord[ nWrdLen-1 ])
         --nWrdLen;
 
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index b28a51c76a4d..443f21bbd69b 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1380,12 +1380,12 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
             if( !bOrderNumberingFirst )
                 aTxt += " ";
         }
-        xub_StrLen nIdx = aTxt.getLength();
+        sal_Int32 nIdx = aTxt.getLength();
         if( !rTxt.isEmpty() )
         {
             aTxt += rSeparator;
         }
-        xub_StrLen nSepIdx = aTxt.getLength();
+        sal_Int32 nSepIdx = aTxt.getLength();
         aTxt += rTxt;
 
         // Insert string
@@ -1675,9 +1675,9 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
             if( !bOrderNumberingFirst )
                 aTxt += " ";
         }
-        xub_StrLen nIdx = aTxt.getLength();
+        sal_Int32 nIdx = aTxt.getLength();
         aTxt += rSeparator;
-        xub_StrLen nSepIdx = aTxt.getLength();
+        sal_Int32 nSepIdx = aTxt.getLength();
         aTxt += rTxt;
 
         // insert text
@@ -1902,7 +1902,7 @@ static OUString lcl_GetUniqueFlyName( const SwDoc* pDoc, sal_uInt16 nDefStrId )
 {
     ResId aId( nDefStrId, *pSwResMgr );
     OUString aName( aId );
-    xub_StrLen nNmLen = aName.getLength();
+    sal_Int32 nNmLen = aName.getLength();
 
     const SwFrmFmts& rFmts = *pDoc->GetSpzFrmFmts();
 
@@ -2004,7 +2004,7 @@ void SwDoc::SetFlyName( SwFlyFrmFmt& rFmt, const OUString& rName )
 
 void SwDoc::SetAllUniqueFlyNames()
 {
-    sal_uInt16 n, nFlyNum = 0, nGrfNum = 0, nOLENum = 0;
+    sal_Int32 n, nFlyNum = 0, nGrfNum = 0, nOLENum = 0;
 
     ResId nFrmId( STR_FRAME_DEFNAME, *pSwResMgr ),
           nGrfId( STR_GRAPHIC_DEFNAME, *pSwResMgr ),
@@ -2024,11 +2024,11 @@ void SwDoc::SetAllUniqueFlyNames()
     {
         if( RES_FLYFRMFMT == (pFlyFmt = (*GetSpzFrmFmts())[ --n ])->Which() )
         {
-            sal_uInt16 *pNum = 0;
+            sal_Int32 *pNum = 0;
             const OUString aNm = pFlyFmt->GetName();
             if ( !aNm.isEmpty() )
             {
-                xub_StrLen nLen = 0;
+                sal_Int32 nLen = 0;
                 if ( aNm.startsWith(sGrfNm) )
                 {
                     nLen = sGrfNm.getLength();
@@ -2047,7 +2047,7 @@ void SwDoc::SetAllUniqueFlyNames()
 
                 if ( pNum )
                 {
-                    const xub_StrLen nNewLen = static_cast< xub_StrLen >( aNm.copy( nLen ).toInt32() );
+                    const sal_Int32 nNewLen = aNm.copy( nLen ).toInt32();
                     if (*pNum < nNewLen)
                         *pNum = nNewLen;
                 }
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index ec8409fe2651..a502668684ce 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1606,7 +1606,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
         while(aIt != aPattern.end()) // #i21237#
         {
             SwFormToken aToken = *aIt; // #i21237#
-            xub_StrLen nStartCharStyle = rTxt.getLength();
+            sal_Int32 nStartCharStyle = rTxt.getLength();
             switch( aToken.eTokenType )
             {
             case TOKEN_ENTRY_NO:
@@ -1785,7 +1785,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
                 {
                     SwIndex aIdx( pTOXNd, nLinkStartPosition );
                     // pTOXNd->Erase( aIdx, SwForm::nFormLinkSttLen );
-                    xub_StrLen nEnd = rTxt.getLength();
+                    sal_Int32 nEnd = rTxt.getLength();
 
                     if( sURL.isEmpty() )
                     {
@@ -2132,7 +2132,7 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
             pCharFmt = pDoc->MakeCharFmt(GetMainEntryCharStyle(), 0);
 
         // find the page numbers in aNumStr and set the character style
-        xub_StrLen nOffset = pNd->GetTxt().getLength() - aNumStr.getLength();
+        sal_Int32 nOffset = pNd->GetTxt().getLength() - aNumStr.getLength();
         SwFmtCharFmt aCharFmt(pCharFmt);
         for (sal_uInt16 j = 0; j < xCharStyleIdx->size(); j += 2)
         {
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index f904db56630c..575f3d083b61 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -1053,7 +1053,7 @@ bool SwAutoFormat::HasBreakAttr( const SwTxtNode& rTxtNd ) const
 bool SwAutoFormat::IsSentenceAtEnd( const SwTxtNode& rTxtNd ) const
 {
     const OUString& rStr = rTxtNd.GetTxt();
-    xub_StrLen n = rStr.getLength();
+    sal_Int32 n = rStr.getLength();
     if( !n )
         return true;
 
@@ -2337,7 +2337,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
 
                 bEmptyLine = false;
                 OUString sEndClrStr( sClrStr );
-                xub_StrLen nLen = DelTrailingBlanks( sEndClrStr ).getLength();
+                sal_Int32 nLen = DelTrailingBlanks( sEndClrStr ).getLength();
 
                 // not, then check if headline
                 if( ':' == sEndClrStr[ nLen - 1 ] )
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 131f314f04d9..9f2f244f91d2 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -511,7 +511,7 @@ static bool lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, xub_StrLen nPos,
         }
     }
 
-    xub_StrLen nEnd = sExp.getLength();
+    sal_Int32 nEnd = sExp.getLength();
     if ( nEnd )
     {
         xub_StrLen n;
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index 8adcd5824596..8ed394cd0366 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -67,7 +67,7 @@ public:
                                DDE_TXT_ENCODING  );
 
             // remove not needed CR-LF at the end
-            xub_StrLen n = sStr.getLength();
+            sal_Int32 n = sStr.getLength();
             while( n && 0 == sStr[ n-1 ] )
                 --n;
             if( n && 0x0a == sStr[ n-1 ] )
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 42b74f81af3c..eb71ce95ebfb 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -1349,7 +1349,7 @@ void SwTable::NewSetTabCols( Parm &rParm, const SwTabCols &rNew,
 static bool lcl_IsValidRowName( const OUString& rStr )
 {
     bool bIsValid = true;
-    xub_StrLen nLen = rStr.getLength();
+    sal_Int32 nLen = rStr.getLength();
     for (xub_StrLen i = 0;  i < nLen && bIsValid;  ++i)
     {
         const sal_Unicode cChar = rStr[i];
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 478fde4bdae8..9fc42da5e128 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -643,7 +643,7 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa
     SwAttrIter aIter( *(SwTxtNode*)this, aScriptInfo );
     xub_StrLen nIdx = 0;
     aIter.SeekAndChgAttrIter( nIdx, pOut );
-    xub_StrLen nLen = m_Text.getLength();
+    sal_Int32 nLen = m_Text.getLength();
     long nAktWidth = 0;
     MSHORT nAdd = 0;
     SwMinMaxArgs aArg( pOut, pSh, rMin, rMax, rAbsMin );
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 025613c6a5a2..f4af8afa6338 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -146,7 +146,7 @@ sal_Bool SwTxtSizeInfo::_HasHint( const SwTxtNode* pTxtNode, xub_StrLen nPos )
 
 MSHORT SwTxtNode::GetDropLen( MSHORT nWishLen ) const
 {
-    xub_StrLen nEnd = GetTxt().getLength();
+    sal_Int32 nEnd = GetTxt().getLength();
     if( nWishLen && nWishLen < nEnd )
         nEnd = nWishLen;
 
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index aa7349b50318..4c51fa982cf8 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -1572,12 +1572,12 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
                     aStr = aStr.replaceAt(i, 1, OUString(CH_BULLET));
         }
 
-        xub_StrLen nCnt = rInf.GetText().getLength();
+        sal_Int32 nCnt = rInf.GetText().getLength();
         if ( nCnt < rInf.GetIdx() )
             nCnt = 0;
         else
             nCnt = nCnt - rInf.GetIdx();
-        nCnt = std::min( nCnt, rInf.GetLen() );
+        nCnt = std::min<sal_Int32>( nCnt, rInf.GetLen() );
         long nKernSum = rInf.GetKern();
         sal_Unicode cChPrev = rInf.GetText()[ rInf.GetIdx() ];
 
@@ -1935,12 +1935,12 @@ Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf )
             rInf.GetOut().GetTextArray( rInf.GetText(), pScrArray,
                                         rInf.GetIdx(), rInf.GetLen() );
             nScrPos = pScrArray[ 0 ];
-            xub_StrLen nCnt = rInf.GetText().getLength();
+            sal_Int32 nCnt = rInf.GetText().getLength();
             if ( nCnt < rInf.GetIdx() )
                 nCnt=0;
             else
                 nCnt = nCnt - rInf.GetIdx();
-            nCnt = std::min (nCnt, nLn);
+            nCnt = std::min<sal_Int32>(nCnt, nLn);
             sal_Unicode nChPrev = rInf.GetText()[ rInf.GetIdx() ];
 
             sal_Unicode nCh;
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 2943e53b3461..ef4edbf7ed5e 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -358,7 +358,7 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
 
     // create a node "in front" of me
     const xub_StrLen nSplitPos = rPos.nContent.GetIndex();
-    const xub_StrLen nTxtLen = m_Text.getLength();
+    const sal_Int32 nTxtLen = m_Text.getLength();
     SwTxtNode* const pNode =
         _MakeNewTxtNode( rPos.nNode, sal_False, nSplitPos==nTxtLen );
 
@@ -625,7 +625,7 @@ SwCntntNode *SwTxtNode::JoinNext()
         std::vector<sal_uLong> aBkmkArr;
         _SaveCntntIdx( pDoc, aIdx.GetIndex(), USHRT_MAX, aBkmkArr, SAVEFLY );
         SwTxtNode *pTxtNode = aIdx.GetNode().GetTxtNode();
-        xub_StrLen nOldLen = m_Text.getLength();
+        sal_Int32 nOldLen = m_Text.getLength();
 
         // METADATA: merge
         this->JoinMetadatable(*pTxtNode, !this->Len(), !pTxtNode->Len());
@@ -1517,7 +1517,7 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
     }
 
     // 1. Text kopieren
-    const xub_StrLen oldLen = pDest->m_Text.getLength();
+    const sal_Int32 oldLen = pDest->m_Text.getLength();
     //JP 15.02.96: Bug 25537 - Attributbehandlung am Ende fehlt! Darum
     //              ueber die InsertMethode den Text einfuegen und nicht
     //              selbst direkt
@@ -1888,7 +1888,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
 
     xub_StrLen nTxtStartIdx = rStart.GetIndex();
     xub_StrLen nDestStart = rDestStart.GetIndex();      // alte Pos merken
-    const xub_StrLen nInitSize = pDest->m_Text.getLength();
+    const sal_Int32 nInitSize = pDest->m_Text.getLength();
 
     // wird in sich selbst verschoben, muss es gesondert behandelt werden !!
     if( pDest == this )
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index 11b559a52a55..6472131870c9 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -1171,7 +1171,7 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf )
 void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const sal_Bool bGrey )
 {
     rInf.SetGreyWave( bGrey );
-    xub_StrLen nLn = rInf.GetText().getLength();
+    sal_Int32 nLn = rInf.GetText().getLength();
     if( !rInf.GetLen() || !nLn )
         return;
     if( STRING_LEN == rInf.GetLen() )
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 1c82cc6e3871..e474f63cb59a 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -385,7 +385,7 @@ void SwTxtNode::RstAttr(
     bool bChanged = false;
 
     // nMin and nMax initialized to maximum / minimum (inverse)
-    xub_StrLen nMin = m_Text.getLength();
+    sal_Int32 nMin = m_Text.getLength();
     xub_StrLen nMax = nStt;
     const bool bNoLen = nMin == 0;
 
@@ -1062,7 +1062,7 @@ sal_uInt16 SwTxtNode::Convert( SwConversionArgs &rArgs )
     // get range of text within node to be converted
     // (either all the text or the text within the selection
     // when the conversion was started)
-    xub_StrLen nTextBegin, nTextEnd;
+    sal_Int32 nTextBegin, nTextEnd;
     //
     if ( rArgs.pStartNode != this )
     {
@@ -1233,7 +1233,7 @@ SwRect SwTxtFrm::_AutoSpell( const SwCntntNode* pActNode, const SwViewOption& rV
     const bool bRedlineChg = (pNode->GetTxt().getStr() != aOldTxt.getStr());
 
     xub_StrLen nBegin = 0;
-    xub_StrLen nEnd = pNode->GetTxt().getLength();
+    sal_Int32  nEnd = pNode->GetTxt().getLength();
     xub_StrLen nInsertPos = 0;
     xub_StrLen nChgStart = STRING_LEN;
     xub_StrLen nChgEnd = 0;
@@ -1518,9 +1518,9 @@ void SwTxtFrm::CollectAutoCmplWrds( SwCntntNode* pActNode, xub_StrLen nActPos )
     SwDoc* pDoc = pNode->GetDoc();
     SwAutoCompleteWord& rACW = SwDoc::GetAutoCompleteWords();
 
-    xub_StrLen nBegin = 0;
-    xub_StrLen nEnd = pNode->GetTxt().getLength();
-    xub_StrLen nLen;
+    sal_Int32  nBegin = 0;
+    sal_Int32  nEnd = pNode->GetTxt().getLength();
+    sal_Int32  nLen;
     bool bACWDirty = false, bAnyWrd = false;
 
     if( nBegin < nEnd )
@@ -1876,7 +1876,7 @@ void SwTxtNode::ReplaceTextOnly( xub_StrLen nPos, xub_StrLen nLen,
 
     m_Text = m_Text.replaceAt(nPos, nLen, rText);
 
-    xub_StrLen nTLen = rText.getLength();
+    sal_Int32 nTLen = rText.getLength();
     const sal_Int32* pOffsets = rOffsets.getConstArray();
     // now look for no 1-1 mapping -> move the indizies!
     xub_StrLen nI, nMyOff;
diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index 83a0e4f687f7..bd0e91bce398 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -60,7 +60,7 @@ SwUndoOverwrite::SwUndoOverwrite( SwDoc* pDoc, SwPosition& rPos,
     OSL_ENSURE( pTxtNd, "Overwrite not in a TextNode?" );
 
     bInsChar = sal_True;
-    xub_StrLen nTxtNdLen = pTxtNd->GetTxt().getLength();
+    sal_Int32 nTxtNdLen = pTxtNd->GetTxt().getLength();
     if( nSttCntnt < nTxtNdLen )     // no pure insert?
     {
         aDelStr += OUString( pTxtNd->GetTxt()[nSttCntnt] );
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 0a6818289280..c210b56fdbcf 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -1653,7 +1653,7 @@ void SwHTMLWriter::AddLinkTarget( const OUString& rURL )
     // There might be a '|' as delimiter (if the link has been inserted
     // freshly) or a '%7c' or a '%7C' if the document has been saved and
     // loaded already.
-    xub_StrLen nPos = rURL.getLength();
+    sal_Int32 nPos = rURL.getLength();
     sal_Bool bFound = sal_False, bEncoded = sal_False;
     while( !bFound && nPos > 0 )
     {
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index afcddfd3aecd..6b60889e9271 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -689,7 +689,7 @@ void SwHTMLParser::Continue( int nToken )
             SwNodeIndex aNxtIdx( *pSttNdIdx );
             if( pTxtNode && pTxtNode->CanJoinNext( &aNxtIdx ))
             {
-                xub_StrLen nStt = pTxtNode->GetTxt().getLength();
+                sal_Int32 nStt = pTxtNode->GetTxt().getLength();
                 // wenn der Cursor noch in dem Node steht, dann setze in an das Ende
                 if( pPam->GetPoint()->nNode == aNxtIdx )
                 {
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 7c6246b7255d..62afa65ebd51 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3545,7 +3545,7 @@ void DocxAttributeOutput::WriteOutliner(const OutlinerParaObject& rParaObj)
 
         OUString aStr( rEditObj.GetText( n ));
         xub_StrLen nAktPos = 0;
-        xub_StrLen nEnd = aStr.getLength();
+        sal_Int32 nEnd = aStr.getLength();
 
         m_pSerializer->startElementNS( XML_w, XML_p, FSEND );
 
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 6af07889d66b..69fc7e94937d 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -870,7 +870,7 @@ void DocxExport::WriteOutliner(const OutlinerParaObject& rParaObj, sal_uInt8 nTy
         rtl_TextEncoding eChrSet = aAttrIter.GetNodeCharSet();
         OUString aStr( rEditObj.GetText( n ));
         xub_StrLen nAktPos = 0;
-        xub_StrLen nEnd = aStr.getLength();
+        sal_Int32  nEnd = aStr.getLength();
         do {
             AttrOutput().StartRun( NULL );
             xub_StrLen nNextAttr = aAttrIter.WhereNext();
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx
index f5dae0f0cee9..5218e3b2e9ce 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -541,7 +541,7 @@ void RtfSdrExport::WriteOutliner(const OutlinerParaObject& rParaObj)
 
         OUString aStr( rEditObj.GetText( n ));
         xub_StrLen nAktPos = 0;
-        xub_StrLen nEnd = aStr.getLength();
+        sal_Int32  nEnd = aStr.getLength();
 
         aAttrIter.OutParaAttr(false);
         m_rAttrOutput.RunText().append(m_rAttrOutput.Styles().makeStringAndClear());
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 1b3ab30855c3..5ac0994aaff5 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1366,7 +1366,7 @@ void WW8Export::WriteOutliner(const OutlinerParaObject& rParaObj, sal_uInt8 nTyp
 
         OUString aStr( rEditObj.GetText( n ));
         xub_StrLen nAktPos = 0;
-        xub_StrLen nEnd = aStr.getLength();
+        sal_Int32  nEnd = aStr.getLength();
         do {
             xub_StrLen nNextAttr = aAttrIter.WhereNext();
             rtl_TextEncoding eNextChrSet = aAttrIter.GetNextCharSet();
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index 44fc3c9fc15b..a8962e972422 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -154,7 +154,7 @@ bool WW8Glossary::MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks,
                 // Need to check make sure the shortcut is not already being used
                 sal_Int32 nStart = 0;
                 sal_uInt16 nCurPos = rBlocks.GetIndex( sShortcut );
-                xub_StrLen nLen = sShortcut.getLength();
+                sal_Int32 nLen = sShortcut.getLength();
                 while( (sal_uInt16)-1 != nCurPos )
                 {
                     sShortcut = sShortcut.copy( 0, nLen );
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 875f6b96ea9a..c906b0b7cd91 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3928,7 +3928,7 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType)
         if (pPreviousNode && bStartLine)
         {
             SwTxtNode* pEndNd = pPaM->GetNode()->GetTxtNode();
-            const xub_StrLen nDropCapLen = pPreviousNode->GetTxt().getLength();
+            const sal_Int32 nDropCapLen = pPreviousNode->GetTxt().getLength();
 
             // Need to reset the font size and text position for the dropcap
             {
@@ -5454,7 +5454,7 @@ namespace
         {
             OUString sUniPassword = QueryPasswordForMedium( rMedium );
 
-            xub_StrLen nLen = sUniPassword.getLength();
+            sal_Int32 nLen = sUniPassword.getLength();
             if ( nLen <= 15 )
             {
                 sal_Unicode pPassword[16];
diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx
index 4af72172b4b9..d834265f8ad3 100644
--- a/sw/source/ui/envelp/envimg.cxx
+++ b/sw/source/ui/envelp/envimg.cxx
@@ -62,7 +62,7 @@ SW_DLLPUBLIC OUString MakeSender()
         OUString sToken = sSenderToken.getToken( 0, ';', nSttPos );
         if (sToken == "COMPANY")
         {
-            xub_StrLen nOldLen = sRet.getLength();
+            sal_Int32 nOldLen = sRet.getLength();
             sRet += rUserOpt.GetCompany();
             bLastLength = sRet.getLength() != nOldLen;
         }
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index 042f3b31f9c5..0b7d9ba489b6 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -244,7 +244,7 @@ void SwHHCWrapper::ChangeText( const OUString &rNewText,
 
         const sal_Int32  nIndices = pOffsets->getLength();
         const sal_Int32 *pIndices = pOffsets->getConstArray();
-        xub_StrLen nConvTextLen = rNewText.getLength();
+        sal_Int32 nConvTextLen = rNewText.getLength();
         xub_StrLen nPos = 0;
         xub_StrLen nChgPos = STRING_NOTFOUND;
         xub_StrLen nChgLen = 0;
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index cc3096685a2c..8d97a433223e 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -6178,7 +6178,7 @@ void OutputDevice::ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& r
                     aLastLine = convertLineEnd(aStr.copy(pLineInfo->GetIndex()), LINEEND_LF);
                     // Replace all LineFeeds with Spaces
                     OUStringBuffer aLastLineBuffer(aLastLine);
-                    xub_StrLen nLastLineLen = aLastLineBuffer.getLength();
+                    sal_Int32 nLastLineLen = aLastLineBuffer.getLength();
                     for ( i = 0; i < nLastLineLen; i++ )
                     {
                         if ( aLastLineBuffer[ i ] == '\n' )
@@ -7717,8 +7717,8 @@ xub_StrLen OutputDevice::HasGlyphs( const Font& rTempFont, const OUString& rStr,
 {
     if( nIndex >= rStr.getLength() )
         return nIndex;
-    xub_StrLen nEnd = nIndex + nLen;
-    if( (sal_Int32)nIndex+nLen > rStr.getLength() )
+    sal_Int32 nEnd = nIndex + nLen;
+    if( nIndex+nLen > rStr.getLength() )
         nEnd = rStr.getLength();
 
     DBG_ASSERT( nIndex < nEnd, "StartPos >= EndPos?" );
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 4227430bacc6..771d4980ad4a 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -5240,7 +5240,7 @@ static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame,
 
             if ( pAttrBuf )
             {
-                xub_StrLen nTextLen2 = aEvt.maText.getLength();
+                sal_Int32 nTextLen2 = aEvt.maText.getLength();
                 pSalAttrAry = new sal_uInt16[nTextLen2];
                 memset( pSalAttrAry, 0, nTextLen2*sizeof( sal_uInt16 ) );
                 for ( xub_StrLen i = 0; (i < nTextLen2) && (i < nAttrLen); i++ )