jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml | 4 ++++ jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml | 4 ++++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 2 ++ jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx | 1 + 4 files changed, 11 insertions(+)
New commits: commit e363458ffa31184dc2d2c58283457e0036ad506f Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 25 11:01:18 2011 +0100 duplicate "add Oracle Java 1.7.0 recognition" from javavendors_linux -> wnt Cherry-picked from <http://cgit.freedesktop.org/libreoffice/core/commit/?id=f95052c29b076995a54b1d3f7c0becf35ebcd23f>. diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml index 267f02f..180a136 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> commit 25ff8db963820a82b9fba31d35d16cc15062ba6e Author: Hanno Meyer-Thurow <h....@web.de> Date: Tue Sep 13 13:23:28 2011 +0100 add Oracle Java 1.7.0 recognition Cherry-picked from <http://cgit.freedesktop.org/libreoffice/core/commit/?id=549e54fb2f8113502743c443d6deadfe648dede1>. diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml index 2422195..874ca64 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.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> @@ -25,6 +28,7 @@ <plugins> <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> + <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index 9feee72..4d617c4 100644 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -112,6 +112,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) //Only do something if the sunjavaplugin created this JavaInfo rtl::OUString sVendor1(RTL_CONSTASCII_USTRINGPARAM("Sun Microsystems Inc.")); + rtl::OUString sVendor9(RTL_CONSTASCII_USTRINGPARAM("Oracle Corporation")); rtl::OUString sVendor2(RTL_CONSTASCII_USTRINGPARAM("IBM Corporation")); rtl::OUString sVendor3(RTL_CONSTASCII_USTRINGPARAM("Blackdown Java-Linux Team")); rtl::OUString sVendor4(RTL_CONSTASCII_USTRINGPARAM("Apple Inc.")); @@ -121,6 +122,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation")); if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True || sVendor2.equals(pInfo->sVendor) == sal_True + || sVendor9.equals(pInfo->sVendor) == sal_True || sVendor3.equals(pInfo->sVendor) == sal_True || sVendor4.equals(pInfo->sVendor) == sal_True || sVendor5.equals(pInfo->sVendor) == sal_True diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx index 059d8a0..3f4c734 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx @@ -52,6 +52,7 @@ namespace jfw_plugin */ BEGIN_VENDOR_MAP() VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo) + VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo) VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo) VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo) VENDOR_MAP_ENTRY("Apple Inc.", OtherInfo) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits