[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - jvmfwk/plugins

[Stephan Bergmann]

 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 09749c7751e4c12a898f0c2f98b0c71ebe67ba6d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Feb 11 18:36:42 2014 +0100

    Don't set JAVA_HOME on Mac OS X
    
    ...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
    (cherry picked from commit 237d2c923b77479dbdf07db7bd926c45b01b8fc8)
    Reviewed-on: https://gerrit.libreoffice.org/8005
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 981b827..a3449c3 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -588,7 +588,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;