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

5 files changed, 15 insertions, 20 deletions

diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 80d440027f1c..7901b2fa798d 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -379,8 +379,7 @@ void SvMetaName::WriteAttributes( SvIdlDataBase &, SvStream & rOutStm,
     {
         WriteTab( rOutStm, nTab );
         rOutStm << "helpcontext("
-                << OString::valueOf(static_cast<sal_Int64>(
-                    GetHelpContext().GetValue())).getStr()
+                << OString::number(GetHelpContext().GetValue()).getStr()
                 << ")," << endl;
     }
 }
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index b926b26e21e5..e265af7255db 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -344,8 +344,7 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS
             if( nId1 == nId2 && nId1 != 0 )
             {
                 OSL_FAIL( "Gleiche Id in MetaClass : " );
-                OSL_FAIL(OString::valueOf(static_cast<sal_Int32>(
-                    pS->GetSlotId().GetValue())).getStr());
+                OSL_FAIL(OString::number(pS->GetSlotId().GetValue()).getStr());
                 OSL_FAIL( pS->GetSlotId().getString().getStr() );
                 OSL_FAIL( rAttr.GetSlotId().getString().getStr() );
 
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index e77bd54d346b..9201b53d0dc1 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -1154,8 +1154,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
     rOutStm << "// Slot Nr. "
         << OString::number(nListPos).getStr()
         << " : ";
-    OString aSlotIdValue(OString::valueOf(static_cast<sal_Int32>(
-        GetSlotId().GetValue())));
+    OString aSlotIdValue(OString::number(GetSlotId().GetValue()));
     rOutStm << aSlotIdValue.getStr() << endl;
     WriteTab( rOutStm, 1 );
     if( bIsEnumSlot )
@@ -1181,11 +1180,11 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
     if( bIsEnumSlot )
     {
         rOutStm << "&a" << rShellName.getStr() << "Slots_Impl["
-            << OString::valueOf(static_cast<sal_Int32>(pLinkedSlot->GetListPos())).getStr()
+            << OString::number(pLinkedSlot->GetListPos()).getStr()
             << "] /*Offset Master*/, " << endl;
         WriteTab( rOutStm, 4 );
         rOutStm << "&a" << rShellName.getStr() << "Slots_Impl["
-            << OString::valueOf(static_cast<sal_Int32>(pNextSlot->GetListPos())).getStr()
+            << OString::number(pNextSlot->GetListPos()).getStr()
             << "] /*Offset Next*/, " << endl;
 
         WriteTab( rOutStm, 4 );
@@ -1240,13 +1239,13 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
         else
         {
             rOutStm << "&a" << rShellName.getStr() << "Slots_Impl["
-                << OString::valueOf(static_cast<sal_Int32>(pLinkedSlot->GetListPos())).getStr()
+                << OString::number(pLinkedSlot->GetListPos()).getStr()
                 << "] /*Offset Linked*/, " << endl;
             WriteTab( rOutStm, 4 );
         }
 
         rOutStm << "&a" << rShellName.getStr() << "Slots_Impl["
-            << OString::valueOf(static_cast<sal_Int32>(pNextSlot->GetListPos())).getStr()
+            << OString::number(pNextSlot->GetListPos()).getStr()
             << "] /*Offset Next*/, " << endl;
 
         WriteTab( rOutStm, 4 );
@@ -1377,8 +1376,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
                 pType = GetType();
             sal_uLong nSCount = pType->GetAttrCount();
             rOutStm
-                << OString::valueOf(static_cast<sal_Int32>(
-                    nSCount)).getStr()
+                << OString::number(nSCount).getStr()
                 << "/*Count*/";
         }
         else
@@ -1529,8 +1527,8 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
                 rTable[ nSId2 ] = this;
 
                 rOutStm << "#define " << aSId.getStr() << '\t'
-                    << OString::valueOf(
-                        static_cast<sal_Int32>(nSId2)).getStr()
+                    << OString::number(
+                        nSId2).getStr()
                     << endl;
             }
         }
@@ -1550,8 +1548,8 @@ void SvMetaSlot::WriteCSV( SvIdlDataBase& rBase, SvStream& rStrm )
     rStrm << "PROJECT,";
     rStrm << GetSlotId().getString().getStr() << ',';
     rStrm
-        << OString::valueOf(
-            static_cast<sal_Int32>(GetSlotId().GetValue())).getStr()
+        << OString::number(
+            GetSlotId().GetValue()).getStr()
         << ',';
 
     if ( !GetPseudoPrefix().isEmpty() )
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index c1ecbf82cf22..642d303586da 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -419,7 +419,7 @@ void SvMetaAttribute::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm
             {
                 WriteTab( rOutStm, nTab );
                 rOutStm << "id("
-                    << OString::valueOf(static_cast<sal_Int32>(MakeSlotValue(rBase,bVar))).getStr()
+                    << OString::number(MakeSlotValue(rBase,bVar)).getStr()
                     << ")," << endl;
             }
             if( bVar && (bReadonly || IsMethod()) )
@@ -461,7 +461,7 @@ void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm,
         }
     }
     rOutStm << "pODKCallFunction( "
-        << OString::valueOf(static_cast<sal_Int32>(MakeSlotValue(rBase, IsVariable()))).getStr();
+        << OString::number(MakeSlotValue(rBase, IsVariable())).getStr();
     rOutStm << ',' << endl;
     WriteTab( rOutStm, 3 );
     rOutStm << " h" << rBase.aIFaceName.getStr() << " , ";
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 091fba389c68..b505b1e3259e 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -716,8 +716,7 @@ sal_Bool SvIdlWorkingBase::WriteSvIdl( SvStream & rOutStm )
             SvStringHashEntry* pEntry = aList[ i ];
             rOutStm << "#define " << pEntry->GetName().getStr()
                     << '\t'
-                    << OString::valueOf(static_cast<sal_Int64>(
-                        pEntry->GetValue())).getStr()
+                    << OString::number(pEntry->GetValue()).getStr()
                     << endl;
         }
     }