[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - default_images/sw jvmfwk/distributions jvmfwk/plugins ooo_custom_images/classic
Damjan Jovanovic (via logerrit)
logerrit at kemper.freedesktop.org
Sat Jul 27 16:09:04 UTC 2019
default_images/sw/res/point.png |binary
default_images/sw/res/point_h.png |binary
jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml | 6 +++++-
jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml | 7 ++++++-
jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml | 6 +++++-
jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml | 6 +++++-
jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 4 +++-
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx | 1 +
ooo_custom_images/classic/classic_images.tar.gz |binary
9 files changed, 25 insertions(+), 5 deletions(-)
New commits:
commit ff76cb4e0f3f8d0164570638742f140aa5b728ef
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sat Jul 27 15:50:09 2019 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Sat Jul 27 15:50:09 2019 +0000
Add support for the AdoptOpenJDK Java distribution
(https://adoptopenjdk.net/).
Closes #i128157# Add support for AdoptOpenJDK JVM's.
Patch by: me
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index cbbc8d21c08d..80dd762cabb6 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -23,7 +23,7 @@
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <updated>2012-10-06</updated>
+ <updated>2019-07-27</updated>
<vendorInfos>
<vendor name="Oracle Corporation">
@@ -44,6 +44,9 @@
<vendor name="BEA Systems, Inc.">
<minVersion>1.5.0</minVersion>
</vendor>
+ <vendor name="AdoptOpenJDK">
+ <minVersion>1.8.0</minVersion>
+ </vendor>
</vendorInfos>
<plugins>
@@ -53,5 +56,6 @@
<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>
<library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="AdoptOpenJDK">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
</plugins>
</javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 63eb024a9a5e..5bc909c3f265 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -23,7 +23,7 @@
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <updated>2013-01-01</updated>
+ <updated>2019-07-27</updated>
<vendorInfos>
<vendor name="Apple Computer, Inc.">
@@ -35,10 +35,15 @@
<vendor name="Oracle Corporation">
<minVersion>1.7.0</minVersion>
</vendor>
+ <vendor name="AdoptOpenJDK">
+ <minVersion>1.8.0</minVersion>
+ </vendor>
</vendorInfos>
+
<plugins>
<library vendor="Apple Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library>
<library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library>
<library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library>
+ <library vendor="AdoptOpenJDK">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library>
</plugins>
</javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index f1f5fa284911..94268509cae6 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
@@ -23,7 +23,7 @@
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <updated>2011-01-07</updated>
+ <updated>2019-07-27</updated>
<vendorInfos>
<vendor name="Oracle Corporation">
@@ -32,10 +32,14 @@
<vendor name="Sun Microsystems Inc.">
<minVersion>1.5.0</minVersion>
</vendor>
+ <vendor name="AdoptOpenJDK">
+ <minVersion>1.8.0</minVersion>
+ </vendor>
</vendorInfos>
<plugins>
<library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
<library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="AdoptOpenJDK">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
</plugins>
</javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index a0257444ae34..92c6d1988c87 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -23,7 +23,7 @@
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <updated>2012-10-06</updated>
+ <updated>2019-07-27</updated>
<vendorInfos>
<vendor name="Oracle Corporation">
@@ -35,11 +35,15 @@
<vendor name="IBM Corporation">
<minVersion>1.5.0</minVersion>
</vendor>
+ <vendor name="AdoptOpenJDK">
+ <minVersion>1.8.0</minVersion>
+ </vendor>
</vendorInfos>
<plugins>
<library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library>
<library vendor="Sun Microsystems Inc.">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>
+ <library vendor="AdoptOpenJDK">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library>
</plugins>
</javaSelection>
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 5c0f0164675d..24b1835695e2 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -120,6 +120,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc."));
rtl::OUString sVendor7(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, Inc."));
rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation"));
+ rtl::OUString sVendor9(RTL_CONSTASCII_USTRINGPARAM("AdoptOpenJDK"));
if ( ! (sVendor0.equals(pInfo->sVendor) == sal_True
|| sVendor1.equals(pInfo->sVendor) == sal_True
|| sVendor2.equals(pInfo->sVendor) == sal_True
@@ -128,7 +129,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
|| sVendor5.equals(pInfo->sVendor) == sal_True
|| sVendor6.equals(pInfo->sVendor) == sal_True
|| sVendor7.equals(pInfo->sVendor) == sal_True
- || sVendor8.equals(pInfo->sVendor) == sal_True))
+ || sVendor8.equals(pInfo->sVendor) == sal_True
+ || sVendor9.equals(pInfo->sVendor) == sal_True))
return 0;
rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index 1a0aff1eb983..75ed944b56f7 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -51,6 +51,7 @@ BEGIN_VENDOR_MAP()
VENDOR_MAP_ENTRY("BEA Systems, Inc.", OtherInfo)
VENDOR_MAP_ENTRY("Free Software Foundation, Inc.", GnuInfo)
VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo)
+ VENDOR_MAP_ENTRY("AdoptOpenJDK", OtherInfo)
END_VENDOR_MAP()
commit 6f01dbdb4adbd827ee308fcb3bc3cd00fbe98781
Author: Matthias Seidel <mseidel at apache.org>
AuthorDate: Sat Jul 27 14:45:04 2019 +0000
Commit: Matthias Seidel <mseidel at apache.org>
CommitDate: Sat Jul 27 14:45:04 2019 +0000
Updated graphics for (navigation) point, moving from blue to black, esp. for macOS
diff --git a/default_images/sw/res/point.png b/default_images/sw/res/point.png
index 1c3c29421a27..44dd50458df7 100644
Binary files a/default_images/sw/res/point.png and b/default_images/sw/res/point.png differ
diff --git a/default_images/sw/res/point_h.png b/default_images/sw/res/point_h.png
index c39971ffa840..9f0ce19c75fc 100644
Binary files a/default_images/sw/res/point_h.png and b/default_images/sw/res/point_h.png differ
diff --git a/ooo_custom_images/classic/classic_images.tar.gz b/ooo_custom_images/classic/classic_images.tar.gz
index c8f4085938e1..12106f894804 100644
Binary files a/ooo_custom_images/classic/classic_images.tar.gz and b/ooo_custom_images/classic/classic_images.tar.gz differ
More information about the Libreoffice-commits
mailing list