mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't set JAVA_HOME on Mac OS X

Browse Source 
...for one, it doesn't appear necessary there ("needed for awt"), and for
another setting it according to Oracle's JRE 7 would prevent a subsequent
visit to the Advanced preferences pane from listing Apple's JRE 6, as launching
that java and reading its system properties would be fooled by the JAVA_HOME and
report the Oracle system properties instead.

Change-Id: I02d82de6113b44b3cae3fb55cd83177fe852d769
This commit is contained in:
Stephan Bergmann
2014-02-11 18:36:42 +01:00
parent b4668f2c48
commit 237d2c923b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
View File

@@ -595,7 +595,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
return JFW_PLUGIN_E_VM_CREATION_FAILED;
}
#ifdef UNX
#if defined UNX && !defined MACOSX
//Setting the JAVA_HOME is needed for awt
OUString javaHome("JAVA_HOME=");
OUString sPathLocation;