[Libreoffice-commits] core.git: jvmfwk/plugins

[Douglas Mencken]

 jvmfwk/plugins/sunmajor/pluginlib/util.cxx |   19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

New commits:
commit b3afc03bcce7156f7ec5ee662776aee54eb0761f
Author: Douglas Mencken <dougmencken at gmail.com>
Date:   Tue Jan 5 10:35:11 2016 -0500

    jvmfwk/plugins: clean-up in util.cxx
    
    These are some remnants from the-good-old-days of Mac OS X 10.4 support
    and 2005's commit b8871d23ea14d72ba1a22376e7812ea5840d1084
    
    Change-Id: I9a14aaac94e4a6e4961a2fa9a5020d9cf3a07c9d
    Reviewed-on: https://gerrit.libreoffice.org/21124
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index f16f96f..0e63598 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -68,8 +68,7 @@ using ::rtl::Reference;
 #define HKEY_SUN_SDK L"Software\\JavaSoft\\Java Development Kit"
 #endif
 
-#ifdef UNX
-#if !(defined MACOSX && defined X86_64)
+#if defined( UNX ) && !defined( MACOSX )
 namespace {
 char const *g_arJavaNames[] = {
     "",
@@ -78,10 +77,9 @@ char const *g_arJavaNames[] = {
     "j2sdk",
     "jdk",
     "jre",
-    "java",
-    "Home",
-    "IBMJava2-ppc-142"
+    "java"
 };
+
 /* These are directory names which could contain multiple java installations.
  */
 char const *g_arCollectDirs[] = {
@@ -101,17 +99,10 @@ char const *g_arCollectDirs[] = {
    looked for.
 */
 char const *g_arSearchPaths[] = {
-#ifdef MACOSX
-    "",
-    "Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin",
-    "System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/"
-#else
 #ifndef JVM_ONE_PATH_CHECK
     "",
     "usr/",
     "usr/local/",
-    "usr/local/IBMJava2-ppc-142",
-    "usr/local/j2sdk1.3.1",
 #ifdef X86_64
     "usr/lib64/",
 #endif
@@ -120,11 +111,9 @@ char const *g_arSearchPaths[] = {
 #else
     JVM_ONE_PATH_CHECK
 #endif
-#endif
 };
 }
-#endif
-#endif //  UNX
+#endif //  UNX && !MACOSX
 
 namespace jfw_plugin
 {