diff options
Diffstat (limited to 'jvmfwk/plugins/sunmajor')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 8 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 3ad5f79fbafc..6c31efb7adf4 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -106,8 +106,8 @@ OString getPluginJarPath( std::u16string_view sVersion) { OString ret; - OUString sName1("javaplugin.jar"); - OUString sName2("plugin.jar"); + OUString sName1(u"javaplugin.jar"_ustr); + OUString sName2(u"plugin.jar"_ustr); OUString sPath; if ( sVendor == u"Sun Microsystems Inc." ) { @@ -667,10 +667,10 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( //Setting the JAVA_HOME is needed for awt OUString sPathLocation; osl::FileBase::getSystemPathFromFileURL(pInfo->sLocation, sPathLocation); - osl_setEnvironment(OUString("JAVA_HOME").pData, sPathLocation.pData); + osl_setEnvironment(u"JAVA_HOME"_ustr.pData, sPathLocation.pData); #endif - OUString sSymbolCreateJava("JNI_CreateJavaVM"); + OUString sSymbolCreateJava(u"JNI_CreateJavaVM"_ustr); JNI_CreateVM_Type * pCreateJavaVM = reinterpret_cast<JNI_CreateVM_Type *>(moduleRt.getFunctionSymbol(sSymbolCreateJava)); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 6eb96d731c8f..1610188f55ac 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -388,9 +388,9 @@ bool getJavaProps(const OUString & exePath, //prepare the arguments sal_Int32 const cArgs = 3; - OUString arg1 = "-classpath";// + sClassPath; + OUString arg1 = u"-classpath"_ustr;// + sClassPath; OUString arg2 = sClassPath; - OUString arg3("JREProperties"); + OUString arg3(u"JREProperties"_ustr); rtl_uString *args[cArgs] = {arg1.pData, arg2.pData, arg3.pData}; oslProcess javaProcess= nullptr; @@ -1161,8 +1161,8 @@ void addJavaInfosDirScan( aDir.close(); } #else // MACOSX - OUString excMessage = "[Java framework] sunjavaplugin: " - "Error in function addJavaInfosDirScan in util.cxx."; + OUString excMessage = u"[Java framework] sunjavaplugin: " + "Error in function addJavaInfosDirScan in util.cxx."_ustr; int cJavaNames= SAL_N_ELEMENTS(g_arJavaNames); std::unique_ptr<OUString[]> sarJavaNames(new OUString[cJavaNames]); OUString *arNames = sarJavaNames.get(); |