finish deprecation of O(U)String::valueOf()

Compiler plugin to replace with matching number(), boolean() or OUString ctor,
ran it, few manual tweaks, mark as really deprecated.

Change-Id: I4a79bdbcf4c460d21e73b635d2bd3725c22876b2

33 files changed, 64 insertions, 64 deletions

diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 10541d65450a..7a923c49182c 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -723,7 +723,7 @@ SdStyleSheet* SdStyleSheet::CreateEmptyUserStyle( SfxStyleSheetBasePool& rPool,
     sal_Int32 nIndex = 1;
     do
     {
-        aName = aPrefix + OUString::valueOf( nIndex++ );
+        aName = aPrefix + OUString::number( nIndex++ );
     }
     while( rPool.Find( aName, eFamily ) != 0 );
 
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 7a0ebb763f63..9b7bf4354acd 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1229,7 +1229,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
                                 if ( pIter != maSlideNameList.end() )
                                 {
                                     nPageIndex = pIter - maSlideNameList.begin();
-                                    aPageUrl = OUString::valueOf(static_cast<sal_Int32>(256 + nPageIndex));
+                                    aPageUrl = OUString::number(256 + nPageIndex);
                                     aPageUrl.Append( OUString( "," ) );
                                     aPageUrl.Append( OUString::number( nPageIndex + 1 ) );
                                     aPageUrl.Append( OUString( ",Slide " ) );
@@ -2070,7 +2070,7 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat
                         nHyperLinkType = 7;
 
                         String aEmpty;
-                        String aHyperString = OUString::valueOf(static_cast<sal_Int32>(256 + nIndex));
+                        String aHyperString = OUString::number(256 + nIndex);
                         aHyperString.Append( OUString( "," ) );
                         aHyperString.Append( OUString::number( nIndex + 1 ) );
                         aHyperString.Append( OUString( ",Slide " ) );
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index fa2160b83d69..951b2cf44744 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -1163,7 +1163,7 @@ sal_Bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt1
                     if ( eTranslateMode & TRANSLATE_NUMBER_TO_STRING )
                     {
                         Any aAny;
-                        OUString aNumber( OUString::valueOf( fVal ) );
+                        OUString aNumber( OUString::number( fVal ) );
                         aAny <<= aNumber;
                         exportAnimPropertyString( rStrm, nPropertyId, aNumber, eTranslateMode );
                     }
@@ -1423,7 +1423,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const OUStr
     {
         double fNumber = 0.0;
         if ( rSourceValue >>= fNumber )
-            aDest += OUString::valueOf( fNumber );
+            aDest += OUString::number( fNumber );
     }
     else if ( rAttributeName == "Color"
             || rAttributeName == "FillColor"     // "Fillcolor" or "FillColor" ?
@@ -1437,21 +1437,21 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const OUStr
         if ( rSourceValue >>= aHSL )
         {
             aDest += "hsl(";
-            aDest += OUString::valueOf( (sal_Int32)( aHSL[ 0 ] / ( 360.0 / 255 ) ) );
+            aDest += OUString::number( (sal_Int32)( aHSL[ 0 ] / ( 360.0 / 255 ) ) );
             aDest += aP;
-            aDest += OUString::valueOf( (sal_Int32)( aHSL[ 1 ] * 255.0 ) );
+            aDest += OUString::number( (sal_Int32)( aHSL[ 1 ] * 255.0 ) );
             aDest += aP;
-            aDest += OUString::valueOf( (sal_Int32)( aHSL[ 2 ] * 255.0 ) );
+            aDest += OUString::number( (sal_Int32)( aHSL[ 2 ] * 255.0 ) );
             aDest += ")";
         }
         else if ( rSourceValue >>= nColor )
         {
             aDest += "rgb(";
-            aDest += OUString::valueOf( (sal_Int32)( (sal_Int8)nColor ) );
+            aDest += OUString::number( ( (sal_Int8)nColor ) );
             aDest += aP;
-            aDest += OUString::valueOf( (sal_Int32)( (sal_Int8)( nColor >> 8 ) ) );
+            aDest += OUString::number( ( (sal_Int8)( nColor >> 8 ) ) );
             aDest += aP;
-            aDest += OUString::valueOf( (sal_Int32)( (sal_Int8)( nColor >> 16 ) ) );
+            aDest += OUString::number( ( (sal_Int8)( nColor >> 16 ) ) );
             aDest += ")";
         }
     }
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index ca78715b6869..18cdd31239a3 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -95,7 +95,7 @@ using ::sax_fastparser::FSHelperPtr;
 
 void dump_pset(Reference< XPropertySet > rXPropSet);
 
-#define IDS(x) OString(OStringLiteral(#x " ") + OString::valueOf( mnShapeIdMax++ )).getStr()
+#define IDS(x) OString(OStringLiteral(#x " ") + OString::number( mnShapeIdMax++ )).getStr()
 
 namespace oox {
     using namespace drawingml;
@@ -1526,7 +1526,7 @@ void PowerPointExport::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPr
                                    .makeStringAndClear() );
 
     mPresentationFS->singleElementNS( XML_p, XML_sldMasterId,
-                                      XML_id, OString::valueOf( (sal_Int64) GetNewSlideMasterId() ).getStr(),
+                                      XML_id, OString::number(  GetNewSlideMasterId() ).getStr(),
                                       FSNS( XML_r, XML_id ), USS( sRelId ),
                                       FSEND );
 
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index a51ef5a6a714..1c3bf81f9c55 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -1994,7 +1994,7 @@ bool HtmlExport::CreateNotesPages()
         aStr.AppendAscii( "</body>\r\n</html>" );
 
         OUString aFileName( "note" );
-        aFileName += OUString::valueOf(nSdPage);
+        aFileName += OUString(nSdPage);
         bOk = WriteHtml( aFileName, true, aStr );
 
 
@@ -2062,7 +2062,7 @@ bool HtmlExport::CreateOutlinePages()
         aStr.AppendAscii( "</body>\r\n</html>" );
 
         OUString aFileName( "outline" );
-        aFileName += OUString::valueOf(nPage);
+        aFileName += OUString::number(nPage);
         bOk = WriteHtml( aFileName, true, aStr );
 
         if (mpProgress)
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 2a3975815e9e..9dc23d05223b 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -146,7 +146,7 @@ SdPublishingDesign::SdPublishingDesign()
     String  aFilterConfigPath( "Office.Common/Filter/Graphic/Export/JPG" );
     FilterConfigItem aFilterConfigItem( aFilterConfigPath );
     sal_Int32 nCompression = aFilterConfigItem.ReadInt32( OUString( KEY_QUALITY ), 75 );
-    m_aCompression = OUString::valueOf( nCompression );
+    m_aCompression = OUString::number( nCompression );
     m_aCompression.Append( sal_Unicode('%') );
 
     SvtUserOptions aUserOptions;
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index a59b7cb74477..f52379c0708f 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -229,7 +229,7 @@ int AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRec
 #ifdef DBG_ANIM_LOG
     static int ppt_anim_debug_stream_number = 1;
     OUString ppt_anim_debug_filename("ppt-animation-import-debug-output-");
-    ppt_anim_debug_filename += OUString::valueOf(ppt_anim_debug_stream_number++);
+    ppt_anim_debug_filename += OUString::number(ppt_anim_debug_stream_number++);
     ppt_anim_debug_filename += OUString(".xml");
     mpFile = fopen( OUStringToOString( ppt_anim_debug_filename, RTL_TEXTENCODING_UTF8).getStr() , "w+" );
 #endif
@@ -1101,7 +1101,7 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId
     if( pStr )
         return OUString::createFromAscii( pStr );
     else
-        return OUString::valueOf( nPresetSubType );
+        return OUString::number( nPresetSubType );
 }
 
 // --------------------------------------------------------------------
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index d07489869b6a..42758e1fd5e7 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -266,7 +266,7 @@ Reference<XAccessible> SAL_CALL
         if (nIndex == 0)
             return mxAccessibleOLEObject;
 
-    throw lang::IndexOutOfBoundsException ( "no child with index " + OUString::valueOf(nIndex), NULL);
+    throw lang::IndexOutOfBoundsException ( "no child with index " + OUString::number(nIndex), NULL);
 }
 
 
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 7d0f2f6a46b5..ddb04b177acd 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -239,7 +239,7 @@ uno::Reference<XAccessible> SAL_CALL
     }
     else
         throw lang::IndexOutOfBoundsException (
-            "no accessible child with index " + OUString::valueOf(nIndex),
+            "no accessible child with index " + OUString::number(nIndex),
             static_cast<uno::XWeak*>(this));
 }
 
@@ -683,7 +683,7 @@ void AccessibleDrawDocumentView::UpdateAccessibleName (void)
                 sal_Int16 nPageNumber (0);
                 if (xProperties->getPropertyValue("Number") >>= nPageNumber)
                 {
-                    sNewName += OUString::valueOf(sal_Int32(nPageNumber));
+                    sNewName += OUString::number(nPageNumber);
                 }
             }
             catch (beans::UnknownPropertyException&)
@@ -699,7 +699,7 @@ void AccessibleDrawDocumentView::UpdateAccessibleName (void)
         if (xPages.is())
         {
             sNewName += " / ";
-            sNewName += OUString::valueOf(xPages->getCount());
+            sNewName += OUString::number(xPages->getCount());
         }
     }
 
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 9e41ebb52e76..8af343d7c95f 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1789,7 +1789,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent,
             if( nPos != LISTBOX_ENTRY_NOTFOUND )
                 mpCBDuration->SelectEntryPos( nPos );
             else
-                mpCBDuration->SetText(OUString::valueOf(fDuration));
+                mpCBDuration->SetText(OUString::number(fDuration));
         }
     }
 
@@ -1820,7 +1820,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent,
             if( nPos != LISTBOX_ENTRY_NOTFOUND )
                 mpCBRepeat->SelectEntryPos( nPos );
             else
-                mpCBRepeat->SetText(OUString::valueOf(fRepeat));
+                mpCBRepeat->SetText(OUString::number(fRepeat));
         }
         else if( aRepeatCount.getValueType() == ::getCppuType((const Timing*)0) )
         {
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 1d06e7979b7c..23ae228aea30 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -134,7 +134,7 @@ OUString getShapeDescription( const Reference< XShape >& xShape, bool bWithText
     }
 
     aDescription += " ";
-    aDescription += OUString::valueOf( getShapeIndex( xShape ) );
+    aDescription += OUString::number( getShapeIndex( xShape ) );
 
     if( bWithText )
     {
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 099b860df468..a74608c806a0 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -1039,7 +1039,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation
             if( pMenu->IsItemEnabled( nId ) )
             {
                 OUString sSlotURL( "slot:" );
-                sSlotURL += OUString::valueOf( sal_Int32( nId ));
+                sSlotURL += OUString::number( nId);
 
                 Image aImage( GetImage( xFrame, sSlotURL, false ) );
                 if( !!aImage )
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index d60c467535d1..7ee5715c34e6 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -589,7 +589,7 @@ BitmapEx AnnotationTag::CreateAnnotationBitmap( bool bSelected )
 
     OUString sAuthor( getInitials( mxAnnotation->getAuthor() ) );
     sAuthor += OUString( sal_Unicode( ' ' ) );
-    sAuthor += OUString::valueOf( (sal_Int32)mnIndex );
+    sAuthor += OUString::number( mnIndex );
 
     aVDev.SetFont( mrFont );
 
diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx
index 74a268a45175..8a8204526801 100644
--- a/sd/source/ui/app/tbxww.cxx
+++ b/sd/source/ui/app/tbxww.cxx
@@ -149,7 +149,7 @@ void SdTbxControl::StateChanged( sal_uInt16 nSId,
             else
             {
                 OUString aSlotURL( "slot:" );
-                aSlotURL += OUString::valueOf( sal_Int32( nImage ));
+                aSlotURL += OUString::number( nImage);
                 Image aImage = GetImage( m_xFrame,
                                          aSlotURL,
                                          hasBigImages()
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index d7b00033f394..bce4935e2ac2 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -563,7 +563,7 @@ long ClientBox::PointToPos( const Point& rPos )
 
 OUString ClientBox::getPin()
 {
-    return OUString::valueOf( m_aPinBox.GetValue() );
+    return OUString::number( m_aPinBox.GetValue() );
 }
 
 //------------------------------------------------------------------------------
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 53db5b9c1c0c..57c5325908d2 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -581,8 +581,8 @@ void AnimationWindow::UpdateControl(bool const bDisableCtrls)
     aCtlDisplay.Invalidate();
     aCtlDisplay.Update();
 
-    aFiCount.SetText(OUString::valueOf(
-                static_cast<sal_Int64>(m_FrameList.size())));
+    aFiCount.SetText(OUString::number(
+                m_FrameList.size()));
 
     if (!m_FrameList.empty() && !bMovie)
     {
@@ -887,7 +887,7 @@ void AnimationWindow::AddObj (::sd::View& rView )
                             if( !nLoopCount ) // endless
                                 aLbLoopCount.SelectEntryPos( aLbLoopCount.GetEntryCount() - 1);
                             else
-                                aLbLoopCount.SelectEntry(OUString::valueOf( nLoopCount ) );
+                                aLbLoopCount.SelectEntry(OUString::number( nLoopCount ) );
                         }
 
                         long nTime = rAnimBmp.nWait;
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index 57d98ba620c5..676de78922a4 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -111,9 +111,9 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit )
     }
 
     // which object is shown at the moment?
-    OUString info = OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetCurObj() ) )
+    OUString info = OUString::number( pProgrInfo->GetCurObj() )
             + "/"
-            + OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetObjCount() ) );
+            + OUString::number( pProgrInfo->GetObjCount() );
     aFiObjInfo.SetText(info);
 
     // how many actions are started?
@@ -123,9 +123,9 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit )
     }
     else
     {
-        info = OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetCurAction() ) )
+        info = OUString::number( pProgrInfo->GetCurAction() )
             + "/"
-            + OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetActionCount() ) );
+            + OUString::number( pProgrInfo->GetActionCount() );
         aFiActInfo.SetText(info);
     }
 
@@ -136,9 +136,9 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit )
     }
     else
     {
-        info = OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetCurInsert() ) )
+        info = OUString::number( pProgrInfo->GetCurInsert() )
             + "/"
-            + OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetInsertCount() ) );
+            + OUString::number( pProgrInfo->GetInsertCount() );
         aFiInsInfo.SetText(info);
     }
 
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index ca4f23856b37..14c64aa8e60b 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -107,10 +107,10 @@ CopyDlg::~CopyDlg()
     rStr += OUString::number(m_pMtrFldHeight->GetValue());
     rStr.Append( TOKEN );
 
-    rStr += OUString::valueOf( (long)m_pLbStartColor->GetSelectEntryColor().GetColor() );
+    rStr += OUString::number( m_pLbStartColor->GetSelectEntryColor().GetColor() );
     rStr.Append( TOKEN );
 
-    rStr += OUString::valueOf( (long)m_pLbEndColor->GetSelectEntryColor().GetColor() );
+    rStr += OUString::number( m_pLbEndColor->GetSelectEntryColor().GetColor() );
 }
 
 /**
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index ac564ee7da1e..1878f5ddb344 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -188,14 +188,14 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
             sal_Int32 nNum = 1;
             if( nStrPos < 0 )
             {
-                aStr = aStr + " ("  + aStrCopy + OUString::valueOf( nNum ) + ")";
+                aStr = aStr + " ("  + aStrCopy + OUString::number( nNum ) + ")";
                 nStrPos = aStr.indexOf( aStrCopy );
             }
             nStrPos = nStrPos + aStrCopy.getLength();
             // that we do not access into the nirvana (--> endless loop)
             if( nStrPos >= aStr.getLength() )
             {
-                aStr = aStr + " " + OUString::valueOf( nNum );
+                aStr = aStr + " " + OUString::number( nNum );
             }
 
             // check name...
@@ -218,7 +218,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
                     const CharClass* pCharClass = rDoc.GetCharClass();
                     while( pCharClass->isDigit( aStr, nStrPos ) )
                         aStr = aStr.replaceAt( nStrPos, 1, "" );
-                    aStr = aStr.copy( 0, nStrPos) + OUString::valueOf( ++nNum ) + aStr.copy( nStrPos);
+                    aStr = aStr.copy( 0, nStrPos) + OUString::number( ++nNum ) + aStr.copy( nStrPos);
                 }
 
             }
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 9313cb26d161..3476358888f0 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -203,7 +203,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
         case PO_OUTLINE_8:
         case PO_OUTLINE_9:
             aTitle = OUString(SdResId( STR_PSEUDOSHEET_OUTLINE )) + " " +
-                OUString::valueOf( static_cast<sal_Int32>( ePO - PO_OUTLINE_1 + 1 ) );
+                OUString::number( ePO - PO_OUTLINE_1 + 1 );
         break;
 
         case PO_NOTES:
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 30a540df7855..e27b406e4615 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -826,7 +826,7 @@ String SdTPAction::GetEditText( sal_Bool bFullDocDestination )
             {
                 const sal_uInt16 nPos = aLbOLEAction.GetSelectEntryPos();
                 if( nPos < aVerbVector.size() )
-                    aStr = OUString::valueOf( aVerbVector[ nPos ] );
+                    aStr = OUString::number( aVerbVector[ nPos ] );
                 return aStr;
             }
         case presentation::ClickAction_DOCUMENT:
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index da7e24ec84da..6bc07433eed3 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -578,9 +578,9 @@ void    SdTpOptionsMisc::SetDrawMode()
 
 String SdTpOptionsMisc::GetScale( sal_Int32 nX, sal_Int32 nY )
 {
-    String aScale( OUString::valueOf( nX ) );
+    String aScale( OUString::number( nX ) );
     aScale.Append( TOKEN );
-    aScale.Append( OUString::valueOf( nY ) );
+    aScale.Append( OUString::number( nY ) );
 
     return( aScale );
 }
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index a87cccd0cb12..9dca799fd096 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -99,7 +99,7 @@ void ImagePreparer::sendPreview( sal_uInt32 aSlideNumber )
 
     aBuffer.append( "slide_preview\n" );
 
-    aBuffer.append( OString::valueOf( sal_Int32( aSlideNumber ) ).getStr() );
+    aBuffer.append( OString::number( aSlideNumber ).getStr() );
     aBuffer.append( "\n" );
 
     aBuffer.append( aEncodedShortString.getStr() );
@@ -190,7 +190,7 @@ void ImagePreparer::sendNotes( sal_uInt32 aSlideNumber )
 
     aBuffer.append( "slide_notes\n" );
 
-    aBuffer.append( OString::valueOf( sal_Int32( aSlideNumber ) ).getStr() );
+    aBuffer.append( OString::number( aSlideNumber ).getStr() );
     aBuffer.append( "\n" );
 
     aBuffer.append( "<html><body>" );
diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx
index d28a526c86c8..be0c9cee6c7c 100644
--- a/sd/source/ui/remotecontrol/Listener.cxx
+++ b/sd/source/ui/remotecontrol/Listener.cxx
@@ -46,8 +46,8 @@ void Listener::init( const css::uno::Reference< css::presentation::XSlideShowCon
         sal_Int32 aCurrentSlide = aController->getCurrentSlideIndex();
         OStringBuffer aBuffer;
         aBuffer.append( "slideshow_started\n" )
-               .append( OString::valueOf( aSlides ) ).append("\n")
-        .append( OString::valueOf( aCurrentSlide ) ).append( "\n\n" );
+               .append( OString::number( aSlides ) ).append("\n")
+        .append( OString::number( aCurrentSlide ) ).append( "\n\n" );
 
         pTransmitter->addMessage( aBuffer.makeStringAndClear(),
                                   Transmitter::PRIORITY_HIGH );
@@ -114,7 +114,7 @@ void SAL_CALL Listener::slideTransitionStarted (void)
     sal_Int32 aSlide = mController->getCurrentSlideIndex();
 
     OStringBuffer aBuilder( "slide_updated\n" );
-    aBuilder.append( OString::valueOf( aSlide ) );
+    aBuilder.append( OString::number( aSlide ) );
     aBuilder.append( "\n\n" );
 
     if ( pTransmitter )
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index be41524594c9..33633f7f3ea4 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -270,7 +270,7 @@ void RecentlyUsedMasterPages::SavePersistentValues (void)
         {
             // Create new child.
             OUString sKey ("index_");
-            sKey += OUString::valueOf(nIndex);
+            sKey += OUString::number(nIndex);
             Reference<container::XNameReplace> xChild(
                 xChildFactory->createInstance(), UNO_QUERY);
             if (xChild.is())
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx
index b4fb2b0d218c..822e8bee6db3 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.cxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx
@@ -133,7 +133,7 @@ void SlideShowRestarter::StartPresentation (void)
         {
             Sequence<css::beans::PropertyValue> aProperties (1);
             aProperties[0].Name = "FirstPage";
-            aProperties[0].Value <<= "page" + OUString::valueOf(mnCurrentSlideNumber+1);
+            aProperties[0].Value <<= "page" + OUString::number(mnCurrentSlideNumber+1);
             mpSlideShow->startWithArguments(aProperties);
         }
         mpSelf.reset();
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index dfd04baeb23f..9b7dcf3bf67e 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -743,7 +743,7 @@ void SlideSorterView::CompleteRedraw (
     mrSlideSorter.GetContentWindow()->SetTextColor(COL_WHITE);
     mrSlideSorter.GetContentWindow()->DrawText(
         gFrameTimeBox,
-        OUString::valueOf(1 / (gFrameTimeSum / gFrameTimeCount)),
+        OUString::number(1 / (gFrameTimeSum / gFrameTimeCount)),
         TEXT_DRAW_RIGHT | TEXT_DRAW_VCENTER);
     //    mrSlideSorter.GetContentWindow()->Invalidate(gFrameTimeBox);
 #endif
diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
index 4375dfa2b7f6..87d91d2aca4c 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
@@ -270,7 +270,7 @@ void InsertionIndicatorOverlay::PaintPageCount (
     ::boost::shared_ptr<Font> pFont(Theme::GetFont(Theme::Font_PageCount, rDevice));
     if (pFont)
     {
-        OUString sNumber (OUString::valueOf(nSelectionCount));
+        OUString sNumber (OUString::number(nSelectionCount));
 
         // Determine the size of the (painted) text and create a bounding
         // box that centers the text on the first preview.
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index a87d7a77711f..0eafa0b21eeb 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/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 OUString sPageNumber(OUString::valueOf(nPageNumber));
+    const OUString sPageNumber(OUString::number(nPageNumber));
     rDevice.SetFont(*mpPageNumberFont);
     rDevice.SetTextColor(aPageNumberColor);
     rDevice.DrawText(aBox, sPageNumber, TEXT_DRAW_RIGHT | TEXT_DRAW_VCENTER);
diff --git a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
index b471040d4b53..da68fab327da 100644
--- a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
@@ -273,7 +273,7 @@ void RecentlyUsedMasterPages::SavePersistentValues (void)
         {
             // Create new child.
             OUString sKey ("index_");
-            sKey += OUString::valueOf(nIndex);
+            sKey += OUString::number(nIndex);
             Reference<container::XNameReplace> xChild(
                 xChildFactory->createInstance(), UNO_QUERY);
             if (xChild.is())
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 15dfadcde042..bf523c10fb0f 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -531,7 +531,7 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal
         while( aLayerName.Len()==0 || rLayerAdmin.GetLayer( aLayerName, sal_False) )
         {
             aLayerName = String(SdResId(STR_LAYER));
-            aLayerName += OUString::valueOf(nLayer);
+            aLayerName += OUString::number(nLayer);
             ++nLayer;
         }
 
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 51b0a450b86d..4597e7e9925a 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -210,7 +210,7 @@ namespace {
             if (nContent == 2 && // selection
                 nCurrentPageIndex >= 0)
             {
-                return OUString::valueOf(nCurrentPageIndex + 1);
+                return OUString::number(nCurrentPageIndex + 1);
             }
 
             return OUString();
@@ -640,7 +640,7 @@ namespace {
             vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt( aPrintRangeName, 1, sal_True );
             AddDialogControl(vcl::PrinterOptionsHelper::setEditControlOpt("pagerange", "",
                                 ".HelpID:vcl:PrintDialog:PageRange:Edit", "PageRange",
-                                OUString::valueOf(mnCurPage + 1), aPageRangeOpt));
+                                OUString::number(mnCurPage + 1), aPageRangeOpt));
 
             FreeResource();
         }
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index d41c9261e13f..18dd7d1056f3 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -720,13 +720,13 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
         // Always show the slide/page number.
         OUString aOUString = SD_RESSTR(STR_SD_PAGE);
         aOUString += " ";
-        aOUString += OUString::valueOf( sal_Int32(maTabControl.GetCurPageId()) );
+        aOUString += OUString::number( maTabControl.GetCurPageId() );
         aOUString += " / " ;
-        aOUString += OUString::valueOf( nPageCount );
+        aOUString += OUString::number( nPageCount );
         if (nPageCount != nActivePageCount)
         {
             aOUString += " (";
-            aOUString += OUString::valueOf( nActivePageCount );
+            aOUString += OUString::number( nActivePageCount );
             aOUString += ")";
         }