fdo#38838 searched, replaced and removed String::CreateFromInt32().

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

And finally removed String::CreateFromInt32().

Change-Id: I53b26a59c68511ae09f0ee82cfade210d0de3fa5
Reviewed-on: https://gerrit.libreoffice.org/2279
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

45 files changed, 115 insertions, 121 deletions

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 42ece11a950d..8f451d60bd99 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -684,7 +684,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& )
 
     nPercent = pOpt->nRightMargin;
     sMargin = ' ';
-    sMargin += String::CreateFromInt32( nPercent );
+    sMargin += OUString::number( nPercent );
     sMargin += '%';
     pUserData = new ImpUserData(&sMargin, 0);
     aCheckLB.SetUserData( MERGE_SINGLE_LINE_PARA, pUserData );
@@ -740,7 +740,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl)
         {
             nPercent = (sal_uInt16)aDlg.GetPrcntFld().GetValue();
             sMargin = ' ';
-            sMargin += String::CreateFromInt32( nPercent );
+            sMargin += OUString::number( nPercent );
             sMargin += '%';
         }
     }
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index 18ae6c65d725..84302b60ac78 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -226,8 +226,8 @@ namespace dbmm
     void ProgressPage::setDocumentCounts( const sal_Int32 _nForms, const sal_Int32 _nReports )
     {
         String sText( m_aObjectCount.GetText() );
-        sText.SearchAndReplaceAscii( "$forms$", String::CreateFromInt32( _nForms ) );
-        sText.SearchAndReplaceAscii( "$reports$", String::CreateFromInt32( _nReports ) );
+        sText.SearchAndReplaceAscii( "$forms$", OUString::number( _nForms ) );
+        sText.SearchAndReplaceAscii( "$reports$", OUString::number( _nReports ) );
         m_aObjectCount.SetText( sText );
     }
 
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 0bf88fe5a3ab..4a0b57a37e13 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -1470,7 +1470,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
 
     if( pTextLen )
     {
-        pTextLen->SetText( String::CreateFromInt32(pFieldDescr->GetPrecision()) );
+        pTextLen->SetText( OUString::number(pFieldDescr->GetPrecision()) );
         pTextLen->ClearModifyFlag();
     }
 
@@ -1480,10 +1480,10 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
     }
 
     if( pLength )
-        pLength->SetText( String::CreateFromInt32(pFieldDescr->GetPrecision()) );
+        pLength->SetText( OUString::number(pFieldDescr->GetPrecision()) );
 
     if( pScale )
-        pScale->SetText( String::CreateFromInt32(pFieldDescr->GetScale()) );
+        pScale->SetText( OUString::number(pFieldDescr->GetScale()) );
 
     if( pFormat )
         UpdateFormatSample(pFieldDescr);
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index 4ec87d096606..f9e8bc082642 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -285,7 +285,7 @@ String OTableGrantControl::GetCellText( long nRow, sal_uInt16 nColId ) const
     if(aFind != m_aPrivMap.end())
         nPriv = aFind->second.nRights;
 
-    return String::CreateFromInt32(isAllowed(nColId,nPriv) ? 1 :0);
+    return OUString::number(isAllowed(nColId,nPriv) ? 1 :0);
 }
 
 //------------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index 9ce1968fed68..21c5ab969a1e 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -286,7 +286,7 @@ DBG_NAME(DirectSQLDialog)
     //--------------------------------------------------------------------
     void DirectSQLDialog::addStatusText(const String& _rMessage)
     {
-        String sAppendMessage = String::CreateFromInt32(m_nStatusCount++);
+        String sAppendMessage = OUString::number(m_nStatusCount++);
         sAppendMessage += rtl::OUString(": ");
         sAppendMessage += _rMessage;
         sAppendMessage += rtl::OUString("\n\n");
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index d9b26902d984..ef2e698a06f3 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -379,7 +379,7 @@ DBG_NAME(DbaIndexDialog)
         for ( i = 1; i < 0x7FFFFFFF; ++i )
         {
             sNewIndexName = sNewIndexNameBase;
-            sNewIndexName += String::CreateFromInt32(i);
+            sNewIndexName += OUString::number(i);
             if (m_pIndexes->end() == m_pIndexes->find(sNewIndexName))
                 break;
         }
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index c46035c7bdcf..874311a625bb 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -260,7 +260,7 @@ namespace
             aDisplayInfo.sMessage = pCurrentError->Message.trim();
             aDisplayInfo.sSQLState = pCurrentError->SQLState;
             if ( pCurrentError->ErrorCode )
-                aDisplayInfo.sErrorCode = String::CreateFromInt32( pCurrentError->ErrorCode );
+                aDisplayInfo.sErrorCode = OUString::number( pCurrentError->ErrorCode );
 
             if  (   !aDisplayInfo.sMessage.Len()
                 &&  !lcl_hasDetails( aDisplayInfo )
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index ec1c75dffe19..db886aada62b 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -258,7 +258,7 @@ sal_Int32 OQueryTableView::CountTableAlias(const String& rName, sal_Int32& rMax)
         String aNewName;
         aNewName = rName;
         aNewName += '_';
-        aNewName += String::CreateFromInt32(++nRet);
+        aNewName += OUString::number(++nRet);
 
         aIter = GetTabWinMap()->find(aNewName);
     }
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 2bfcc1f00f54..381b8c47a3c3 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -1037,7 +1037,7 @@ sal_Bool OSelectionBrowseBox::SaveModified()
 
             case BROW_ORDER_ROW:
             {
-                strOldCellContents = String::CreateFromInt32((sal_uInt16)pEntry->GetOrderDir());
+                strOldCellContents = OUString::number((sal_uInt16)pEntry->GetOrderDir());
                 sal_uInt16 nIdx = m_pOrderCell->GetSelectEntryPos();
                 if (nIdx == sal_uInt16(-1))
                     nIdx = 0;
@@ -1048,7 +1048,7 @@ sal_Bool OSelectionBrowseBox::SaveModified()
                     m_pVisibleCell->GetBox().Check();
                     RowModified(GetBrowseRow(BROW_VIS_ROW), GetCurColumnId());
                 }
-                sNewValue = String::CreateFromInt32((sal_uInt16)pEntry->GetOrderDir());
+                sNewValue = OUString::number((sal_uInt16)pEntry->GetOrderDir());
             }   break;
 
             case BROW_COLUMNALIAS_ROW:
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 27cfa5f3ca64..184a9606902c 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -897,7 +897,7 @@ String OTableEditorCtrl::GenerateName( const String& rName )
     while( HasFieldName(aFieldName) )
     {
         aFieldName = aBaseName;
-        aFieldName += String::CreateFromInt32(i);
+        aFieldName += OUString::number(i);
         i++;
     }
 
@@ -1227,7 +1227,7 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId )
 
         case FIELD_PROPERTY_TEXTLEN:
         case FIELD_PROPERTY_LENGTH:
-            sValue = String::CreateFromInt32(pFieldDescr->GetPrecision());
+            sValue = OUString::number(pFieldDescr->GetPrecision());
             break;
 
         case FIELD_PROPERTY_NUMTYPE:
@@ -1239,7 +1239,7 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId )
             break;
 
         case FIELD_PROPERTY_SCALE:
-            sValue = String::CreateFromInt32(pFieldDescr->GetScale());
+            sValue = OUString::number(pFieldDescr->GetScale());
             break;
 
         case FIELD_PROPERTY_BOOL_DEFAULT:
@@ -1247,7 +1247,7 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId )
             break;
 
         case FIELD_PROPERTY_FORMAT:
-            sValue = String::CreateFromInt32(pFieldDescr->GetFormatKey());
+            sValue = OUString::number(pFieldDescr->GetFormatKey());
             break;
     }
 
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index a35808f8618a..c486f0d71099 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -95,18 +95,18 @@ inline void SetValueProp( XubString& rStr, const sal_uInt16 nValue,
                           const sal_uInt16 nProp )
 {
     if( 100 == nProp )
-        rStr += String::CreateFromInt32( nValue );
+        rStr += OUString::number( nValue );
     else
-        ( rStr += String::CreateFromInt32( nProp )) += sal_Unicode('%');
+        ( rStr += OUString::number( nProp )) += sal_Unicode('%');
 }
 
 inline void SetValueProp( XubString& rStr, const short nValue,
                           const sal_uInt16 nProp )
 {
     if( 100 == nProp )
-        rStr += String::CreateFromInt32( nValue );
+        rStr += OUString::number( nValue );
     else
-        ( rStr += String::CreateFromInt32( nProp )) += sal_Unicode('%');
+        ( rStr += OUString::number( nProp )) += sal_Unicode('%');
 }
 
 // -----------------------------------------------------------------------
diff --git a/editeng/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx
index 2e2b55c5d828..d3e2c9746286 100644
--- a/editeng/source/items/itemtype.cxx
+++ b/editeng/source/items/itemtype.cxx
@@ -79,7 +79,7 @@ XubString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, c
         case SFX_MAPUNIT_POINT:
         case SFX_MAPUNIT_TWIP:
         case SFX_MAPUNIT_PIXEL:
-            return String::CreateFromInt32( (long)OutputDevice::LogicToLogic(
+            return OUString::number( (long)OutputDevice::LogicToLogic(
                         nVal, (MapUnit)eSrcUnit, (MapUnit)eDestUnit ));
 
         default:
@@ -106,7 +106,7 @@ XubString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, c
         if ( nRet < nDiff )
             sRet += sal_Unicode('0');
         else
-            sRet += String::CreateFromInt32( nRet / nDiff );
+            sRet += OUString::number( nRet / nDiff );
         nRet %= nDiff;
         if( 4 == nDigits )
         {
@@ -162,11 +162,11 @@ XubString GetColorString( const Color& rCol )
     {
         sStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( "RGB" ));
         sStr += sal_Unicode('(');
-        sStr += String::CreateFromInt32( rCol.GetRed() );
+        sStr += OUString::number( rCol.GetRed() );
         sStr += cpDelim;
-        sStr += String::CreateFromInt32( rCol.GetGreen() );
+        sStr += OUString::number( rCol.GetGreen() );
         sStr += cpDelim;
-        sStr += String::CreateFromInt32( rCol.GetBlue() );
+        sStr += OUString::number( rCol.GetBlue() );
         sStr += sal_Unicode(')');
     }
     return sStr;
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 5eed71a46a30..57a21cfb1283 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -710,7 +710,7 @@ void Outliner::ImplSetLevelDependendStyleSheet( sal_uInt16 nPara, SfxStyleSheet*
 
         String aNewStyleSheetName( pStyle->GetName() );
         aNewStyleSheetName.Erase( aNewStyleSheetName.Len()-1, 1 );
-        aNewStyleSheetName += String::CreateFromInt32( nDepth+1 );
+        aNewStyleSheetName += OUString::number( nDepth+1 );
         SfxStyleSheet* pNewStyle = (SfxStyleSheet*)GetStyleSheetPool()->Find( aNewStyleSheetName, pStyle->GetFamily() );
         DBG_ASSERT( pNewStyle, "AutoStyleSheetName - Style not found!" );
         if ( pNewStyle && ( pNewStyle != GetStyleSheet( nPara ) ) )
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index e1e24be242c0..6d3869ba729c 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -288,7 +288,7 @@ void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo)
         aWinData.append(rInfo.aExtraString);
     }
 
-    SvtViewOptions aWinOpt( E_WINDOW, String::CreateFromInt32( nID ) );
+    SvtViewOptions aWinOpt( E_WINDOW, OUString::number( nID ) );
     aWinOpt.SetWindowState(rtl::OStringToOUString(rInfo.aWinState, RTL_TEXTENCODING_UTF8));
 
     ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1);
@@ -350,7 +350,7 @@ sal_uInt16 SfxChildWindow::GetPosition()
 void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWinInfo& rInfo )
 {
     // load configuration
-    SvtViewOptions aWinOpt( E_WINDOW, String::CreateFromInt32( nId ) );
+    SvtViewOptions aWinOpt( E_WINDOW, OUString::number( nId ) );
 
     if ( aWinOpt.Exists() && aWinOpt.HasVisible() )
         rInfo.bVisible  = aWinOpt.IsVisible(); // set state from configuration. Can be overwritten by UserData, see below
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 1bf812bb29e6..4187f67017c7 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1010,10 +1010,10 @@ SearchTabPage_Impl::~SearchTabPage_Impl()
 {
     SvtViewOptions aViewOpt( E_TABPAGE, CONFIGNAME_SEARCHPAGE );
     sal_Int32 nChecked = aFullWordsCB.IsChecked() ? 1 : 0;
-    String aUserData = String::CreateFromInt32( nChecked );
+    String aUserData = OUString::number( nChecked );
     aUserData += ';';
     nChecked = aScopeCB.IsChecked() ? 1 : 0;
-    aUserData += String::CreateFromInt32( nChecked );
+    aUserData += OUString::number( nChecked );
     aUserData += ';';
     sal_uInt16 nCount = Min( aSearchED.GetEntryCount(), (sal_uInt16)10 );  // save only 10 entries
 
@@ -2992,20 +2992,20 @@ void SfxHelpWindow_Impl::SaveConfig()
     }
 
     aViewOpt.SetVisible( bIndex );
-    String aUserData = String::CreateFromInt32( nIndexSize );
+    String aUserData = OUString::number( nIndexSize );
     aUserData += ';';
-    aUserData += String::CreateFromInt32( nTextSize );
+    aUserData += OUString::number( nTextSize );
     aUserData += ';';
-    aUserData += String::CreateFromInt32( nW );
+    aUserData += OUString::number( nW );
     aUserData += ';';
-    aUserData += String::CreateFromInt32( nH );
+    aUserData += OUString::number( nH );
 
        Window* pScreenWin = VCLUnoHelper::GetWindow( xWindow );
     aWinPos = pScreenWin->GetWindowExtentsRelative( NULL ).TopLeft();
     aUserData += ';';
-    aUserData += String::CreateFromInt32( aWinPos.X() );
+    aUserData += OUString::number( aWinPos.X() );
     aUserData += ';';
-    aUserData += String::CreateFromInt32( aWinPos.Y() );
+    aUserData += OUString::number( aWinPos.Y() );
 
     aViewOpt.SetUserItem( USERITEM_NAME, makeAny( rtl::OUString( aUserData ) ) );
 }
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 46131aae5c7c..bf79d7f4f924 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -147,7 +147,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
         if( (i_xDocProps->getAutoloadSecs() != 0) ||
             !i_xDocProps->getAutoloadURL().isEmpty() )
         {
-            String sContent = String::CreateFromInt32(
+            String sContent = OUString::number(
                                 i_xDocProps->getAutoloadSecs() );
 
             const String &rReloadURL = i_xDocProps->getAutoloadURL();
@@ -173,9 +173,9 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
         ::util::DateTime uDT = i_xDocProps->getCreationDate();
         Date aD(uDT.Day, uDT.Month, uDT.Year);
         Time aT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.HundredthSeconds);
-        String sOut = String::CreateFromInt32(aD.GetDate());
+        String sOut = OUString::number(aD.GetDate());
         sOut += ';';
-        sOut += String::CreateFromInt32(aT.GetTime());
+        sOut += OUString::number(aT.GetTime());
         OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_created, sOut, sal_False,
                  eDestEnc, pNonConvertableChars );
 
@@ -189,9 +189,9 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
         uDT = i_xDocProps->getModificationDate();
         Date aD2(uDT.Day, uDT.Month, uDT.Year);
         Time aT2(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.HundredthSeconds);
-        sOut = String::CreateFromInt32(aD2.GetDate());
+        sOut = OUString::number(aD2.GetDate());
         sOut += ';';
-        sOut += String::CreateFromInt32(aT2.GetTime());
+        sOut += OUString::number(aT2.GetTime());
         OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changed, sOut, sal_False,
                  eDestEnc, pNonConvertableChars );
 
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 06a361afa08a..65f393496ed3 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -98,7 +98,7 @@ void SfxFloatingWindow_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint )
 void SfxModalDialog::SetDialogData_Impl()
 {
     // save settings (position and user data)
-    SvtViewOptions aDlgOpt( E_DIALOG, String::CreateFromInt32( nUniqId ) );
+    SvtViewOptions aDlgOpt( E_DIALOG, OUString::number( nUniqId ) );
     aDlgOpt.SetWindowState(OStringToOUString(
         GetWindowState(WINDOWSTATE_MASK_POS), RTL_TEXTENCODING_ASCII_US));
     if ( aExtraData.Len() )
@@ -116,7 +116,7 @@ void SfxModalDialog::GetDialogData_Impl()
 */
 
 {
-    SvtViewOptions aDlgOpt( E_DIALOG, String::CreateFromInt32( nUniqId ) );
+    SvtViewOptions aDlgOpt( E_DIALOG, OUString::number( nUniqId ) );
     if ( aDlgOpt.Exists() )
     {
         // load settings
@@ -707,7 +707,7 @@ IMPL_LINK_NOARG(SfxSingleTabDialogBase, OKHdl_Impl)
         // Save user data in IniManager.
         pImpl->m_pSfxPage->FillUserData();
         String sData( pImpl->m_pSfxPage->GetUserData() );
-        SvtViewOptions aPageOpt( E_TABPAGE, String::CreateFromInt32( GetUniqId() ) );
+        SvtViewOptions aPageOpt( E_TABPAGE, OUString::number( GetUniqId() ) );
         aPageOpt.SetUserItem( USERITEM_NAME, makeAny( OUString( sData ) ) );
         EndDialog( RET_OK );
     }
@@ -807,7 +807,7 @@ void SfxSingleTabDialog::setTabPage(SfxTabPage* pTabPage,
     if ( pImpl->m_pSfxPage )
     {
         // First obtain the user data, only then Reset()
-        SvtViewOptions aPageOpt( E_TABPAGE, String::CreateFromInt32( GetUniqId() ) );
+        SvtViewOptions aPageOpt( E_TABPAGE, OUString::number( GetUniqId() ) );
         String sUserData;
         Any aUserItem = aPageOpt.GetUserItem( USERITEM_NAME );
         OUString aTemp;
@@ -857,7 +857,7 @@ void SfxNoLayoutSingleTabDialog::SetTabPage( SfxTabPage* pTabPage,
     if ( pImpl->m_pSfxPage )
     {
         // First obtain the user data, only then Reset()
-        SvtViewOptions aPageOpt( E_TABPAGE, String::CreateFromInt32( GetUniqId() ) );
+        SvtViewOptions aPageOpt( E_TABPAGE, OUString::number( GetUniqId() ) );
         String sUserData;
         Any aUserItem = aPageOpt.GetUserItem( USERITEM_NAME );
         OUString aTemp;
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index fee23481e897..109522070d9b 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1090,7 +1090,7 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet )
     {
         const Time aT( nTime/3600, (nTime%3600)/60, nTime%60 );
         m_pTimeLogValFt->SetText( rLocaleWrapper.getDuration( aT ) );
-        m_pDocNoValFt->SetText( String::CreateFromInt32(
+        m_pDocNoValFt->SetText( OUString::number(
             m_pInfoItem->getEditingCycles() ) );
     }
 
@@ -1626,12 +1626,12 @@ void CustomPropertiesDurationField::SetDuration( const util::Duration& rDuration
     m_aDuration = rDuration;
     String sText(rDuration.Negative ? rtl::OUString('-') : rtl::OUString('+'));
     sText += m_pLine->m_sDurationFormat;
-    sText.SearchAndReplace(rtl::OUString("%1"), String::CreateFromInt32( rDuration.Years ) );
-    sText.SearchAndReplace(rtl::OUString("%2"), String::CreateFromInt32( rDuration.Months ) );
-    sText.SearchAndReplace(rtl::OUString("%3"), String::CreateFromInt32( rDuration.Days   ) );
-    sText.SearchAndReplace(rtl::OUString("%4"), String::CreateFromInt32( rDuration.Hours  ) );
-    sText.SearchAndReplace(rtl::OUString("%5"), String::CreateFromInt32( rDuration.Minutes) );
-    sText.SearchAndReplace(rtl::OUString("%6"), String::CreateFromInt32( rDuration.Seconds) );
+    sText.SearchAndReplace(rtl::OUString("%1"), OUString::number( rDuration.Years ) );
+    sText.SearchAndReplace(rtl::OUString("%2"), OUString::number( rDuration.Months ) );
+    sText.SearchAndReplace(rtl::OUString("%3"), OUString::number( rDuration.Days   ) );
+    sText.SearchAndReplace(rtl::OUString("%4"), OUString::number( rDuration.Hours  ) );
+    sText.SearchAndReplace(rtl::OUString("%5"), OUString::number( rDuration.Minutes) );
+    sText.SearchAndReplace(rtl::OUString("%6"), OUString::number( rDuration.Seconds) );
     SetText( sText );
 }
 
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index e0a16237a788..d1b87e610f9c 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -1199,24 +1199,24 @@ void SfxDockingWindow::FillInfo(SfxChildWinInfo& rInfo) const
 
     rInfo.aWinState = pImp->aWinState;
     rInfo.aExtraString = "AL:(";
-    rInfo.aExtraString += String::CreateFromInt32((sal_uInt16) GetAlignment());
+    rInfo.aExtraString += OUString::number((sal_uInt16) GetAlignment());
     rInfo.aExtraString += ',';
-    rInfo.aExtraString += String::CreateFromInt32 ((sal_uInt16) pImp->GetLastAlignment());
+    rInfo.aExtraString += OUString::number ((sal_uInt16) pImp->GetLastAlignment());
     if ( pImp->bSplitable )
     {
         Point aPos(pImp->nLine, pImp->nPos);
         rInfo.aExtraString += ',';
-        rInfo.aExtraString += String::CreateFromInt32( aPos.X() );
+        rInfo.aExtraString += OUString::number( aPos.X() );
         rInfo.aExtraString += '/';
-        rInfo.aExtraString += String::CreateFromInt32( aPos.Y() );
+        rInfo.aExtraString += OUString::number( aPos.Y() );
         rInfo.aExtraString += '/';
-        rInfo.aExtraString += String::CreateFromInt32( pImp->nHorizontalSize );
+        rInfo.aExtraString += OUString::number( pImp->nHorizontalSize );
         rInfo.aExtraString += '/';
-        rInfo.aExtraString += String::CreateFromInt32( pImp->nVerticalSize );
+        rInfo.aExtraString += OUString::number( pImp->nVerticalSize );
         rInfo.aExtraString += ',';
-        rInfo.aExtraString += String::CreateFromInt32( pImp->aSplitSize.Width() );
+        rInfo.aExtraString += OUString::number( pImp->aSplitSize.Width() );
         rInfo.aExtraString += ';';
-        rInfo.aExtraString += String::CreateFromInt32( pImp->aSplitSize.Height() );
+        rInfo.aExtraString += OUString::number( pImp->aSplitSize.Height() );
     }
 
     rInfo.aExtraString += ')';
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index d20e542b7ae0..2e4a53619f42 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1965,7 +1965,7 @@ void FileDialogHelper_Impl::saveConfig()
             aValue = xDlg->getValue( ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0 );
             bValue = sal_False;
             aValue >>= bValue;
-            aUserData.SetToken( 1, ' ', String::CreateFromInt32( (sal_Int32) bValue ) );
+            aUserData.SetToken( 1, ' ', OUString::number( (sal_Int32) bValue ) );
 
             INetURLObject aObj( getPath() );
 
@@ -2001,7 +2001,7 @@ void FileDialogHelper_Impl::saveConfig()
                 aValue = xDlg->getValue( ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, 0 );
                 sal_Bool bAutoExt = sal_True;
                 aValue >>= bAutoExt;
-                aUserData.SetToken( 0, ' ', String::CreateFromInt32( (sal_Int32) bAutoExt ) );
+                aUserData.SetToken( 0, ' ', OUString::number( (sal_Int32) bAutoExt ) );
                 bWriteConfig = sal_True;
             }
             catch( const IllegalArgumentException& ){}
@@ -2027,7 +2027,7 @@ void FileDialogHelper_Impl::saveConfig()
                 aValue >>= bSelection;
                 if ( comphelper::string::getTokenCount(aUserData, ' ') < 3 )
                     aUserData.Append(' ');
-                aUserData.SetToken( 2, ' ', String::CreateFromInt32( (sal_Int32) bSelection ) );
+                aUserData.SetToken( 2, ' ', OUString::number( (sal_Int32) bSelection ) );
                 bWriteConfig = sal_True;
             }
             catch( const IllegalArgumentException& ){}
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 3c820cc39e88..3d127ad4bddc 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -115,12 +115,12 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem
         String aNoName( SfxResId(STR_NONAME).toString() );
         sal_uInt16 nNo = 1;
         String aNo( aNoName );
-        aNoName += String::CreateFromInt32( nNo );
+        aNoName += OUString::number( nNo );
         while ( pPool->Find( aNoName ) )
         {
             ++nNo;
             aNoName = aNo;
-            aNoName += String::CreateFromInt32( nNo );
+            aNoName += OUString::number( nNo );
         }
         pStyle->SetName( aNoName );
         aName = aNoName;
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 239713670d74..cfd28ce960c5 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -134,7 +134,7 @@ void SfxPasswordDialog::SetPasswdText( )
     else
     {
         maMainPwdStr = maMinLenPwdStr;
-        maMainPwdStr.SearchAndReplace( OUString("$(MINLEN)"), String::CreateFromInt32((sal_Int32) mnMinLen ), 0);
+        maMainPwdStr.SearchAndReplace( OUString("$(MINLEN)"), OUString::number((sal_Int32) mnMinLen ), 0);
         mpMinLengthFT->SetText(maMainPwdStr);
     }
 }
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index a865280c1017..e5b08586cc97 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -233,7 +233,7 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
     {
         //  Read Configuration
         String aWindowId = rtl::OUString("SplitWindow");
-        aWindowId += String::CreateFromInt32( (sal_Int32) eTbxAlign );
+        aWindowId += OUString::number( (sal_Int32) eTbxAlign );
         SvtViewOptions aWinOpt( E_WINDOW, aWindowId );
         String aWinData;
         Any aUserItem = aWinOpt.GetUserItem( USERITEM_NAME );
@@ -336,7 +336,7 @@ void SfxSplitWindow::SaveConfig_Impl()
     }
 
     String aWindowId = rtl::OUString("SplitWindow");
-    aWindowId += String::CreateFromInt32( (sal_Int32) GetAlign() );
+    aWindowId += OUString::number( (sal_Int32) GetAlign() );
     SvtViewOptions aWinOpt( E_WINDOW, aWindowId );
     aWinOpt.SetUserItem( USERITEM_NAME, makeAny( aWinData.makeStringAndClear() ) );
 }
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx
index 0cf9690d9896..7d7c45ad8cab 100644
--- a/sfx2/source/dialog/srchdlg.cxx
+++ b/sfx2/source/dialog/srchdlg.cxx
@@ -119,13 +119,13 @@ void SearchDialog::SaveConfig()
     }
     sUserData = comphelper::string::stripStart(sUserData, '\t');
     sUserData += ';';
-    sUserData += String::CreateFromInt32( m_aWholeWordsBox.IsChecked() ? 1 : 0 );
+    sUserData += OUString::number( m_aWholeWordsBox.IsChecked() ? 1 : 0 );
     sUserData += ';';
-    sUserData += String::CreateFromInt32( m_aMatchCaseBox.IsChecked() ? 1 : 0 );
+    sUserData += OUString::number( m_aMatchCaseBox.IsChecked() ? 1 : 0 );
     sUserData += ';';
-    sUserData += String::CreateFromInt32( m_aWrapAroundBox.IsChecked() ? 1 : 0 );
+    sUserData += OUString::number( m_aWrapAroundBox.IsChecked() ? 1 : 0 );
     sUserData += ';';
-    sUserData += String::CreateFromInt32( m_aBackwardsBox.IsChecked() ? 1 : 0 );
+    sUserData += OUString::number( m_aBackwardsBox.IsChecked() ? 1 : 0 );
 
     Any aUserItem = makeAny( ::rtl::OUString( sUserData ) );
     aViewOpt.SetUserItem( "UserItem", aUserItem );
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 130abfe192be..4ec5a76e035b 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -528,7 +528,7 @@ SfxTabDialog::~SfxTabDialog()
             if ( aPageData.Len() )
             {
                 // save settings of all pages (user data)
-                SvtViewOptions aPageOpt( E_TABPAGE, String::CreateFromInt32( pDataObject->nId ) );
+                SvtViewOptions aPageOpt( E_TABPAGE, OUString::number( pDataObject->nId ) );
                 aPageOpt.SetUserItem( USERITEM_NAME, makeAny( OUString( aPageData ) ) );
             }
 
@@ -784,7 +784,7 @@ void SfxTabDialog::Start_Impl()
     sal_uInt16 nActPage = m_pTabCtrl->GetPageId( 0 );
 
     // load old settings, when exists
-    SvtViewOptions aDlgOpt( E_TABDIALOG, String::CreateFromInt32( nResId ) );
+    SvtViewOptions aDlgOpt( E_TABDIALOG, OUString::number( nResId ) );
     if ( aDlgOpt.Exists() )
     {
         SetWindowState(rtl::OUStringToOString(aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US));
@@ -971,7 +971,7 @@ void SfxTabDialog::RemoveTabPage( sal_uInt16 nId )
             if ( aPageData.Len() )
             {
                 // save settings of this page (user data)
-                SvtViewOptions aPageOpt( E_TABPAGE, String::CreateFromInt32( pDataObject->nId ) );
+                SvtViewOptions aPageOpt( E_TABPAGE, OUString::number( pDataObject->nId ) );
                 aPageOpt.SetUserItem( USERITEM_NAME, makeAny( OUString( aPageData ) ) );
             }
 
@@ -1042,7 +1042,7 @@ SfxTabPage* SfxTabDialog::GetTabPage( sal_uInt16 nPageId ) const
 void SfxTabDialog::SavePosAndId()
 {
     // save settings (screen position and current page)
-    SvtViewOptions aDlgOpt( E_TABDIALOG, String::CreateFromInt32( nResId ) );
+    SvtViewOptions aDlgOpt( E_TABDIALOG, OUString::number( nResId ) );
     aDlgOpt.SetWindowState(OStringToOUString(GetWindowState(WINDOWSTATE_MASK_POS),RTL_TEXTENCODING_ASCII_US));
     aDlgOpt.SetPageID( m_pTabCtrl->GetCurPageId() );
 }
@@ -1402,7 +1402,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
         pDataObject->pTabPage = pTabPage;
 
         pDataObject->pTabPage->SetTabDialog( this );
-        SvtViewOptions aPageOpt( E_TABPAGE, String::CreateFromInt32( pDataObject->nId ) );
+        SvtViewOptions aPageOpt( E_TABPAGE, OUString::number( pDataObject->nId ) );
         String sUserData;
         Any aUserItem = aPageOpt.GetUserItem( USERITEM_NAME );
         OUString aTemp;
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index 64dcdf583fc0..86ce6401bc10 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -147,7 +147,7 @@ void SfxViewFrame::UpdateTitle()
     if ( IsVisible() )
     {
         aSbxName += ':';
-        aSbxName += String::CreateFromInt32(pImp->nDocViewNo);
+        aSbxName += OUString::number(pImp->nDocViewNo);
     }
 
     SetName( aSbxName );
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index f95b241d4a0f..5835acf65a3f 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -596,7 +596,7 @@ BaseStorage* Storage::OpenStorage( const String& rName, StreamMode m, bool bDire
             if( !aNewName.Len() )
             {
                 aNewName.AssignAscii( "Temp Stg " );
-                aNewName.Append( String::CreateFromInt32( ++nTmpCount ) );
+                aNewName.Append( OUString::number( ++nTmpCount ) );
                 bTemp = sal_True;
             }
             p = pIo->pTOC->Create( *pEntry, aNewName, STG_STORAGE );
@@ -656,7 +656,7 @@ pB
             if( !aNewName.Len() )
             {
                 aNewName.AssignAscii( "Temp Strm " );
-                aNewName.Append( String::CreateFromInt32( ++nTmpCount ) );
+                aNewName.Append( OUString::number( ++nTmpCount ) );
                 bTemp = sal_True;
             }
             p = pIo->pTOC->Create( *pEntry, aNewName, STG_STREAM );
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 4360dcd85bd9..58dfff7685b5 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -3213,7 +3213,7 @@ String UCBStorage::CreateLinkFile( const String& rName )
             for ( sal_Int32 i=0; !bRet; i++ )
             {
                 String aTmp( aTitle );
-                aTmp += String::CreateFromInt32( i );
+                aTmp += OUString::number( i );
                 bRet = ::utl::UCBContentHelper::MakeFolder( aFolder, aTmp, aNewFolder );
                 if ( bRet )
                     aTitle = aTmp;
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index b911b5f4a890..2aa85599f99b 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -1848,7 +1848,7 @@ sal_Bool MathType::HandleSize(sal_Int16 nLstSize,sal_Int16 nDefSize, int &rSetSi
             {
                 nLastSize = nCurSize;
                 APPEND(rRet," size ");
-                rRet += String::CreateFromInt32(-nLstSize/32);
+                rRet += OUString::number(-nLstSize/32);
                 rRet += '{';
                 bRet=true;
                 rSetSize++;
@@ -1877,7 +1877,7 @@ sal_Bool MathType::HandleSize(sal_Int16 nLstSize,sal_Int16 nDefSize, int &rSetSi
             {
                 nLastSize = nCurSize;
                 APPEND(rRet," size ");
-                rRet += String::CreateFromInt32(nLstSize);
+                rRet += OUString::number(nLstSize);
                 rRet += '{';
                 bRet=true;
                 rSetSize++;
diff --git a/svtools/bmpmaker/bmpcore.cxx b/svtools/bmpmaker/bmpcore.cxx
index 50ae2933086d..7e8247c67afe 100644
--- a/svtools/bmpmaker/bmpcore.cxx
+++ b/svtools/bmpmaker/bmpcore.cxx
@@ -128,7 +128,7 @@ void BmpCreator::ImplCreate( const ::std::vector< DirEntry >& rInDirs,
                 aString = aPrefix;
 
                 if( atoi( aLine.getStr() ) < 10000 )
-                    aString += String::CreateFromInt32( 0 );
+                    aString += OUString::number( 0 );
 
                 // search for pngs by default
                 String aPngString( aString += rtl::OStringToOUString(aLine, RTL_TEXTENCODING_UTF8) );
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 9d846616fe64..dfb0a1095a54 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1572,7 +1572,7 @@ String SvtFileView::GetConfigString() const
     DBG_ASSERT( pBar, "invalid headerbar" );
 
     // sort order
-    sRet += String::CreateFromInt32( mpImp->mnSortColumn );
+    sRet += OUString::number( mpImp->mnSortColumn );
     sRet += ';';
     HeaderBarItemBits nBits = pBar->GetItemBits( mpImp->mnSortColumn );
     sal_Bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW );
@@ -1583,9 +1583,9 @@ String SvtFileView::GetConfigString() const
     for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
         sal_uInt16 nId = pBar->GetItemId(i);
-        sRet += String::CreateFromInt32( nId );
+        sRet += OUString::number( nId );
         sRet += ';';
-        sRet += String::CreateFromInt32( pBar->GetItemSize( nId ) );
+        sRet += OUString::number( pBar->GetItemSize( nId ) );
         sRet += ';';
     }
 
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 829db41085dd..d52382c87077 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -1114,10 +1114,10 @@ sal_Bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Poin
             sal_uInt16 nColumn  = static_cast< sal_uInt16 >( _nPos % nColumnCount );
 
             String aText( SVT_RESSTR(STR_SVT_ACC_DESC_TABLISTBOX) );
-            aText.SearchAndReplace( sVar1, String::CreateFromInt32( nRow ) );
+            aText.SearchAndReplace( sVar1, OUString::number( nRow ) );
             String sColHeader = m_pImpl->m_pHeaderBar->GetItemText( m_pImpl->m_pHeaderBar->GetItemId( nColumn ) );
             if ( sColHeader.Len() == 0 )
-                sColHeader = String::CreateFromInt32( nColumn );
+                sColHeader = OUString::number( nColumn );
             aText.SearchAndReplace( sVar2, sColHeader );
             aRetText = aText;
         }
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 529029ee671a..10c7c5056b34 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -1693,21 +1693,21 @@ void Calendar::RequestHelp( const HelpEvent& rHEvt )
                 sal_uInt16      nMonth = aDate.GetMonth();
                 XubString   aStr( maDayText );
                 aStr.AppendAscii( ": " );
-                aStr.Append( XubString::CreateFromInt32( aDate.GetDayOfYear() ) );
+                aStr.Append( OUString::number( aDate.GetDayOfYear() ) );
                 aStr.AppendAscii( " / " );
                 aStr.Append( maWeekText );
                 aStr.AppendAscii( ": " );
-                aStr.Append( XubString::CreateFromInt32( nWeek ) );
+                aStr.Append( OUString::number( nWeek ) );
                 // Evt. noch Jahr hinzufuegen, wenn es nicht das gleiche ist
                 if ( (nMonth == 12) && (nWeek == 1) )
                 {
                     aStr.AppendAscii( ",  " );
-                    aStr.Append( XubString::CreateFromInt32( aDate.GetYear()+1 ) );
+                    aStr.Append( OUString::number( aDate.GetYear()+1 ) );
                 }
                 else if ( (nMonth == 1) && (nWeek > 50) )
                 {
                     aStr.AppendAscii( ", " );
-                    aStr.Append( XubString::CreateFromInt32( aDate.GetYear()-1 ) );
+                    aStr.Append( OUString::number( aDate.GetYear()-1 ) );
                 }
                 Help::ShowQuickHelp( this, aDateRect, aStr );
                 return;
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index e193c1e38673..3d0642b680bc 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -748,7 +748,7 @@ sal_Int16 SAL_CALL ToolbarMenuEntryAcc::getAccessibleRole() throw (RuntimeExcept
         if( !aRet.Len() )
         {
             aRet = String( RTL_CONSTASCII_USTRINGPARAM( "Item " ) );
-            aRet += String::CreateFromInt32( mpParent->mnEntryId );
+            aRet += OUString::number( mpParent->mnEntryId );
         }
     }
 
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index 80ee93093393..b240f0b52ecf 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -206,7 +206,7 @@ XubString ImplPrnDlgGetStatusText( const QueueInfo& rInfo )
     if ( nJobs && (nJobs != QUEUE_JOBS_DONTKNOW) )
     {
         XubString aJobStr( SVT_RESSTR( STR_SVT_PRNDLG_JOBCOUNT ) );
-        XubString aJobs( XubString::CreateFromInt32( nJobs ) );
+        XubString aJobs( OUString::number( nJobs ) );
         aJobStr.SearchAndReplaceAscii( "%d", aJobs );
         ImplPrnDlgAddString( aStr, aJobStr );
     }
diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx
index d9f3c8d51b01..185e0246f5a3 100644
--- a/svtools/source/urlobj/inetimg.cxx
+++ b/svtools/source/urlobj/inetimg.cxx
@@ -36,9 +36,9 @@ sal_Bool INetImage::Write( SvStream& rOStm, sal_uLong nFormat ) const
             (sString += aTargetURL ) += TOKEN_SEPARATOR;
             (sString += aTargetFrame ) += TOKEN_SEPARATOR;
             (sString += aAlternateText ) += TOKEN_SEPARATOR;
-            sString += String::CreateFromInt32( aSizePixel.Width() );
+            sString += OUString::number( aSizePixel.Width() );
             sString += TOKEN_SEPARATOR;
-            sString += String::CreateFromInt32( aSizePixel.Height() );
+            sString += OUString::number( aSizePixel.Height() );
 
             rtl::OString sOut(rtl::OUStringToOString(sString,
                 RTL_TEXTENCODING_UTF8));
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index ce81a613ac8c..6be3d7db5709 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -167,7 +167,6 @@ public:
                             { return Append( UniString( concat ) ); }
 #endif
 
-    static UniString    CreateFromInt32( sal_Int32 n, sal_Int16 nRadix = 10 );
     static const UniString& EmptyString();
     sal_Int32           ToInt32() const;
     sal_Int64           ToInt64() const;
diff --git a/tools/source/generic/bigint.cxx b/tools/source/generic/bigint.cxx
index 9247b1fec667..2aedb0f46f00 100644
--- a/tools/source/generic/bigint.cxx
+++ b/tools/source/generic/bigint.cxx
@@ -611,7 +611,7 @@ rtl::OUString BigInt::GetString() const
     String aString;
 
     if ( !bIsBig )
-        aString = String::CreateFromInt32( nVal );
+        aString = OUString::number( nVal );
     else
     {
         BigInt aTmp( *this );
@@ -627,20 +627,20 @@ rtl::OUString BigInt::GetString() const
             String aStr = aString;
             if ( a.nVal < 100000000L )
             { // leading 0s
-                aString = String::CreateFromInt32( a.nVal + 1000000000L );
+                aString = OUString::number( a.nVal + 1000000000L );
                 aString.Erase(0,1);
             }
             else
-                aString = String::CreateFromInt32( a.nVal );
+                aString = OUString::number( a.nVal );
             aString += aStr;
         }
         while( aTmp.bIsBig );
 
         String aStr = aString;
         if ( bIsNeg )
-            aString = String::CreateFromInt32( -aTmp.nVal );
+            aString = OUString::number( -aTmp.nVal );
         else
-            aString = String::CreateFromInt32( aTmp.nVal );
+            aString = OUString::number( aTmp.nVal );
         aString += aStr;
     }
 
diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx
index f8fc18a0259f..a66dc6026452 100644
--- a/tools/source/string/tustring.cxx
+++ b/tools/source/string/tustring.cxx
@@ -49,11 +49,6 @@ DBG_NAME( UniString )
 
 UniString::UniString(char c): mpData(ImplAllocData(1)) { mpData->maStr[0] = c; }
 
-UniString UniString::CreateFromInt32( sal_Int32 n, sal_Int16 nRadix )
-{
-    return rtl::OUString::valueOf(n, nRadix);
-}
-
 namespace { struct Empty : public rtl::Static< const UniString, Empty> {}; }
 
 const UniString& UniString::EmptyString()
diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx
index 72eb0d5fe9b1..fd5860933da7 100644
--- a/ucb/workben/ucb/ucbdemo.cxx
+++ b/ucb/workben/ucb/ucbdemo.cxx
@@ -2143,7 +2143,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox )
             if (m_nFetchSize > 0)
             {
                 aText.AssignAscii("Fetch size set to ");
-                aText += String::CreateFromInt32(m_nFetchSize);
+                aText += OUString::number(m_nFetchSize);
             }
             else
                 aText.AssignAscii("Fetch size reset to default");
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index 1782dcf6a011..5ffb316b0b78 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -267,7 +267,7 @@ void lcl_createName(TempFile_Impl& _rImpl,const String& rLeadingChars,sal_Bool _
     {
         String aTmp( aName );
         if ( bUseNumber )
-            aTmp += String::CreateFromInt32( i );
+            aTmp += OUString::number( i );
         bUseNumber = sal_True;
         if ( pExtension )
             aTmp += *pExtension;
@@ -316,7 +316,7 @@ umask(old_mode);
             }
         }
         if ( !_bStartWithZero )
-            aTmp += String::CreateFromInt32( i );
+            aTmp += OUString::number( i );
     }
 }
 
diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx
index 1d7c50766775..60bd5b42d599 100644
--- a/vcl/aqua/source/app/salsys.cxx
+++ b/vcl/aqua/source/app/salsys.cxx
@@ -90,7 +90,7 @@ rtl::OUString AquaSalSystem::GetDisplayScreenName( unsigned int nScreen )
         if( pMgr )
         {
             String aScreenName( ResId( SV_MAC_SCREENNNAME, *pMgr ) );
-            aScreenName.SearchAndReplaceAllAscii( "%d", String::CreateFromInt32( nScreen ) );
+            aScreenName.SearchAndReplaceAllAscii( "%d", OUString::number( nScreen ) );
             aRet = aScreenName;
         }
    }
diff --git a/vcl/ios/source/app/salsys.cxx b/vcl/ios/source/app/salsys.cxx
index e551e70a1578..c5dfabb9fd34 100644
--- a/vcl/ios/source/app/salsys.cxx
+++ b/vcl/ios/source/app/salsys.cxx
@@ -90,7 +90,7 @@ rtl::OUString IosSalSystem::GetDisplayScreenName( unsigned int nScreen )
         if( pMgr )
         {
             String aScreenName( ResId( SV_MAC_SCREENNNAME, *pMgr ) );
-            aScreenName.SearchAndReplaceAllAscii( "%d", String::CreateFromInt32( nScreen ) );
+            aScreenName.SearchAndReplaceAllAscii( "%d", OUString::number( nScreen ) );
             aRet = aScreenName;
         }
    }
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 6374b69483ae..7bc7c45fd901 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -2754,11 +2754,11 @@ void TimeFormatter::ImplSetUserTime( const Time& rNewTime, Selection* pNewSelect
             sal_uLong n  = aNewTime.GetHour() * 3600L;
             n       += aNewTime.GetMin()  * 60L;
             n       += aNewTime.GetSec();
-            aStr     = String::CreateFromInt32( n );
+            aStr     = OUString::number( n );
             aStr    += ImplGetLocaleDataWrapper().getTime100SecSep();
             if ( aNewTime.Get100Sec() < 10 )
                 aStr += '0';
-            aStr += String::CreateFromInt32( aNewTime.Get100Sec() );
+            aStr += OUString::number( aNewTime.Get100Sec() );
         }
         else if ( mbDuration )
         {
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index e787bae6e96a..a0e4ac4aa7f3 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -976,11 +976,11 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings
             const GtkPageRange* pRanges = gtk_print_settings_get_page_ranges(pSettings, &num_ranges);
             for (gint i = 0; i < num_ranges; ++i)
             {
-                aRangeText.Append(String::CreateFromInt32(pRanges[i].start+1));
+                aRangeText.Append(OUString::number(pRanges[i].start+1));
                 if (pRanges[i].start != pRanges[i].end)
                 {
                     aRangeText.AppendAscii("-");
-                    aRangeText.Append(String::CreateFromInt32(pRanges[i].end+1));
+                    aRangeText.Append(OUString::number(pRanges[i].end+1));
                 }
 
                 if (i != num_ranges-1)
@@ -1028,7 +1028,7 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings
                        {
                             aFilterData.realloc(aFilterData.getLength()+1);
                             aFilterData[aFilterData.getLength()-1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageRange"));
-                            aFilterData[aFilterData.getLength()-1].Value <<= rtl::OUString(String::CreateFromInt32(i + 1));
+                            aFilterData[aFilterData.getLength()-1].Value <<= rtl::OUString(OUString::number(i + 1));
                        }
                    }
             }