String::CreateFromInt32->rtl::OUString::valueOf

basic/source/basmgr/basmgr.cxx

@@ -1525,8 +1525,8 @@ sal_Bool BasicManager::LoadLib( sal_uInt16 nLib )
     }
     else
     {
-        StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_LIBLOAD, String(), ERRCODE_BUTTON_OK );
-        aErrors.push_back(BasicError(*pErrInf, BASERR_REASON_LIBNOTFOUND, String::CreateFromInt32(nLib)));
+        StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_LIBLOAD, rtl::OUString(), ERRCODE_BUTTON_OK );
+        aErrors.push_back(BasicError(*pErrInf, BASERR_REASON_LIBNOTFOUND, rtl::OUString::valueOf(static_cast<sal_Int32>(nLib))));
     }
     return bDone;
 }

basic/source/classes/sb.cxx

@@ -1601,14 +1601,12 @@ void StarBASIC::MakeErrorText( SbError nId, const ::rtl::OUString& aMsg )
     }
     else if( nOldID != 0 )
     {
-        String aStdMsg( RTL_CONSTASCII_USTRINGPARAM("Fehler ") );
-        aStdMsg += String::CreateFromInt32( nOldID);
-        aStdMsg += String( RTL_CONSTASCII_USTRINGPARAM(": Kein Fehlertext verfuegbar!") );
-        GetSbData()->aErrMsg = aStdMsg;
+        rtl::OUStringBuffer aStdMsg;
+        aStdMsg.append("Fehler ").append(static_cast<sal_Int32>(nOldID)).append(": Kein Fehlertext verfuegbar!");
+        GetSbData()->aErrMsg = aStdMsg.makeStringAndClear();
     }
     else
         GetSbData()->aErrMsg = String::EmptyString();
-
 }
 
 sal_Bool StarBASIC::CError
@@ -1672,11 +1670,10 @@ sal_Bool StarBASIC::RTError( SbError code, const String& rMsg, sal_uInt16 l, sal
         // like vba ( adds an error number etc )
         if ( SbiRuntime::isVBAEnabled() && ( code == SbERR_BASIC_COMPAT ) )
         {
-            String aTmp = '\'';
-            aTmp += String::CreateFromInt32( SbxErrObject::getUnoErrObject()->getNumber() );
-            aTmp += String( RTL_CONSTASCII_USTRINGPARAM("\'\n") );
-            aTmp +=  GetSbData()->aErrMsg.Len() ? GetSbData()->aErrMsg : rMsg;
-            code = (sal_uIntPtr)*new StringErrorInfo( code, aTmp );
+            rtl::OUStringBuffer aTmp;
+            aTmp.append('\'').append(SbxErrObject::getUnoErrObject()->getNumber())
+                .append("\'\n").append(GetSbData()->aErrMsg.Len() ? GetSbData()->aErrMsg : rMsg);
+            code = (sal_uIntPtr)*new StringErrorInfo( code, aTmp.makeStringAndClear() );
         }
         else
             code = (sal_uIntPtr)*new StringErrorInfo( code, String(rMsg) );

basic/source/sbx/sbxscan.cxx

@@ -800,13 +800,13 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
                 }
                 else
                 {
-                    rRes = String::CreateFromInt32( nMin );
+                    rRes = rtl::OUString::valueOf(nMin);
                 }
             }
             else if( aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_W ))
             {
                 sal_Int32 nWeekDay = implGetWeekDay( nNumber );
-                rRes = String::CreateFromInt32( nWeekDay );
+                rRes = rtl::OUString::valueOf(nWeekDay);
             }
             else if( aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_Y ))
             {
@@ -814,7 +814,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
                 double dBaseDate;
                 implDateSerial( nYear, 1, 1, dBaseDate );
                 sal_Int32 nYear32 = 1 + sal_Int32( nNumber - dBaseDate );
-                rRes = String::CreateFromInt32( nYear32 );
+                rRes = rtl::OUString::valueOf(nYear32);
             }
             else
             {