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

sd/source/core/drawdoc4.cxx

@@ -1137,7 +1137,7 @@ String SdDrawDocument::CreatePageNumValue(sal_uInt16 nNum) const
             aPageNumValue += sal_Unicode(' ');
             break;
         default:
-            aPageNumValue += String::CreateFromInt32( (sal_Int32)nNum );
+            aPageNumValue += rtl::OUString::valueOf(static_cast<sal_Int32>(nNum));
     }
 
     return(aPageNumValue);

sd/source/ui/animations/CustomAnimationCreateDialog.cxx

@@ -664,7 +664,7 @@ Window * lcl_GetTopmostParent( Window * pWindow )
 void CustomAnimationCreateDialog::setPosition()
 {
     SvtViewOptions aDlgOpt(
-        E_TABDIALOG, String::CreateFromInt32( DLG_CUSTOMANIMATION_CREATE ) );
+        E_TABDIALOG, rtl::OUString::valueOf(static_cast<sal_Int32>(DLG_CUSTOMANIMATION_CREATE)));
     if ( aDlgOpt.Exists() )
     {
         SetWindowState( rtl::OUStringToOString(aDlgOpt.GetWindowState(),
@@ -692,7 +692,7 @@ void CustomAnimationCreateDialog::storePosition()
 {
     // save settings (screen position and current page)
     SvtViewOptions aDlgOpt(
-        E_TABDIALOG, String::CreateFromInt32( DLG_CUSTOMANIMATION_CREATE ) );
+        E_TABDIALOG, rtl::OUString::valueOf(static_cast<sal_Int32>(DLG_CUSTOMANIMATION_CREATE)));
     aDlgOpt.SetWindowState(OStringToOUString(
         GetWindowState(WINDOWSTATE_MASK_POS), RTL_TEXTENCODING_ASCII_US));
 }

sd/source/ui/animations/CustomAnimationDialog.cxx

@@ -574,9 +574,9 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, Window
     mpMetric->SetMax( 100 );
 
     mpMenu = new PopupMenu();
-    for( sal_uInt16 i = 25; i < 101; i += 25 )
+    for( sal_Int32 i = 25; i < 101; i += 25 )
     {
-        String aStr( String::CreateFromInt32( i ) );
+        String aStr(rtl::OUString::valueOf(i));
         aStr += sal_Unicode('%');
         mpMenu->InsertItem( i, aStr );
     }

sd/source/ui/dlg/animobjs.cxx

@@ -611,7 +611,7 @@ void AnimationWindow::UpdateControl( sal_uLong nListPos, sal_Bool bDisableCtrls
     aCtlDisplay.Invalidate();
     aCtlDisplay.Update();
 
-    aFiCount.SetText( UniString::CreateFromInt32( aBmpExList.Count() ) );
+    aFiCount.SetText(rtl::OUString::valueOf(static_cast<sal_Int32>(aBmpExList.Count())));
 
     if( pBitmapEx && !bMovie )
     {

sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx

@@ -331,7 +331,7 @@ void PageObjectPainter::PaintPageNumber (
     // Paint the page number.
     OSL_ASSERT(rpDescriptor->GetPage()!=NULL);
     const sal_Int32 nPageNumber ((rpDescriptor->GetPage()->GetPageNum() - 1) / 2 + 1);
-    const String sPageNumber (String::CreateFromInt32(nPageNumber));
+    const rtl::OUString sPageNumber(rtl::OUString::valueOf(nPageNumber));
     rDevice.SetFont(*mpPageNumberFont);
     rDevice.SetTextColor(aPageNumberColor);
     rDevice.DrawText(aBox, sPageNumber, TEXT_DRAW_RIGHT | TEXT_DRAW_VCENTER);

sd/source/ui/unoidl/unolayer.cxx

@@ -534,15 +534,15 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal
     {
         SdrLayerAdmin& rLayerAdmin = mpModel->mpDoc->GetLayerAdmin();
         sal_uInt16 nLayerCnt = rLayerAdmin.GetLayerCount();
-        sal_uInt16 nLayer = nLayerCnt - 2 + 1;
+        sal_Int32 nLayer = nLayerCnt - 2 + 1;
         String aLayerName;
 
         // Ueberpruefung auf schon vorhandene Namen
         while( aLayerName.Len()==0 || rLayerAdmin.GetLayer( aLayerName, sal_False) )
         {
             aLayerName = String(SdResId(STR_LAYER));
-            aLayerName += String::CreateFromInt32( (sal_Int32)nLayer );
-            nLayer++;
+            aLayerName += rtl::OUString::valueOf(nLayer);
+            ++nLayer;
         }
 
         SdrLayerAdmin& rLA=mpModel->mpDoc->GetLayerAdmin();