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

19 files changed, 43 insertions, 43 deletions

diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 49ca5cc19332..426ab51d4436 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -369,7 +369,7 @@ uno::Reference<XAccessible> SAL_CALL
     else
         throw lang::IndexOutOfBoundsException (
             OUString("shape has no child with index ")
-            + OUString::valueOf(nIndex),
+            + OUString::number(nIndex),
             static_cast<uno::XWeak*>(this));
 
     return xChild;
@@ -1003,7 +1003,7 @@ OUString
 
     // Put a space between name and index because of Gnopernicus othewise
     // spells the name.
-    sName += " " + OUString::valueOf (nIndex);
+    sName += " " + OUString::number (nIndex);
 
     return sName;
 }
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 1828ebf22dde..5a20a6808c5b 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -121,7 +121,7 @@ uno::Reference<XAccessible>
     // Check whether the given index is valid.
     if (nIndex < 0 || (unsigned long)nIndex >= maVisibleChildren.size())
         throw lang::IndexOutOfBoundsException (
-            "no accessible child with index " + OUString::valueOf(nIndex),
+            "no accessible child with index " + OUString::number(nIndex),
             mxParent);
 
     return GetChild (maVisibleChildren[nIndex],nIndex);
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index c6bc3971ec7f..6ec8a724cbb8 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -328,7 +328,7 @@ void EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( OUString
         if ( nPara & 0x400 )
         {
             rParameter += "?";
-            rParameter += OUString::valueOf( (sal_Int32)( nPara & 0xff ) );
+            rParameter += OUString::number( ( nPara & 0xff ) );
             rParameter += " ";
         }
         else
@@ -347,7 +347,7 @@ void EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( OUString
                 case DFF_Prop_adjust10Value :
                 {
                     rParameter += "$";
-                    rParameter += OUString::valueOf( (sal_Int32)( nPara - DFF_Prop_adjustValue ) );
+                    rParameter += OUString::number( ( nPara - DFF_Prop_adjustValue ) );
                     rParameter += " ";
                 }
                 break;
@@ -376,7 +376,7 @@ void EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( OUString
     }
     else
     {
-        rParameter += OUString::valueOf( (sal_Int32)( nPara ) );
+        rParameter += OUString::number( ( nPara ) );
     }
 }
 
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index efc480ad4d1c..f719403643b2 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -160,8 +160,8 @@ void CompressGraphicsDialog::Update()
     OUString aHeightString = GetUnitString( aOriginalSize100mm.Height(), eFieldUnit, cSeparator );
     aBitmapSizeString = aBitmapSizeString.replaceAll("$(WIDTH)",  aWidthString);
     aBitmapSizeString = aBitmapSizeString.replaceAll("$(HEIGHT)", aHeightString);
-    aBitmapSizeString = aBitmapSizeString.replaceAll("$(WIDTH_IN_PX)",  OUString::valueOf(aPixelSize.Width()));
-    aBitmapSizeString = aBitmapSizeString.replaceAll("$(HEIGHT_IN_PX)", OUString::valueOf(aPixelSize.Height()));
+    aBitmapSizeString = aBitmapSizeString.replaceAll("$(WIDTH_IN_PX)",  OUString::number(aPixelSize.Width()));
+    aBitmapSizeString = aBitmapSizeString.replaceAll("$(HEIGHT_IN_PX)", OUString::number(aPixelSize.Height()));
     m_pFixedText2->SetText(aBitmapSizeString);
 
     int aValX = (int) (aPixelSize.Width() / GetViewWidthInch());
@@ -182,7 +182,7 @@ void CompressGraphicsDialog::Update()
     sal_Int32 aNativeSize = aMemStream.Tell();
 
     OUString aNativeSizeString = SVX_RESSTR(STR_IMAGE_CAPACITY);
-    aNativeSizeString = aNativeSizeString.replaceAll("$(CAPACITY)",  OUString::valueOf(aNativeSize / 1024));
+    aNativeSizeString = aNativeSizeString.replaceAll("$(CAPACITY)",  OUString::number(aNativeSize / 1024));
     m_pFixedText5->SetText(aNativeSizeString);
 
     m_pFixedText6->SetText(String("??"));
@@ -202,7 +202,7 @@ void CompressGraphicsDialog::UpdateNewHeightMF()
 
 void CompressGraphicsDialog::UpdateResolutionLB()
 {
-    m_pResolutionLB->SetText( OUString::valueOf( (sal_Int32) m_dResolution ) );
+    m_pResolutionLB->SetText( OUString::number( (sal_Int32) m_dResolution ) );
 }
 
 double CompressGraphicsDialog::GetViewWidthInch()
@@ -326,7 +326,7 @@ IMPL_LINK_NOARG( CompressGraphicsDialog, CalculateClickHdl )
 
     if ( aSize > 0 )
     {
-        OUString aSizeAsString = OUString::valueOf(aSize / 1024);
+        OUString aSizeAsString = OUString::number(aSize / 1024);
 
         OUString aNewSizeString = SVX_RESSTR(STR_IMAGE_CAPACITY);
         aNewSizeString = aNewSizeString.replaceAll("$(CAPACITY)", aSizeAsString);
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index b2683522a304..dc9454ac034d 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -562,7 +562,7 @@ namespace svx
             sal_Int32 nSelectedRow( 0 );
             OSL_VERIFY( *pSelRows >>= nSelectedRow );
 
-            m_sCompatibleObjectDescription += OUString::valueOf((sal_Int32)nSelectedRow);
+            m_sCompatibleObjectDescription += OUString::number(nSelectedRow);
             m_sCompatibleObjectDescription += sSeparator;
         }
     }
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index 32f58ced4229..1e9e096499c2 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -147,7 +147,7 @@ namespace svxform
 
         OSL_FAIL(
             (   OString( "lcl_implMapIntValue: could not convert the integer value " )
-            +=  OString::valueOf( (sal_Int32)_nValue )
+            +=  OString::number( _nValue )
             +=  OString( " !" )
             ).getStr()
         );
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 2c28bf6000d9..5d251b67fb4a 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -463,7 +463,7 @@ namespace svx
             {
                 OString sMessage( "lcl_getUnoSlotName: invalid slot id, or invalid slot, or no UNO name!\n" );
                 sMessage += "(slot id: ";
-                sMessage += OString::valueOf( (sal_Int32)_nSlotId );
+                sMessage += OString::number( _nSlotId );
                 sMessage += ")";
                 OSL_FAIL( sMessage.getStr() );
             }
@@ -743,8 +743,8 @@ namespace svx
                     else
                     {
                         OString sError( "FmTextControShell::executeAttributeDialog: Could not handle the following item:" );
-                        sError += "\n  SlotID: "; sError += OString::valueOf( (sal_Int32)nSlotForItemSet );
-                        sError += "\n  WhichID: "; sError += OString::valueOf( (sal_Int32)nWhich );
+                        sError += "\n  SlotID: "; sError += OString::number( nSlotForItemSet );
+                        sError += "\n  WhichID: "; sError += OString::number( nWhich );
                         sError += "\n  UNO name: ";
 
                         OUString sUnoSlotName = lcl_getUnoSlotName( *SFX_APP(), nSlotForItemSet );
@@ -1065,7 +1065,7 @@ namespace svx
     {
 #if OSL_DEBUG_LEVEL > 0
         OString sTrace( "FmTextControlShell::formActivated: 0x" );
-        sTrace += OString::valueOf( (sal_IntPtr)_rxController.get(), 16 );
+        sTrace += OString::number( (sal_IntPtr)_rxController.get(), 16 );
         OSL_TRACE( "%s", sTrace.getStr() );
 #endif
 
@@ -1093,7 +1093,7 @@ namespace svx
     {
 #if OSL_DEBUG_LEVEL > 0
         OString sTrace( "FmTextControlShell::formDeactivated: 0x" );
-        sTrace += OString::valueOf( (sal_IntPtr)_rxController.get(), 16 );
+        sTrace += OString::number( (sal_IntPtr)_rxController.get(), 16 );
         OSL_TRACE( "%s", sTrace.getStr() );
 #endif
         (void)_rxController;
@@ -1346,7 +1346,7 @@ namespace svx
 
 #if OSL_DEBUG_LEVEL > 0
         OString sTrace( "FmTextControlShell::focusGained: 0x" );
-        sTrace += OString::valueOf( (sal_IntPtr)xControl.get(), 16 );
+        sTrace += OString::number( (sal_IntPtr)xControl.get(), 16 );
         OSL_TRACE( "%s", sTrace.getStr() );
 #endif
 
@@ -1362,7 +1362,7 @@ namespace svx
 
 #if OSL_DEBUG_LEVEL > 0
         OString sTrace( "FmTextControlShell::focusLost: 0x" );
-        sTrace += OString::valueOf( (sal_IntPtr)xControl.get(), 16 );
+        sTrace += OString::number( (sal_IntPtr)xControl.get(), 16 );
         OSL_TRACE( "%s", sTrace.getStr() );
 #endif
 
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 4760d300409c..fe70ba209df9 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -4041,7 +4041,7 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) th
     if ( nLength > 1 )
     {
         sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORDS );
-        sTitle.SearchAndReplace( OUString('#'), OUString::valueOf(nLength) );
+        sTitle.SearchAndReplace( OUString('#'), OUString::number(nLength) );
     }
     else
         sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORD );
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 57056505f16c..50b118c1d238 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1456,7 +1456,7 @@ namespace svxform
             if( i>0 )
             {
                 aNewName += OUString(" ");
-                aNewName += OUString::valueOf(i).getStr();
+                aNewName += OUString::number(i).getStr();
             }
 
             if( GetNavModel()->FindData(aNewName, pFormParentData,sal_False) == NULL )
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index a2628f497955..8407e8ef3267 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -192,7 +192,7 @@ void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const
             case SID_FM_SPINBUTTON:
             {   // set a new image, matching to this slot
                 OUString aSlotURL( "slot:" );
-                aSlotURL += OUString::valueOf( sal_Int32( nSlot ));
+                aSlotURL += OUString::number( nSlot);
                 Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() );
                 GetToolBox().SetItemImage( GetId(), aImage );
                 nLastSlot = nSlot;
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index f02739a951c6..ef305aa8f3e9 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -80,7 +80,7 @@ SfxItemPresentation SvxRotateModeItem::GetPresentation(
 //          break; // DURCHFALLEN!!!
 
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            rText += OUString::valueOf( GetValue() );
+            rText += OUString( GetValue() );
             break;
         default: ;//prevent warning
     }
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 21d42773f19c..1dcd3e584beb 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -71,7 +71,7 @@ String SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal )
 
     if ( nConvVal < 0 && ( nConvVal / 100 == 0 ) )
         sMetric += '-';
-    sMetric += OUString::valueOf(nConvVal / 100);
+    sMetric += OUString::number(nConvVal / 100);
 
     if( FUNIT_NONE != eOutUnit )
     {
@@ -82,7 +82,7 @@ String SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal )
             nFract *= -1;
         if ( nFract < 10 )
             sMetric += '0';
-        sMetric += OUString::valueOf(nFract);
+        sMetric += OUString::number(nFract);
     }
 
     return sMetric;
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 5d50104572ac..68251fcd7e8c 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -667,11 +667,11 @@ SfxItemPresentation SdrFractionItem::GetPresentation(
     if(nValue.IsValid())
     {
         sal_Int32 nDiv = nValue.GetDenominator();
-        rText = OUString::valueOf(nValue.GetNumerator());
+        rText = OUString::number(nValue.GetNumerator());
 
         if(nDiv != 1)
         {
-            rText = rText + "/" + OUString::valueOf(nDiv);
+            rText = rText + "/" + OUString::number(nDiv);
         }
     }
     else
@@ -721,7 +721,7 @@ SfxItemPresentation SdrScaleItem::GetPresentation(
     {
         sal_Int32 nDiv = GetValue().GetDenominator();
 
-        rText = OUString::valueOf(GetValue().GetNumerator()) + ":" + OUString::valueOf(nDiv);
+        rText = OUString::number(GetValue().GetNumerator()) + ":" + OUString::number(nDiv);
     }
     else
     {
@@ -876,7 +876,7 @@ SfxItemPresentation SdrAngleItem::GetPresentation(
     if(bNeg)
         nValue = -nValue;
 
-    OUStringBuffer aText = OUString::valueOf(nValue);
+    OUStringBuffer aText = OUString::number(nValue);
 
     if(nValue)
     {
@@ -1360,7 +1360,7 @@ SfxItemPresentation SdrTextAniAmountItem::GetPresentation(
 
     if(nValue < 0)
     {
-        rText = OUString::valueOf(-nValue) + "pixel";
+        rText = OUString::number(-nValue) + "pixel";
     }
     else
     {
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 9679d72733fc..4118b8e825ec 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -317,7 +317,7 @@ OUString _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) con
                 switch (_nColId)
                 {
                     case ITEMBROWSER_WHICHCOL_ID:
-                        sRet = OUString::valueOf( static_cast<sal_Int32>(pEntry->nWhichId) ); break;
+                        sRet = OUString::number( pEntry->nWhichId ); break;
                     case ITEMBROWSER_STATECOL_ID:
                     {
                         switch (pEntry->eState)
@@ -514,9 +514,9 @@ bool _SdrItemBrowserControl::BegChangeEntry(sal_uIntPtr nPos)
         aNeuNam += pEntry->GetItemTypeStr();
         if (pEntry->bCanNum) {
             aNeuNam.AppendAscii(": ");
-            aNeuNam += OUString::valueOf(pEntry->nMin);
+            aNeuNam += OUString::number(pEntry->nMin);
             aNeuNam.AppendAscii("..");
-            aNeuNam += OUString::valueOf(pEntry->nMax);
+            aNeuNam += OUString::number(pEntry->nMax);
         }
         aNeuNam.AppendAscii(" - Type 'del' to reset to default.");
         pParent->SetText(aNeuNam);
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index bcbcbf250eb2..e952af6c4a29 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1409,7 +1409,7 @@ void SdrModel::TakePercentStr(const Fraction& rVal, XubString& rStr, bool bNoPer
     nMul += nDiv/2;
     nMul /= nDiv;
 
-    rStr = OUString::valueOf(nMul);
+    rStr = OUString::number(nMul);
 
     if(bNeg)
         rStr.Insert(sal_Unicode('-'), 0);
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 60db7b97bb98..89a8ddc4499b 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -866,7 +866,7 @@ void SdrFormatter::TakeStr(long nVal, OUString& rStr) const
     if(nMul_ != nDiv_)
         nVal = BigMulDiv(nVal, nMul_, nDiv_);
 
-    OUStringBuffer aStr = OUString::valueOf(nVal);
+    OUStringBuffer aStr = OUString::number(nVal);
 
     if(nC > 0 && aStr.getLength() <= nC )
     {
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 89d07820b02d..fc97b305dfa3 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1253,13 +1253,13 @@ XubString SdrView::GetStatusText()
             if (nLen==0) bBrk=true; // to be sure
         }
 
-        aStr.SearchAndReplaceAscii("%1", OUString::valueOf(nPar + 1));
-        aStr.SearchAndReplaceAscii("%2", OUString::valueOf(nLin + 1));
-        aStr.SearchAndReplaceAscii("%3", OUString::valueOf(nCol + 1));
+        aStr.SearchAndReplaceAscii("%1", OUString::number(nPar + 1));
+        aStr.SearchAndReplaceAscii("%2", OUString::number(nLin + 1));
+        aStr.SearchAndReplaceAscii("%3", OUString::number(nCol + 1));
 
 #ifdef DBG_UTIL
         aStr += OUString( ", Level " );
-        aStr += OUString::valueOf( sal_Int32( pTextEditOutliner->GetDepth( aSel.nEndPara )) );
+        aStr += OUString::number( pTextEditOutliner->GetDepth( aSel.nEndPara ) );
 #endif
     }
 
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index c86662cb6b34..b2518d7ea3fd 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -1791,7 +1791,7 @@ static OUString getCellName( sal_Int32 nCol, sal_Int32 nRow )
                 static_cast<sal_uInt16>(nCol));
         aBuf.append(comphelper::string::reverseString(aStr));
     }
-    aBuf.append( OUString::valueOf(nRow+1) );
+    aBuf.append( OUString::number(nRow+1) );
     return aBuf.makeStringAndClear();
 }
 
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index 117715d71979..4a2d9647ffa2 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -135,7 +135,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa
     xRowSet->getPropertyValue( msSize ) >>= nRowHeight;
 
     mrStrm << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH << "30" << OOO_STRING_SVTOOLS_RTF_TRLEFT << "-30";
-    mrStrm << OOO_STRING_SVTOOLS_RTF_TRRH << OString::valueOf(nRowHeight).getStr();
+    mrStrm << OOO_STRING_SVTOOLS_RTF_TRRH << OString::number(nRowHeight).getStr();
 
     const sal_Int32 nColCount = mxTable->getColumnCount();
     for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ )
@@ -145,7 +145,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa
         if( !xCell.is() )
             continue;
 
-        mrStrm << OOO_STRING_SVTOOLS_RTF_CELLX << OString::valueOf(aColumnStart[nCol]).getStr();
+        mrStrm << OOO_STRING_SVTOOLS_RTF_CELLX << OString::number(aColumnStart[nCol]).getStr();
         if ( (nCol & 0x0F) == 0x0F )
             mrStrm << RTFOutFuncs::sNewLine;        // Zeilen nicht zu lang werden lassen
     }