summaryrefslogtreecommitdiff
path: root/jvmfwk/distributions/OpenOfficeorg
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-04-09 00:37:27 +0300
committerTor Lillqvist <tml@iki.fi>2013-04-09 00:54:29 +0300
commit02864717973c01b055152795ac747aeb9c160169 (patch)
treed27129347d9575c6ed20b83f6b094a3d528a9e92 /jvmfwk/distributions/OpenOfficeorg
parent2ecae4cd94445371cdee7defaac784707a9642da (diff)
Look for Oracle Java 7 in a 64-bit LibreOffice on OS X
Change-Id: Ife3fc97c11ab5216df62aba92dc11ed6cf07c154
Diffstat (limited to 'jvmfwk/distributions/OpenOfficeorg')
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml6
1 files changed, 5 insertions, 1 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 673ebbf93eb2..172b570a67cc 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -20,7 +20,7 @@
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <updated>2006-05-02</updated>
+ <updated>2013-04-09</updated>
<vendorInfos>
<vendor name="Apple Computer, Inc.">
@@ -29,8 +29,12 @@
<vendor name="Apple Inc.">
<minVersion>1.5.0</minVersion>
</vendor>
+ <vendor name="Oracle Corporation">
+ <minVersion>1.7.0</minVersion>
+ </vendor>
</vendorInfos>
<plugins>
+ <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dylib</library>
<library vendor="Apple Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dylib</library>
<library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dylib</library>
</plugins>