fdo#38838 search replace for String::CreateFromInt32().

I ran the following code replace:
    s/(Uni|Xub)?String\s*::\s*CreateFromInt32/OUString::number/

Change-Id: I45edaec4de2481ad45f9bcae2e280d5aca487714
Reviewed-on: https://gerrit.libreoffice.org/2281
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

52 files changed, 125 insertions, 125 deletions

diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 535a48061b02..e7f008c7bc87 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -917,7 +917,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
                     case SFX_ITEM_PRESENTATION_NAMELESS:
                     {
                         String aPages( ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALE_PAGES ) );
-                        aPages.SearchAndReplaceAscii( "%1", String::CreateFromInt32( nPagNo ) );
+                        aPages.SearchAndReplaceAscii( "%1", OUString::number( nPagNo ) );
                         rText += aPages;
                     }
                     break;
@@ -946,7 +946,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
                     rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_FIRSTPAGENO) + aStrSep;
 //                  break; // DURCHFALLEN!!!
                     case SFX_ITEM_PRESENTATION_NAMELESS:
-                    rText += String::CreateFromInt32( nPagNo );
+                    rText += OUString::number( nPagNo );
                     break;
                     default:
                     {
diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx
index 9cdb2a75e2f6..5d795b946fb0 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -171,7 +171,7 @@ rtl::OUString ScDPSaveGroupDimension::CreateGroupName(const rtl::OUString& rPref
     while ( nAdd <= nMaxAdd )
     {
         String aGroupName( rPrefix );
-        aGroupName.Append( String::CreateFromInt32( nAdd ) );
+        aGroupName.Append( OUString::number( nAdd ) );
         bool bExists = false;
 
         // look for existing groups
diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index 269148b20061..17bb747fbcbc 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -50,7 +50,7 @@ const sal_uInt16 SC_DP_LEAPYEAR = 1648;     // arbitrary leap year for date calc
 
 rtl::OUString getTwoDigitString(sal_Int32 nValue)
 {
-    String aRet = String::CreateFromInt32( nValue );
+    String aRet = OUString::number( nValue );
     if ( aRet.Len() < 2 )
         aRet.Insert( (sal_Unicode)'0', 0 );
     return aRet;
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 4b4198cfe779..3f2805fbb69b 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -1736,7 +1736,7 @@ String ScDrawLayer::GetNewGraphicName( long* pnCounter ) const
     {
         ++nId;
         aGraphicName = aBase;
-        aGraphicName += String::CreateFromInt32( nId );
+        aGraphicName += OUString::number( nId );
         bThere = ( GetNamedObject( aGraphicName, 0, nDummy ) != NULL );
     }
 
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 0d0a3d0b5536..8188b5deed28 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -399,7 +399,7 @@ String ScGlobal::GetErrorString(sal_uInt16 nErrNumber)
         case errIllegalFPOperation : nErrNumber = STR_NUM_ERROR; break;
 
         default          : sResStr = GetRscString(STR_ERROR_STR);
-                           sResStr += String::CreateFromInt32( nErrNumber );
+                           sResStr += OUString::number( nErrNumber );
                            nErrNumber = 0;
                            break;
     }
@@ -733,7 +733,7 @@ String ScGlobal::GetCharsetString( CharSet eVal )
         case RTL_TEXTENCODING_DONTKNOW:     pChar = "SYSTEM";       break;
         // new string of TextEncoding value
         default:
-            return String::CreateFromInt32( eVal );
+            return OUString::number( eVal );
     }
     return rtl::OUString::createFromAscii(pChar);
 }
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index ce17027e7237..0dc76c3b411a 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -96,7 +96,7 @@ SfxStyleSheetBase& ScStyleSheetPool::Make( const String& rName,
         for ( sal_uInt32 nAdd = 1; nAdd <= nCount; nAdd++ )
         {
             String aNewName = ScGlobal::GetRscString(STR_STYLENAME_STANDARD);
-            aNewName += String::CreateFromInt32( nAdd );
+            aNewName += OUString::number( nAdd );
             if ( Find( aNewName, eFam ) == NULL )
                 return SfxStyleSheetPool::Make( aNewName, eFam, mask, nPos );
         }
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 5c870c2708c7..80a3ebba5ab2 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -129,10 +129,10 @@ static short lcl_DecompValueString( String& aValue, sal_Int32& nVal, sal_uInt16*
 static String lcl_ValueString( sal_Int32 nValue, sal_uInt16 nMinDigits )
 {
     if ( nMinDigits <= 1 )
-        return String::CreateFromInt32( nValue );           // simple case...
+        return OUString::number( nValue );           // simple case...
     else
     {
-        String aStr = String::CreateFromInt32( Abs( nValue ) );
+        String aStr = OUString::number( Abs( nValue ) );
         if ( aStr.Len() < nMinDigits )
         {
             OUStringBuffer aZero;
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 08e29ded0fc0..9da5caeff7ee 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1610,7 +1610,7 @@ lcl_a1_append_r ( String &r, int nRow, bool bIsAbs )
 {
     if ( bIsAbs )
         r += '$';
-    r += String::CreateFromInt32( nRow+1 );
+    r += OUString::number( nRow+1 );
 }
 
 static inline void
@@ -1620,14 +1620,14 @@ lcl_r1c1_append_c ( String &r, int nCol, bool bIsAbs,
     r += 'C';
     if (bIsAbs)
     {
-        r += String::CreateFromInt32( nCol + 1 );
+        r += OUString::number( nCol + 1 );
     }
     else
     {
         nCol -= rDetails.nCol;
         if (nCol != 0) {
             r += '[';
-            r += String::CreateFromInt32( nCol );
+            r += OUString::number( nCol );
             r += ']';
         }
     }
@@ -1639,14 +1639,14 @@ lcl_r1c1_append_r ( String &r, int nRow, bool bIsAbs,
     r += 'R';
     if (bIsAbs)
     {
-        r += String::CreateFromInt32( nRow + 1 );
+        r += OUString::number( nRow + 1 );
     }
     else
     {
         nRow -= rDetails.nRow;
         if (nRow != 0) {
             r += '[';
-            r += String::CreateFromInt32( nRow );
+            r += OUString::number( nRow );
             r += ']';
         }
     }
@@ -1996,7 +1996,7 @@ String ScAddress::GetColRowString( bool bAbsolute,
     if ( bAbsolute )
         aString.Append( '$' );
 
-    aString += String::CreateFromInt32(nRow+1);
+    aString += OUString::number(nRow+1);
         break;
 
     case formula::FormulaGrammar::CONV_XL_R1C1:
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 51fba63a3deb..ba18b3aa88a0 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -1456,12 +1456,12 @@ r1c1_add_col( rtl::OUStringBuffer &rBuf, const ScSingleRefData& rRef )
         if (rRef.nRelCol != 0)
         {
             rBuf.append( sal_Unicode( '[' ) );
-            rBuf.append( String::CreateFromInt32( rRef.nRelCol ) );
+            rBuf.append( OUString::number( rRef.nRelCol ) );
             rBuf.append( sal_Unicode( ']' ) );
         }
     }
     else
-        rBuf.append( String::CreateFromInt32( rRef.nCol + 1 ) );
+        rBuf.append( OUString::number( rRef.nCol + 1 ) );
 }
 static void
 r1c1_add_row( rtl::OUStringBuffer &rBuf, const ScSingleRefData& rRef )
@@ -1472,12 +1472,12 @@ r1c1_add_row( rtl::OUStringBuffer &rBuf, const ScSingleRefData& rRef )
         if (rRef.nRelRow != 0)
         {
             rBuf.append( sal_Unicode( '[' ) );
-            rBuf.append( String::CreateFromInt32( rRef.nRelRow ) );
+            rBuf.append( OUString::number( rRef.nRelRow ) );
             rBuf.append( sal_Unicode( ']' ) );
         }
     }
     else
-        rBuf.append( String::CreateFromInt32( rRef.nRow + 1 ) );
+        rBuf.append( OUString::number( rRef.nRow + 1 ) );
 }
 
 struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL
diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
index 2a45427b477f..abd325868e17 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -82,7 +82,7 @@ using namespace oox;
 static String lcl_GetVbaTabName( SCTAB n )
 {
     String  aRet( RTL_CONSTASCII_USTRINGPARAM( "__VBA__" ) );
-    aRet += String::CreateFromInt32( static_cast<sal_uInt16>(n) );
+    aRet += OUString::number( static_cast<sal_uInt16>(n) );
     return aRet;
 }
 
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index 07d22f81b42f..3a02917b839d 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -653,7 +653,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
             case 0x38: // Command-Equivalent Function           [333    ]
                 aString.AssignAscii( "COMM_EQU_FUNC" );
                 aIn >> nByte;
-                aString += String::CreateFromInt32( nByte );
+                aString += OUString::number( nByte );
                 aIn >> nByte;
                 aStack << aPool.Store( aString );
                 DoMulArgs( ocPush, nByte + 1 );
diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx
index 3a03b0036ac4..ab8e950a57c1 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -642,7 +642,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
             case 0x38: // Command-Equivalent Function           [333    ]
                 aString.AssignAscii( "COMM_EQU_FUNC" );
                 aIn >> nByte;
-                aString += String::CreateFromInt32( nByte );
+                aString += OUString::number( nByte );
                 aIn >> nByte;
                 aStack << aPool.Store( aString );
                 DoMulArgs( ocPush, nByte + 1 );
diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx
index 13f6a28ca456..293a2c8e9d1c 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -141,15 +141,15 @@ sal_uInt16 ShrfmlaBuffer::Find( const ScAddress & aAddr ) const
 String ShrfmlaBuffer::CreateName( const ScRange& r )
 {
     String          aName( RTL_CONSTASCII_USTRINGPARAM( SHRFMLA_BASENAME ) );
-    aName += String::CreateFromInt32( r.aStart.Col() );
+    aName += OUString::number( r.aStart.Col() );
     aName.Append( '_' );
-    aName += String::CreateFromInt32( r.aStart.Row() );
+    aName += OUString::number( r.aStart.Row() );
     aName.Append( '_' );
-    aName += String::CreateFromInt32( r.aEnd.Col() );
+    aName += OUString::number( r.aEnd.Col() );
     aName.Append( '_' );
-    aName += String::CreateFromInt32( r.aEnd.Row() );
+    aName += OUString::number( r.aEnd.Row() );
     aName.Append( '_' );
-    aName += String::CreateFromInt32( r.aStart.Tab() );
+    aName += OUString::number( r.aStart.Tab() );
 
     return aName;
 }
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 301cef86641b..b69b8e692ead 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -769,7 +769,7 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico
                 (aNewData.mnHeight += 10) /= 20;
                 bool bFontHtChanged = (aFontData.mnHeight != aNewData.mnHeight);
                 if( bFontHtChanged )
-                    aParaText.Append( '&' ).Append( String::CreateFromInt32( aNewData.mnHeight ) );
+                    aParaText.Append( '&' ).Append( OUString::number( aNewData.mnHeight ) );
                 // update maximum paragraph height, convert to twips
                 nParaHeight = ::std::max< sal_Int32 >( nParaHeight, aNewData.mnHeight * 20 );
 
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index 5720adfb07bc..7e7a76025bea 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -529,7 +529,7 @@ String XclExpNameManagerImpl::GetUnusedName( const String& rName ) const
             bExist = xName->GetOrigName() == aNewName;
             // name exists -> create a new name "<originalname>_<counter>"
             if( bExist )
-                aNewName.Assign( rName ).Append( '_' ).Append( String::CreateFromInt32( ++nAppIdx ) );
+                aNewName.Assign( rName ).Append( '_' ).Append( OUString::number( ++nAppIdx ) );
         }
     }
     return aNewName;
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 63cb8396c9e5..a118f8381bc7 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -1598,7 +1598,7 @@ void XclImpXFBuffer::CreateUserStyles()
         sal_Int32 nIndex = 0;
         do
         {
-            aUnusedName.Assign( pStyle->GetName() ).Append( ' ' ).Append( String::CreateFromInt32( ++nIndex ) );
+            aUnusedName.Assign( pStyle->GetName() ).Append( ' ' ).Append( OUString::number( ++nIndex ) );
         }
         while( aCellStyles.count( aUnusedName ) > 0 );
         aCellStyles[ aUnusedName ] = pStyle;
diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx
index 07ef459315d7..be9f26818928 100644
--- a/sc/source/filter/ftools/ftools.cxx
+++ b/sc/source/filter/ftools/ftools.cxx
@@ -233,7 +233,7 @@ ScStyleSheet& lclMakeStyleSheet( ScStyleSheetPool& rPool, const String& rStyleNa
     {
         if( !pOldStyleSheet )
             pOldStyleSheet = pStyleSheet;
-        aNewName.Assign( rStyleName ).Append( ' ' ).Append( String::CreateFromInt32( ++nIndex ) );
+        aNewName.Assign( rStyleName ).Append( ' ' ).Append( OUString::number( ++nIndex ) );
     }
 
     // rename existing style
@@ -305,7 +305,7 @@ const String& ScfTools::GetHTMLNamePrefix()
 String ScfTools::GetNameFromHTMLIndex( sal_uInt32 nIndex )
 {
     String aName( GetHTMLIndexPrefix() );
-    aName += String::CreateFromInt32( static_cast< sal_Int32 >( nIndex ) );
+    aName += OUString::number( static_cast< sal_Int32 >( nIndex ) );
     return aName;
 }
 
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index e6eb8a84d0cb..d5bcd41360fa 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -679,7 +679,7 @@ void ScHTMLExport::WriteTables()
             {
                 aStrOut  = aStrTable;
                 aStrOut.AppendAscii( " " );
-                aStrOut += String::CreateFromInt32( nTableStrNum++ );
+                aStrOut += OUString::number( nTableStrNum++ );
                 aStrOut.AppendAscii( ": " );
 
                 OUT_HR();
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index 813039e54fda..22e239892062 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -381,7 +381,7 @@ static String lcl_MakeOldPageStyleFormatName( sal_uInt16 i )
 {
     String  aName = ScGlobal::GetRscString( STR_PAGESTYLE );
     aName.AppendAscii( " " );
-    aName += String::CreateFromInt32( i + 1 );
+    aName += OUString::number( i + 1 );
 
     return aName;
 }
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 01e3a2cdd870..8c44c5a0ddc6 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -213,9 +213,9 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe
             OSL_FAIL(aError.getStr());
 #endif
 
-            String sErr( String::CreateFromInt32( r.LineNumber ));
+            String sErr( OUString::number( r.LineNumber ));
             sErr += ',';
-            sErr += String::CreateFromInt32( r.ColumnNumber );
+            sErr += OUString::number( r.ColumnNumber );
 
             if( !sDocName.isEmpty() )
             {
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 57d3d4b641fe..deb600879345 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -1423,7 +1423,7 @@ String ScAccessibleCsvGrid::implGetCellText( sal_Int32 nRow, sal_Int32 nColumn )
     if( (nColumn > 0) && (nRow > 0) )
         aCellStr = rGrid.GetCellText( lcl_GetGridColumn( nColumn ), nLine );
     else if( nRow > 0 )
-        aCellStr = String::CreateFromInt32( nLine + 1L );
+        aCellStr = OUString::number( nLine + 1L );
     else if( nColumn > 0 )
         aCellStr = rGrid.GetColumnTypeName( lcl_GetGridColumn( nColumn ) );
     return aCellStr;
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index be205b01a5c6..4700ecb573bb 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -326,7 +326,7 @@ String ScAsciiOptions::WriteToString() const
         {
             if (i)
                 aOutStr += '/';
-            aOutStr += String::CreateFromInt32(aFieldSeps.GetChar(i));
+            aOutStr += OUString::number(aFieldSeps.GetChar(i));
         }
         if ( bMergeFieldSeps )
         {
@@ -341,7 +341,7 @@ String ScAsciiOptions::WriteToString() const
         //  Text-Trenner
         //
 
-    aOutStr += String::CreateFromInt32(cTextSep);
+    aOutStr += OUString::number(cTextSep);
     aOutStr += ',';                 // Token-Ende
 
         //
@@ -358,7 +358,7 @@ String ScAsciiOptions::WriteToString() const
         //  Startzeile
         //
 
-    aOutStr += String::CreateFromInt32(nStartRow);
+    aOutStr += OUString::number(nStartRow);
     aOutStr += ',';                 // Token-Ende
 
         //
@@ -370,9 +370,9 @@ String ScAsciiOptions::WriteToString() const
     {
         if (nInfo)
             aOutStr += '/';
-        aOutStr += String::CreateFromInt32(pColStart[nInfo]);
+        aOutStr += OUString::number(pColStart[nInfo]);
         aOutStr += '/';
-        aOutStr += String::CreateFromInt32(pColFormat[nInfo]);
+        aOutStr += OUString::number(pColFormat[nInfo]);
     }
 
     // #i112025# the options string is used in macros and linked sheets,
@@ -381,7 +381,7 @@ String ScAsciiOptions::WriteToString() const
     aOutStr += ',';
 
     // Language
-    aOutStr += String::CreateFromInt32(eLang);
+    aOutStr += OUString::number(eLang);
     aOutStr += ',';
 
     // Import quoted field as text.
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 647bfa6f9bd8..532107db8aff 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -1190,7 +1190,7 @@ void ScCsvGrid::ImplDrawRowHeaders()
     sal_Int32 nLastLine = GetLastVisLine();
     for( sal_Int32 nLine = GetFirstVisLine(); nLine <= nLastLine; ++nLine )
     {
-        String aText( String::CreateFromInt32( nLine + 1 ) );
+        String aText( OUString::number( nLine + 1 ) );
         sal_Int32 nX = GetHdrX() + (GetHdrWidth() - maBackgrDev.GetTextWidth( aText )) / 2;
         maBackgrDev.DrawText( Point( nX, GetY( nLine ) ), aText );
     }
diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx
index ea1044aff8fb..ffd05389b491 100644
--- a/sc/source/ui/dbgui/csvruler.cxx
+++ b/sc/source/ui/dbgui/csvruler.cxx
@@ -75,7 +75,7 @@ static void save_FixedWidthList(ScCsvSplits aSplits)
     sal_uInt32 n = aSplits.Count();
     for (sal_uInt32 i = 0; i < n; ++i)
     {
-        sSplits.Append( String::CreateFromInt32( aSplits[i] ) );
+        sSplits.Append( OUString::number( aSplits[i] ) );
         sSplits.Append((char)';');
     }
 
@@ -591,7 +591,7 @@ void ScCsvRuler::ImplDrawBackgrDev()
     maBackgrDev.SetTextFillColor();
     for( nPos = ((nFirstPos + 9) / 10) * 10; nPos <= nLastPos; nPos += 10 )
     {
-        String aText( String::CreateFromInt32( nPos ) );
+        String aText( OUString::number( nPos ) );
         sal_Int32 nTextWidth = maBackgrDev.GetTextWidth( aText );
         sal_Int32 nTextX = GetX( nPos ) - nTextWidth / 2;
         ImplDrawArea( nTextX - 1, nTextWidth + 2 );
diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx
index 5a6bc771cbad..8860d6ddc2c7 100644
--- a/sc/source/ui/dbgui/imoptdlg.cxx
+++ b/sc/source/ui/dbgui/imoptdlg.cxx
@@ -84,9 +84,9 @@ String ScImportOptions::BuildString() const
     if( bFixedWidth )
         aResult.AppendAscii( pStrFix );
     else
-        aResult += String::CreateFromInt32(nFieldSepCode);
+        aResult += OUString::number(nFieldSepCode);
     aResult += ',';
-    aResult += String::CreateFromInt32(nTextSepCode);
+    aResult += OUString::number(nTextSepCode);
     aResult += ',';
     aResult += aStrFont;
                                                             // use the same string format as ScAsciiOptions:
diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx
index 211afccca8c2..806f28478ceb 100644
--- a/sc/source/ui/dbgui/sortkeydlg.cxx
+++ b/sc/source/ui/dbgui/sortkeydlg.cxx
@@ -90,7 +90,7 @@ void ScSortKeyWindow::AddSortKey( sal_uInt16 nItemNumber )
 
     // Set Sort key number
     String aLine = pSortKeyItem->m_pFlSort->GetText();
-    aLine += String::CreateFromInt32( nItemNumber );
+    aLine += OUString::number( nItemNumber );
     pSortKeyItem->m_pFlSort->SetText( aLine );
 
     mrSortKeyItems.push_back(pSortKeyItem);
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index 967958ec4e85..f45c7f20e288 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -367,7 +367,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
                             {
                                 String aPict = ScGlobal::GetRscString( STR_PROGRESS_IMPORT );
                                 String aText = aPict.GetToken(0,'#');
-                                aText += String::CreateFromInt32( nInserted );
+                                aText += OUString::number( nInserted );
                                 aText += aPict.GetToken(1,'#');
 
                                 if (!aProgress.SetStateText( 0, aText ))    // stopped by user?
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index 4e32bca64cc3..b431f938ab1c 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -266,7 +266,7 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
                 {
                     ++nCount;
                     aNewName = aImport;
-                    aNewName += String::CreateFromInt32( nCount );
+                    aNewName += OUString::number( nCount );
                     pDummy = rDBs.findByUpperName(ScGlobal::pCharClass->uppercase(aNewName));
                 }
                 while (pDummy);
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 188588176676..cc474931cbeb 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -398,18 +398,18 @@ sal_uLong ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet
                     break;
                 case sdbc::DataType::VARCHAR:
                     aHeader.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",C," ));
-                    aHeader += String::CreateFromInt32( xMeta->getColumnDisplaySize( i+1 ) );
+                    aHeader += OUString::number( xMeta->getColumnDisplaySize( i+1 ) );
                     break;
                 case sdbc::DataType::DECIMAL:
                     {
                         long nPrec = xMeta->getPrecision( i+1 );
                         long nScale = xMeta->getScale( i+1 );
                         aHeader.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",N," ));
-                        aHeader += String::CreateFromInt32(
+                        aHeader += OUString::number(
                                     SvDbaseConverter::ConvertPrecisionToDbase(
                                         nPrec, nScale ) );
                         aHeader += ',';
-                        aHeader += String::CreateFromInt32( nScale );
+                        aHeader += OUString::number( nScale );
                         aScales[i] = nScale;
                     }
                     break;
@@ -609,7 +609,7 @@ void lcl_GetColumnTypes(
                 do
                 {
                     ++nSub;
-                    String aVarPart = String::CreateFromInt32( nSub );
+                    String aVarPart = OUString::number( nSub );
                     if ( aFixPart.Len() + aVarPart.Len() > 10 )
                         aFixPart.Erase( 10 - aVarPart.Len() );
                     aFieldName = aFixPart;
@@ -620,7 +620,7 @@ void lcl_GetColumnTypes(
         else
         {
             aFieldName = 'N';
-            aFieldName += String::CreateFromInt32(nCol+1);
+            aFieldName += OUString::number(nCol+1);
         }
 
         if ( !bTypeDefined )
@@ -746,13 +746,13 @@ void lcl_GetColumnTypes(
                     break;
                 case sdbc::DataType::VARCHAR :
                     aOutString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",C," ));
-                    aOutString += String::CreateFromInt32( nFieldLen );
+                    aOutString += OUString::number( nFieldLen );
                     break;
                 case sdbc::DataType::DECIMAL :
                     aOutString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",N," ));
-                    aOutString += String::CreateFromInt32( nFieldLen );
+                    aOutString += OUString::number( nFieldLen );
                     aOutString += ',';
-                    aOutString += String::CreateFromInt32( nPrecision );
+                    aOutString += OUString::number( nPrecision );
                     break;
             }
             if ( !aOutString.EqualsIgnoreCaseAscii( aString ) )
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 8cff0c90396e..0c9d73b12128 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1985,9 +1985,9 @@ bool ScImportExport::Doc2Sylk( SvStream& rStrm )
                             rtl_math_DecimalPlaces_Max, '.', true );
 
                     aBufStr.AssignAscii(RTL_CONSTASCII_STRINGPARAM( "C;X" ));
-                    aBufStr += String::CreateFromInt32( c );
+                    aBufStr += OUString::number( c );
                     aBufStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ";Y" ));
-                    aBufStr += String::CreateFromInt32( r );
+                    aBufStr += OUString::number( r );
                     aBufStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ";K" ));
                     aBufStr += aValStr;
                     lcl_WriteSimpleString( rStrm, aBufStr );
@@ -2000,9 +2000,9 @@ bool ScImportExport::Doc2Sylk( SvStream& rStrm )
                     aCellStr.SearchAndReplaceAll( rtl::OUString(_LF), rtl::OUString(SYLK_LF) );
 
                     aBufStr.AssignAscii(RTL_CONSTASCII_STRINGPARAM( "C;X" ));
-                    aBufStr += String::CreateFromInt32( c );
+                    aBufStr += OUString::number( c );
                     aBufStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ";Y" ));
-                    aBufStr += String::CreateFromInt32( r );
+                    aBufStr += OUString::number( r );
                     aBufStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ";K" ));
                     lcl_WriteSimpleString( rStrm, aBufStr );
                     lcl_WriteString( rStrm, aCellStr, '"', ';' );
@@ -2047,9 +2047,9 @@ bool ScImportExport::Doc2Sylk( SvStream& rStrm )
                                 nC += c - 1;
                                 nR += r - 1;
                                 aPrefix.AssignAscii( RTL_CONSTASCII_STRINGPARAM( ";R" ) );
-                                aPrefix += String::CreateFromInt32( nR );
+                                aPrefix += OUString::number( nR );
                                 aPrefix.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ";C" ) );
-                                aPrefix += String::CreateFromInt32( nC );
+                                aPrefix += OUString::number( nC );
                                 aPrefix.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ";M" ) );
                             }
                             break;
@@ -2058,9 +2058,9 @@ bool ScImportExport::Doc2Sylk( SvStream& rStrm )
                                 ScAddress aPos;
                                 pFCell->GetMatrixOrigin( aPos );
                                 aPrefix.AssignAscii( RTL_CONSTASCII_STRINGPARAM( ";I;R" ) );
-                                aPrefix += String::CreateFromInt32( aPos.Row() - nStartRow + 1 );
+                                aPrefix += OUString::number( aPos.Row() - nStartRow + 1 );
                                 aPrefix.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ";C" ) );
-                                aPrefix += String::CreateFromInt32( aPos.Col() - nStartCol + 1 );
+                                aPrefix += OUString::number( aPos.Col() - nStartCol + 1 );
                             }
                             break;
                             default:
diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx
index ced5f70b212a..86f73fb712dc 100644
--- a/sc/source/ui/docshell/tpstat.cxx
+++ b/sc/source/ui/docshell/tpstat.cxx
@@ -60,9 +60,9 @@ ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet& rSet )
     String aInfo = aFlInfo.GetText();
     aInfo += aDocStat.aDocName;
     aFlInfo     .SetText( aInfo );
-    aFtTables   .SetText( String::CreateFromInt32( aDocStat.nTableCount ) );
-    aFtCells    .SetText( String::CreateFromInt32( aDocStat.nCellCount ) );
-    aFtPages    .SetText( String::CreateFromInt32( aDocStat.nPageCount ) );
+    aFtTables   .SetText( OUString::number( aDocStat.nTableCount ) );
+    aFtCells    .SetText( OUString::number( aDocStat.nCellCount ) );
+    aFtPages    .SetText( OUString::number( aDocStat.nPageCount ) );
 
     FreeResource();
 }
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index cc978c0f7866..32bfae897582 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -1105,9 +1105,9 @@ void ScFunctionDockWin::FillInfo(SfxChildWinInfo& rInfo) const
     SfxDockingWindow::FillInfo(rInfo);
     Point aPoint=aPrivatSplit.GetPosPixel();
     rInfo.aExtraString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( "ScFuncList:(" ));
-    rInfo.aExtraString += String::CreateFromInt32(aPoint.Y());
+    rInfo.aExtraString += OUString::number(aPoint.Y());
     rInfo.aExtraString += ';';
-    rInfo.aExtraString += String::CreateFromInt32(aCatBox.GetSelectEntryPos());
+    rInfo.aExtraString += OUString::number(aCatBox.GetSelectEntryPos());
     rInfo.aExtraString += ')';
 }
 
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index a70d5f42116e..debae9480d93 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -1883,11 +1883,11 @@ void ScAcceptChgDlg::FillInfo(SfxChildWinInfo& rInfo) const
 
     sal_uInt16  nCount=pTheView->TabCount();
 
-    rInfo.aExtraString += String::CreateFromInt32(nCount);
+    rInfo.aExtraString += OUString::number(nCount);
     rInfo.aExtraString += ';';
     for(sal_uInt16 i=0;i<nCount;i++)
     {
-        rInfo.aExtraString += String::CreateFromInt32(pTheView->GetTab(i));
+        rInfo.aExtraString += OUString::number(pTheView->GetTab(i));
         rInfo.aExtraString += ';';
     }
     rInfo.aExtraString += ')';
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index 6b5e3a450f7b..c229a2644a82 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -93,7 +93,7 @@ void ScInsertTableDlg::Init_Impl( bool bFromFile )
     m_pBtnOk->SetClickHdl( LINK( this, ScInsertTableDlg, DoEnterHdl ));
     m_pBtnBefore->Check();
 
-    m_pNfCount->SetText( String::CreateFromInt32(nTableCount) );
+    m_pNfCount->SetText( OUString::number(nTableCount) );
     m_pNfCount->SetMax( MAXTAB - rDoc.GetTableCount() + 1 );
 
     if(nTableCount==1)
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 8bcea3d805d4..b6bbbe2803ab 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -71,7 +71,7 @@ void ScSolverProgressDialog::SetTimeLimit( sal_Int32 nSeconds )
 {
     String aOld = maFtTime.GetText();
     String aNew = aOld.GetToken(0,'#');
-    aNew += String::CreateFromInt32( nSeconds );
+    aNew += OUString::number( nSeconds );
     aNew += aOld.GetToken(1,'#');
     maFtTime.SetText( aNew );
 }
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index 1600d0dc90a5..e87d467bd19c 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -137,7 +137,7 @@ void ScShareDocumentDlg::UpdateView()
                         {
                             aUser = maStrUnkownUser;
                             aUser += ' ';
-                            aUser += String::CreateFromInt32( nUnknownUser++ );
+                            aUser += OUString::number( nUnknownUser++ );
                         }
 
                         // parse the edit time string of the format "DD.MM.YYYY hh:mm"
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index cb94bdbd0982..30053a301f6d 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -517,7 +517,7 @@ void ScContentTree::RequestHelp( const HelpEvent& rHEvt )
             SvTreeListEntry* pParent = GetParent(pEntry);
             if ( !pParent )                                 // Top-Level ?
             {
-                aHelpText = String::CreateFromInt32( GetChildCount(pEntry) );
+                aHelpText = OUString::number( GetChildCount(pEntry) );
                 aHelpText += ' ';
                 aHelpText += GetEntryText(pEntry);
                 bRet = sal_True;
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 5840837c2161..267194f61a2e 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -3179,7 +3179,7 @@ public:
                     pArr[mnCount] = aString;
                 }
                 else //only indices for categories
-                    pArr[mnCount] = String::CreateFromInt32( mnCount+1 );
+                    pArr[mnCount] = OUString::number( mnCount+1 );
                 ++mnCount;
             }
         }
@@ -3191,11 +3191,11 @@ public:
                 {
                     String aString = ScGlobal::GetRscString(STR_ROW);
                     aString += ' ';
-                    aString += String::CreateFromInt32( nRow+1 );
+                    aString += OUString::number( nRow+1 );
                     pArr[mnCount] = aString;
                 }
                 else //only indices for categories
-                    pArr[mnCount] = String::CreateFromInt32( mnCount+1 );
+                    pArr[mnCount] = OUString::number( mnCount+1 );
                 ++mnCount;
             }
         }
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index f5ca4556bc4d..282345cec5f5 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -235,7 +235,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
                 LanguageType eLang = pDlg->GetLanguageType();
                 OUStringBuffer aBuf;
 
-                aBuf.append(String::CreateFromInt32(static_cast<sal_Int32>(eLang)));
+                aBuf.append(OUString::number(static_cast<sal_Int32>(eLang)));
                 aBuf.append(sal_Unicode(' '));
                 aBuf.append(pDlg->IsDateConversionSet() ? sal_Unicode('1') : sal_Unicode('0'));
                 aFilterOptions = aBuf.makeStringAndClear();
diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx
index 3fdc2c8bab22..09af947ab0fb 100644
--- a/sc/source/ui/vba/vbaworksheet.cxx
+++ b/sc/source/ui/vba/vbaworksheet.cxx
@@ -114,12 +114,12 @@ static void getNewSpreadsheetName (rtl::OUString &aNewName, rtl::OUString aOldNa
         throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getNewSpreadsheetName() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface  >(), 1 );
     static rtl::OUString aUnderScre( RTL_CONSTASCII_USTRINGPARAM( "_" ) );
     int currentNum =2;
-    aNewName = aOldName + aUnderScre+ String::CreateFromInt32(currentNum) ;
+    aNewName = aOldName + aUnderScre+ OUString::number(currentNum) ;
     SCTAB nTab = 0;
     while ( ScVbaWorksheets::nameExists(xSpreadDoc,aNewName, nTab ) )
     {
         aNewName = aOldName + aUnderScre +
-        String::CreateFromInt32(++currentNum) ;
+        OUString::number(++currentNum) ;
     }
 }
 
diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx
index 870eb95613b0..707c1bc54860 100644
--- a/sc/source/ui/vba/vbaworksheets.cxx
+++ b/sc/source/ui/vba/vbaworksheets.cxx
@@ -274,12 +274,12 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After,
     for (SCTAB i=0; i < nNewSheets; i++, nSheetName++)
     {
         String aStringName = aStringBase;
-        aStringName += String::CreateFromInt32(nSheetName);
+        aStringName += OUString::number(nSheetName);
         while (m_xNameAccess->hasByName(aStringName))
         {
             nSheetName++;
             aStringName = aStringBase;
-            aStringName += String::CreateFromInt32(nSheetName);
+            aStringName += OUString::number(nSheetName);
         }
         m_xSheets->insertNewByName(aStringName, nSheetIndex + i);
         result = getItemByStringIndex( aStringName );
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index faecae8890c5..ee9028e6f31c 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -659,9 +659,9 @@ void ScCellShell::GetState(SfxItemSet &rSet)
                     String  aStr( ScGlobal::GetRscString( STR_TABLE ) );
 
                     aStr += ' ';
-                    aStr += String::CreateFromInt32( nTab + 1 );
+                    aStr += OUString::number( nTab + 1 );
                     aStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " / " ));
-                    aStr += String::CreateFromInt32( nTabCount );
+                    aStr += OUString::number( nTabCount );
                     rSet.Put( SfxStringItem( nWhich, aStr ) );
                 }
                 break;
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 353f46903d0a..d6a0e81ec923 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -448,7 +448,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
                         do
                         {
                             aName = aBaseName;
-                            aName += String::CreateFromInt32( i );
+                            aName += OUString::number( i );
                             if (bPrefix)
                                 bValid = pDoc->ValidNewTabName( aName );
                             else
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx
index eed1ba9208e3..b4ca85e6bdab 100644
--- a/sc/source/ui/view/colrowba.cxx
+++ b/sc/source/ui/view/colrowba.cxx
@@ -92,7 +92,7 @@ sal_uInt16 ScColBar::GetEntrySize( SCCOLROW nEntryNo )
 String ScColBar::GetEntryText( SCCOLROW nEntryNo )
 {
     return UseNumericHeader()
-        ? String::CreateFromInt32( nEntryNo + 1 )
+        ? OUString::number( nEntryNo + 1 )
         : ScColToAlpha( static_cast<SCCOL>(nEntryNo) );
 }
 
@@ -257,7 +257,7 @@ sal_uInt16 ScRowBar::GetEntrySize( SCCOLROW nEntryNo )
 
 String ScRowBar::GetEntryText( SCCOLROW nEntryNo )
 {
-    return String::CreateFromInt32( nEntryNo + 1 );
+    return OUString::number( nEntryNo + 1 );
 }
 
 void ScRowBar::SetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize )
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 3a9dc0ad826c..88fb66e636d8 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -560,7 +560,7 @@ void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, sal_Bool bRecord )
 static String lcl_MakePivotTabName( const String& rPrefix, SCTAB nNumber )
 {
     String aName = rPrefix;
-    aName += String::CreateFromInt32( nNumber );
+    aName += OUString::number( nNumber );
     return aName;
 }
 
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 9c48dd2d9645..084f37db514f 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1052,7 +1052,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
                                     nPageNo += ((long)nRowPos)*nColBreaks+nColPos;
 
                                 String aThisPageStr = aPageStr; // Don't modify the original string.
-                                aThisPageStr.SearchAndReplaceAscii("%1", String::CreateFromInt32(nPageNo));
+                                aThisPageStr.SearchAndReplaceAscii("%1", OUString::number(nPageNo));
 
                                 if ( pEditEng )
                                 {
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 196ad9cd4d9b..be981b235d92 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -662,12 +662,12 @@ String ScPreview::GetPosString()
 
     String aString( ScGlobal::GetRscString( STR_PAGE ) );
     aString += ' ';
-    aString += String::CreateFromInt32(nPageNo+1);
+    aString += OUString::number(nPageNo+1);
 
     if (nTabsTested >= nTabCount)
     {
         aString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " / " ));
-        aString += String::CreateFromInt32(nTotalPages);
+        aString += OUString::number(nTotalPages);
     }
 
     return aString;
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 2cc99a59eab2..cc3fcc863a2a 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -458,10 +458,10 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll )
 
                 aHelpStr = ScGlobal::GetRscString( STR_PAGE );
                 aHelpStr += ' ';
-                aHelpStr += String::CreateFromInt32( nPageNo );
+                aHelpStr += OUString::number( nPageNo );
 
                 aHelpStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " / " ));
-                aHelpStr += String::CreateFromInt32( nTotalPages );
+                aHelpStr += OUString::number( nTotalPages );
             }
             else if( nDelta > 0 )
             {
@@ -471,10 +471,10 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll )
 
                 aHelpStr = ScGlobal::GetRscString( STR_PAGE );
                 aHelpStr += ' ';
-                aHelpStr += String::CreateFromInt32( nPageNo+1 );
+                aHelpStr += OUString::number( nPageNo+1 );
 
                 aHelpStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " / " ));
-                aHelpStr += String::CreateFromInt32( nTotalPages );
+                aHelpStr += OUString::number( nTotalPages );
             }
 
             aRect.Left()    = aPos.X() - 8;
@@ -933,9 +933,9 @@ void ScPreviewShell::WriteUserData(String& rData, sal_Bool /* bBrowse */)
     //  nZoom
     //  nPageNo
 
-    rData =  String::CreateFromInt32(pPreview->GetZoom());
+    rData =  OUString::number(pPreview->GetZoom());
     rData += (sal_Unicode) SC_USERDATA_SEP;
-    rData += String::CreateFromInt32(pPreview->GetPageNo());
+    rData += OUString::number(pPreview->GetPageNo());
 }
 
 void ScPreviewShell::ReadUserData(const String& rData, sal_Bool /* bBrowse */)
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 07a360f3b4ff..4aaa6efa0013 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -1421,7 +1421,7 @@ void ScPrintFunc::PrintRowHdr( SCROW nY1, SCROW nY2, long nScrX, long nScrY )
 
             pDev->DrawRect( Rectangle( nPosX,nPosY,nEndX,nEndY ) );
 
-            aText = String::CreateFromInt32( nRow+1 );
+            aText = OUString::number( nRow+1 );
             long nTextWidth = pDev->GetTextWidth(aText);
             long nTextHeight = pDev->GetTextHeight();
             long nAddX = ( nWidth  - nTextWidth  ) / 2;
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 0deadab02af6..596f990981fd 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -1114,7 +1114,7 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
             {
                 aHelpStr = ScGlobal::GetRscString(STR_ROW);
                 aHelpStr += ' ';
-                aHelpStr += String::CreateFromInt32(nScrollPos + 1);
+                aHelpStr += OUString::number(nScrollPos + 1);
 
                 // show quicktext always inside sheet area
                 aRect.Left() = bLayoutRTL ? (aPos.X() + aSize.Width() + 8) : (aPos.X() - 8);
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 07f96f2fee30..2586b9f4b209 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -68,9 +68,9 @@ void ScTabView::ShowRefTip()
 
             String aHelp = ScGlobal::GetRscString( STR_QUICKHELP_REF );
             aHelp.SearchAndReplace( rtl::OUString("%1"),
-                                    String::CreateFromInt32(nRows) );
+                                    OUString::number(nRows) );
             aHelp.SearchAndReplace( rtl::OUString("%2"),
-                                    String::CreateFromInt32(nCols) );
+                                    OUString::number(nCols) );
 
             ScSplitPos eWhich = aViewData.GetActivePart();
             Window* pWin = pGridWin[eWhich];
@@ -264,9 +264,9 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ )
             SCCOL nCols = nEndX + 1 - aViewData.GetRefStartX(); // Reihenfolge ist richtig
             SCROW nRows = nEndY + 1 - aViewData.GetRefStartY();
             aHelpStr.SearchAndReplace( rtl::OUString("%1"),
-                                       String::CreateFromInt32(nRows) );
+                                       OUString::number(nRows) );
             aHelpStr.SearchAndReplace( rtl::OUString("%2"),
-                                       String::CreateFromInt32(nCols) );
+                                       OUString::number(nCols) );
         }
         else if ( aViewData.GetDelMark( aDelRange ) )
             aHelpStr = ScGlobal::GetRscString( STR_QUICKHELP_DELETE );
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index acc422f4baac..1cce1ab6ec7b 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2183,10 +2183,10 @@ void ScViewData::WriteUserData(String& rData)
     //  wenn Zeilen groesser 8192, "+" statt "/"
 
     sal_uInt16 nZoom = (sal_uInt16)((pThisTab->aZoomY.GetNumerator() * 100) / pThisTab->aZoomY.GetDenominator());
-    rData = String::CreateFromInt32( nZoom );
+    rData = OUString::number( nZoom );
     rData += '/';
     nZoom = (sal_uInt16)((pThisTab->aPageZoomY.GetNumerator() * 100) / pThisTab->aPageZoomY.GetDenominator());
-    rData += String::CreateFromInt32( nZoom );
+    rData += OUString::number( nZoom );
     rData += '/';
     if (bPagebreak)
         rData += '1';
@@ -2194,10 +2194,10 @@ void ScViewData::WriteUserData(String& rData)
         rData += '0';
 
     rData += ';';
-    rData += String::CreateFromInt32( nTabNo );
+    rData += OUString::number( nTabNo );
     rData += ';';
     rData.AppendAscii(RTL_CONSTASCII_STRINGPARAM( TAG_TABBARWIDTH ));
-    rData += String::CreateFromInt32( pView->GetTabBarWidth() );
+    rData += OUString::number( pView->GetTabBarWidth() );
 
     SCTAB nTabCount = pDoc->GetTableCount();
     for (SCTAB i=0; i<nTabCount; i++)
@@ -2215,33 +2215,33 @@ void ScViewData::WriteUserData(String& rData)
             }
 
 
-            rData += String::CreateFromInt32( maTabData[i]->nCurX );
+            rData += OUString::number( maTabData[i]->nCurX );
             rData += cTabSep;
-            rData += String::CreateFromInt32( maTabData[i]->nCurY );
+            rData += OUString::number( maTabData[i]->nCurY );
             rData += cTabSep;
-            rData += String::CreateFromInt32( maTabData[i]->eHSplitMode );
+            rData += OUString::number( maTabData[i]->eHSplitMode );
             rData += cTabSep;
-            rData += String::CreateFromInt32( maTabData[i]->eVSplitMode );
+            rData += OUString::number( maTabData[i]->eVSplitMode );
             rData += cTabSep;
             if ( maTabData[i]->eHSplitMode == SC_SPLIT_FIX )
-                rData += String::CreateFromInt32( maTabData[i]->nFixPosX );
+                rData += OUString::number( maTabData[i]->nFixPosX );
             else
-                rData += String::CreateFromInt32( maTabData[i]->nHSplitPos );
+                rData += OUString::number( maTabData[i]->nHSplitPos );
             rData += cTabSep;
             if ( maTabData[i]->eVSplitMode == SC_SPLIT_FIX )
-                rData += String::CreateFromInt32( maTabData[i]->nFixPosY );
+                rData += OUString::number( maTabData[i]->nFixPosY );
             else
-                rData += String::CreateFromInt32( maTabData[i]->nVSplitPos );
+                rData += OUString::number( maTabData[i]->nVSplitPos );
             rData += cTabSep;
-            rData += String::CreateFromInt32( maTabData[i]->eWhichActive );
+            rData += OUString::number( maTabData[i]->eWhichActive );
             rData += cTabSep;
-            rData += String::CreateFromInt32( maTabData[i]->nPosX[0] );
+            rData += OUString::number( maTabData[i]->nPosX[0] );
             rData += cTabSep;
-            rData += String::CreateFromInt32( maTabData[i]->nPosX[1] );
+            rData += OUString::number( maTabData[i]->nPosX[1] );
             rData += cTabSep;
-            rData += String::CreateFromInt32( maTabData[i]->nPosY[0] );
+            rData += OUString::number( maTabData[i]->nPosY[0] );
             rData += cTabSep;
-            rData += String::CreateFromInt32( maTabData[i]->nPosY[1] );
+            rData += OUString::number( maTabData[i]->nPosY[1] );
         }
     }
 }