UniString::CreateFromInt32 -> rtl::OUString::valueOf

25 files changed, 75 insertions, 83 deletions

diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
index 7ff06baa8cc4..3af511788ab6 100644
--- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -133,17 +133,17 @@ namespace accessibility
         SolarMethodGuard aGuard( *this );
 
         // TODO: localize this!
-        String sName = mpBrowseBox->GetColumnDescription( ::sal::static_int_cast< sal_uInt16 >( getColumnPos() ) );
-        if ( 0 == sName.Len() )
+        rtl::OUStringBuffer sName(mpBrowseBox->GetColumnDescription( ::sal::static_int_cast< sal_uInt16 >( getColumnPos() ) ));
+        if ( 0 == sName.getLength() )
         {
-            sName = String::CreateFromAscii( "Column " );
-            sName += String::CreateFromInt32( getColumnPos( ) );
+            sName.appendAscii(RTL_CONSTASCII_STRINGPARAM("Column "));
+            sName.append(getColumnPos());
         }
 
-        sName += String::CreateFromAscii( ", Row " );
-        sName += String::CreateFromInt32( getRowPos( ) );
+        sName.appendAscii(RTL_CONSTASCII_STRINGPARAM(", Row "));
+        sName.append(getRowPos());
 
-        return ::rtl::OUString( sName );
+        return sName.makeStringAndClear();
     }
 
     // -----------------------------------------------------------------------------
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx
index bf1679a5fb6e..2e2bc0659f95 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.cxx
@@ -257,13 +257,13 @@ namespace cairocanvas
 
     void DeviceHelper::dumpScreenContent() const
     {
-        static sal_uInt32 nFilePostfixCount(0);
+        static sal_Int32 nFilePostfixCount(0);
 
         if( mpRefDevice )
         {
-            String aFilename( String::CreateFromAscii("dbg_frontbuffer") );
-            aFilename += String::CreateFromInt32(nFilePostfixCount);
-            aFilename += String::CreateFromAscii(".bmp");
+            rtl::OUString aFilename("dbg_frontbuffer");
+            aFilename += rtl::OUString::valueOf(nFilePostfixCount);
+            aFilename += rtl::OUString(".bmp");
 
             SvFileStream aStream( aFilename, STREAM_STD_READWRITE );
 
diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx
index 1c2c085e30a6..44c35cbf4ac7 100644
--- a/canvas/source/vcl/devicehelper.cxx
+++ b/canvas/source/vcl/devicehelper.cxx
@@ -216,13 +216,13 @@ namespace vclcanvas
 
     void DeviceHelper::dumpScreenContent() const
     {
-        static sal_uInt32 nFilePostfixCount(0);
+        static sal_Int32 nFilePostfixCount(0);
 
         if( mpOutDev )
         {
-            String aFilename( String::CreateFromAscii("dbg_frontbuffer") );
-            aFilename += String::CreateFromInt32(nFilePostfixCount);
-            aFilename += String::CreateFromAscii(".bmp");
+            rtl::OUString aFilename("dbg_frontbuffer");
+            aFilename += rtl::OUString::valueOf(nFilePostfixCount);
+            aFilename += rtl::OUString(".bmp");
 
             SvFileStream aStream( aFilename, STREAM_STD_READWRITE );
 
diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx
index 627ce37055b2..b99dc4e66cc0 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.cxx
@@ -135,13 +135,13 @@ namespace vclcanvas
     {
         DeviceHelper::dumpScreenContent();
 
-        static sal_uInt32 nFilePostfixCount(0);
+        static sal_Int32 nFilePostfixCount(0);
 
         if( mpBackBuffer )
         {
-            String aFilename( String::CreateFromAscii("dbg_backbuffer") );
-            aFilename += String::CreateFromInt32(nFilePostfixCount);
-            aFilename += String::CreateFromAscii(".bmp");
+            rtl::OUString aFilename("dbg_backbuffer");
+            aFilename += rtl::OUString::valueOf(nFilePostfixCount);
+            aFilename += rtl::OUString(".bmp");
 
             SvFileStream aStream( aFilename, STREAM_STD_READWRITE );
 
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index c518e642eae2..cff38eeb610b 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -658,7 +658,7 @@ String DataBrowser::GetColString( sal_Int32 nColumnId ) const
 
 String DataBrowser::GetRowString( sal_Int32 nRow ) const
 {
-    return String::CreateFromInt32( nRow + 1 );
+    return rtl::OUString::valueOf(nRow + 1);
 }
 
 String DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index b094fb90d950..df6c47d027b7 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -160,15 +160,15 @@ namespace
 {
     rtl::OUString lcl_makeColorName( Color rColor )
     {
-        String aStr(SVX_RES(RID_SVXFLOAT3D_FIX_R));
-        aStr += String::CreateFromInt32((sal_Int32)rColor.GetRed());
-        aStr += sal_Unicode(' ');
-        aStr += String(SVX_RES(RID_SVXFLOAT3D_FIX_G));
-        aStr += String::CreateFromInt32((sal_Int32)rColor.GetGreen());
-        aStr += sal_Unicode(' ');
-        aStr += String(SVX_RES(RID_SVXFLOAT3D_FIX_B));
-        aStr += String::CreateFromInt32((sal_Int32)rColor.GetBlue());
-        return aStr;
+        rtl::OUStringBuffer aStr(SVX_RESSTR(RID_SVXFLOAT3D_FIX_R));
+        aStr.append((sal_Int32)rColor.GetRed());
+        aStr.append(' ');
+        aStr.append(SVX_RESSTR(RID_SVXFLOAT3D_FIX_G));
+        aStr.append((sal_Int32)rColor.GetGreen());
+        aStr.append(' ');
+        aStr.append(SVX_RESSTR(RID_SVXFLOAT3D_FIX_B));
+        aStr.append((sal_Int32)rColor.GetBlue());
+        return aStr.makeStringAndClear();
     }
     void lcl_selectColor( ColorListBox& rListBox, const Color& rColor )
     {
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 0c66967661d1..bde97f023689 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -491,7 +491,7 @@ void DataSourceTabPage::fillSeriesListBox()
                 if( nIndex != -1 )
                     aLabel = String( aResString.replaceAt(
                                          nIndex, aReplacementStr.getLength(),
-                                         String::CreateFromInt32( nUnnamedSeriesIndex )));
+                                         rtl::OUString::valueOf(nUnnamedSeriesIndex)));
             }
             if( aLabel.Len() == 0 )
                 aLabel = String( ::chart::SchResId( STR_DATA_UNNAMED_SERIES ));
diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx
index 94ce189bbf9c..c9395eb0751b 100644
--- a/chart2/source/controller/main/DragMethod_PieSegment.cxx
+++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx
@@ -83,8 +83,8 @@ DragMethod_PieSegment::~DragMethod_PieSegment()
 }
 void DragMethod_PieSegment::TakeSdrDragComment(String& rStr) const
 {
-    rStr = String( SchResId( STR_STATUS_PIE_SEGMENT_EXPLODED ) );
-    rStr.SearchAndReplaceAscii( "%PERCENTVALUE", String::CreateFromInt32( static_cast<sal_Int32>((m_fAdditionalOffset+m_fInitialOffset)*100.0) ));
+    rStr = ResId::toString(SchResId(STR_STATUS_PIE_SEGMENT_EXPLODED));
+    rStr.SearchAndReplaceAscii( "%PERCENTVALUE", rtl::OUString::valueOf( static_cast<sal_Int32>((m_fAdditionalOffset+m_fInitialOffset)*100.0) ));
 }
 bool DragMethod_PieSegment::BeginSdrDrag()
 {
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 9c8077820f9e..65dafe55b28e 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -510,8 +510,8 @@ uno::Reference< awt::XControlModel >  BibGeneralPage::AddXControl(
                     uno::Sequence<rtl::OUString> aListSource(TYPE_COUNT);
                     rtl::OUString* pListSourceArr = aListSource.getArray();
                     //pListSourceArr[0] = C2U("select TypeName, TypeIndex from TypeNms");
-                    for(sal_uInt16 i = 0; i < TYPE_COUNT; i++)
-                        pListSourceArr[i] = String::CreateFromInt32(i);
+                    for(sal_Int32 i = 0; i < TYPE_COUNT; ++i)
+                        pListSourceArr[i] = rtl::OUString::valueOf(i);
                     aAny.setValue(&aListSource, ::getCppuType((uno::Sequence<rtl::OUString>*)0));
 
                     xPropSet->setPropertyValue(C2U("ListSource"), aAny);
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index de3026902aca..1776726d7ef7 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -273,7 +273,7 @@ namespace dbp
         for (::svt::WizardTypes::WizardState i=0; i<m_aExistingRadios.GetEntryCount(); ++i)
         {
             rSettings.aLabels.push_back(m_aExistingRadios.GetEntry(i));
-            rSettings.aValues.push_back(String::CreateFromInt32((sal_Int32)(i + 1)));
+            rSettings.aValues.push_back(rtl::OUString::valueOf((sal_Int32)(i + 1)));
         }
 
         return sal_True;
diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx
index dd26f82516a0..367a550cffc3 100644
--- a/extensions/source/propctrlr/newdatatype.cxx
+++ b/extensions/source/propctrlr/newdatatype.cxx
@@ -76,7 +76,7 @@ namespace pcr
         sal_Int32 nPostfixNumber = 1;
         do
         {
-            ( sInitialName = sNameBase ) += String::CreateFromInt32( nPostfixNumber++ );
+            ( sInitialName = sNameBase ) += rtl::OUString::valueOf(nPostfixNumber++);
         }
         while ( m_aProhibitedNames.find( sInitialName ) != m_aProhibitedNames.end() );
 
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index c18ff8b0df32..e814595f432b 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -486,7 +486,7 @@ namespace frm
             }
             else if ( _nFeatureId == FormFeature::MoveAbsolute )
             {
-                pNavBar->setFeatureText( _nFeatureId, String::CreateFromInt32( getIntegerState( _nFeatureId ) ) );
+                pNavBar->setFeatureText( _nFeatureId, rtl::OUString::valueOf(getIntegerState(_nFeatureId)) );
             }
         }
 
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index 012fc203a64b..91953f35aa4b 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -755,7 +755,7 @@ const Reference< XIndexContainer >&
             while( xNameCont->hasByName( sName ) )
             {
                 sName = sStdName;
-                sName += String::CreateFromInt32( ++n );
+                sName += rtl::OUString::valueOf(static_cast<sal_Int32>(++n));
             }
 
             const Reference< XMultiServiceFactory > &rServiceFactory
diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index df2f4e2c8f93..ae1964d021c5 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -1074,7 +1074,7 @@ String AddPrinterDialog::uniquePrinterName( const String& rBase )
 
     PrinterInfoManager& rManager( PrinterInfoManager::get() );
 
-    int nVersion = 1;
+    sal_Int32 nVersion = 1;
     list< OUString > aPrinterList;
     rManager.listPrinters( aPrinterList );
     boost::unordered_set< OUString, OUStringHash > aPrinters;
@@ -1084,7 +1084,7 @@ String AddPrinterDialog::uniquePrinterName( const String& rBase )
     {
         aResult = rBase;
         aResult.AppendAscii( "_" );
-        aResult += String::CreateFromInt32( nVersion++ );
+        aResult += rtl::OUString::valueOf(nVersion++);
     }
 
     return aResult;
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 15e71c537ffe..4870c61ead56 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -395,27 +395,21 @@ const String SmFontFormatList::GetFontFormatId( size_t nPos ) const
 }
 
 
-const String SmFontFormatList::GetNewFontFormatId() const
+const rtl::OUString SmFontFormatList::GetNewFontFormatId() const
 {
     // returns first unused FormatId
 
-    String aRes;
-
-    String aPrefix( RTL_CONSTASCII_USTRINGPARAM( "Id" ) );
+    rtl::OUString aPrefix("Id");
     sal_Int32 nCnt = GetCount();
     for (sal_Int32 i = 1;  i <= nCnt + 1;  ++i)
     {
-        String aTmpId( aPrefix );
-        aTmpId += String::CreateFromInt32( i );
-        if (!GetFontFormat( aTmpId ))
-        {
-            aRes = aTmpId;
-            break;
-        }
+        rtl::OUString aTmpId =  aPrefix + rtl::OUString::valueOf(i);
+        if (!GetFontFormat(aTmpId))
+            return aTmpId;
     }
-    OSL_ENSURE( 0 != aRes.Len(), "failed to create new FontFormatId" );
+    OSL_ENSURE( !this, "failed to create new FontFormatId" );
 
-    return aRes;
+    return rtl::OUString();
 }
 
 /////////////////////////////////////////////////////////////////
diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx
index e3fb818d4c4c..2fc98b41755c 100644
--- a/starmath/source/cfgitem.hxx
+++ b/starmath/source/cfgitem.hxx
@@ -104,7 +104,7 @@ public:
     const String            GetFontFormatId( const SmFontFormat &rFntFmt ) const;
     const String            GetFontFormatId( const SmFontFormat &rFntFmt, bool bAdd );
     const String            GetFontFormatId( size_t nPos ) const;
-    const String            GetNewFontFormatId() const;
+    const rtl::OUString     GetNewFontFormatId() const;
     size_t                  GetCount() const    { return aEntries.size(); }
 
     bool    IsModified() const          { return bModified; }
diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx
index 2633128add6e..03c2661b523a 100644
--- a/svl/inc/svl/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
@@ -649,12 +649,12 @@ private:
             sal_uInt16 nMinDigits = 0  ) const;
 
     String ImpIntToString( sal_uInt16 nIx, sal_Int32 nVal, sal_uInt16 nMinDigits = 0 ) const
-        {
-            const SvNumberNatNum& rNum = NumFor[nIx].GetNatNum();
-            if ( nMinDigits || rNum.IsComplete() )
-                return ImpGetNatNumString( rNum, nVal, nMinDigits );
-            return String::CreateFromInt32( nVal );
-        }
+    {
+        const SvNumberNatNum& rNum = NumFor[nIx].GetNatNum();
+        if ( nMinDigits || rNum.IsComplete() )
+            return ImpGetNatNumString( rNum, nVal, nMinDigits );
+        return rtl::OUString::valueOf(nVal);
+    }
 
     // transliterate according to NativeNumber
     SVL_DLLPRIVATE void ImpTransliterateImpl( String& rStr, const SvNumberNatNum& rNum ) const;
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 8db2a1580103..40beb7da7213 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -738,12 +738,12 @@ void BrowserScrollBar::Tracking( const TrackingEvent& rTEvt )
     sal_uLong nPos = GetThumbPos();
     if ( nPos != _nLastPos )
     {
-        String aTip( String::CreateFromInt32(nPos) );
+        String aTip( rtl::OUString::valueOf(static_cast<sal_Int32>(nPos)) );
         aTip += '/';
         if ( _pDataWin->GetRealRowCount().Len() )
             aTip += _pDataWin->GetRealRowCount();
         else
-            aTip += String::CreateFromInt32(GetRangeMax());
+            aTip += rtl::OUString::valueOf(static_cast<sal_Int32>(GetRangeMax()));
 
         Rectangle aRect( GetPointerPosPixel(), Size( GetTextHeight(), GetTextWidth( aTip ) ) );
         if ( _nTip )
diff --git a/svtools/workben/svdem.cxx b/svtools/workben/svdem.cxx
index be6ce3d6d382..c18e749b21f1 100644
--- a/svtools/workben/svdem.cxx
+++ b/svtools/workben/svdem.cxx
@@ -308,7 +308,7 @@ void ShowFont::Paint( const Rectangle& )
 
     if ( rFont.GetOrientation() )
     {
-        aText.Append( String::CreateFromInt32( rFont.GetOrientation()/10 ) );
+        aText.Append( rtl::OUString::valueOf(static_cast<sal_Int32>(rFont.GetOrientation()/10)) );
         aText.AppendAscii( " degree." );
 
         x = aWindowSize.Width()/2;
diff --git a/sw/qa/core/swdoc-test.cxx b/sw/qa/core/swdoc-test.cxx
index 6106da20c34f..72c5ad32e276 100644
--- a/sw/qa/core/swdoc-test.cxx
+++ b/sw/qa/core/swdoc-test.cxx
@@ -367,8 +367,7 @@ getRand(int modulus)
 static rtl::OUString
 getRandString()
 {
-    static rtl::OUString aText(RTL_CONSTASCII_USTRINGPARAM(
-        "AAAAA BBBB CCC DD E \n"));
+    rtl::OUString aText("AAAAA BBBB CCC DD E \n");
     int s = getRand(aText.getLength());
     int j = getRand(aText.getLength() - s);
     rtl::OUString aRet(aText.copy(s, j));
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index 9f8e52c56730..c0c5f9699af8 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -692,9 +692,9 @@ sal_Int16 VCLXAccessibleComponent::getAccessibleRole(  ) throw (uno::RuntimeExce
     {
         aName = GetWindow()->GetAccessibleName();
 #if OSL_DEBUG_LEVEL > 1
-        aName += String( RTL_CONSTASCII_USTRINGPARAM( " (Type = " ) );
-        aName += String::CreateFromInt32( GetWindow()->GetType() );
-        aName += String( RTL_CONSTASCII_USTRINGPARAM( ")" ) );
+        aName += rtl::OUString(" (Type = ");
+        aName += rtl::OUString::valueOf(static_cast<sal_Int32>(GetWindow()->GetType()));
+        aName += rtl::OUString( ")");
 #endif
     }
     return aName;
diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index 2b762f0adae2..c8d65e2c2b1f 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -720,9 +720,7 @@ void SvtSecurityOptions_Impl::Commit()
                         Sequence< Sequence< com::sun::star::beans::PropertyValue > > lPropertyValuesSeq( nCnt );
                         for( sal_Int32 i = 0 ; i < nCnt ; ++i )
                         {
-                            String  aPrefix( s );
-                            aPrefix += String::CreateFromInt32( i );
-                            aPrefix.AppendAscii( "/" );
+                            rtl::OUString aPrefix = rtl::OUStringBuffer(s).append(i).append('/').makeStringAndClear();
                             Sequence< com::sun::star::beans::PropertyValue >    lPropertyValues( 3 );
                             lPropertyValues[ 0 ].Name = aPrefix + PROPERTYNAME_TRUSTEDAUTHOR_SUBJECTNAME;
                             lPropertyValues[ 0 ].Value <<= m_seqTrustedAuthors[ i ][0];
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index 977b7b94e1e6..1e2ee1562465 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -342,19 +342,20 @@ void LocaleDataWrapper::invalidateData()
 //                      && !aDebugLocale.EqualsAscii( "es_BR" ) // ?!? Brazil/es
                     )
                 {
-                    String aMsg( RTL_CONSTASCII_USTRINGPARAM(
+                    rtl::OUStringBuffer aMsg;
+                    aMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM(
                                 "ConvertIsoNamesToLanguage/ConvertLanguageToIsoNames: ambiguous locale (MS-LCID?)\n"));
-                    aMsg += aDebugLocale;
-                    aMsg.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "  ->  0x" ) );
-                    aMsg += String::CreateFromInt32( eLang, 16 );
-                    aMsg.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "  ->  " ) );
-                    aMsg += String( aLanguage);
+                    aMsg.append(aDebugLocale);
+                    aMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM( "  ->  0x"));
+                    aMsg.append(static_cast<sal_Int32>(eLang), 16);
+                    aMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM( "  ->  "));
+                    aMsg.append(aLanguage);
                     if ( !aCountry.isEmpty() )
                     {
-                        aMsg += '_';
-                        aMsg += String( aCountry);
+                        aMsg.append('_');
+                        aMsg.append(aCountry);
                     }
-                    outputCheckMessage( aMsg );
+                    outputCheckMessage( aMsg.makeStringAndClear() );
                 }
                 eLang = LANGUAGE_DONTKNOW;
             }
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index cb60a488c36d..38739bd9f3ed 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -632,7 +632,7 @@ UUIInteractionHelper::handleRequest_impl(
             sal_Int32 nMedium = 0;
             aWrongMediumException.Medium >>= nMedium;
             std::vector< rtl::OUString > aArguments;
-            aArguments.push_back(UniString::CreateFromInt32(nMedium + 1));
+            aArguments.push_back(rtl::OUString::valueOf(nMedium + 1));
             handleErrorHandlerRequest(aWrongMediumException.Classification,
                                       ERRCODE_UUI_WRONGMEDIUM,
                                       aArguments,
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index f428ab90a494..bd953a31b28c 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -1380,7 +1380,7 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
             {
                 aFormatCode.appendAscii( RTL_CONSTASCII_STRINGPARAM( "][$-" ) );
                 // language code in upper hex:
-                aFormatCode.append( String::CreateFromInt32( sal_Int32( eLang ), 16 ).ToUpperAscii() );
+                aFormatCode.append(rtl::OUString::valueOf(sal_Int32(eLang), 16).toAsciiUpperCase());
             }
             aFormatCode.append( sal_Unicode(']') );
         }
@@ -1905,7 +1905,7 @@ void SvXMLNumFormatContext::AddCurrency( const rtl::OUString& rContent, Language
         {
             //  '-' sign and language code in hex:
             aFormatCode.append( (sal_Unicode) '-' );
-            aFormatCode.append( String::CreateFromInt32( sal_Int32( nLang ), 16 ).ToUpperAscii() );
+            aFormatCode.append(rtl::OUString::valueOf(sal_Int32(nLang), 16).toAsciiUpperCase());
         }
 
         aFormatCode.append( (sal_Unicode) ']' );    // end of "new" currency symbol