summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorJoachim Lingner <jl@openoffice.org>2004-05-14 11:30:48 +0000
committerJoachim Lingner <jl@openoffice.org>2004-05-14 11:30:48 +0000
commita4f62cc3474eb25826ee0e509a1ef9ab61d8ba08 (patch)
tree03e9c5f7e788ad68a33a3c4bc6c9b30f1b056ac2 /jvmfwk
parent97e043a37b4e0722a8eca55671cc7e71b36a222f (diff)
#i20052#
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 7d3eaaff9f4d..77bf876b14de 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: sunjavaplugin.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: jl $ $Date: 2004-05-14 11:00:05 $
+ * last change: $Author: jl $ $Date: 2004-05-14 12:30:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -372,8 +372,11 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
}
#ifdef UNX
+ //Setting the JAVA_HOME is needed for awt
rtl::OUString javaHome(RTL_CONSTASCII_USTRINGPARAM("JAVA_HOME="));
- javaHome += pInfo->sLocation;
+ rtl::OUString sPathLocation;
+ osl_getSystemPathFromFileURL(pInfo->sLocation, & sPathLocation.pData);
+ javaHome += sPathLocation;
rtl::OString osJavaHome = rtl::OUStringToOString(
javaHome, osl_getThreadTextEncoding());
putenv(strdup(osJavaHome.getStr()));