summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-11-25 11:01:18 +0100
committerStephan Bergmann <sbergman@redhat.com>2011-12-09 09:32:00 +0100
commite363458ffa31184dc2d2c58283457e0036ad506f (patch)
tree0638bb9327f3afee1d0184be7e5133de530290a7
parent25ff8db963820a82b9fba31d35d16cc15062ba6e (diff)
duplicate "add Oracle Java 1.7.0 recognition" from javavendors_linux -> wnt
Cherry-picked from <http://cgit.freedesktop.org/libreoffice/core/commit/?id=f95052c29b076995a54b1d3f7c0becf35ebcd23f>.
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 267f02fb7..180a1362b 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -9,6 +9,9 @@
<vendor name="Sun Microsystems Inc.">
<minVersion>1.5.0</minVersion>
</vendor>
+ <vendor name="Oracle Corporation">
+ <minVersion>1.7.0</minVersion>
+ </vendor>
<vendor name="IBM Corporation">
<minVersion>1.5.0</minVersion>
</vendor>
@@ -16,6 +19,7 @@
<plugins>
<library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library>
+ <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library>
<library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library>
</plugins>
</javaSelection>