diff -Nru libreoffice-l10n-6.0.7/debian/changelog libreoffice-l10n-6.0.7/debian/changelog --- libreoffice-l10n-6.0.7/debian/changelog 2019-02-27 11:11:27.000000000 +0000 +++ libreoffice-l10n-6.0.7/debian/changelog 2019-07-16 16:28:21.000000000 +0000 @@ -1,4 +1,48 @@ -libreoffice-l10n (1:6.0.7-0ubuntu0.18.04.4) bionic; urgency=medium +libreoffice-l10n (1:6.0.7-0ubuntu0.18.04.8) bionic-security; urgency=medium + + * SECURITY UPDATE: LibreLogo arbitrary script execution + - debian/patches/CVE-2019-9848.diff: don't allow LibreLogo to be used with + mouseover/etc dom-alike events. + - CVE-2019-9848 + * SECURITY UPDATE: Remote bullet graphics retrieved in 'stealth mode' + - debian/patches/CVE-2019-9849.diff: include bullet graphics in 'stealth + mode' protection. + - CVE-2019-9849 + + -- Marcus Tomlinson Tue, 16 Jul 2019 17:28:21 +0100 + +libreoffice-l10n (1:6.0.7-0ubuntu0.18.04.7) bionic; urgency=medium + + * debian/patches/cpdmgr-check-dbus-desc.diff (LP: #1798074): + - Only create CPDManager if D-Bus descriptions present. + - Fixes LibreOffice startup crash when CPD packages installed. + + -- Marcus Tomlinson Fri, 31 May 2019 11:43:00 +0100 + +libreoffice-l10n (1:6.0.7-0ubuntu0.18.04.6) bionic; urgency=medium + + [ Ikuya Awashiro ] + * debian/patches/new-japanese-era-name.patch (LP: #1827451): + Add new Japanse era name "Reiwa" support which taken from upstream: + https://cgit.freedesktop.org/libreoffice/core/commit/?id=cacbb0faef77ae8462de9ff5c7307a6a2e28b2bb + https://cgit.freedesktop.org/libreoffice/core/commit/?id=597c5d75b8e72d429e096535334eaac7973455ef + + [ Olivier Tilloy ] + * debian/patches/java.vendor-Ubuntu.patch: update to also recognize + "Private Build" as java.vendor (for custom PPA builds) (LP: #1822839) + * debian/patches/java.vendor-Ubuntu.patch: also make jvmfwk recognize + "Ubuntu" as java.vendor (LP: #1822839) + + [ Rene Engelhard ] + * debian/patches/java.vendor-Debian.diff: make jvmfwk recognize "Debian" + as java.vendor as that's what is set in openjdk 11 >= 11.0.3+4-2 + - see #926009 (closes: #926318) (LP: #1822839) + * debian/control.gtk3.in: + - make libreoffice-gtk3 recommend gstreamer1.0-gtk3 (LP: #1820062) + + -- Marcus Tomlinson Tue, 07 May 2019 12:35:49 +0100 + +libreoffice-l10n (1:6.0.7-0ubuntu0.18.04.5) bionic; urgency=medium * debian/patches/jdk-11.0.2-javadoc.diff: fix architecture-independent build with OpenJDK 11 (debian bug #920331) diff -Nru libreoffice-l10n-6.0.7/debian/config libreoffice-l10n-6.0.7/debian/config --- libreoffice-l10n-6.0.7/debian/config 2019-02-27 11:11:27.000000000 +0000 +++ libreoffice-l10n-6.0.7/debian/config 2019-07-16 16:28:21.000000000 +0000 @@ -1,5 +1,5 @@ BUILD_DEPS:=autoconf, automake, bc, bison, bzip2, flex (>= 2.3.35), gperf, libc0.1 (>= 2.10.2-7) [kfreebsd-any], libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , binutils (>= 2.23) [mips mipsel], libc6 (>= 2.17-6) [mips mipsel] , gcc (>= 4:7) [m68k], g++ (>= 4:7) [m68k] , libpoppler-dev (>= 0.12.0), libpoppler-private-dev, libpoppler-cpp-dev , libgraphite2-dev (>= 0.9.3) , libharfbuzz-dev (>= 0.9.42) , libexttextcat-dev (>= 3.4.1) , libjpeg-dev , libxml2-dev (>= 2.8), libxml2-utils , libxslt1-dev , libxmlsec1-dev (>= 1.2.24) , libexpat1-dev , unixodbc-dev (>= 2.2.11) , libsane-dev , libpng-dev , libcurl4-gnutls-dev , python3 , python3-dev (>= 3.3) , python3-distutils , dh-python , debhelper (>= 10) , dpkg-dev (>= 1.18.2~) , locales [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , gdb [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , fontconfig [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , fonts-liberation2 [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , fonts-crosextra-carlito [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , fonts-dejavu [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , libcppunit-dev (>= 1.14) [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , pstoedit [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , imagemagick [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , ghostscript [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , hunspell-en-us [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , junit4 (>= 4.8.2-2) [amd64 arm64] , maven-repo-helper , java-common (>= 0.49) , default-jdk (>= 1:1.6) [!hppa !mips64 !s390 !sparc !i386] , default-jdk (>= 2:1.9) [i386] , default-jdk (>= 1:1.7-48) [ia64] , default-jdk (>= 2:1.7-52.1) [kfreebsd-any] , default-jdk (>= 2:1.8-55) [sparc64] , ant (>= 1.7.0) [!hppa !mips64 !s390 !sparc], ant-optional (>= 1.7.0) [!hppa !mips64 !s390 !sparc] , libcommons-logging-java [!hppa !mips64 !s390 !sparc] , javahelper (>= 0.37~) , libnss3-dev (>= 3.12.3) , libnspr4-dev , ucpp , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libboost-dev (>= 1.58), libboost-date-time-dev (>= 1.58), libboost-iostreams-dev (>= 1.58), libboost-filesystem-dev (>= 1.58), libboost-locale-dev (>= 1.58) , libmdds-dev (>= 1.2.3) , liborcus-dev (>= 0.13.3) , libclucene-dev (>= 2.3.3.4-4.1) , librevenge-dev , libwpd-dev (>= 0.10) , libmythes-dev (>= 2:1.2) , libwps-dev (>= 0.4) , libwps-dev (>= 0.4.8) , libwpg-dev (>= 0.3) , libvisio-dev (>= 0.1) , libcdr-dev (>= 0.1) , libmspub-dev (>= 0.1) , libmwaw-dev (>= 0.3.1) , libmwaw-dev (>= 0.3.13) , libodfgen-dev (>= 0.1) , libepubgen-dev (>= 0.1.0) , libetonyek-dev , libetonyek-dev (>= 0.1.7) , libfreehand-dev (>= 0.1) , libabw-dev (>= 0.1) , libpagemaker-dev , libe-book-dev , libe-book-dev (>= 0.1.2) , libcmis-dev (>= 0.5.0-3ubuntu1) , dh-apparmor , libeot-dev , liblcms2-dev , libldap2-dev , liblangtag-dev (>= 0.4) , libicu-dev (>= 52) , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4:4.8) , default-libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.7-4) , firebird-dev (>= 3.0.0.32483.ds4-4) [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , firebird3.0-server-core [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , libgtk2.0-dev (>= 2.18.0) , libgtk-3-dev (>= 3.8.0), libglib2.0-dev (>= 2.38.0) , gobject-introspection (>= 1.32.0), libgirepository1.0-dev (>= 1.32) , libebook1.2-dev , libpq-dev (>= 9.0~) , libxrandr-dev , libhsqldb1.8.0-java (>> 1.8.0.10) [!hppa !mips64 !s390 !sparc], libarchive-zip-perl [!hppa !mips64 !s390 !sparc] , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.70) , libbluetooth-dev [linux-any] , libavahi-client-dev , libgstreamer1.0-dev , libgstreamer-plugins-base1.0-dev , libneon27-gnutls-dev , librdf0-dev (>= 1.0.16-2) , libepoxy-dev (>= 1.2) , libglm-dev (>= 0.9.9~a2) , libgpgmepp-dev, libgpgme-dev, libgpg-error-dev , gpg , gpgconf , gpg-agent , libdconf-dev (>= 0.15.2) -CONFIGURE_FLAGS:=--with-vendor='The Document Foundation, Debian and Ubuntu' --with-build-version='1:6.0.7-0ubuntu0.18.04.4' --prefix=/usr --mandir=/usr/share/man --docdir=/usr/share/doc/libreoffice --libdir=/usr/lib --host=x86_64-linux-gnu --build=x86_64-linux-gnu --disable-online-update --disable-fetch-external --disable-gstreamer-0-10 --without-fonts --without-myspell-dicts --enable-release-build --disable-dependency-tracking --with-alloc=system --enable-extension-integration --with-gdrive-client-id=424119844901-gee57209rkbo1rgula4i0arilvgv3lsf.apps.googleusercontent.com --with-gdrive-client-secret=3h1DknIrVsq2wEhIuADVxQ3E --with-system-dicts --with-system-hunspell --with-system-altlinuxhyph --with-system-boost --with-system-mdds --with-system-mythes --with-system-icu --with-system-librevenge --with-system-libwpd --with-system-libwpg --with-system-libwps --with-system-libvisio --with-system-libcdr --with-system-libmspub --with-system-libmwaw --with-system-libodfgen --with-system-libepubgen --with-system-libetonyek --with-system-libfreehand --with-system-libebook --with-system-libabw --with-system-libpagemaker --with-system-cairo --with-system-xmlsec --with-system-beanshell --with-system-hsqldb --with-system-lpsolve --with-system-coinmp --with-system-bluez --with-system-neon --with-system-redland --with-system-epoxy --with-system-apache-commons --with-system-graphite --with-system-harfbuzz --with-system-libexttextcat --with-system-cppunit --with-system-mariadb --with-system-mysql-cppconn --with-system-postgresql --with-system-libcmis --with-system-jpeg --with-system-libxml --with-system-expat --with-system-odbc --with-system-curl --with-system-sane --with-system-poppler --with-system-libpng --with-system-nss --with-system-clucene --with-system-lcms2 --with-system-openldap --with-system-liblangtag --with-system-orcus --with-system-ucpp --with-system-firebird --with-system-libeot --with-system-glm --with-system-gpgmepp --disable-coinmp --enable-symbols --without-export-validation --with-jdk-home=/usr/lib/jvm/default-java --with-commons-logging-jar=/usr/share/java/commons-logging.jar --with-external-dict-dir=/usr/share/hunspell --with-external-hyph-dir=/usr/share/hyphen --with-boost-libdir=/usr/lib/x86_64-linux-gnu --with-external-thes-dir=/usr/share/mythes --enable-eot --enable-kde4 --enable-ext-mariadb-connector --enable-evolution2 --enable-python=system --with-hsqldb-jar=/usr/share/java/hsqldb1.8.0.jar --enable-scripting-beanshell --enable-scripting-javascript --enable-dbus --enable-avahi --enable-gstreamer-1-0 --with-webdav=neon --disable-ccache --with-parallelism= +CONFIGURE_FLAGS:=--with-vendor='The Document Foundation, Debian and Ubuntu' --with-build-version='1:6.0.7-0ubuntu0.18.04.8' --prefix=/usr --mandir=/usr/share/man --docdir=/usr/share/doc/libreoffice --libdir=/usr/lib --host=x86_64-linux-gnu --build=x86_64-linux-gnu --disable-online-update --disable-fetch-external --disable-gstreamer-0-10 --without-fonts --without-myspell-dicts --enable-release-build --disable-dependency-tracking --with-alloc=system --enable-extension-integration --with-gdrive-client-id=424119844901-gee57209rkbo1rgula4i0arilvgv3lsf.apps.googleusercontent.com --with-gdrive-client-secret=3h1DknIrVsq2wEhIuADVxQ3E --with-system-dicts --with-system-hunspell --with-system-altlinuxhyph --with-system-boost --with-system-mdds --with-system-mythes --with-system-icu --with-system-librevenge --with-system-libwpd --with-system-libwpg --with-system-libwps --with-system-libvisio --with-system-libcdr --with-system-libmspub --with-system-libmwaw --with-system-libodfgen --with-system-libepubgen --with-system-libetonyek --with-system-libfreehand --with-system-libebook --with-system-libabw --with-system-libpagemaker --with-system-cairo --with-system-xmlsec --with-system-beanshell --with-system-hsqldb --with-system-lpsolve --with-system-coinmp --with-system-bluez --with-system-neon --with-system-redland --with-system-epoxy --with-system-apache-commons --with-system-graphite --with-system-harfbuzz --with-system-libexttextcat --with-system-cppunit --with-system-mariadb --with-system-mysql-cppconn --with-system-postgresql --with-system-libcmis --with-system-jpeg --with-system-libxml --with-system-expat --with-system-odbc --with-system-curl --with-system-sane --with-system-poppler --with-system-libpng --with-system-nss --with-system-clucene --with-system-lcms2 --with-system-openldap --with-system-liblangtag --with-system-orcus --with-system-ucpp --with-system-firebird --with-system-libeot --with-system-glm --with-system-gpgmepp --disable-coinmp --enable-symbols --without-export-validation --with-jdk-home=/usr/lib/jvm/default-java --with-commons-logging-jar=/usr/share/java/commons-logging.jar --with-external-dict-dir=/usr/share/hunspell --with-external-hyph-dir=/usr/share/hyphen --with-boost-libdir=/usr/lib/x86_64-linux-gnu --with-external-thes-dir=/usr/share/mythes --enable-eot --enable-kde4 --enable-ext-mariadb-connector --enable-evolution2 --enable-python=system --with-hsqldb-jar=/usr/share/java/hsqldb1.8.0.jar --enable-scripting-beanshell --enable-scripting-javascript --enable-dbus --enable-avahi --enable-gstreamer-1-0 --with-webdav=neon --disable-ccache --with-parallelism= CONFIGURE_FLAGS_LANG=--with-lang="en-US af am ar as ast be bg bn br bs ca ca-valencia cs cy da de dz el en-GB en-ZA eo es et eu fa fi fr ga gd gl gu gug he hi hr hu id is it ja ka kk km kmr-Latn kn ko lt lv mk mn ml mr nb ne nl nn nr nso oc om or pa-IN pl pt pt-BR ro ru rw si sk sl sr sr-Latn ss st sv ta te tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu" LANGPACKISOS:=en-US af am ar as ast be bg bn br bs ca ca-valencia cs cy da de dz el en-GB en-ZA eo es et eu fa fi fr ga gd gl gu gug he hi hr hu id is it ja ka kk km kmr-Latn kn ko lt lv mk mn ml mr nb ne nl nn nr nso oc om or pa-IN pl pt pt-BR ro ru rw si sk sl sr sr-Latn ss st sv ta te tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu ISOS=en-US af am ar as ast be bg bn br bs ca ca-valencia cs cy da de dz el en-GB en-ZA eo es et eu fa fi fr ga gd gl gu gug he hi hr hu id is it ja ka kk km kmr-Latn kn ko lt lv mk mn ml mr nb ne nl nn nr nso oc om or pa-IN pl pt pt-BR ro ru rw si sk sl sr sr-Latn ss st sv ta te tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu diff -Nru libreoffice-l10n-6.0.7/debian/patches/cpdmgr-check-dbus-desc.diff libreoffice-l10n-6.0.7/debian/patches/cpdmgr-check-dbus-desc.diff --- libreoffice-l10n-6.0.7/debian/patches/cpdmgr-check-dbus-desc.diff 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-l10n-6.0.7/debian/patches/cpdmgr-check-dbus-desc.diff 2019-07-16 15:33:11.000000000 +0000 @@ -0,0 +1,22 @@ +Description: Only create CPDManager if D-Bus descriptions present +Author: Michael Weghorn +Upstream Commit: https://gerrit.libreoffice.org/plugins/gitiles/core/+/773e4896521ccf29ab040f977a3faaadd805c8d8%5E%21 +Bug: https://launchpad.net/bugs/1798074 + +diff --git a/vcl/unx/generic/printer/cpdmgr.cxx b/vcl/unx/generic/printer/cpdmgr.cxx +index a830c86c9..2438c98b8 100644 +--- a/vcl/unx/generic/printer/cpdmgr.cxx ++++ b/vcl/unx/generic/printer/cpdmgr.cxx +@@ -247,6 +247,12 @@ CPDManager* CPDManager::tryLoadCPD() + static const char* pEnv = getenv("SAL_DISABLE_CPD"); + + if (!pEnv || !*pEnv) { ++ // interface description XML files are needed in 'onNameAcquired()' ++ if (!g_file_test(FRONTEND_INTERFACE, G_FILE_TEST_IS_REGULAR) || ++ !g_file_test(BACKEND_INTERFACE, G_FILE_TEST_IS_REGULAR)) { ++ return nullptr; ++ } ++ + GDir *dir; + const gchar *filename; + dir = g_dir_open(BACKEND_DIR, 0, nullptr); diff -Nru libreoffice-l10n-6.0.7/debian/patches/CVE-2019-9848.diff libreoffice-l10n-6.0.7/debian/patches/CVE-2019-9848.diff --- libreoffice-l10n-6.0.7/debian/patches/CVE-2019-9848.diff 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-l10n-6.0.7/debian/patches/CVE-2019-9848.diff 2019-07-16 16:18:40.000000000 +0000 @@ -0,0 +1,36 @@ +Description: Explictly exclude LibreLogo from XScript usage +Author: Caolán McNamara +Upstream Commit: https://cgit.freedesktop.org/libreoffice/core/commit/?id=cb0024e3668979dfdef44db5aa15ddfaf035e695 +Bug: https://www.libreoffice.org/about-us/security/advisories/cve-2019-9848/ + +diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx +index a5e62da8c..02d79c356 100644 +--- a/sfx2/source/doc/objmisc.cxx ++++ b/sfx2/source/doc/objmisc.cxx +@@ -1347,6 +1347,16 @@ namespace + } + } + ++namespace { ++ ++// don't allow LibreLogo to be used with our mouseover/etc dom-alike events ++bool UnTrustedScript(const OUString& rScriptURL) ++{ ++ return rScriptURL.startsWithIgnoreAsciiCase("vnd.sun.star.script:LibreLogo"); ++} ++ ++} ++ + ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const OUString& _rScriptURL, + const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError, const css::uno::Any* pCaller ) + { +@@ -1359,6 +1369,9 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon + if ( bIsDocumentScript && !lcl_isScriptAccessAllowed_nothrow( _rxScriptContext ) ) + return ERRCODE_IO_ACCESSDENIED; + ++ if ( UnTrustedScript(_rScriptURL) ) ++ return ERRCODE_IO_ACCESSDENIED; ++ + bool bCaughtException = false; + Any aException; + try diff -Nru libreoffice-l10n-6.0.7/debian/patches/CVE-2019-9849.diff libreoffice-l10n-6.0.7/debian/patches/CVE-2019-9849.diff --- libreoffice-l10n-6.0.7/debian/patches/CVE-2019-9849.diff 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-l10n-6.0.7/debian/patches/CVE-2019-9849.diff 2019-07-16 16:28:21.000000000 +0000 @@ -0,0 +1,141 @@ +Description: More uses of referer URL with SvxBrushItem +Author: Stephan Bergmann +Upstream Commit: https://cgit.freedesktop.org/libreoffice/core/commit/?id=b518882de8213ef71a8003f95fbdf7689069c06d +Bug: https://www.libreoffice.org/about-us/security/advisories/cve-2019-9849/ + +diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx +index 295eb06fe..185b5bcb4 100644 +--- a/sw/inc/unosett.hxx ++++ b/sw/inc/unosett.hxx +@@ -210,7 +210,7 @@ public: + + static css::uno::Sequence GetPropertiesForNumFormat( + const SwNumFormat& rFormat, OUString const& rCharFormatName, +- OUString const* pHeadingStyleName); ++ OUString const* pHeadingStyleName, OUString const & referer); + static void SetPropertiesToNumFormat( + SwNumFormat & aFormat, + OUString & rCharStyleName, +diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx +index 777165819..b29cee3b5 100644 +--- a/sw/source/core/text/porfld.cxx ++++ b/sw/source/core/text/porfld.cxx +@@ -755,7 +755,7 @@ SwBulletPortion::SwBulletPortion( const sal_Unicode cBullet, + + SwGrfNumPortion::SwGrfNumPortion( + const OUString& rGraphicFollowedBy, +- const SvxBrushItem* pGrfBrush, ++ const SvxBrushItem* pGrfBrush, OUString const & referer, + const SwFormatVertOrient* pGrfOrient, const Size& rGrfSize, + const bool bLft, const bool bCntr, const sal_uInt16 nMinDst, + const bool bLabelAlignmentPosAndSpaceModeActive ) : +@@ -769,7 +769,7 @@ SwGrfNumPortion::SwGrfNumPortion( + if( pGrfBrush ) + { + *pBrush = *pGrfBrush; +- const Graphic* pGraph = pGrfBrush->GetGraphic(); ++ const Graphic* pGraph = pGrfBrush->GetGraphic(referer); + if( pGraph ) + SetAnimated( pGraph->IsAnimated() ); + else +diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx +index 38fc08993..4ecf25e7d 100644 +--- a/sw/source/core/text/porfld.hxx ++++ b/sw/source/core/text/porfld.hxx +@@ -168,6 +168,7 @@ class SwGrfNumPortion : public SwNumberPortion + public: + SwGrfNumPortion( const OUString& rGraphicFollowedBy, + const SvxBrushItem* pGrfBrush, ++ OUString const & referer, + const SwFormatVertOrient* pGrfOrient, + const Size& rGrfSize, + const bool bLeft, +diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx +index 6b2b93886..14e396869 100644 +--- a/sw/source/core/text/txtfld.cxx ++++ b/sw/source/core/text/txtfld.cxx +@@ -52,6 +52,7 @@ + #include + #include + #include ++#include + #include + + static bool lcl_IsInBody( SwFrame const *pFrame ) +@@ -478,8 +479,17 @@ SwNumberPortion *SwTextFormatter::NewNumberPortion( SwTextFormatInfo &rInf ) con + + if( SVX_NUM_BITMAP == rNumFormat.GetNumberingType() ) + { ++ OUString referer; ++ if (auto const sh1 = rInf.GetVsh()) { ++ if (auto const doc = sh1->GetDoc()) { ++ auto const sh2 = doc->GetPersist(); ++ if (sh2 != nullptr && sh2->HasName()) { ++ referer = sh2->GetMedium()->GetName(); ++ } ++ } ++ } + pRet = new SwGrfNumPortion( pTextNd->GetLabelFollowedBy(), +- rNumFormat.GetBrush(), ++ rNumFormat.GetBrush(), referer, + rNumFormat.GetGraphicOrientation(), + rNumFormat.GetGraphicSize(), + bLeft, bCenter, nMinDist, +diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx +index f7376b936..218afbdd9 100644 +--- a/sw/source/core/unocore/unosett.cxx ++++ b/sw/source/core/unocore/unosett.cxx +@@ -57,6 +57,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -1316,13 +1317,21 @@ uno::Sequence SwXNumberingRules::GetNumberingRuleByIndex( + SwStyleNameMapper::FillProgName(sValue, aUString, SwGetPoolIdFromName::TxtColl); + } + +- return GetPropertiesForNumFormat(rFormat, CharStyleName, (pDocShell) ? & aUString : nullptr); ++ OUString referer; ++ if (pDoc != nullptr) { ++ auto const sh = pDoc->GetPersist(); ++ if (sh != nullptr && sh->HasName()) { ++ referer = sh->GetMedium()->GetName(); ++ } ++ } ++ return GetPropertiesForNumFormat( ++ rFormat, CharStyleName, pDocShell ? & aUString : nullptr, referer); + + } + + uno::Sequence SwXNumberingRules::GetPropertiesForNumFormat( + const SwNumFormat& rFormat, OUString const& rCharFormatName, +- OUString const*const pHeadingStyleName) ++ OUString const*const pHeadingStyleName, OUString const & referer) + { + bool bChapterNum = pHeadingStyleName != nullptr; + +@@ -1454,7 +1463,7 @@ uno::Sequence SwXNumberingRules::GetPropertiesForNumFormat + //graphicbitmap + const Graphic* pGraphic = nullptr; + if(pBrush ) +- pGraphic = pBrush->GetGraphic(); ++ pGraphic = pBrush->GetGraphic(referer); + if(pGraphic) + { + uno::Reference xBmp = VCLUnoHelper::CreateBitmap( pGraphic->GetBitmapEx() ); +diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx +index c575863f0..b972ec5ed 100644 +--- a/sw/source/uibase/config/StoredChapterNumbering.cxx ++++ b/sw/source/uibase/config/StoredChapterNumbering.cxx +@@ -129,7 +129,7 @@ public: + OUString dummy; // pass in empty HeadingStyleName - can't import anyway + uno::Sequence const ret( + SwXNumberingRules::GetPropertiesForNumFormat( +- *pNumFormat, *pCharStyleName, &dummy)); ++ *pNumFormat, *pCharStyleName, &dummy, "")); + return uno::makeAny(ret); + } + diff -Nru libreoffice-l10n-6.0.7/debian/patches/java.vendor-Debian.diff libreoffice-l10n-6.0.7/debian/patches/java.vendor-Debian.diff --- libreoffice-l10n-6.0.7/debian/patches/java.vendor-Debian.diff 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-l10n-6.0.7/debian/patches/java.vendor-Debian.diff 2019-05-03 15:37:57.000000000 +0000 @@ -0,0 +1,39 @@ +diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +index 969ed01c6..94504b9cb 100644 +--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml ++++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +@@ -25,6 +25,9 @@ + + 1.6.0 + ++ ++ 1.6.0 ++ + + 1.5.0 + +diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx +index 2960d118c..88a28e700 100644 +--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx ++++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx +@@ -41,6 +41,7 @@ BEGIN_VENDOR_MAP() + #endif + VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo) + VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo) ++ VENDOR_MAP_ENTRY("Debian", SunInfo) + #ifndef MACOSX + VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo) + VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo) +diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java +index 0f5d9bffc..72cde69a1 100644 +--- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java ++++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java +@@ -250,7 +250,7 @@ public class LocalOfficeWindow + if (getNativeWindowSystemType() == SystemDependent.SYSTEM_XWINDOW ) + { + String vendor = System.getProperty("java.vendor"); +- if ((vendor.equals("Sun Microsystems Inc.") || vendor.equals("Oracle Corporation")) ++ if ((vendor.equals("Sun Microsystems Inc.") || vendor.equals("Oracle Corporation") || vendor.equals("Debian")) + && Boolean.getBoolean("sun.awt.xembedserver")) + { + xembed = new NamedValue( diff -Nru libreoffice-l10n-6.0.7/debian/patches/java.vendor-Ubuntu.patch libreoffice-l10n-6.0.7/debian/patches/java.vendor-Ubuntu.patch --- libreoffice-l10n-6.0.7/debian/patches/java.vendor-Ubuntu.patch 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-l10n-6.0.7/debian/patches/java.vendor-Ubuntu.patch 2019-05-03 15:39:42.000000000 +0000 @@ -0,0 +1,42 @@ +Description: Add "Ubuntu" and "Private Build" as recognized Java vendors +Author: Olivier Tilloy +Bug: https://bugs.documentfoundation.org/show_bug.cgi?id=124503 +Bug-Ubuntu: https://launchpad.net/bugs/1822839 + +--- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java ++++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java +@@ -250,7 +250,7 @@ public class LocalOfficeWindow + if (getNativeWindowSystemType() == SystemDependent.SYSTEM_XWINDOW ) + { + String vendor = System.getProperty("java.vendor"); +- if ((vendor.equals("Sun Microsystems Inc.") || vendor.equals("Oracle Corporation") || vendor.equals("Debian")) ++ if ((vendor.equals("Sun Microsystems Inc.") || vendor.equals("Oracle Corporation") || vendor.equals("Debian") || vendor.equals("Ubuntu") || vendor.equals("Private Build")) + && Boolean.getBoolean("sun.awt.xembedserver")) + { + xembed = new NamedValue( +--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml ++++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +@@ -28,6 +28,12 @@ + + 1.6.0 + ++ ++ 1.6.0 ++ ++ ++ 1.6.0 ++ + + 1.5.0 + +--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx ++++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx +@@ -42,6 +42,8 @@ BEGIN_VENDOR_MAP() + VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo) + VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo) + VENDOR_MAP_ENTRY("Debian", SunInfo) ++ VENDOR_MAP_ENTRY("Ubuntu", SunInfo) ++ VENDOR_MAP_ENTRY("Private Build", SunInfo) + #ifndef MACOSX + VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo) + VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo) diff -Nru libreoffice-l10n-6.0.7/debian/patches/new-japanese-era-name.patch libreoffice-l10n-6.0.7/debian/patches/new-japanese-era-name.patch --- libreoffice-l10n-6.0.7/debian/patches/new-japanese-era-name.patch 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-l10n-6.0.7/debian/patches/new-japanese-era-name.patch 2019-05-31 10:31:11.000000000 +0000 @@ -0,0 +1,54 @@ +Description: Japanese new era "Reiwa(令和)" support +Author: Ikuya Awashiro +Bug: https://launchpad.net/bugs/1827451 + +Index: libreoffice-6.0.7/i18npool/source/calendar/calendar_gregorian.cxx +=================================================================== +--- libreoffice-6.0.7.orig/i18npool/source/calendar/calendar_gregorian.cxx ++++ libreoffice-6.0.7/i18npool/source/calendar/calendar_gregorian.cxx +@@ -206,10 +206,11 @@ Calendar_hanja::loadCalendar( const OUSt + } + + static const Era gengou_eraArray[] = { +- {1868, 1, 1, 0}, +- {1912, 7, 30, 0}, +- {1926, 12, 25, 0}, +- {1989, 1, 8, 0}, ++ {1868, 1, 1, 0}, // Meiji ++ {1912, 7, 30, 0}, // Taisho ++ {1926, 12, 25, 0}, // Showa ++ {1989, 1, 8, 0}, // Heisei ++ {2019, 5, 1, 0}, // Reiwa + {0, 0, 0, 0} + }; + Calendar_gengou::Calendar_gengou() : Calendar_gregorian(gengou_eraArray) +Index: libreoffice-6.0.7/i18npool/source/localedata/data/ja_JP.xml +=================================================================== +--- libreoffice-6.0.7.orig/i18npool/source/localedata/data/ja_JP.xml ++++ libreoffice-6.0.7/i18npool/source/localedata/data/ja_JP.xml +@@ -480,6 +480,11 @@ + 平 + 平成 + ++ ++ Reiwa ++ 令 ++ 令和 ++ + + + sun +Index: libreoffice-6.0.7/svl/source/numbers/zformat.cxx +=================================================================== +--- libreoffice-6.0.7.orig/svl/source/numbers/zformat.cxx ++++ libreoffice-6.0.7/svl/source/numbers/zformat.cxx +@@ -3380,6 +3380,9 @@ void SvNumberformat::ImpAppendEraG( OUSt + case 4: + cEra = 'H'; + break; ++ case 5: ++ cEra = 'R'; ++ break; + default: + cEra = '?'; + break; diff -Nru libreoffice-l10n-6.0.7/debian/patches/series libreoffice-l10n-6.0.7/debian/patches/series --- libreoffice-l10n-6.0.7/debian/patches/series 2019-02-27 11:06:45.000000000 +0000 +++ libreoffice-l10n-6.0.7/debian/patches/series 2019-07-16 16:20:05.000000000 +0000 @@ -42,3 +42,9 @@ #lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff #integraltrans.diff hide-startcenter-and-maths-desktop-files.patch +new-japanese-era-name.patch +java.vendor-Debian.diff +java.vendor-Ubuntu.patch +cpdmgr-check-dbus-desc.diff +CVE-2019-9848.diff +CVE-2019-9849.diff