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

Related: #i121715# find official JRE>=7 on OSX

Browse Source 
(cherry picked from commit a3eded9728647bde4af68b9f3c75a51dc0676fc7)

Conflicts:
	jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
	jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx

Change-Id: I5ec6aa62147f9b3fb3e5142fbc2658c0b54f21b8
This commit is contained in:
Herbert Dürr 2013-04-26 08:51:11 +00:00 committed by Caolán McNamara
parent 53b552518e
commit b828a6f494
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,6 +95,7 @@ char const *g_arCollectDirs[] = {
char const *g_arSearchPaths[] = { char const *g_arSearchPaths[] = {
#ifdef MACOSX #ifdef MACOSX
"", "",
"Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin",
"System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/" "System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/"
#else #else
#ifndef JVM_ONE_PATH_CHECK #ifndef JVM_ONE_PATH_CHECK