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

jvmfwk/plugins: clean-up in util.cxx

Browse Source 
These are some remnants from the-good-old-days of Mac OS X 10.4 support
and 2005's commit b8871d23ea

Change-Id: I9a14aaac94e4a6e4961a2fa9a5020d9cf3a07c9d
Reviewed-on: https://gerrit.libreoffice.org/21124
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Douglas Mencken
2016-01-05 10:35:11 -05:00
committed by Michael Stahl
parent 55a5ac48c2
commit b3afc03bcc
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
jvmfwk/plugins/sunmajor/pluginlib/util.cxx
View File

@@ -68,8 +68,7 @@ using ::rtl::Reference;
#define HKEY_SUN_SDK L"Software\\JavaSoft\\Java Development Kit" #define HKEY_SUN_SDK L"Software\\JavaSoft\\Java Development Kit"
#endif #endif
#ifdef UNX #if defined( UNX ) && !defined( MACOSX )
#if !(defined MACOSX && defined X86_64)
namespace { namespace {
char const *g_arJavaNames[] = { char const *g_arJavaNames[] = {
"", "",
@@ -78,10 +77,9 @@ char const *g_arJavaNames[] = {
"j2sdk", "j2sdk",
"jdk", "jdk",
"jre", "jre",
"java", "java"
"Home",
"IBMJava2-ppc-142"
}; };
/* These are directory names which could contain multiple java installations. /* These are directory names which could contain multiple java installations.
*/ */
char const *g_arCollectDirs[] = { char const *g_arCollectDirs[] = {
@@ -101,17 +99,10 @@ char const *g_arCollectDirs[] = {
looked for. looked for.
*/ */
char const *g_arSearchPaths[] = { 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 #ifndef JVM_ONE_PATH_CHECK
"", "",
"usr/", "usr/",
"usr/local/", "usr/local/",
"usr/local/IBMJava2-ppc-142",
"usr/local/j2sdk1.3.1",
#ifdef X86_64 #ifdef X86_64
"usr/lib64/", "usr/lib64/",
#endif #endif
@@ -120,11 +111,9 @@ char const *g_arSearchPaths[] = {
#else #else
JVM_ONE_PATH_CHECK JVM_ONE_PATH_CHECK
#endif #endif
#endif
}; };
} }
#endif #endif // UNX && !MACOSX
#endif // UNX
namespace jfw_plugin namespace jfw_plugin
{ {