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

11 files changed, 31 insertions, 31 deletions

diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx
index d22d2c89e56d..94730be8d385 100644
--- a/vcl/generic/print/glyphset.cxx
+++ b/vcl/generic/print/glyphset.cxx
@@ -395,7 +395,7 @@ GlyphSet::GetGlyphSetEncodingName (rtl_TextEncoding nEnc, const OString &rFontNa
     {
         return  rFontName
                 + OString("Enc")
-                + OString::valueOf ((sal_Int32)(nEnc - RTL_TEXTENCODING_USER_START));
+                + OString::number ((nEnc - RTL_TEXTENCODING_USER_START));
     }
     else
     {
@@ -448,7 +448,7 @@ GlyphSet::GetReencodedFontName (rtl_TextEncoding nEnc, const OString &rFontName)
     {
         return rFontName
                + OString("-enc")
-               + OString::valueOf ((sal_Int32)(nEnc - RTL_TEXTENCODING_USER_START));
+               + OString::number ((nEnc - RTL_TEXTENCODING_USER_START));
     }
     else
     {
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index 2af8923af271..7c1b359cd836 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -586,7 +586,7 @@ PrinterJob::StartPage (const JobData& rJobSetup)
 {
     InitPaperSize (rJobSetup);
 
-    OUString aPageNo = OUString::valueOf ((sal_Int32)maPageList.size()+1); // sequential page number must start with 1
+    OUString aPageNo = OUString::number ((sal_Int32)maPageList.size()+1); // sequential page number must start with 1
     OUString aExt    = aPageNo + OUString(".ps");
 
     osl::File* pPageHeader = CreateSpoolFile ( OUString("psp_pghead"), aExt);
@@ -862,7 +862,7 @@ void PrinterJob::writeJobPatch( osl::File* pFile, const JobData& rJobData )
     {
         // note: this discards patch files not adhering to the "int" scheme
         // as there won't be a value for them
-        writeFeature( pFile, pKey, pKey->getValue( OUString::valueOf( patch_order.front() ) ), false );
+        writeFeature( pFile, pKey, pKey->getValue( OUString::number( patch_order.front() ) ), false );
         patch_order.pop_front();
     }
 }
diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx
index 321438a5dba6..a8c4eb60a6ca 100644
--- a/vcl/headless/svpdummies.cxx
+++ b/vcl/headless/svpdummies.cxx
@@ -66,7 +66,7 @@ Rectangle SvpSalSystem::GetDisplayScreenPosSizePixel( unsigned int nScreen )
 
 OUString SvpSalSystem::GetDisplayScreenName( unsigned int nScreen )
 {
-   return "VirtualScreen " + OUString::valueOf(sal_Int32(nScreen));
+   return "VirtualScreen " + OUString::number(nScreen);
 }
 
 int SvpSalSystem::ShowNativeDialog( const OUString&, const OUString&,
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 27367d770dae..e0c7558ade9f 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -945,12 +945,12 @@ namespace
         OUStringBuffer aBuf;
         sal_Int32 nTextLen;
 
-        nTextLen = OUString::valueOf(rFormatter.GetMin()).getLength();
+        nTextLen = OUString::number(rFormatter.GetMin()).getLength();
         string::padToLength(aBuf, nTextLen, '9');
         Size aMinTextSize = rSpinField.CalcMinimumSizeForText(
             rFormatter.CreateFieldText(aBuf.makeStringAndClear().toInt64()));
 
-        nTextLen = OUString::valueOf(rFormatter.GetMax()).getLength();
+        nTextLen = OUString::number(rFormatter.GetMax()).getLength();
         string::padToLength(aBuf, nTextLen, '9');
         Size aMaxTextSize = rSpinField.CalcMinimumSizeForText(
             rFormatter.CreateFieldText(aBuf.makeStringAndClear().toInt64()));
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index 328289b12506..e6d46e7cd578 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -394,7 +394,7 @@ uno::Reference< graphic::XGraphic > Graphic::GetXGraphic() const
         OUString                                aURL( "private:memorygraphic/" );
 
         aLoadProps[ 0 ].Name = OUString( "URL" );
-        aLoadProps[ 0 ].Value <<= ( aURL += OUString::valueOf( reinterpret_cast< sal_Int64 >( this ) ) );
+        aLoadProps[ 0 ].Value <<= ( aURL += OUString::number( reinterpret_cast< sal_Int64 >( this ) ) );
 
         xRet = xProv->queryGraphic( aLoadProps );
     }
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 252cd5d2b550..482929d883ba 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -773,7 +773,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
         if( i_rControl.getType() == PDFWriter::RadioButton )
         {
             aPartialName  = "RadioGroup";
-            aPartialName += OString::valueOf( static_cast<const PDFWriter::RadioButtonWidget&>(i_rControl).RadioGroup );
+            aPartialName += OString::number( static_cast<const PDFWriter::RadioButtonWidget&>(i_rControl).RadioGroup );
         }
         else
             aPartialName = OString( "Widget" );
@@ -6634,7 +6634,7 @@ bool PDFWriterImpl::emitTrailer()
     for( sal_Int32 i = 0; i < nObjects; i++ )
     {
         aLine.setLength( 0 );
-        OString aOffset = OString::valueOf( (sal_Int64)m_aObjects[i] );
+        OString aOffset = OString::number( m_aObjects[i] );
         for( sal_Int32 j = 0; j < (10-aOffset.getLength()); j++ )
             aLine.append( '0' );
         aLine.append( aOffset );
@@ -11649,7 +11649,7 @@ void PDFWriterImpl::ensureUniqueRadioOnValues()
             {
                 int nKidIndex = rGroupWidget.m_aKidsIndex[nKid];
                 PDFWidget& rKid = m_aWidgets[nKidIndex];
-                rKid.m_aOnValue = OUString::valueOf( sal_Int32(nKid+1) );
+                rKid.m_aOnValue = OUString::number( nKid+1 );
                 if( rKid.m_aValue != "Off" )
                     rKid.m_aValue = rKid.m_aOnValue;
             }
@@ -11895,7 +11895,7 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa
             rNewWidget.m_aRect = Rectangle(0, 0, 0, 0);
 
         m_nSignatureObject = createObject();
-        rNewWidget.m_aValue = OUString::valueOf( m_nSignatureObject );
+        rNewWidget.m_aValue = OUString::number( m_nSignatureObject );
         rNewWidget.m_aValue += " 0 R";
         //createDefaultSignatureAppearance( rNewWidget, rSig );
         // let's add a fake appearance
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 21d45b6431cf..6cc9800aa138 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1051,9 +1051,9 @@ void VclBuilder::cleanupWidgetOwnScrolling(Window *pScrollParent, Window *pWindo
 {
     //remove the redundant scrolling parent
     sal_Int32 nWidthReq = pScrollParent->get_width_request();
-    rMap[OString("width-request")] = OString::valueOf(nWidthReq);
+    rMap[OString("width-request")] = OString::number(nWidthReq);
     sal_Int32 nHeightReq = pScrollParent->get_height_request();
-    rMap[OString("height-request")] = OString::valueOf(nHeightReq);
+    rMap[OString("height-request")] = OString::number(nHeightReq);
 
     m_pParserState->m_aRedundantParentWidgets[pScrollParent] = pWindow;
 }
@@ -2000,7 +2000,7 @@ void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID, sal
                     }
                     else if (nId == 0 && name.equals("translatable") && reader.getAttributeValue(false).equals("yes"))
                     {
-                        sValue = getTranslation(rID, OString::valueOf(nRowIndex));
+                        sValue = getTranslation(rID, OString::number(nRowIndex));
                         bTranslated = !sValue.isEmpty();
                     }
                 }
@@ -2140,7 +2140,7 @@ std::vector<OString> VclBuilder::handleItems(xmlreader::XmlReader &reader, const
                 {
                     if (name.equals("translatable") && reader.getAttributeValue(false).equals("yes"))
                     {
-                        sValue = getTranslation(rID, OString::valueOf(nItemIndex));
+                        sValue = getTranslation(rID, OString::number(nItemIndex));
                         bTranslated = !sValue.isEmpty();
                     }
                 }
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 594fb4442450..42c04113d0a2 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -325,7 +325,7 @@ void PrintDialog::ShowNupOrderWindow::Paint( const Rectangle& i_rRect )
     Font aFont( GetSettings().GetStyleSettings().GetFieldFont() );
     aFont.SetSize( Size( 0, 24 ) );
     SetFont( aFont );
-    Size aSampleTextSize( GetTextWidth( OUString::valueOf( sal_Int32(nPages+1) ) ), GetTextHeight() );
+    Size aSampleTextSize( GetTextWidth( OUString::number( nPages+1 ) ), GetTextHeight() );
 
     Size aOutSize( GetOutputSizePixel() );
     Size aSubSize( aOutSize.Width() / mnColumns, aOutSize.Height() / mnRows );
@@ -341,7 +341,7 @@ void PrintDialog::ShowNupOrderWindow::Paint( const Rectangle& i_rRect )
     long nTextHeight = GetTextHeight();
     for( int i = 0; i < nPages; i++ )
     {
-        OUString aPageText( OUString::valueOf( sal_Int32(i+1) ) );
+        OUString aPageText( OUString::number( i+1 ) );
         int nX = 0, nY = 0;
         switch( mnOrderMode )
         {
@@ -1269,7 +1269,7 @@ void PrintDialog::updatePrinterText()
 
 void PrintDialog::setPreviewText( sal_Int32 )
 {
-    OUString aNewText( searchAndReplace( maPageStr, "%n", 2, OUString::valueOf( mnCachedPages )  ) );
+    OUString aNewText( searchAndReplace( maPageStr, "%n", 2, OUString::number( mnCachedPages )  ) );
     mpNumPagesText->SetText( aNewText );
 }
 
@@ -1904,8 +1904,8 @@ void PrintProgressDialog::setProgress( int i_nCurrent, int i_nMax )
     if( mnMax < 1 )
         mnMax = 1;
 
-    OUString aNewText( searchAndReplace( maStr, "%p", 2, OUString::valueOf( mnCur ) ) );
-    aNewText = searchAndReplace( aNewText, "%n", 2, OUString::valueOf( mnMax ) );
+    OUString aNewText( searchAndReplace( maStr, "%p", 2, OUString::number( mnCur ) ) );
+    aNewText = searchAndReplace( aNewText, "%n", 2, OUString::number( mnMax ) );
     maText.SetText( aNewText );
 
     // update progress
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index e386d3dfc293..a5705c31bd30 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -629,7 +629,7 @@ void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner
 
     if( rJob.m_nPDFDevice > 0 && rJob.m_nCopies > 1 )
     {
-        OString aVal( OString::valueOf( sal_Int32( rJob.m_nCopies ) ) );
+        OString aVal( OString::number( rJob.m_nCopies ) );
         rNumOptions = cupsAddOption( "copies", aVal.getStr(), rNumOptions, (cups_option_t**)rOptions );
     }
     if( ! bBanner )
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 4e53c82891a2..9f4dfa2870d7 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -772,12 +772,12 @@ bool PrinterInfoManager::writePrinterConfig()
             pConfig->WriteKey( "Command", OUStringToOString(it->second.m_aInfo.m_aCommand, RTL_TEXTENCODING_UTF8) );
             pConfig->WriteKey( "QuickCommand", OUStringToOString(it->second.m_aInfo.m_aQuickCommand, RTL_TEXTENCODING_UTF8) );
             pConfig->WriteKey( "Features", OUStringToOString(it->second.m_aInfo.m_aFeatures, RTL_TEXTENCODING_UTF8) );
-            pConfig->WriteKey("Copies", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nCopies)));
+            pConfig->WriteKey("Copies", OString::number(it->second.m_aInfo.m_nCopies));
             pConfig->WriteKey( "Orientation", it->second.m_aInfo.m_eOrientation == orientation::Landscape ? "Landscape" : "Portrait" );
-            pConfig->WriteKey("PSLevel", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nPSLevel)));
-            pConfig->WriteKey("PDFDevice", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nPDFDevice)));
-            pConfig->WriteKey("ColorDevice", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nColorDevice)));
-            pConfig->WriteKey("ColorDepth", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nColorDepth)));
+            pConfig->WriteKey("PSLevel", OString::number(it->second.m_aInfo.m_nPSLevel));
+            pConfig->WriteKey("PDFDevice", OString::number(it->second.m_aInfo.m_nPDFDevice));
+            pConfig->WriteKey("ColorDevice", OString::number(it->second.m_aInfo.m_nColorDevice));
+            pConfig->WriteKey("ColorDepth", OString::number(it->second.m_aInfo.m_nColorDepth));
             aValue.append(static_cast<sal_Int32>(it->second.m_aInfo.m_nLeftMarginAdjust));
             aValue.append(',');
             aValue.append(static_cast<sal_Int32>(it->second.m_aInfo.m_nRightMarginAdjust));
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index b50fae1b1815..18af29460b82 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -635,7 +635,7 @@ GtkPrintDialog::impl_initCustomTab()
                     GtkWidget* const pRow = gtk_hbox_new(FALSE, 12);
                     gtk_box_pack_start(GTK_BOX(pVbox), pRow, FALSE, FALSE, 0);
                     gtk_box_pack_start(GTK_BOX(pRow), pWidget, FALSE, FALSE, 0);
-                    aPropertyToDependencyRowMap[aPropertyName + OUString::valueOf(m)] = pRow;
+                    aPropertyToDependencyRowMap[aPropertyName + OUString::number(m)] = pRow;
                     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pWidget), m == nSelectVal);
                     gtk_widget_set_sensitive(pWidget,
                         m_rController.isUIOptionEnabled(aPropertyName) && pVal != NULL);
@@ -722,7 +722,7 @@ GtkPrintDialog::impl_initCustomTab()
             {
                 if (bUseDependencyRow && !aDependsOnName.isEmpty())
                 {
-                    pRow = aPropertyToDependencyRowMap[aDependsOnName + OUString::valueOf(nDependsOnValue)];
+                    pRow = aPropertyToDependencyRowMap[aDependsOnName + OUString::number(nDependsOnValue)];
                     if (!pRow)
                     {
                         gtk_widget_destroy(pWidget);
@@ -738,7 +738,7 @@ GtkPrintDialog::impl_initCustomTab()
                     gtk_box_pack_start(GTK_BOX(pCurParent), pRow, FALSE, FALSE, 0);
                 }
                 if (!pGroup)
-                    aPropertyToDependencyRowMap[aPropertyName + OUString::valueOf(sal_Int32(0))] = pRow;
+                    aPropertyToDependencyRowMap[aPropertyName + OUString::number(0)] = pRow;
                 gtk_box_pack_start(GTK_BOX(pRow), pWidget, FALSE, FALSE, 0);
             }
         }
@@ -1153,7 +1153,7 @@ const
     const OUString aPrintDialogStr("PrintDialog");
     pItem->setValue(aPrintDialogStr,
             OUString("CopyCount"),
-            OUString::valueOf(sal_Int32(m_pWrapper->print_settings_get_n_copies(pSettings))));
+            OUString::number(m_pWrapper->print_settings_get_n_copies(pSettings)));
     pItem->setValue(aPrintDialogStr,
             OUString("Collate"),
             m_pWrapper->print_settings_get_collate(pSettings)