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

10 files changed, 26 insertions, 26 deletions

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 51f43c75c067..e5726901abdd 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -300,13 +300,13 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
             //as CharStyleName or ParaStyleName
             //if the style is a user defined style then it must have an ISTD - built-in styles might not have it
             StyleSheetTablePtr pStyleSheets = m_pImpl->GetStyleSheetTable();
-            OUString sValue = OUString::valueOf(nIntValue, 16);
+            OUString sValue = OUString::number(nIntValue, 16);
             const StyleSheetEntryPtr pEntry = pStyleSheets->FindStyleSheetByISTD(sValue);
             if( pEntry.get( ) )
             {
                 bool bParaStyle = (pEntry->nStyleTypeCode == STYLE_TYPE_PARA);
                 if(bParaStyle)
-                    m_pImpl->SetCurrentParaStyleId(OUString::valueOf(static_cast<sal_Int32>(nIntValue), 16));
+                    m_pImpl->SetCurrentParaStyleId(OUString::number(nIntValue, 16));
                 if (m_pImpl->GetTopContext() && m_pImpl->GetTopContextType() != CONTEXT_SECTION)
                     m_pImpl->GetTopContext()->Insert(
                                                  bParaStyle ?
@@ -1464,13 +1464,13 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
             {
 #if OSL_DEBUG_LEVEL > 0
             OString sMessage("DomainMapper::attribute() - Id: ");
-            sMessage += OString::valueOf( sal_Int32( nName ), 10 );
+            sMessage += OString::number( nName, 10 );
             sMessage += " / 0x";
-            sMessage += OString::valueOf( sal_Int32( nName ), 16 );
+            sMessage += OString::number( nName, 16 );
             sMessage += " value: ";
-            sMessage += OString::valueOf( sal_Int32( nIntValue ), 10 );
+            sMessage += OString::number( nIntValue, 10 );
             sMessage += " / 0x";
-            sMessage += OString::valueOf( sal_Int32( nIntValue ), 16 );
+            sMessage += OString::number( nIntValue, 16 );
             SAL_WARN("writerfilter", sMessage.getStr());
 #endif
             }
diff --git a/writerfilter/source/dmapper/FormControlHelper.cxx b/writerfilter/source/dmapper/FormControlHelper.cxx
index 38edf6f9f6ba..851cdf4991d9 100644
--- a/writerfilter/source/dmapper/FormControlHelper.cxx
+++ b/writerfilter/source/dmapper/FormControlHelper.cxx
@@ -99,7 +99,7 @@ uno::Reference<form::XForm> FormControlHelper::FormControlHelper_Impl::getForm()
             {
                 ++nUnique;
                 sFormName = sDOCXForm;
-                sFormName += OUString::valueOf(nUnique);
+                sFormName += OUString(nUnique);
             }
 
             uno::Reference<uno::XInterface> xForm(getServiceFactory()->createInstance("com.sun.star.form.component.Form"));
@@ -280,7 +280,7 @@ bool FormControlHelper::insertControl(uno::Reference<text::XTextRange> xTextRang
     do
     {
         OUString sTmp(sControl);
-        sTmp += OUString::valueOf(nControl);
+        sTmp += OUString::number(nControl);
 
         nControl++;
         if (! xFormCompsByName->hasByName(sTmp))
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 951b01ec7ba9..3ff217603b59 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1293,9 +1293,9 @@ void GraphicImport::lcl_sprm(Sprm & rSprm)
         default:
 #if OSL_DEBUG_LEVEL > 0
             OString sMessage( "GraphicImport::sprm() - Id: ");
-            sMessage += OString::valueOf( sal_Int32( nSprmId ), 10 );
+            sMessage += OString::number( nSprmId, 10 );
             sMessage += " / 0x";
-            sMessage += OString::valueOf( sal_Int32( nSprmId ), 16 );
+            sMessage += OString::number( nSprmId, 16 );
             SAL_WARN("writerfilter", sMessage.getStr());
 #endif
             ;
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index ecd70b59fda9..e5b924c474da 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -60,7 +60,7 @@ void lcl_printProperties( uno::Sequence< beans::PropertyValue > aProps )
         OUString sValue;
 
         if ( !( aValue >>= sValue ) && ( aValue >>= nValue ) )
-            sValue = OUString::valueOf( nValue );
+            sValue = OUString::number( nValue );
 
         SAL_INFO("writerfilter", "Property " << aProps[i].Name << ": " << sValue);
     }
@@ -524,7 +524,7 @@ ListDef::~ListDef( )
 OUString ListDef::GetStyleName( sal_Int32 nId )
 {
     OUString sStyleName( "WWNum" );
-    sStyleName += OUString::valueOf( nId );
+    sStyleName += OUString::number( nId );
 
     return sStyleName;
 }
@@ -852,13 +852,13 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal )
         {
 #if OSL_DEBUG_LEVEL > 0
             OString sMessage( "ListTable::attribute() - Id: ");
-            sMessage += OString::valueOf( sal_Int32( nName ), 10 );
+            sMessage += OString::number( nName, 10 );
             sMessage += " / 0x";
-            sMessage += OString::valueOf( sal_Int32( nName ), 16 );
+            sMessage += OString::number( nName, 16 );
             sMessage += " value: ";
-            sMessage += OString::valueOf( sal_Int32( nIntValue ), 10 );
+            sMessage += OString::number( nIntValue, 10 );
             sMessage += " / 0x";
-            sMessage += OString::valueOf( sal_Int32( nIntValue ), 16 );
+            sMessage += OString::number( nIntValue, 16 );
             SAL_WARN("writerfilter", sMessage.getStr());
 #endif
         }
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx
index e2a333535ecb..44e4f4baf875 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -185,7 +185,7 @@ OUString OLEHandler::copyOLEOStream( uno::Reference< text::XTextDocument > xText
         static sal_Int32 nObjectCount = 100;
         uno::Reference< container::XNameAccess > xNA( xEmbeddedResolver, uno::UNO_QUERY_THROW );
         OUString aURL("Obj");
-        aURL += OUString::valueOf( nObjectCount++ );
+        aURL += OUString::number( nObjectCount++ );
         uno::Reference < io::XOutputStream > xOLEStream;
         if( (xNA->getByName( aURL ) >>= xOLEStream) && xOLEStream.is() )
         {
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index ccb0506c0d15..5507109e1913 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -373,7 +373,7 @@ OUString lcl_FindUnusedPageStyleName(const uno::Sequence< OUString >& rPageStyle
         }
     }
     OUString sRet( sDefaultStyle );
-    sRet += OUString::valueOf( nMaxIndex + 1);
+    sRet += OUString::number( nMaxIndex + 1);
     return sRet;
 }
 
@@ -997,7 +997,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
 
         sal_Int32 nCharWidth = 423; //240 twip/ 12 pt
         //todo: is '0' the right index here?
-        const StyleSheetEntryPtr pEntry = rDM_Impl.GetStyleSheetTable()->FindStyleSheetByISTD(OUString::valueOf(static_cast<sal_Int32>(0), 16));
+        const StyleSheetEntryPtr pEntry = rDM_Impl.GetStyleSheetTable()->FindStyleSheetByISTD(OUString::number(0, 16));
         if( pEntry.get( ) )
         {
             PropertyMap::iterator aElement_ = pEntry->pProperties->find(PropertyDefinition( PROP_CHAR_HEIGHT_ASIAN ));
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 0f9218388e8e..481a35bd3f01 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -382,7 +382,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
     switch(Name)
     {
         case NS_rtf::LN_ISTD:
-            m_pImpl->m_pCurrentEntry->sStyleIdentifierD = OUString::valueOf(static_cast<sal_Int32>(nIntValue), 16);
+            m_pImpl->m_pCurrentEntry->sStyleIdentifierD = OUString::number(nIntValue, 16);
         break;
         case NS_rtf::LN_STI:
         {
@@ -400,11 +400,11 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
         break;
         case NS_rtf::LN_ISTDBASE:
             if (static_cast<sal_uInt32>(nIntValue) != 0xfff)
-                m_pImpl->m_pCurrentEntry->sBaseStyleIdentifier = OUString::valueOf(static_cast<sal_Int32>(nIntValue), 16);
+                m_pImpl->m_pCurrentEntry->sBaseStyleIdentifier = OUString::number(nIntValue, 16);
         break;
         case NS_rtf::LN_ISTDNEXT:
             if (static_cast<sal_uInt32>(nIntValue) != 0xfff)
-                m_pImpl->m_pCurrentEntry->sNextStyleIdentifier = OUString::valueOf(static_cast<sal_Int32>(nIntValue), 16);
+                m_pImpl->m_pCurrentEntry->sNextStyleIdentifier = OUString::number(nIntValue, 16);
         break;
         case NS_rtf::LN_FSCRATCH:
         case NS_rtf::LN_FINVALHEIGHT:
@@ -1275,7 +1275,7 @@ OUString StyleSheetTable::getOrCreateCharStyle( PropertyValueVector_t& rCharProp
         }
     }
     sListLabel = OUString::createFromAscii( cListLabel );
-    sListLabel += OUString::valueOf( ++nStyleFound );
+    sListLabel += OUString::number( ++nStyleFound );
     //create a new one otherwise
     uno::Reference< lang::XMultiServiceFactory > xDocFactory( m_pImpl->m_xTextDocument, uno::UNO_QUERY_THROW );
     PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index da7a81cb0229..f4afe8a98c91 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2610,7 +2610,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
                     if (nType)
                     {
                             uno::Reference<drawing::XEnhancedCustomShapeDefaulter> xDefaulter(m_aStates.top().aDrawingObject.xShape, uno::UNO_QUERY);
-                            xDefaulter->createCustomShapeDefaults(OUString::valueOf(nType));
+                            xDefaulter->createCustomShapeDefaults(OUString::number(nType));
                     }
                     m_aStates.top().aDrawingObject.xPropertySet.set(m_aStates.top().aDrawingObject.xShape, uno::UNO_QUERY);
                     std::vector<beans::PropertyValue>& rPendingProperties = m_aStates.top().aDrawingObject.aPendingProperties;
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index b51ba64d821b..23f2820c0fed 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -580,7 +580,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose)
     if (bCustom && xShape.is())
     {
         uno::Reference<drawing::XEnhancedCustomShapeDefaulter> xDefaulter(xShape, uno::UNO_QUERY);
-        xDefaulter->createCustomShapeDefaults(OUString::valueOf(sal_Int32(nType)));
+        xDefaulter->createCustomShapeDefaults(OUString::number(nType));
     }
 
     // Creating Path property
diff --git a/writerfilter/source/rtftok/rtfvalue.cxx b/writerfilter/source/rtftok/rtfvalue.cxx
index b786b093b9a9..7af638ff8219 100644
--- a/writerfilter/source/rtftok/rtfvalue.cxx
+++ b/writerfilter/source/rtftok/rtfvalue.cxx
@@ -148,7 +148,7 @@ OUString RTFValue::getString() const
     if (!m_sValue.isEmpty() || m_bForceString)
         return m_sValue;
     else
-        return OUString::valueOf(sal_Int32(m_nValue));
+        return OUString::number(m_nValue);
 }
 
 void RTFValue::setString(OUString sValue)