removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarations

s/(OUString\s+[a-zA-Z_][A-Za-z0-9_]*\s*)\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/$1\($2\)/gms

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

5 files changed, 22 insertions, 35 deletions

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
index 0723910b566f..f58a66d3b4ea 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -92,18 +92,12 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
 
     OUString sJavaLibraryPath;
     typedef vector<pair<OUString, OUString> >::const_iterator it_prop;
-    OUString sVendorProperty(
-        RTL_CONSTASCII_USTRINGPARAM("java.vendor"));
-    OUString sVersionProperty(
-        RTL_CONSTASCII_USTRINGPARAM("java.version"));
-    OUString sJavaHomeProperty(
-        RTL_CONSTASCII_USTRINGPARAM("java.home"));
-    OUString sJavaLibraryPathProperty(
-        RTL_CONSTASCII_USTRINGPARAM("java.library.path"));
-    OUString sGNUHomeProperty(
-        RTL_CONSTASCII_USTRINGPARAM("gnu.classpath.home.url"));
-    OUString sAccessProperty(
-        RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies"));
+    OUString sVendorProperty("java.vendor");
+    OUString sVersionProperty("java.version");
+    OUString sJavaHomeProperty("java.home");
+    OUString sJavaLibraryPathProperty("java.library.path");
+    OUString sGNUHomeProperty("gnu.classpath.home.url");
+    OUString sAccessProperty("javax.accessibility.assistive_technologies");
 
     bool bVersion = false;
     bool bVendor = false;
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 810470e1c58e..9ac4503b1899 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -86,8 +86,8 @@ OString getPluginJarPath(
     const OUString& sVersion)
 {
     OString ret;
-    OUString sName1(RTL_CONSTASCII_USTRINGPARAM("javaplugin.jar"));
-    OUString sName2(RTL_CONSTASCII_USTRINGPARAM("plugin.jar"));
+    OUString sName1("javaplugin.jar");
+    OUString sName2("plugin.jar");
     OUString sPath;
     if ( sVendor == SUN_MICRO )
     {
@@ -599,7 +599,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
 
 #ifdef UNX
     //Setting the JAVA_HOME is needed for awt
-    rtl::OUString javaHome(RTL_CONSTASCII_USTRINGPARAM("JAVA_HOME="));
+    rtl::OUString javaHome("JAVA_HOME=");
     rtl::OUString sPathLocation;
     osl_getSystemPathFromFileURL(pInfo->sLocation, & sPathLocation.pData);
     javaHome += sPathLocation;
@@ -609,8 +609,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
 #endif
 
     typedef jint JNICALL JNI_CreateVM_Type(JavaVM **, JNIEnv **, void *);
-    rtl::OUString sSymbolCreateJava(
-            RTL_CONSTASCII_USTRINGPARAM("JNI_CreateJavaVM"));
+    rtl::OUString sSymbolCreateJava("JNI_CreateJavaVM");
 
     JNI_CreateVM_Type * pCreateJavaVM = (JNI_CreateVM_Type *) osl_getFunctionSymbol(
         moduleRt, sSymbolCreateJava.pData);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 7b6901aed5ec..e4e5b0945ddd 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -396,7 +396,7 @@ bool getJavaProps(const OUString & exePath,
     sal_Int32 cArgs = 3;
     OUString arg1 = OUString("-classpath");// + sClassPath;
     OUString arg2 = sClassPath;
-    OUString arg3(RTL_CONSTASCII_USTRINGPARAM("JREProperties"));
+    OUString arg3("JREProperties");
     OUString arg4 = "noaccessibility";
     rtl_uString *args[4] = {arg1.pData, arg2.pData, arg3.pData};
 
@@ -467,7 +467,7 @@ bool getJavaProps(const OUString & exePath,
 
 #ifdef JVM_ONE_PATH_CHECK
         //replace absolute path by linux distro link
-        OUString sHomeProperty(RTL_CONSTASCII_USTRINGPARAM("java.home"));
+        OUString sHomeProperty("java.home");
         if(sHomeProperty.equals(sKey))
         {
             sVal = homePath + OUString::createFromAscii("/jre");
@@ -991,7 +991,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
 
     //find java.vendor property
     typedef vector<pair<OUString, OUString> >::const_iterator c_ip;
-    OUString sVendor(RTL_CONSTASCII_USTRINGPARAM("java.vendor"));
+    OUString sVendor("java.vendor");
     OUString sVendorName;
 
     for (c_ip i = props.begin(); i != props.end(); ++i)
@@ -1056,8 +1056,8 @@ inline OUString getDirFromFile(const OUString& usFilePath)
 void createJavaInfoFromPath(vector<rtl::Reference<VendorBase> >& vecInfos)
 {
 // Get Java from PATH environment variable
-    static OUString sCurDir(RTL_CONSTASCII_USTRINGPARAM("."));
-    static OUString sParentDir(RTL_CONSTASCII_USTRINGPARAM(".."));
+    static OUString sCurDir(".");
+    static OUString sParentDir("..");
     char *szPath= getenv("PATH");
     if(szPath)
     {
@@ -1169,7 +1169,7 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
 
 
 
-    OUString usFile(RTL_CONSTASCII_USTRINGPARAM("file:///"));
+    OUString usFile("file:///");
     for( int ii = 0; ii < cSearchPaths; ii ++)
     {
         OUString usDir1(usFile + arPaths[ii]);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index 9f19d1768504..67957ef6fbd2 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -74,14 +74,10 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
     //javax.accessibility.assistive_technologies from system properties
 
     typedef vector<pair<OUString, OUString> >::const_iterator it_prop;
-    OUString sVendorProperty(
-        RTL_CONSTASCII_USTRINGPARAM("java.vendor"));
-    OUString sVersionProperty(
-        RTL_CONSTASCII_USTRINGPARAM("java.version"));
-    OUString sHomeProperty(
-        RTL_CONSTASCII_USTRINGPARAM("java.home"));
-    OUString sAccessProperty(
-        RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies"));
+    OUString sVendorProperty("java.vendor");
+    OUString sVersionProperty("java.version");
+    OUString sHomeProperty("java.home");
+    OUString sAccessProperty("javax.accessibility.assistive_technologies");
 
     bool bVersion = false;
     bool bVendor = false;
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 03a575a5708d..b4dde95ac429 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -412,8 +412,7 @@ javaFrameworkError SAL_CALL jfw_startVM(
         if ( ! modulePlugin)
             return JFW_E_NO_PLUGIN;
 
-        rtl::OUString sFunctionName(
-            RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_startJavaVirtualMachine"));
+        rtl::OUString sFunctionName("jfw_plugin_startJavaVirtualMachine");
         jfw_plugin_startJavaVirtualMachine_ptr pFunc =
             (jfw_plugin_startJavaVirtualMachine_ptr)
             osl_getFunctionSymbol(modulePlugin, sFunctionName.pData);
@@ -1224,8 +1223,7 @@ javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist)
     osl::Module modulePlugin(sLibPath);
     if ( ! modulePlugin)
         return JFW_E_NO_PLUGIN;
-    rtl::OUString sFunctionName(
-        RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_existJRE"));
+    rtl::OUString sFunctionName("jfw_plugin_existJRE");
     jfw_plugin_existJRE_ptr pFunc =
         (jfw_plugin_existJRE_ptr)
         osl_getFunctionSymbol(modulePlugin, sFunctionName.pData);