jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
New commits: commit 3818cc53291008f0ad2ebe6f898e2c58d6974b09 Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Jul 1 12:26:51 2014 +0200 simplify Change-Id: I1f44dd938bd0033ad4a5b6af4d24d1ba3e76d852 diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 217c6ce..d32beff 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -635,10 +635,9 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( #if defined UNX && !defined MACOSX //Setting the JAVA_HOME is needed for awt - OUString javaHome("JAVA_HOME"); OUString sPathLocation; osl_getSystemPathFromFileURL(pInfo->sLocation, & sPathLocation.pData); - osl_setEnvironment(javaHome.pData, sPathLocation.pData); + osl_setEnvironment(OUString("JAVA_HOME").pData, sPathLocation.pData); #endif typedef jint JNICALL JNI_CreateVM_Type(JavaVM **, JNIEnv **, void *); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits