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

3 files changed, 10 insertions, 10 deletions

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 0e323cfb9f96..75c34129a4c7 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -405,7 +405,7 @@ bool getJavaProps(const OUString & exePath,
     rtl_uString *args[4] = {arg1.pData, arg2.pData, arg3.pData};
 
     // Only add the fourth param if the bootstrap parameter is set.
-    if (sValue.equals(OUString::valueOf((sal_Int32) 1)))
+    if (sValue.equals(OUString::number( 1)))
     {
         args[3] = arg4.pData;
         cArgs = 4;
@@ -1215,7 +1215,7 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
                         JFW_TRACE2(OUString("[Java framework] sunjavaplugin: ")
                                    + "Could not read directory "
                                    + usDir2 + ". Osl file error: "
-                                   + OUString::valueOf((sal_Int32) openErr));
+                                   + OUString::number(openErr));
                         continue;
                     }
 
@@ -1228,7 +1228,7 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
                         if ((errStatus = curIt.getFileStatus(aStatus)) != File::E_None)
                         {
                             JFW_TRACE2(excMessage + "getFileStatus failed with error "
-                                + OUString::valueOf((sal_Int32) errStatus));
+                                + OUString::number(errStatus));
                             continue;
                         }
                         JFW_TRACE2(OUString("[Java framework] sunjavaplugin: ") +
@@ -1242,7 +1242,7 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
                                 OUString("[Java framework] sunjavaplugin: ")
                                 + "Error while iterating over contens of "
                                 + usDir2 + ". Osl file error: "
-                                + OUString::valueOf((sal_Int32) openErr));
+                                + OUString::number(openErr));
                 }
                 else
                 {
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 712939b94e6f..db5c3e24bd22 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -996,8 +996,8 @@ void CNodeJavaInfo::writeToNode(xmlDoc* pDoc,
     xmlAddChild(pJavaInfoNode, nodeCrLf);
 
     //Create the features element
-    OUString sFeatures = OUString::valueOf(
-        (sal_Int64)nFeatures, 16);
+    OUString sFeatures = OUString::number(
+        nFeatures, 16);
     xmlNewTextChild(pJavaInfoNode, NULL, (xmlChar*) "features",
                     CXmlCharPtr(sFeatures));
     //add a new line for better readability
@@ -1006,8 +1006,8 @@ void CNodeJavaInfo::writeToNode(xmlDoc* pDoc,
 
 
     //Create the requirements element
-    OUString sRequirements = OUString::valueOf(
-        (sal_Int64) nRequirements, 16);
+    OUString sRequirements = OUString::number(
+         nRequirements, 16);
     xmlNewTextChild(pJavaInfoNode, NULL, (xmlChar*) "requirements",
                     CXmlCharPtr(sRequirements));
     //add a new line for better readability
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index c4110a3a77ce..1b4cf3ccec07 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -322,7 +322,7 @@ OUString VendorSettings::getPluginLibrary(const OUString& sVendor)
 
     for (sal_Int32 i = 1; ; i++)
     {
-        OUString sName = OUString(UNO_JAVA_JFW_PARAMETER) + OUString::valueOf(i);
+        OUString sName = OUString(UNO_JAVA_JFW_PARAMETER) + OUString::number(i);
         OUString sValue;
         if (Bootstrap::get()->getFrom(sName, sValue) == sal_True)
         {
@@ -528,7 +528,7 @@ JFW_MODE getMode()
                     {
                         OUString sParams = OUString(
                             UNO_JAVA_JFW_PARAMETER) +
-                            OUString::valueOf((sal_Int32)1);
+                            OUString::number(1);
                         if (aBoot->getFrom(sParams, sValue) == sal_False)
                         {
                             bDirectMode = false;