automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings

Done with a perl regex:

s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms

Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

4 files changed, 11 insertions, 11 deletions

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
index e0339eb3f409..0723910b566f 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -168,7 +168,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
         return false;
 
     if (m_sJavaHome.isEmpty())
-        m_sJavaHome = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib"));
+        m_sJavaHome = rtl::OUString("file:///usr/lib");
 
     // init m_sRuntimeLibrary
     OSL_ASSERT(!m_sHome.isEmpty());
@@ -233,9 +233,9 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
 
 #ifdef X86_64
     //Make one last final legacy attempt on x86_64 in case the distro placed it in lib64 instead
-    if (!bRt && m_sJavaHome != rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib")))
+    if (!bRt && m_sJavaHome != rtl::OUString("file:///usr/lib"))
     {
-        m_sHome = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib64"));
+        m_sHome = rtl::OUString("file:///usr/lib64");
         for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip)
         {
             //Construct an absolute path to the possible runtime
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 662f66d6f2d2..7b6901aed5ec 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -394,7 +394,7 @@ bool getJavaProps(const OUString & exePath,
 
     //prepare the arguments
     sal_Int32 cArgs = 3;
-    OUString arg1 = OUString(RTL_CONSTASCII_USTRINGPARAM("-classpath"));// + sClassPath;
+    OUString arg1 = OUString("-classpath");// + sClassPath;
     OUString arg2 = sClassPath;
     OUString arg3(RTL_CONSTASCII_USTRINGPARAM("JREProperties"));
     OUString arg4 = "noaccessibility";
@@ -904,7 +904,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
                 sFullPath = sResolvedDir + (*i);
             else
                 sFullPath = sResolvedDir +
-                OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + (*i);
+                OUString("/") + (*i);
 
 
             sFilePath = resolveFilePath(sFullPath);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
index ffc7d7e5fcc9..cab102757f64 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
@@ -74,7 +74,7 @@ struct SameOrSubDirJREMap
         if (s1 == s2.first)
             return true;
         rtl::OUString sSub;
-        sSub = s2.first + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+        sSub = s2.first + rtl::OUString("/");
         if (s1.match(sSub) == sal_True)
             return true;
         return false;
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 6bfe53af7b62..03a575a5708d 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -157,7 +157,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
             }
             jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc =
                 (jfw_plugin_getAllJavaInfos_ptr) pluginLib.getFunctionSymbol(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getAllJavaInfos")));
+                    rtl::OUString("jfw_plugin_getAllJavaInfos"));
 #else
             jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc =
                 jfw_plugin_getAllJavaInfos;
@@ -193,7 +193,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
 #ifndef DISABLE_DYNLOADING
             jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc =
                 (jfw_plugin_getJavaInfoByPath_ptr) pluginLib.getFunctionSymbol(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getJavaInfoByPath")));
+                    rtl::OUString("jfw_plugin_getJavaInfoByPath"));
             OSL_ASSERT(jfw_plugin_getJavaInfoByPathFunc);
             if (jfw_plugin_getJavaInfoByPathFunc == NULL)
                 return JFW_E_ERROR;
@@ -543,7 +543,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
 
             jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc =
                 (jfw_plugin_getAllJavaInfos_ptr) pluginLib.getFunctionSymbol(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getAllJavaInfos")));
+                    rtl::OUString("jfw_plugin_getAllJavaInfos"));
 #else
             jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc =
                 jfw_plugin_getAllJavaInfos;
@@ -629,7 +629,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
                 //get the function from the plugin
                 jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc =
                     (jfw_plugin_getJavaInfoByPath_ptr) pluginLib.getFunctionSymbol(
-                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getJavaInfoByPath")));
+                        rtl::OUString("jfw_plugin_getJavaInfoByPath"));
 #else
                 jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc =
                     jfw_plugin_getJavaInfoByPath;
@@ -872,7 +872,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
 
             jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc =
                 (jfw_plugin_getJavaInfoByPath_ptr) pluginLib.getFunctionSymbol(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getJavaInfoByPath")));
+                    rtl::OUString("jfw_plugin_getJavaInfoByPath"));
 #else
             jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc =
                 jfw_plugin_getJavaInfoByPath;