From e98b30144686c7bab992ecbf258bd17f06433200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Sat, 14 Aug 2021 20:21:33 +0100 Subject: [PATCH] upgrade to 7.2.0 --- .gitignore | 12 +- 0001-Get-rid-of-apache-commons-logging.patch | 1309 ----------------- ...d-DOCTYPE-from-odk-examples-xcu-file.patch | 36 - 0001-Replace-inet_ntoa-with-inet_ntop.patch | 162 -- ...739-two-style-tags-where-there-shoul.patch | 4 +- ...0-gdrive-support-w-oAuth-and-Drive-A.patch | 1248 ++++++++++++++++ ...truction-of-a-hardcoded-IPv4-address.patch | 39 - 0001-fix-detecting-qrcodegen.patch | 91 -- ...missing-gdk_threads_enter-calls-in-e.patch | 118 -- ...desktop-include-Spreadsheet-category.patch | 39 - 0001-rhbz-1918152-fix-FTBFS.patch | 26 - ...ow-convert-to-csv-to-write-each-shee.patch | 428 ------ libreoffice.spec | 40 +- sources | 12 +- 14 files changed, 1282 insertions(+), 2282 deletions(-) delete mode 100644 0001-Get-rid-of-apache-commons-logging.patch delete mode 100644 0001-Remove-unused-DOCTYPE-from-odk-examples-xcu-file.patch delete mode 100644 0001-Replace-inet_ntoa-with-inet_ntop.patch create mode 100644 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch delete mode 100644 0001-Simplify-construction-of-a-hardcoded-IPv4-address.patch delete mode 100644 0001-fix-detecting-qrcodegen.patch delete mode 100644 0001-gtk3-workaround-missing-gdk_threads_enter-calls-in-e.patch delete mode 100644 0001-math.desktop-include-Spreadsheet-category.patch delete mode 100644 0001-rhbz-1918152-fix-FTBFS.patch delete mode 100644 0001-rhbz-1980800-allow-convert-to-csv-to-write-each-shee.patch diff --git a/.gitignore b/.gitignore index 9f38af5..79fc533 100644 --- a/.gitignore +++ b/.gitignore @@ -6,9 +6,9 @@ /f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf /libreoffice-multiliblauncher.sh /dtoa-20180411.tgz -/libreoffice-7.1.5.2.tar.xz -/libreoffice-7.1.5.2.tar.xz.asc -/libreoffice-help-7.1.5.2.tar.xz -/libreoffice-help-7.1.5.2.tar.xz.asc -/libreoffice-translations-7.1.5.2.tar.xz.asc -/libreoffice-translations-7.1.5.2.tar.xz +/libreoffice-7.2.0.3.tar.xz +/libreoffice-7.2.0.3.tar.xz.asc +/libreoffice-help-7.2.0.3.tar.xz +/libreoffice-help-7.2.0.3.tar.xz.asc +/libreoffice-translations-7.2.0.3.tar.xz +/libreoffice-translations-7.2.0.3.tar.xz.asc diff --git a/0001-Get-rid-of-apache-commons-logging.patch b/0001-Get-rid-of-apache-commons-logging.patch deleted file mode 100644 index ca31754..0000000 --- a/0001-Get-rid-of-apache-commons-logging.patch +++ /dev/null @@ -1,1309 +0,0 @@ -From 4fd868fdfca690e9b0f159b2beadde5920897ab4 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Sun, 11 Apr 2021 09:20:13 +0200 -Subject: [PATCH] Get rid of apache-commons-logging - -...using Java 1.4 java.util.logging.Logger instead also for the last remaining -uses in reportbuilder. - -(The mention in swext/mediawiki/src/THIRDPARTYLICENSEREADME.html was presumably -a leftover from 4b6ceed4a4a9b152905a8b1712ffb9bd61373c16 "swext: Wiki Publisher -does not use those apache-commons libraries".) - -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113939 -Tested-by: Jenkins -Reviewed-by: Stephan Bergmann -(cherry picked from commit 6de0b1710adfba82c96b75a5da6f52633a54c692) -Conflicts: - readlicense_oo/license/NOTICE - swext/mediawiki/src/THIRDPARTYLICENSEREADME.html - -Change-Id: Ia0bc598fe5844ced11cae497548ec7d09453a99d ---- - Makefile.fetch | 1 - - RepositoryExternal.mk | 26 ---------- - config_host.mk.in | 3 -- - configure.ac | 40 --------------- - distro-configs/LibreOfficeFlatpak.conf | 1 - - download.lst | 2 - - external/Module_external.mk | 1 - - .../ExternalPackage_apache_commons_logging.mk | 16 ------ - .../ExternalProject_apache_commons_logging.mk | 32 ------------ - external/apache-commons/Makefile | 7 --- - .../apache-commons/Module_apache-commons.mk | 18 ------- - external/apache-commons/README | 1 - - .../UnpackedTarball_apache_commons_logging.mk | 22 --------- - external/apache-commons/patches/logging.patch | 46 ----------------- - readlicense_oo/license/NOTICE | 8 --- - readlicense_oo/license/license.xml | 6 --- - reportbuilder/Jar_reportbuilder.mk | 1 - - .../report/SDBCReportDataFactory.java | 7 +-- - .../libreoffice/report/StorageRepository.java | 48 +++++++++--------- - .../libreoffice/report/pentaho/Manifest.mf | 2 +- - .../report/pentaho/PentahoReportJob.java | 10 ++-- - .../report/pentaho/SOReportJobFactory.java | 9 ++-- - .../layoutprocessor/FormatValueUtility.java | 2 +- - .../FormattedTextLayoutController.java | 7 ++- - .../ImageElementLayoutController.java | 19 ++++--- - .../report/pentaho/output/ImageProducer.java | 23 ++++----- - .../output/OfficeDocumentReportTarget.java | 23 ++++----- - .../report/pentaho/output/OleProducer.java | 12 ++--- - .../report/pentaho/output/StyleUtilities.java | 10 ++-- - .../SpreadsheetRawReportTarget.java | 2 +- - .../office/DocumentContentReadHandler.java | 13 +++-- - solenv/flatpak-manifest.in | 6 --- - .../src/THIRDPARTYLICENSEREADME.html | 49 ------------------- - 33 files changed, 82 insertions(+), 391 deletions(-) - delete mode 100644 external/apache-commons/ExternalPackage_apache_commons_logging.mk - delete mode 100644 external/apache-commons/ExternalProject_apache_commons_logging.mk - delete mode 100644 external/apache-commons/Makefile - delete mode 100644 external/apache-commons/Module_apache-commons.mk - delete mode 100644 external/apache-commons/README - delete mode 100644 external/apache-commons/UnpackedTarball_apache_commons_logging.mk - delete mode 100644 external/apache-commons/patches/logging.patch - -diff --git a/Makefile.fetch b/Makefile.fetch -index 0a6202a4b3c7..924927bb4fb5 100644 ---- a/Makefile.fetch -+++ b/Makefile.fetch -@@ -101,7 +101,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S - @date >> $(fetch_LOGFILE) - $(foreach item, \ - $(call fetch_Optional,ABW,ABW_TARBALL) \ -- $(call fetch_Optional,APACHE_COMMONS,APACHE_COMMONS_LOGGING_TARBALL) \ - $(call fetch_Optional,APR,APR_TARBALL) \ - $(call fetch_Optional,APR,APR_UTIL_TARBALL) \ - $(call fetch_Optional,BOOST,BOOST_TARBALL) \ -diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk -index ad3febbae41b..d2fe7e044dfb 100644 ---- a/RepositoryExternal.mk -+++ b/RepositoryExternal.mk -@@ -3723,32 +3723,6 @@ endif # SYSTEM_RHINO - - endif - --ifneq ($(SYSTEM_APACHE_COMMONS),) -- --define gb_Jar__use_commons-logging --$(call gb_Jar_use_system_jar,$(1),$(COMMONS_LOGGING_JAR)) --endef --gb_ExternalProject__use_commons-logging := -- --else # !SYSTEM_APACHE_COMMONS -- --ifeq ($(ENABLE_JAVA),TRUE) --$(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\ -- commons-logging-$(COMMONS_LOGGING_VERSION) \ --)) --endif -- --define gb_Jar__use_commons-logging --$(call gb_Jar_use_external_project,$(1),apache_commons_logging) --$(call gb_Jar_use_jar,$(1),commons-logging-$(COMMONS_LOGGING_VERSION)) --endef --define gb_ExternalProject__use_commons-logging --$(call gb_ExternalProject_use_external_project,$(1),apache_commons_logging) --endef -- --endif # SYSTEM_APACHE_COMMONS -- -- - ifneq ($(SYSTEM_JFREEREPORT),) - - define gb_Jar__use_flow-engine -diff --git a/config_host.mk.in b/config_host.mk.in -index 42f4511a62e8..c9b3aa015123 100644 ---- a/config_host.mk.in -+++ b/config_host.mk.in -@@ -77,8 +77,6 @@ export CLUCENE_LIBS=$(gb_SPACE)@CLUCENE_LIBS@ - export LIBCMIS_CFLAGS=$(gb_SPACE)@LIBCMIS_CFLAGS@ - export LIBCMIS_LIBS=$(gb_SPACE)@LIBCMIS_LIBS@ - export COM=@COM@ --export COMMONS_LOGGING_JAR=@COMMONS_LOGGING_JAR@ --export COMMONS_LOGGING_VERSION=@COMMONS_LOGGING_VERSION@ - export COMPATH=@COMPATH@ - export COMPILER_PLUGINS=@COMPILER_PLUGINS@ - export COMPILER_PLUGINS_ANALYZER_PCH=@COMPILER_PLUGINS_ANALYZER_PCH@ -@@ -546,7 +544,6 @@ export STRIP=@STRIP@ - export STRIP_COMPONENTS=@STRIP_COMPONENTS@ - export SYSBASE=@SYSBASE@ - export SYSTEM_ABW=@SYSTEM_ABW@ --export SYSTEM_APACHE_COMMONS=@SYSTEM_APACHE_COMMONS@ - export SYSTEM_APR=@SYSTEM_APR@ - export SYSTEM_BLUEZ=@SYSTEM_BLUEZ@ - export SYSTEM_BOOST=@SYSTEM_BOOST@ -diff --git a/configure.ac b/configure.ac -index 11d93b7ba6eb..1cb0a61ad9c2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2076,11 +2076,6 @@ AC_ARG_WITH(system-gpgmepp, - [Use gpgmepp already on system]),, - [with_system_gpgmepp="$with_system_libs"]) - --AC_ARG_WITH(system-apache-commons, -- AS_HELP_STRING([--with-system-apache-commons], -- [Use Apache commons libraries already on system.]),, -- [with_system_apache_commons="$with_system_jars"]) -- - AC_ARG_WITH(system-mariadb, - AS_HELP_STRING([--with-system-mariadb], - [Use MariaDB/MySQL libraries already on system.]),, -@@ -2158,11 +2153,6 @@ AC_ARG_WITH(rhino-jar, - [Specify path to jarfile manually.]), - RHINO_JAR=$withval) - --AC_ARG_WITH(commons-logging-jar, -- AS_HELP_STRING([--with-commons-logging-jar=JARFILE], -- [Specify path to jarfile manually.]), -- COMMONS_LOGGING_JAR=$withval) -- - AC_ARG_WITH(system-jfreereport, - AS_HELP_STRING([--with-system-jfreereport], - [Use JFreeReport already on system.]),, -@@ -12298,36 +12288,6 @@ AC_SUBST(LIBREPOSITORY_JAR) - AC_SUBST(LIBFONTS_JAR) - AC_SUBST(LIBSERIALIZER_JAR) - --# this has to be here because both the Wiki Publisher and the SRB use --# commons-logging --COMMONS_LOGGING_VERSION=1.2 --if test "$ENABLE_REPORTBUILDER" = "TRUE"; then -- AC_MSG_CHECKING([which Apache commons-* libs to use]) -- if test "$with_system_apache_commons" = "yes"; then -- SYSTEM_APACHE_COMMONS=TRUE -- AC_MSG_RESULT([external]) -- if test -z $COMMONS_LOGGING_JAR; then -- if test -f /usr/share/java/commons-logging-${COMMONS_LOGGING_VERSION}.jar; then -- COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-${COMMONS_LOGGING_VERSION}.jar -- elif test -f /usr/share/java/commons-logging.jar; then -- COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar -- else -- AC_MSG_ERROR(commons-logging.jar replacement not found.) -- fi -- elif ! test -f $COMMONS_LOGGING_JAR; then -- AC_MSG_ERROR(commons-logging.jar not found.) -- fi -- else -- AC_MSG_RESULT([internal]) -- SYSTEM_APACHE_COMMONS= -- BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS" -- NEED_ANT=TRUE -- fi --fi --AC_SUBST(SYSTEM_APACHE_COMMONS) --AC_SUBST(COMMONS_LOGGING_JAR) --AC_SUBST(COMMONS_LOGGING_VERSION) -- - # scripting provider for BeanShell? - AC_MSG_CHECKING([whether to build support for scripts in BeanShell]) - if test "${enable_scripting_beanshell}" != "no" -a "x$with_java" != "xno"; then -diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf -index 81604de9f1f7..97bfaba200fc 100644 ---- a/distro-configs/LibreOfficeFlatpak.conf -+++ b/distro-configs/LibreOfficeFlatpak.conf -@@ -10,7 +10,6 @@ - --without-export-validation - --without-junit - --without-lxml ----without-system-apache-commons - --without-system-beanshell - --without-system-bluez - --without-system-boost -diff --git a/download.lst b/download.lst -index c474e9f60208..f74d49e8dfcb 100644 ---- a/download.lst -+++ b/download.lst -@@ -5,8 +5,6 @@ - - export ABW_SHA256SUM := e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed - export ABW_TARBALL := libabw-0.1.3.tar.xz --export APACHE_COMMONS_LOGGING_SHA256SUM := 49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81 --export APACHE_COMMONS_LOGGING_TARBALL := commons-logging-1.2-src.tar.gz - export APR_SHA256SUM := 1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb - export APR_TARBALL := apr-1.5.2.tar.gz - export APR_UTIL_SHA256SUM := 976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19 -diff --git a/external/Module_external.mk b/external/Module_external.mk -index 1c722a325c2d..185974271b93 100644 ---- a/external/Module_external.mk -+++ b/external/Module_external.mk -@@ -16,7 +16,6 @@ endif - $(eval $(call gb_Module_add_moduledirs,external,\ - $(call gb_Helper_optional,XMLSEC,xmlsec) \ - $(call gb_Helper_optional,ABW,libabw) \ -- $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \ - $(call gb_Helper_optional,APR,apr) \ - $(call gb_Helper_optional,BOOST,boost) \ - $(call gb_Helper_optional,BOX2D,box2d) \ -diff --git a/external/apache-commons/ExternalPackage_apache_commons_logging.mk b/external/apache-commons/ExternalPackage_apache_commons_logging.mk -deleted file mode 100644 -index 2bff13b93c66..000000000000 ---- a/external/apache-commons/ExternalPackage_apache_commons_logging.mk -+++ /dev/null -@@ -1,16 +0,0 @@ --# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- --# --# This file is part of the LibreOffice project. --# --# This Source Code Form is subject to the terms of the Mozilla Public --# License, v. 2.0. If a copy of the MPL was not distributed with this --# file, You can obtain one at http://mozilla.org/MPL/2.0/. --# -- --$(eval $(call gb_ExternalPackage_ExternalPackage,apache_commons_logging,apache_commons_logging)) -- --$(eval $(call gb_ExternalPackage_use_external_project,apache_commons_logging,apache_commons_logging)) -- --$(eval $(call gb_ExternalPackage_add_file,apache_commons_logging,$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-$(COMMONS_LOGGING_VERSION).jar,target/commons-logging-$(COMMONS_LOGGING_VERSION).jar)) -- --# vim: set noet sw=4 ts=4: -diff --git a/external/apache-commons/ExternalProject_apache_commons_logging.mk b/external/apache-commons/ExternalProject_apache_commons_logging.mk -deleted file mode 100644 -index 7c689d18c443..000000000000 ---- a/external/apache-commons/ExternalProject_apache_commons_logging.mk -+++ /dev/null -@@ -1,32 +0,0 @@ --# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- --# --# This file is part of the LibreOffice project. --# --# This Source Code Form is subject to the terms of the Mozilla Public --# License, v. 2.0. If a copy of the MPL was not distributed with this --# file, You can obtain one at http://mozilla.org/MPL/2.0/. --# -- --$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_logging)) -- --$(eval $(call gb_ExternalProject_register_targets,apache_commons_logging,\ -- build \ --)) -- --$(call gb_ExternalProject_get_state_target,apache_commons_logging,build) : -- $(call gb_Trace_StartRange,apache_commons_logging,EXTERNAL) -- $(call gb_ExternalProject_run,build,\ -- JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \ -- ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \ -- $(ICECREAM_RUN) "$(ANT)" \ -- $(if $(verbose),-v,-q) \ -- -f build.xml \ -- -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ -- -Dant.build.javac.source=$(JAVA_SOURCE_VER) \ -- -Dant.build.javac.target=$(JAVA_TARGET_VER) \ -- $(if $(debug),-Dcompile.debug="true",-Dcompile.debug="false") \ -- compile build-jar \ -- ) -- $(call gb_Trace_EndRange,apache_commons_logging,EXTERNAL) -- --# vim: set noet sw=4 ts=4: -diff --git a/external/apache-commons/Makefile b/external/apache-commons/Makefile -deleted file mode 100644 -index e4968cf85fb6..000000000000 ---- a/external/apache-commons/Makefile -+++ /dev/null -@@ -1,7 +0,0 @@ --# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -- --module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -- --include $(module_directory)/../../solenv/gbuild/partial_build.mk -- --# vim: set noet sw=4 ts=4: -diff --git a/external/apache-commons/Module_apache-commons.mk b/external/apache-commons/Module_apache-commons.mk -deleted file mode 100644 -index 45aabe229b03..000000000000 ---- a/external/apache-commons/Module_apache-commons.mk -+++ /dev/null -@@ -1,18 +0,0 @@ --# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- --# --# This file is part of the LibreOffice project. --# --# This Source Code Form is subject to the terms of the Mozilla Public --# License, v. 2.0. If a copy of the MPL was not distributed with this --# file, You can obtain one at http://mozilla.org/MPL/2.0/. --# -- --$(eval $(call gb_Module_Module,apache-commons)) -- --$(eval $(call gb_Module_add_targets,apache-commons,\ -- ExternalPackage_apache_commons_logging \ -- ExternalProject_apache_commons_logging \ -- UnpackedTarball_apache_commons_logging \ --)) -- --# vim: set noet sw=4 ts=4: -diff --git a/external/apache-commons/README b/external/apache-commons/README -deleted file mode 100644 -index 18944aca4af7..000000000000 ---- a/external/apache-commons/README -+++ /dev/null -@@ -1 +0,0 @@ --Java library; used for logging in Extensions, from [http://commons.apache.org/] -diff --git a/external/apache-commons/UnpackedTarball_apache_commons_logging.mk b/external/apache-commons/UnpackedTarball_apache_commons_logging.mk -deleted file mode 100644 -index 1d5ad3dc2d9d..000000000000 ---- a/external/apache-commons/UnpackedTarball_apache_commons_logging.mk -+++ /dev/null -@@ -1,22 +0,0 @@ --# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- --# --# This file is part of the LibreOffice project. --# --# This Source Code Form is subject to the terms of the Mozilla Public --# License, v. 2.0. If a copy of the MPL was not distributed with this --# file, You can obtain one at http://mozilla.org/MPL/2.0/. --# -- --$(eval $(call gb_UnpackedTarball_UnpackedTarball,apache_commons_logging)) -- --$(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_logging,$(APACHE_COMMONS_LOGGING_TARBALL),,apache-commons)) -- --$(eval $(call gb_UnpackedTarball_fix_end_of_line,apache_commons_logging,\ -- build.xml \ --)) -- --$(eval $(call gb_UnpackedTarball_add_patches,apache_commons_logging,\ -- external/apache-commons/patches/logging.patch \ --)) -- --# vim: set noet sw=4 ts=4: -diff --git a/external/apache-commons/patches/logging.patch b/external/apache-commons/patches/logging.patch -deleted file mode 100644 -index c225e5a30338..000000000000 ---- a/external/apache-commons/patches/logging.patch -+++ /dev/null -@@ -1,46 +0,0 @@ ----- misc/commons-logging-1.1.1-src/build.xml 2007-11-22 00:27:52.000000000 +0100 --+++ misc/build/commons-logging-1.1.1-src/build.xml 2008-06-24 14:23:56.316301736 +0200 --@@ -129,12 +129,6 @@ -- -- -- --- --- --- --- --- --- -- -- -- --@@ -283,6 +277,10 @@ -- classpathref="compile.classpath" -- classname="org.apache.avalon.framework.logger.Logger"/> -- --+ --+ -- -- -- --@@ -362,8 +360,8 @@ -- debug="${compile.debug}" -- deprecation="${compile.deprecation}" -- optimize="${compile.optimize}" --- source="${source.version}" --- target="${target.version}"> --+ source="${ant.build.javac.source}" --+ target="${ant.build.javac.target}"> -- -- -- --@@ -373,6 +371,8 @@ -- unless="logkit.present"/> -- --+ -- -- -- -diff --git a/readlicense_oo/license/NOTICE b/readlicense_oo/license/NOTICE -index 46b7fccaf737..0cecc2dbfa50 100644 ---- a/readlicense_oo/license/NOTICE -+++ b/readlicense_oo/license/NOTICE -@@ -25,7 +25,6 @@ Apache projects: - - Apache Lucene - - Apache Portable Runtime - - Apache Portable Runtime Utility Library --- Apache Commons - used by MediaWiki Publisher extension - - Apache Jakarta HttpClient - used by MediaWiki Publisher extension - - Apache Tomcat - used by MediaWiki Publisher extension - -@@ -106,13 +105,6 @@ This product includes software from the Spring Framework, - under the Apache License 2.0 (see: StringUtils.containsWhitespace()) - - --Apache Commons Logging --Copyright 2003-2007 The Apache Software Foundation -- --This product includes software developed by --The Apache Software Foundation (http://www.apache.org/). -- -- - Apache Tomcat - Copyright 1999-2012 The Apache Software Foundation - -diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml -index 2c45a12fd202..2bd6b943096f 100644 ---- a/readlicense_oo/license/license.xml -+++ b/readlicense_oo/license/license.xml -@@ -52,12 +52,6 @@ -

Third Party Code Additional Copyright - Notices and License Terms

-

Libraries

--
--

Apache Commons

--

The following software may be included in this product: Apache Commons (codec, httpclient, lang, logging). -- Use of any of this software is governed by the terms of the license below:

--

Jump to Apache License Version 2.0

--
-
-

Apache Portable Runtime (APR)

-

The following software may be included in this product: Apache Portable Runtime (APR). -diff --git a/reportbuilder/Jar_reportbuilder.mk b/reportbuilder/Jar_reportbuilder.mk -index 101ebc9330b7..7abcf796a0d0 100644 ---- a/reportbuilder/Jar_reportbuilder.mk -+++ b/reportbuilder/Jar_reportbuilder.mk -@@ -15,7 +15,6 @@ $(eval $(call gb_Jar_use_jars,reportbuilder,\ - )) - - $(eval $(call gb_Jar_use_externals,reportbuilder,\ -- commons-logging \ - flow-engine \ - flute \ - libbase \ -diff --git a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java -index 463addc63e71..b3c4508666ca 100644 ---- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java -+++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java -@@ -58,9 +58,6 @@ import java.util.Map; - import java.util.logging.Level; - import java.util.logging.Logger; - --import org.apache.commons.logging.Log; --import org.apache.commons.logging.LogFactory; -- - - /** - * Very primitive implementation, just to show how this could be used ... -@@ -142,7 +139,7 @@ public class SDBCReportDataFactory implements DataSourceFactory - private int parameterCount = 0; - private final ArrayList parameterIndex = new ArrayList(); - } -- private static final Log LOGGER = LogFactory.getLog(SDBCReportDataFactory.class); -+ private static final Logger LOGGER = Logger.getLogger(SDBCReportDataFactory.class.getName()); - public static final String COMMAND_TYPE = "command-type"; - public static final String ESCAPE_PROCESSING = "escape-processing"; - public static final String SORT_EXPRESSIONS = "sort-expressions"; -@@ -259,7 +256,7 @@ public class SDBCReportDataFactory implements DataSourceFactory - } - catch (SQLException ex) - { -- LOGGER.error("ReportProcessing failed / getOrderStatement could not get quote character", ex); -+ LOGGER.severe("ReportProcessing failed / getOrderStatement could not get quote character: " + ex); - // fall back to the SQL standard - quote=""; - } -diff --git a/reportbuilder/java/org/libreoffice/report/StorageRepository.java b/reportbuilder/java/org/libreoffice/report/StorageRepository.java -index 8b6d08c458a2..a338ee5dedb5 100644 ---- a/reportbuilder/java/org/libreoffice/report/StorageRepository.java -+++ b/reportbuilder/java/org/libreoffice/report/StorageRepository.java -@@ -37,9 +37,7 @@ import java.io.BufferedOutputStream; - import java.io.IOException; - import java.io.InputStream; - import java.io.OutputStream; -- --import org.apache.commons.logging.Log; --import org.apache.commons.logging.LogFactory; -+import java.util.logging.Logger; - - /** - * A directory holds all the contents here. -@@ -49,8 +47,8 @@ import org.apache.commons.logging.LogFactory; - public class StorageRepository implements InputRepository, OutputRepository - { - -- private static final Log LOGGER = LogFactory.getLog(StorageRepository.class); -- private static final String REPORT_PROCESSING_FAILED = "ReportProcessing failed"; -+ private static final Logger LOGGER = Logger.getLogger(StorageRepository.class.getName()); -+ private static final String REPORT_PROCESSING_FAILED = "ReportProcessing failed: "; - private XStorage input; - private XStorage output; - private final String rootURL; -@@ -134,11 +132,11 @@ public class StorageRepository implements InputRepository, OutputRepository - } - catch (InvalidStorageException ex) - { -- LOGGER.error(REPORT_PROCESSING_FAILED, ex); -+ LOGGER.severe(REPORT_PROCESSING_FAILED + ex); - } - catch (com.sun.star.lang.IllegalArgumentException ex) - { -- LOGGER.error(REPORT_PROCESSING_FAILED, ex); -+ LOGGER.severe(REPORT_PROCESSING_FAILED + ex); - } - catch (NoSuchElementException e) - { -@@ -168,15 +166,15 @@ public class StorageRepository implements InputRepository, OutputRepository - } - catch (InvalidStorageException ex) - { -- LOGGER.error(REPORT_PROCESSING_FAILED, ex); -+ LOGGER.severe(REPORT_PROCESSING_FAILED + ex); - } - catch (com.sun.star.lang.IllegalArgumentException ex) - { -- LOGGER.error(REPORT_PROCESSING_FAILED, ex); -+ LOGGER.severe(REPORT_PROCESSING_FAILED + ex); - } - catch (NoSuchElementException ex) - { -- LOGGER.error(REPORT_PROCESSING_FAILED, ex); -+ LOGGER.severe(REPORT_PROCESSING_FAILED + ex); - } - return false; - } -@@ -195,23 +193,23 @@ public class StorageRepository implements InputRepository, OutputRepository - } - catch (NoSuchElementException ex) - { -- LOGGER.error(REPORT_PROCESSING_FAILED, ex); -+ LOGGER.severe(REPORT_PROCESSING_FAILED + ex); - } - catch (WrappedTargetException ex) - { -- LOGGER.error(REPORT_PROCESSING_FAILED, ex); -+ LOGGER.severe(REPORT_PROCESSING_FAILED + ex); - } - catch (InvalidStorageException ex) - { -- LOGGER.error(REPORT_PROCESSING_FAILED, ex); -+ LOGGER.severe(REPORT_PROCESSING_FAILED + ex); - } - catch (IllegalArgumentException ex) - { -- LOGGER.error(REPORT_PROCESSING_FAILED, ex); -+ LOGGER.severe(REPORT_PROCESSING_FAILED + ex); - } - catch (com.sun.star.io.IOException ex) - { -- LOGGER.error(REPORT_PROCESSING_FAILED, ex); -+ LOGGER.severe(REPORT_PROCESSING_FAILED + ex); - } - throw new IOException(); - } -@@ -245,27 +243,27 @@ public class StorageRepository implements InputRepository, OutputRepository - } - catch (UnknownPropertyException ex) - { -- LOGGER.error(REPORT_PROCESSING_FAILED, ex); -+ LOGGER.severe(REPORT_PROCESSING_FAILED + ex); - } - catch (PropertyVetoException ex) - { -- LOGGER.error(REPORT_PROCESSING_FAILED, ex); -+ LOGGER.severe(REPORT_PROCESSING_FAILED + ex); - } - catch (IllegalArgumentException ex) - { -- LOGGER.error(REPORT_PROCESSING_FAILED, ex); -+ LOGGER.severe(REPORT_PROCESSING_FAILED + ex); - } - catch (WrappedTargetException ex) - { -- LOGGER.error(REPORT_PROCESSING_FAILED, ex); -+ LOGGER.severe(REPORT_PROCESSING_FAILED + ex); - } - catch (InvalidStorageException ex) - { -- LOGGER.error(REPORT_PROCESSING_FAILED, ex); -+ LOGGER.severe(REPORT_PROCESSING_FAILED + ex); - } - catch (com.sun.star.io.IOException ex) - { -- LOGGER.error(REPORT_PROCESSING_FAILED, ex); -+ LOGGER.severe(REPORT_PROCESSING_FAILED + ex); - } - - throw new IOException(); -@@ -293,11 +291,11 @@ public class StorageRepository implements InputRepository, OutputRepository - } - catch (com.sun.star.io.IOException ex) - { -- LOGGER.error(REPORT_PROCESSING_FAILED, ex); -+ LOGGER.severe(REPORT_PROCESSING_FAILED + ex); - } - catch (WrappedTargetException ex) - { -- LOGGER.error(REPORT_PROCESSING_FAILED, ex); -+ LOGGER.severe(REPORT_PROCESSING_FAILED + ex); - } - output.dispose(); - } -@@ -312,11 +310,11 @@ public class StorageRepository implements InputRepository, OutputRepository - } - catch (InvalidStorageException ex) - { -- LOGGER.error(REPORT_PROCESSING_FAILED, ex); -+ LOGGER.severe(REPORT_PROCESSING_FAILED + ex); - } - catch (com.sun.star.lang.IllegalArgumentException ex) - { -- LOGGER.error(REPORT_PROCESSING_FAILED, ex); -+ LOGGER.severe(REPORT_PROCESSING_FAILED + ex); - } - catch (NoSuchElementException ex) - { -diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf b/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf -index 23731b104054..2a56b2fbb9fa 100644 ---- a/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf -+++ b/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf -@@ -3,5 +3,5 @@ Class-Path: reportbuilderwizard.jar - flute-1.1.6.jar libserializer-1.1.6.jar libbase-1.1.6.jar - libfonts-1.1.6.jar libformula-1.1.7.jar liblayout.jar - libloader-1.1.6.jar librepository-1.1.6.jar libxml-1.1.7.jar -- flow-engine.jar sac.jar commons-logging-1.2.jar -+ flow-engine.jar sac.jar - UNO-Type-Path: -diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java -index 480bca548e7e..efb4261ce127 100644 ---- a/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java -+++ b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java -@@ -42,9 +42,7 @@ import java.io.IOException; - - import java.util.ArrayList; - import java.util.List; -- --import org.apache.commons.logging.Log; --import org.apache.commons.logging.LogFactory; -+import java.util.logging.Logger; - - import org.jfree.report.expressions.Expression; - import org.jfree.report.expressions.FormulaExpression; -@@ -72,7 +70,7 @@ import org.pentaho.reporting.libraries.resourceloader.ResourceManager; - public class PentahoReportJob implements ReportJob - { - -- private static final Log LOGGER = LogFactory.getLog(PentahoReportJob.class); -+ private static final Logger LOGGER = Logger.getLogger(PentahoReportJob.class.getName()); - private final DataSourceFactory dataSourceFactory; - private final OutputRepository outputRepository; - private final JobProperties jobProperties; -@@ -235,7 +233,7 @@ public class PentahoReportJob implements ReportJob - } - catch (ParseException ex) - { -- LOGGER.error("ReportProcessing failed", ex); -+ LOGGER.severe("ReportProcessing failed: " + ex); - } - } - else if (node instanceof OfficeDetailSection) -@@ -338,7 +336,7 @@ public class PentahoReportJob implements ReportJob - rp.processReport(job); - job.close(); - final long endTime = System.currentTimeMillis(); -- LOGGER.debug("Report processing time: " + (endTime - startTime)); -+ LOGGER.config("Report processing time: " + (endTime - startTime)); - } - catch (final Exception e) - { -diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java -index 54694fd619ab..3c52473e3d3c 100644 ---- a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java -+++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java -@@ -68,9 +68,6 @@ import java.io.Writer; - import java.io.PrintWriter; - import java.io.StringWriter; - --import org.apache.commons.logging.Log; --import org.apache.commons.logging.LogFactory; -- - /** - * This class capsulates the class, that implements the minimal component, a factory for creating the service - * (__getComponentFactory) and a method, that writes the information into the given registry key -@@ -86,7 +83,7 @@ public class SOReportJobFactory - public static class _SOReportJobFactory extends WeakBase implements XInitialization, XServiceInfo, XJob, XPropertySet, ReportJobFactory - { - -- private static final Log LOGGER = LogFactory.getLog(_SOReportJobFactory.class); -+ private static final Logger LOGGER = Logger.getLogger(_SOReportJobFactory.class.getName()); - /** - * The service name, that must be used to get an instance of this service. - */ -@@ -242,7 +239,7 @@ public class SOReportJobFactory - } - catch (java.lang.Exception e) - { -- LOGGER.error("ReportProcessing failed", e); -+ LOGGER.severe("ReportProcessing failed: " + e); - Writer result = new StringWriter(); - PrintWriter printWriter = new PrintWriter(result); - e.printStackTrace(printWriter); -@@ -254,7 +251,7 @@ public class SOReportJobFactory - } - catch (java.lang.IncompatibleClassChangeError e) - { -- LOGGER.error("Detected an IncompatibleClassChangeError"); -+ LOGGER.severe("Detected an IncompatibleClassChangeError"); - Writer result = new StringWriter(); - PrintWriter printWriter = new PrintWriter(result); - e.printStackTrace(printWriter); -diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java -index 6a1bd00736ee..eab7c512284d 100644 ---- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java -+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java -@@ -208,7 +208,7 @@ public class FormatValueUtility - if (result == null) - { - // ignore it. Ignoring it is much better than printing 'null'. -- // LOGGER.debug("Formula '" + formulaExpression.getFormula() + "' evaluated to null."); -+ // LOGGER.config("Formula '" + formulaExpression.getFormula() + "' evaluated to null."); - return null; - } - else if (result instanceof DataFlags) -diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java -index 7f1470edc866..7959b5857408 100644 ---- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java -+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java -@@ -20,8 +20,7 @@ package org.libreoffice.report.pentaho.layoutprocessor; - - import org.libreoffice.report.pentaho.OfficeNamespaces; - import org.libreoffice.report.pentaho.model.FormattedTextElement; --import org.apache.commons.logging.Log; --import org.apache.commons.logging.LogFactory; -+import java.util.logging.Logger; - - import org.jfree.report.DataFlags; - import org.jfree.report.DataSourceException; -@@ -45,7 +44,7 @@ public class FormattedTextLayoutController - extends AbstractReportElementLayoutController - { - -- private static final Log LOGGER = LogFactory.getLog(FormattedTextLayoutController.class); -+ private static final Logger LOGGER = Logger.getLogger(FormattedTextLayoutController.class.getName()); - - @Override - public boolean isValueChanged() -@@ -62,7 +61,7 @@ public class FormattedTextLayoutController - } - catch (final ParseException e) - { -- LOGGER.debug("Parse Exception", e); -+ LOGGER.config("Parse Exception: " + e); - return false; - } - } -diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController.java -index 0bf40b9dcd28..6fc68e816f7c 100644 ---- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController.java -+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController.java -@@ -22,8 +22,7 @@ import org.libreoffice.report.OfficeToken; - import org.libreoffice.report.pentaho.OfficeNamespaces; - import org.libreoffice.report.pentaho.model.ImageElement; - --import org.apache.commons.logging.Log; --import org.apache.commons.logging.LogFactory; -+import java.util.logging.Logger; - - import org.jfree.layouting.util.AttributeMap; - import org.jfree.report.DataSourceException; -@@ -59,7 +58,7 @@ public class ImageElementLayoutController - extends AbstractReportElementLayoutController - { - -- private static final Log LOGGER = LogFactory.getLog(ImageElementLayoutController.class); -+ private static final Logger LOGGER = Logger.getLogger(ImageElementLayoutController.class.getName()); - private ImageElementContext context; - - @Override -@@ -116,7 +115,7 @@ public class ImageElementLayoutController - final LayoutController cellController = findParentCell(); - if (cellController == null) - { -- LOGGER.warn("Image is not contained in a table. Unable to calculate the image-size."); -+ LOGGER.warning("Image is not contained in a table. Unable to calculate the image-size."); - return null; - } - final Element tableCell = (Element) cellController.getNode(); -@@ -124,14 +123,14 @@ public class ImageElementLayoutController - final int colSpan = TextUtilities.parseInt((String) tableCell.getAttribute(OfficeNamespaces.TABLE_NS, "number-columns-spanned"), 1); - if (rowSpan < 1 || colSpan < 1) - { -- LOGGER.warn("Rowspan or colspan for image-size calculation was invalid."); -+ LOGGER.warning("Rowspan or colspan for image-size calculation was invalid."); - return null; - } - - final LayoutController rowController = cellController.getParent(); - if (rowController == null) - { -- LOGGER.warn("Table-Cell has no parent. Unable to calculate the image-size."); -+ LOGGER.warning("Table-Cell has no parent. Unable to calculate the image-size."); - return null; - } - final Section tableRow = (Section) rowController.getNode(); -@@ -141,14 +140,14 @@ public class ImageElementLayoutController - final int columnPos = findNodeInSection(tableRow, tableCell, OfficeToken.COVERED_TABLE_CELL); - if (columnPos == -1) - { -- LOGGER.warn("Table-Cell is not a direct child of the table-row. Unable to calculate the image-size."); -+ LOGGER.warning("Table-Cell is not a direct child of the table-row. Unable to calculate the image-size."); - return null; - } - - final LayoutController tableController = rowController.getParent(); - if (tableController == null) - { -- LOGGER.warn("Table-Row has no Table. Unable to calculate the image-size."); -+ LOGGER.warning("Table-Row has no Table. Unable to calculate the image-size."); - return null; - } - -@@ -158,7 +157,7 @@ public class ImageElementLayoutController - if (columns.getNodeCount() <= columnPos + colSpan) - { - // the colspan is too large. The table definition is therefore invalid. We do not try to fix this. -- LOGGER.warn( -+ LOGGER.warning( - "The Table's defined columns do not match the col-span or col-position. Unable to calculate the image-size."); - return null; - } -@@ -169,7 +168,7 @@ public class ImageElementLayoutController - final int rowPos = findNodeInSection(table, tableRow, null); - if (rowPos == -1) - { -- LOGGER.warn("Table-Cell is not a direct child of the table-row. Unable to calculate the image-size."); -+ LOGGER.warning("Table-Cell is not a direct child of the table-row. Unable to calculate the image-size."); - return null; - } - -diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/ImageProducer.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/ImageProducer.java -index ae1a8273bfb7..69995d7aa1c5 100644 ---- a/reportbuilder/java/org/libreoffice/report/pentaho/output/ImageProducer.java -+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/ImageProducer.java -@@ -48,9 +48,6 @@ import java.util.Map; - import java.util.logging.Level; - import java.util.logging.Logger; - --import org.apache.commons.logging.Log; --import org.apache.commons.logging.LogFactory; -- - import org.jfree.layouting.input.style.values.CSSNumericType; - import org.jfree.layouting.input.style.values.CSSNumericValue; - -@@ -67,7 +64,7 @@ import org.pentaho.reporting.libraries.base.util.WaitingImageObserver; - public class ImageProducer - { - -- private static final Log LOGGER = LogFactory.getLog(ImageProducer.class); -+ private static final Logger LOGGER = Logger.getLogger(ImageProducer.class.getName()); - - public static class OfficeImage - { -@@ -188,7 +185,7 @@ public class ImageProducer - final boolean preserveIRI) - { - -- LOGGER.debug("Want to produce image " + imageData); -+ LOGGER.config("Want to produce image " + imageData); - if (imageData instanceof String) - { - return produceFromString((String) imageData, preserveIRI); -@@ -247,11 +244,11 @@ public class ImageProducer - } - catch (IOException e) - { -- LOGGER.warn("Failed to produce image from Blob", e); -+ LOGGER.warning("Failed to produce image from Blob: " + e); - } - catch (SQLException e) - { -- LOGGER.warn("Failed to produce image from Blob", e); -+ LOGGER.warning("Failed to produce image from Blob: " + e); - } - return null; - } -@@ -295,11 +292,11 @@ public class ImageProducer - } - catch (IOException e) - { -- LOGGER.warn("Failed to load image from local input-repository", e); -+ LOGGER.warning("Failed to load image from local input-repository: " + e); - } - catch (ReportExecutionException e) - { -- LOGGER.warn("Failed to create image from local input-repository", e); -+ LOGGER.warning("Failed to create image from local input-repository: " + e); - } - return null; - } -@@ -353,11 +350,11 @@ public class ImageProducer - } - catch (IOException e) - { -- LOGGER.warn("Failed to load image from local input-repository", e); -+ LOGGER.warning("Failed to load image from local input-repository: " + e); - } - catch (ReportExecutionException e) - { -- LOGGER.warn("Failed to create image from local input-repository", e); -+ LOGGER.warning("Failed to create image from local input-repository: " + e); - } - } - else -@@ -435,11 +432,11 @@ public class ImageProducer - } - catch (IOException e) - { -- LOGGER.warn("Failed to load image from local input-repository", e); -+ LOGGER.warning("Failed to load image from local input-repository: " + e); - } - catch (ReportExecutionException e) - { -- LOGGER.warn("Failed to create image from local input-repository", e); -+ LOGGER.warning("Failed to create image from local input-repository: " + e); - } - - if (!preserveIRI) -diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java -index a5c3be135a65..b73b5781b3a3 100644 ---- a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java -+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java -@@ -65,9 +65,6 @@ import java.util.Map; - import java.util.zip.DeflaterOutputStream; - import java.util.zip.InflaterInputStream; - --import org.apache.commons.logging.Log; --import org.apache.commons.logging.LogFactory; -- - import org.jfree.layouting.input.style.parser.CSSValueFactory; - import org.jfree.layouting.input.style.parser.StyleSheetParserUtil; - import org.jfree.layouting.input.style.values.CSSNumericType; -@@ -112,7 +109,7 @@ import org.w3c.css.sac.LexicalUnit; - public abstract class OfficeDocumentReportTarget extends AbstractReportTarget - { - -- protected static final Log LOGGER = LogFactory.getLog(OfficeDocumentReportTarget.class); -+ protected static final Logger LOGGER = Logger.getLogger(OfficeDocumentReportTarget.class.getName()); - public static final String HORIZONTAL_POS = "horizontal-pos"; - public static final String TAG_DEF_PREFIX = "org.libreoffice.report.pentaho.output."; - private static final int ROLE_NONE = 0; -@@ -517,7 +514,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget - // todo - if (DEBUG_ELEMENTS) - { -- LOGGER.debug("Starting " + getCurrentState() + '/' + states.size() + ' ' + ReportTargetUtil.getNamespaceFromAttribute(attrs) + " -> " + ReportTargetUtil.getElemenTypeFromAttribute(attrs)); -+ LOGGER.config("Starting " + getCurrentState() + '/' + states.size() + ' ' + ReportTargetUtil.getNamespaceFromAttribute(attrs) + " -> " + ReportTargetUtil.getElemenTypeFromAttribute(attrs)); - } - try - { -@@ -713,7 +710,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget - } - catch (IOException ioe) - { -- LOGGER.error("ReportProcessing failed", ioe); -+ LOGGER.severe("ReportProcessing failed: " + ioe); - throw new ReportProcessingException("Failed to write content", ioe); - } - } -@@ -762,7 +759,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget - if (styleMapper.isListOfStyles(elementNamespace, elementName, attrNamespace, attrName)) - { - // ignored for now. -- LOGGER.warn("List of styles is not yet implemented."); -+ LOGGER.warning("List of styles is not yet implemented."); - continue; - } - -@@ -970,7 +967,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget - - if (DEBUG_ELEMENTS) - { -- LOGGER.debug("Finished " + getCurrentState() + "/" + states.size() + " " + ReportTargetUtil.getNamespaceFromAttribute(attrs) + ":" + ReportTargetUtil.getElemenTypeFromAttribute(attrs)); -+ LOGGER.config("Finished " + getCurrentState() + "/" + states.size() + " " + ReportTargetUtil.getNamespaceFromAttribute(attrs) + ":" + ReportTargetUtil.getElemenTypeFromAttribute(attrs)); - } - - } -@@ -1153,7 +1150,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget - } - catch (IOException e) - { -- LOGGER.error("ReportProcessing failed", e); -+ LOGGER.severe("ReportProcessing failed: " + e); - } - return state; - } -@@ -1294,7 +1291,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget - - final CSSNumericValue height = image.getHeight(); // always in 100th of a mm - -- LOGGER.debug("Image " + imageData + " Width: " + width + ", Height: " + height); -+ LOGGER.config("Image " + imageData + " Width: " + width + ", Height: " + height); - if (width == null || height == null) - { - return; -@@ -1313,7 +1310,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget - - if (imageAreaWidthVal == null || imageAreaHeightVal == null) - { -- LOGGER.debug("Image data returned from context is invalid. Maybe this is not an image?"); -+ LOGGER.config("Image data returned from context is invalid. Maybe this is not an image?"); - return; - } - else -@@ -1410,7 +1407,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget - } - else - { -- LOGGER.debug("There is no image-context, so we have to rely on the image's natural bounds. " + "This may go awfully wrong."); -+ LOGGER.config("There is no image-context, so we have to rely on the image's natural bounds. " + "This may go awfully wrong."); - imageAreaWidthVal = image.getWidth(); - imageAreaHeightVal = image.getHeight(); - } -@@ -1427,7 +1424,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget - frameList.setAttribute(OfficeNamespaces.SVG_NS, "y", posY.getValue() + posY.getType().getType()); - - -- LOGGER.debug("Image " + imageData + " A-Width: " + imageAreaWidthVal + ", A-Height: " + imageAreaHeightVal); -+ LOGGER.config("Image " + imageData + " A-Width: " + imageAreaWidthVal + ", A-Height: " + imageAreaHeightVal); - - if (imageAreaWidthVal != null) - { -diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/OleProducer.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/OleProducer.java -index 2010a189be1d..27f3c25a4b4b 100644 ---- a/reportbuilder/java/org/libreoffice/report/pentaho/output/OleProducer.java -+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/OleProducer.java -@@ -32,14 +32,12 @@ import org.libreoffice.report.pentaho.PentahoReportEngineMetaData; - import java.io.IOException; - - import java.util.List; -- --import org.apache.commons.logging.Log; --import org.apache.commons.logging.LogFactory; -+import java.util.logging.Logger; - - public class OleProducer - { - -- private static final Log LOGGER = LogFactory.getLog(OleProducer.class); -+ private static final Logger LOGGER = Logger.getLogger(OleProducer.class.getName()); - private final InputRepository inputRepository; - private final OutputRepository outputRepository; - private final DefaultNameGenerator nameGenerator; -@@ -100,16 +98,16 @@ public class OleProducer - } - catch (ReportExecutionException ex) - { -- LOGGER.error("ReportProcessing failed", ex); -+ LOGGER.severe("ReportProcessing failed: " + ex); - } - catch (IOException ex) - { -- LOGGER.error("ReportProcessing failed", ex); -+ LOGGER.severe("ReportProcessing failed: " + ex); - } - } - catch (IOException ex) - { -- LOGGER.error("ReportProcessing failed", ex); -+ LOGGER.severe("ReportProcessing failed: " + ex); - } finally - { - if (subInputRepository != null) -diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java -index 2b204a4bf502..98af0c3fa076 100644 ---- a/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java -+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java -@@ -28,9 +28,7 @@ import org.libreoffice.report.pentaho.model.OfficeStylesCollection; - import java.util.ArrayList; - import java.util.HashSet; - import java.util.Set; -- --import org.apache.commons.logging.Log; --import org.apache.commons.logging.LogFactory; -+import java.util.logging.Logger; - - import org.jfree.report.ReportProcessingException; - import org.jfree.report.structure.Element; -@@ -46,7 +44,7 @@ import org.jfree.report.util.AttributeNameGenerator; - public class StyleUtilities - { - -- private static final Log LOGGER = LogFactory.getLog(StyleUtilities.class); -+ private static final Logger LOGGER = Logger.getLogger(StyleUtilities.class.getName()); - private static final String STYLE = "style"; - - private StyleUtilities() -@@ -180,7 +178,7 @@ public class StyleUtilities - } - else if (styleParent != null) - { -- LOGGER.warn("Inconsistent styles: " + styleFamily + ":" + styleParent + " does not exist."); -+ LOGGER.warning("Inconsistent styles: " + styleFamily + ":" + styleParent + " does not exist."); - } - return preStyle; - } -@@ -301,7 +299,7 @@ public class StyleUtilities - } - else - { -- LOGGER.warn("Dangling data style: " + styleName); -+ LOGGER.warning("Dangling data style: " + styleName); - derivedStyle = null; - } - } -diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java -index e6c234503c22..b1d979e7b788 100644 ---- a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java -+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java -@@ -305,7 +305,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget - } - catch (IOException ex) - { -- LOGGER.error("ReportProcessing failed", ex); -+ LOGGER.severe("ReportProcessing failed: " + ex); - } - } - } -diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java -index 6d36eb6f9ea5..65a48252e69f 100644 ---- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java -+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java -@@ -22,8 +22,7 @@ import org.libreoffice.report.pentaho.model.OfficeDocument; - import org.libreoffice.report.pentaho.model.OfficeStylesCollection; - import org.libreoffice.report.pentaho.parser.style.OfficeStylesReadHandler; - --import org.apache.commons.logging.Log; --import org.apache.commons.logging.LogFactory; -+import java.util.logging.Logger; - - import org.jfree.report.JFreeReport; - -@@ -49,7 +48,7 @@ import org.xml.sax.SAXException; - public class DocumentContentReadHandler extends AbstractXmlReadHandler - { - -- private static final Log LOGGER = LogFactory.getLog(DocumentContentReadHandler.class); -+ private static final Logger LOGGER = Logger.getLogger(DocumentContentReadHandler.class.getName()); - private OfficeDocument report; - private FontFaceDeclsReadHandler fontFaceReadHandler; - private BodyReadHandler bodyReadHandler; -@@ -98,12 +97,12 @@ public class DocumentContentReadHandler extends AbstractXmlReadHandler - catch (ResourceKeyCreationException e) - { - // ignore .. -- LOGGER.debug("Failed to create resource-key for 'styles.xml'. Ignoring.", e); -+ LOGGER.config("Failed to create resource-key for 'styles.xml'. Ignoring: " + e); - } - catch (ResourceException e) - { - // ignore .. -- LOGGER.debug("Failed to parse resource for 'styles.xml'. Ignoring.", e); -+ LOGGER.config("Failed to parse resource for 'styles.xml'. Ignoring: " + e); - } - - return new OfficeStylesCollection(); -@@ -135,12 +134,12 @@ public class DocumentContentReadHandler extends AbstractXmlReadHandler - catch (ResourceKeyCreationException e) - { - // ignore .. -- LOGGER.debug("Failed to create resource-key for 'content.xml'. Ignoring."); -+ LOGGER.config("Failed to create resource-key for 'content.xml'. Ignoring."); - } - catch (ResourceException e) - { - // ignore .. -- LOGGER.debug("Failed to parse resource for 'content.xml'. Ignoring."); -+ LOGGER.config("Failed to parse resource for 'content.xml'. Ignoring."); - } - return new OfficeDocument(); - -diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in -index d5699baefb90..8610fa05d6f5 100644 ---- a/solenv/flatpak-manifest.in -+++ b/solenv/flatpak-manifest.in -@@ -543,13 +543,6 @@ - "dest": "external/tarballs", - "dest-filename": "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip" - }, -- { -- "url": "https://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz", -- "sha256": "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81", -- "type": "file", -- "dest": "external/tarballs", -- "dest-filename": "commons-logging-1.2-src.tar.gz" -- }, - { - "url": "https://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip", - "sha256": "233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd", -diff --git a/swext/mediawiki/src/THIRDPARTYLICENSEREADME.html b/swext/mediawiki/src/THIRDPARTYLICENSEREADME.html -index fbd8b0bfdca0..877661330b6b 100644 ---- a/swext/mediawiki/src/THIRDPARTYLICENSEREADME.html -+++ b/swext/mediawiki/src/THIRDPARTYLICENSEREADME.html -@@ -10,27 +10,6 @@ DO NOT TRANSLATE OR LOCALIZE THIS DOCUMENT
-
-

    - --
  • The Apache Software Foundation -- -- --
    • --
  • The Apache Software Foundation -- -- --
    • --
  • The Apache Software Foundation -- -- --
    • -
  • The Apache Software Foundation - -
      -@@ -51,34 +30,6 @@ Foundation -
      The following software may be - included in this product: Jakarta Commons Codec; Use of any of this - software is governed by the terms of the license below:
      --

      The Apache Software --Foundation
      --

      --

      Commons Codec
      --

      --
                                       Apache License
                                 Version 2.0, January 2004
                              http://www.apache.org/licenses/

         TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

         1. Definitions.

            "License" shall mean the terms and conditions for use, reproduction,
            and distribution as defined by Sections 1 through 9 of this document.

            "Licensor" shall mean the copyright owner or entity authorized by
            the copyright owner that is granting the License.

            "Legal Entity" shall mean the union of the acting entity and all
            other entities that control, are controlled by, or are under common
            control with that entity. For the purposes of this definition,
            "control" means (i) the power, direct or indirect, to cause the
            direction or management of such entity, whether by contract or
            otherwise, or (ii) ownership of fifty percent (50%) or more of the
            outstanding shares, or (iii) beneficial ownership of such entity.

            "You" (or "Your") shall mean an individual or Legal Entity
            exercising permissions granted by this License.

            "Source" form shall mean the preferred form for making modifications,
            including but not limited to software source code, documentation
            source, and configuration files.

            "Object" form shall mean any form resulting from mechanical
            transformation or translation of a Source form, including but
            not limited to compiled object code, generated documentation,
            and conversions to other media types.

            "Work" shall mean the work of authorship, whether in Source or
            Object form, made available under the License, as indicated by a
            copyright notice that is included in or attached to the work
            (an example is provided in the Appendix below).

            "Derivative Works" shall mean any work, whether in Source or Object
            form, that is based on (or derived from) the Work and for which the
            editorial revisions, annotations, elaborations, or other modifications
            represent, as a whole, an original work of authorship. For the purposes
            of this License, Derivative Works shall not include works that remain
            separable from, or merely link (or bind by name) to the interfaces of,
            the Work and Derivative Works thereof.

            "Contribution" shall mean any work of authorship, including
            the original version of the Work and any modifications or additions
            to that Work or Derivative Works thereof, that is intentionally
            submitted to Licensor for inclusion in the Work by the copyright owner
            or by an individual or Legal Entity authorized to submit on behalf of
            the copyright owner. For the purposes of this definition, "submitted"
            means any form of electronic, verbal, or written communication sent
            to the Licensor or its representatives, including but not limited to
            communication on electronic mailing lists, source code control systems,
            and issue tracking systems that are managed by, or on behalf of, the
            Licensor for the purpose of discussing and improving the Work, but
            excluding communication that is conspicuously marked or otherwise
            designated in writing by the copyright owner as "Not a Contribution."

            "Contributor" shall mean Licensor and any individual or Legal Entity
            on behalf of whom a Contribution has been received by Licensor and
            subsequently incorporated within the Work.

         2. Grant of Copyright License. Subject to the terms and conditions of
            this License, each Contributor hereby grants to You a perpetual,
            worldwide, non-exclusive, no-charge, royalty-free, irrevocable
            copyright license to reproduce, prepare Derivative Works of,
            publicly display, publicly perform, sublicense, and distribute the
            Work and such Derivative Works in Source or Object form.

         3. Grant of Patent License. Subject to the terms and conditions of
            this License, each Contributor hereby grants to You a perpetual,
            worldwide, non-exclusive, no-charge, royalty-free, irrevocable
            (except as stated in this section) patent license to make, have made,
            use, offer to sell, sell, import, and otherwise transfer the Work,
            where such license applies only to those patent claims licensable
            by such Contributor that are necessarily infringed by their
            Contribution(s) alone or by combination of their Contribution(s)
            with the Work to which such Contribution(s) was submitted. If You
            institute patent litigation against any entity (including a
            cross-claim or counterclaim in a lawsuit) alleging that the Work
            or a Contribution incorporated within the Work constitutes direct
            or contributory patent infringement, then any patent licenses
            granted to You under this License for that Work shall terminate
            as of the date such litigation is filed.

         4. Redistribution. You may reproduce and distribute copies of the
            Work or Derivative Works thereof in any medium, with or without
            modifications, and in Source or Object form, provided that You
            meet the following conditions:

            (a) You must give any other recipients of the Work or
                Derivative Works a copy of this License; and

            (b) You must cause any modified files to carry prominent notices
                stating that You changed the files; and

            (c) You must retain, in the Source form of any Derivative Works
                that You distribute, all copyright, patent, trademark, and
                attribution notices from the Source form of the Work,
                excluding those notices that do not pertain to any part of
                the Derivative Works; and

            (d) If the Work includes a "NOTICE" text file as part of its
                distribution, then any Derivative Works that You distribute must
                include a readable copy of the attribution notices contained
                within such NOTICE file, excluding those notices that do not
                pertain to any part of the Derivative Works, in at least one
                of the following places: within a NOTICE text file distributed
                as part of the Derivative Works; within the Source form or
                documentation, if provided along with the Derivative Works; or,
                within a display generated by the Derivative Works, if and
                wherever such third-party notices normally appear. The contents
                of the NOTICE file are for informational purposes only and
                do not modify the License. You may add Your own attribution
                notices within Derivative Works that You distribute, alongside
                or as an addendum to the NOTICE text from the Work, provided
                that such additional attribution notices cannot be construed
                as modifying the License.

            You may add Your own copyright statement to Your modifications and
            may provide additional or different license terms and conditions
            for use, reproduction, or distribution of Your modifications, or
            for any such Derivative Works as a whole, provided Your use,
            reproduction, and distribution of the Work otherwise complies with
            the conditions stated in this License.

         5. Submission of Contributions. Unless You explicitly state otherwise,
            any Contribution intentionally submitted for inclusion in the Work
            by You to the Licensor shall be under the terms and conditions of
            this License, without any additional terms or conditions.
            Notwithstanding the above, nothing herein shall supersede or modify
            the terms of any separate license agreement you may have executed
            with Licensor regarding such Contributions.

         6. Trademarks. This License does not grant permission to use the trade
            names, trademarks, service marks, or product names of the Licensor,
            except as required for reasonable and customary use in describing the
            origin of the Work and reproducing the content of the NOTICE file.

         7. Disclaimer of Warranty. Unless required by applicable law or
            agreed to in writing, Licensor provides the Work (and each
            Contributor provides its Contributions) on an "AS IS" BASIS,
            WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
            implied, including, without limitation, any warranties or conditions
            of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
            PARTICULAR PURPOSE. You are solely responsible for determining the
            appropriateness of using or redistributing the Work and assume any
            risks associated with Your exercise of permissions under this License.

         8. Limitation of Liability. In no event and under no legal theory,
            whether in tort (including negligence), contract, or otherwise,
            unless required by applicable law (such as deliberate and grossly
            negligent acts) or agreed to in writing, shall any Contributor be
            liable to You for damages, including any direct, indirect, special,
            incidental, or consequential damages of any character arising as a
            result of this License or out of the use or inability to use the
            Work (including but not limited to damages for loss of goodwill,
            work stoppage, computer failure or malfunction, or any and all
            other commercial damages or losses), even if such Contributor
            has been advised of the possibility of such damages.

         9. Accepting Warranty or Additional Liability. While redistributing
            the Work or Derivative Works thereof, You may choose to offer,
            and charge a fee for, acceptance of support, warranty, indemnity,
            or other liability obligations and/or rights consistent with this
            License. However, in accepting such obligations, You may act only
            on Your own behalf and on Your sole responsibility, not on behalf
            of any other Contributor, and only if You agree to indemnify,
            defend, and hold each Contributor harmless for any liability
            incurred by, or claims asserted against, such Contributor by reason
            of your accepting any such warranty or additional liability.

         END OF TERMS AND CONDITIONS

         APPENDIX: How to apply the Apache License to your work.

            To apply the Apache License to your work, attach the following
            boilerplate notice, with the fields enclosed by brackets "[]"
            replaced with your own identifying information. (Don't include
            the brackets!)  The text should be enclosed in the appropriate
            comment syntax for the file format. We also recommend that a
            file or class name and description of purpose be included on the
            same "printed page" as the copyright notice for easier
            identification within third-party archives.

         Copyright [yyyy] [name of copyright owner]

         Licensed under the Apache License, Version 2.0 (the "License");
         you may not use this file except in compliance with the License.
         You may obtain a copy of the License at

             http://www.apache.org/licenses/LICENSE-2.0

         Unless required by applicable law or agreed to in writing, software
         distributed under the License is distributed on an "AS IS" BASIS,
         WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
         See the License for the specific language governing permissions and
         limitations under the License.

      --
      The following software may be --included in this product: Jakarta Commons HTTP Client 2; Use of any of --this --software is governed by the terms of the license below:
      --

      The Apache Software --Foundation
      --

      --

      Commons HTTP Client
      --

      --
                                       Apache License
                                 Version 2.0, January 2004
                              http://www.apache.org/licenses/

         TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

         1. Definitions.

            "License" shall mean the terms and conditions for use, reproduction,
            and distribution as defined by Sections 1 through 9 of this document.

            "Licensor" shall mean the copyright owner or entity authorized by
            the copyright owner that is granting the License.

            "Legal Entity" shall mean the union of the acting entity and all
            other entities that control, are controlled by, or are under common
            control with that entity. For the purposes of this definition,
            "control" means (i) the power, direct or indirect, to cause the
            direction or management of such entity, whether by contract or
            otherwise, or (ii) ownership of fifty percent (50%) or more of the
            outstanding shares, or (iii) beneficial ownership of such entity.

            "You" (or "Your") shall mean an individual or Legal Entity
            exercising permissions granted by this License.

            "Source" form shall mean the preferred form for making modifications,
            including but not limited to software source code, documentation
            source, and configuration files.

            "Object" form shall mean any form resulting from mechanical
            transformation or translation of a Source form, including but
            not limited to compiled object code, generated documentation,
            and conversions to other media types.

            "Work" shall mean the work of authorship, whether in Source or
            Object form, made available under the License, as indicated by a
            copyright notice that is included in or attached to the work
            (an example is provided in the Appendix below).

            "Derivative Works" shall mean any work, whether in Source or Object
            form, that is based on (or derived from) the Work and for which the
            editorial revisions, annotations, elaborations, or other modifications
            represent, as a whole, an original work of authorship. For the purposes
            of this License, Derivative Works shall not include works that remain
            separable from, or merely link (or bind by name) to the interfaces of,
            the Work and Derivative Works thereof.

            "Contribution" shall mean any work of authorship, including
            the original version of the Work and any modifications or additions
            to that Work or Derivative Works thereof, that is intentionally
            submitted to Licensor for inclusion in the Work by the copyright owner
            or by an individual or Legal Entity authorized to submit on behalf of
            the copyright owner. For the purposes of this definition, "submitted"
            means any form of electronic, verbal, or written communication sent
            to the Licensor or its representatives, including but not limited to
            communication on electronic mailing lists, source code control systems,
            and issue tracking systems that are managed by, or on behalf of, the
            Licensor for the purpose of discussing and improving the Work, but
            excluding communication that is conspicuously marked or otherwise
            designated in writing by the copyright owner as "Not a Contribution."

            "Contributor" shall mean Licensor and any individual or Legal Entity
            on behalf of whom a Contribution has been received by Licensor and
            subsequently incorporated within the Work.

         2. Grant of Copyright License. Subject to the terms and conditions of
            this License, each Contributor hereby grants to You a perpetual,
            worldwide, non-exclusive, no-charge, royalty-free, irrevocable
            copyright license to reproduce, prepare Derivative Works of,
            publicly display, publicly perform, sublicense, and distribute the
            Work and such Derivative Works in Source or Object form.

         3. Grant of Patent License. Subject to the terms and conditions of
            this License, each Contributor hereby grants to You a perpetual,
            worldwide, non-exclusive, no-charge, royalty-free, irrevocable
            (except as stated in this section) patent license to make, have made,
            use, offer to sell, sell, import, and otherwise transfer the Work,
            where such license applies only to those patent claims licensable
            by such Contributor that are necessarily infringed by their
            Contribution(s) alone or by combination of their Contribution(s)
            with the Work to which such Contribution(s) was submitted. If You
            institute patent litigation against any entity (including a
            cross-claim or counterclaim in a lawsuit) alleging that the Work
            or a Contribution incorporated within the Work constitutes direct
            or contributory patent infringement, then any patent licenses
            granted to You under this License for that Work shall terminate
            as of the date such litigation is filed.

         4. Redistribution. You may reproduce and distribute copies of the
            Work or Derivative Works thereof in any medium, with or without
            modifications, and in Source or Object form, provided that You
            meet the following conditions:

            (a) You must give any other recipients of the Work or
                Derivative Works a copy of this License; and

            (b) You must cause any modified files to carry prominent notices
                stating that You changed the files; and

            (c) You must retain, in the Source form of any Derivative Works
                that You distribute, all copyright, patent, trademark, and
                attribution notices from the Source form of the Work,
                excluding those notices that do not pertain to any part of
                the Derivative Works; and

            (d) If the Work includes a "NOTICE" text file as part of its
                distribution, then any Derivative Works that You distribute must
                include a readable copy of the attribution notices contained
                within such NOTICE file, excluding those notices that do not
                pertain to any part of the Derivative Works, in at least one
                of the following places: within a NOTICE text file distributed
                as part of the Derivative Works; within the Source form or
                documentation, if provided along with the Derivative Works; or,
                within a display generated by the Derivative Works, if and
                wherever such third-party notices normally appear. The contents
                of the NOTICE file are for informational purposes only and
                do not modify the License. You may add Your own attribution
                notices within Derivative Works that You distribute, alongside
                or as an addendum to the NOTICE text from the Work, provided
                that such additional attribution notices cannot be construed
                as modifying the License.

            You may add Your own copyright statement to Your modifications and
            may provide additional or different license terms and conditions
            for use, reproduction, or distribution of Your modifications, or
            for any such Derivative Works as a whole, provided Your use,
            reproduction, and distribution of the Work otherwise complies with
            the conditions stated in this License.

         5. Submission of Contributions. Unless You explicitly state otherwise,
            any Contribution intentionally submitted for inclusion in the Work
            by You to the Licensor shall be under the terms and conditions of
            this License, without any additional terms or conditions.
            Notwithstanding the above, nothing herein shall supersede or modify
            the terms of any separate license agreement you may have executed
            with Licensor regarding such Contributions.

         6. Trademarks. This License does not grant permission to use the trade
            names, trademarks, service marks, or product names of the Licensor,
            except as required for reasonable and customary use in describing the
            origin of the Work and reproducing the content of the NOTICE file.

         7. Disclaimer of Warranty. Unless required by applicable law or
            agreed to in writing, Licensor provides the Work (and each
            Contributor provides its Contributions) on an "AS IS" BASIS,
            WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
            implied, including, without limitation, any warranties or conditions
            of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
            PARTICULAR PURPOSE. You are solely responsible for determining the
            appropriateness of using or redistributing the Work and assume any
            risks associated with Your exercise of permissions under this License.

         8. Limitation of Liability. In no event and under no legal theory,
            whether in tort (including negligence), contract, or otherwise,
            unless required by applicable law (such as deliberate and grossly
            negligent acts) or agreed to in writing, shall any Contributor be
            liable to You for damages, including any direct, indirect, special,
            incidental, or consequential damages of any character arising as a
            result of this License or out of the use or inability to use the
            Work (including but not limited to damages for loss of goodwill,
            work stoppage, computer failure or malfunction, or any and all
            other commercial damages or losses), even if such Contributor
            has been advised of the possibility of such damages.

         9. Accepting Warranty or Additional Liability. While redistributing
            the Work or Derivative Works thereof, You may choose to offer,
            and charge a fee for, acceptance of support, warranty, indemnity,
            or other liability obligations and/or rights consistent with this
            License. However, in accepting such obligations, You may act only
            on Your own behalf and on Your sole responsibility, not on behalf
            of any other Contributor, and only if You agree to indemnify,
            defend, and hold each Contributor harmless for any liability
            incurred by, or claims asserted against, such Contributor by reason
            of your accepting any such warranty or additional liability.

         END OF TERMS AND CONDITIONS

         APPENDIX: How to apply the Apache License to your work.

            To apply the Apache License to your work, attach the following
            boilerplate notice, with the fields enclosed by brackets "[]"
            replaced with your own identifying information. (Don't include
            the brackets!)  The text should be enclosed in the appropriate
            comment syntax for the file format. We also recommend that a
            file or class name and description of purpose be included on the
            same "printed page" as the copyright notice for easier
            identification within third-party archives.

         Copyright [yyyy] [name of copyright owner]

         Licensed under the Apache License, Version 2.0 (the "License");
         you may not use this file except in compliance with the License.
         You may obtain a copy of the License at

             http://www.apache.org/licenses/LICENSE-2.0

         Unless required by applicable law or agreed to in writing, software
         distributed under the License is distributed on an "AS IS" BASIS,
         WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
         See the License for the specific language governing permissions and
         limitations under the License.

      --
      The following software may be --included in this product: Jakarta Commons Lang 2.1; Use of any of this --software is governed by the terms of the license below:
      --

      The Apache Software --Foundation
      --

      --

      Commons Lang
      --

      --
                                       Apache License
                                 Version 2.0, January 2004
                              http://www.apache.org/licenses/

         TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

         1. Definitions.

            "License" shall mean the terms and conditions for use, reproduction,
            and distribution as defined by Sections 1 through 9 of this document.

            "Licensor" shall mean the copyright owner or entity authorized by
            the copyright owner that is granting the License.

            "Legal Entity" shall mean the union of the acting entity and all
            other entities that control, are controlled by, or are under common
            control with that entity. For the purposes of this definition,
            "control" means (i) the power, direct or indirect, to cause the
            direction or management of such entity, whether by contract or
            otherwise, or (ii) ownership of fifty percent (50%) or more of the
            outstanding shares, or (iii) beneficial ownership of such entity.

            "You" (or "Your") shall mean an individual or Legal Entity
            exercising permissions granted by this License.

            "Source" form shall mean the preferred form for making modifications,
            including but not limited to software source code, documentation
            source, and configuration files.

            "Object" form shall mean any form resulting from mechanical
            transformation or translation of a Source form, including but
            not limited to compiled object code, generated documentation,
            and conversions to other media types.

            "Work" shall mean the work of authorship, whether in Source or
            Object form, made available under the License, as indicated by a
            copyright notice that is included in or attached to the work
            (an example is provided in the Appendix below).

            "Derivative Works" shall mean any work, whether in Source or Object
            form, that is based on (or derived from) the Work and for which the
            editorial revisions, annotations, elaborations, or other modifications
            represent, as a whole, an original work of authorship. For the purposes
            of this License, Derivative Works shall not include works that remain
            separable from, or merely link (or bind by name) to the interfaces of,
            the Work and Derivative Works thereof.

            "Contribution" shall mean any work of authorship, including
            the original version of the Work and any modifications or additions
            to that Work or Derivative Works thereof, that is intentionally
            submitted to Licensor for inclusion in the Work by the copyright owner
            or by an individual or Legal Entity authorized to submit on behalf of
            the copyright owner. For the purposes of this definition, "submitted"
            means any form of electronic, verbal, or written communication sent
            to the Licensor or its representatives, including but not limited to
            communication on electronic mailing lists, source code control systems,
            and issue tracking systems that are managed by, or on behalf of, the
            Licensor for the purpose of discussing and improving the Work, but
            excluding communication that is conspicuously marked or otherwise
            designated in writing by the copyright owner as "Not a Contribution."

            "Contributor" shall mean Licensor and any individual or Legal Entity
            on behalf of whom a Contribution has been received by Licensor and
            subsequently incorporated within the Work.

         2. Grant of Copyright License. Subject to the terms and conditions of
            this License, each Contributor hereby grants to You a perpetual,
            worldwide, non-exclusive, no-charge, royalty-free, irrevocable
            copyright license to reproduce, prepare Derivative Works of,
            publicly display, publicly perform, sublicense, and distribute the
            Work and such Derivative Works in Source or Object form.

         3. Grant of Patent License. Subject to the terms and conditions of
            this License, each Contributor hereby grants to You a perpetual,
            worldwide, non-exclusive, no-charge, royalty-free, irrevocable
            (except as stated in this section) patent license to make, have made,
            use, offer to sell, sell, import, and otherwise transfer the Work,
            where such license applies only to those patent claims licensable
            by such Contributor that are necessarily infringed by their
            Contribution(s) alone or by combination of their Contribution(s)
            with the Work to which such Contribution(s) was submitted. If You
            institute patent litigation against any entity (including a
            cross-claim or counterclaim in a lawsuit) alleging that the Work
            or a Contribution incorporated within the Work constitutes direct
            or contributory patent infringement, then any patent licenses
            granted to You under this License for that Work shall terminate
            as of the date such litigation is filed.

         4. Redistribution. You may reproduce and distribute copies of the
            Work or Derivative Works thereof in any medium, with or without
            modifications, and in Source or Object form, provided that You
            meet the following conditions:

            (a) You must give any other recipients of the Work or
                Derivative Works a copy of this License; and

            (b) You must cause any modified files to carry prominent notices
                stating that You changed the files; and

            (c) You must retain, in the Source form of any Derivative Works
                that You distribute, all copyright, patent, trademark, and
                attribution notices from the Source form of the Work,
                excluding those notices that do not pertain to any part of
                the Derivative Works; and

            (d) If the Work includes a "NOTICE" text file as part of its
                distribution, then any Derivative Works that You distribute must
                include a readable copy of the attribution notices contained
                within such NOTICE file, excluding those notices that do not
                pertain to any part of the Derivative Works, in at least one
                of the following places: within a NOTICE text file distributed
                as part of the Derivative Works; within the Source form or
                documentation, if provided along with the Derivative Works; or,
                within a display generated by the Derivative Works, if and
                wherever such third-party notices normally appear. The contents
                of the NOTICE file are for informational purposes only and
                do not modify the License. You may add Your own attribution
                notices within Derivative Works that You distribute, alongside
                or as an addendum to the NOTICE text from the Work, provided
                that such additional attribution notices cannot be construed
                as modifying the License.

            You may add Your own copyright statement to Your modifications and
            may provide additional or different license terms and conditions
            for use, reproduction, or distribution of Your modifications, or
            for any such Derivative Works as a whole, provided Your use,
            reproduction, and distribution of the Work otherwise complies with
            the conditions stated in this License.

         5. Submission of Contributions. Unless You explicitly state otherwise,
            any Contribution intentionally submitted for inclusion in the Work
            by You to the Licensor shall be under the terms and conditions of
            this License, without any additional terms or conditions.
            Notwithstanding the above, nothing herein shall supersede or modify
            the terms of any separate license agreement you may have executed
            with Licensor regarding such Contributions.

         6. Trademarks. This License does not grant permission to use the trade
            names, trademarks, service marks, or product names of the Licensor,
            except as required for reasonable and customary use in describing the
            origin of the Work and reproducing the content of the NOTICE file.

         7. Disclaimer of Warranty. Unless required by applicable law or
            agreed to in writing, Licensor provides the Work (and each
            Contributor provides its Contributions) on an "AS IS" BASIS,
            WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
            implied, including, without limitation, any warranties or conditions
            of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
            PARTICULAR PURPOSE. You are solely responsible for determining the
            appropriateness of using or redistributing the Work and assume any
            risks associated with Your exercise of permissions under this License.

         8. Limitation of Liability. In no event and under no legal theory,
            whether in tort (including negligence), contract, or otherwise,
            unless required by applicable law (such as deliberate and grossly
            negligent acts) or agreed to in writing, shall any Contributor be
            liable to You for damages, including any direct, indirect, special,
            incidental, or consequential damages of any character arising as a
            result of this License or out of the use or inability to use the
            Work (including but not limited to damages for loss of goodwill,
            work stoppage, computer failure or malfunction, or any and all
            other commercial damages or losses), even if such Contributor
            has been advised of the possibility of such damages.

         9. Accepting Warranty or Additional Liability. While redistributing
            the Work or Derivative Works thereof, You may choose to offer,
            and charge a fee for, acceptance of support, warranty, indemnity,
            or other liability obligations and/or rights consistent with this
            License. However, in accepting such obligations, You may act only
            on Your own behalf and on Your sole responsibility, not on behalf
            of any other Contributor, and only if You agree to indemnify,
            defend, and hold each Contributor harmless for any liability
            incurred by, or claims asserted against, such Contributor by reason
            of your accepting any such warranty or additional liability.

         END OF TERMS AND CONDITIONS

         APPENDIX: How to apply the Apache License to your work.

            To apply the Apache License to your work, attach the following
            boilerplate notice, with the fields enclosed by brackets "[]"
            replaced with your own identifying information. (Don't include
            the brackets!)  The text should be enclosed in the appropriate
            comment syntax for the file format. We also recommend that a
            file or class name and description of purpose be included on the
            same "printed page" as the copyright notice for easier
            identification within third-party archives.

         Copyright [yyyy] [name of copyright owner]

         Licensed under the Apache License, Version 2.0 (the "License");
         you may not use this file except in compliance with the License.
         You may obtain a copy of the License at

             http://www.apache.org/licenses/LICENSE-2.0

         Unless required by applicable law or agreed to in writing, software
         distributed under the License is distributed on an "AS IS" BASIS,
         WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
         See the License for the specific language governing permissions and
         limitations under the License.

      --
      The following software may be --included in this product: Jakarta Commons Codec; Use of any of this --software is governed by the terms of the license below:
      -

      The Apache Software - Foundation
      -

      --- -2.30.2 - diff --git a/0001-Remove-unused-DOCTYPE-from-odk-examples-xcu-file.patch b/0001-Remove-unused-DOCTYPE-from-odk-examples-xcu-file.patch deleted file mode 100644 index 4b999c0..0000000 --- a/0001-Remove-unused-DOCTYPE-from-odk-examples-xcu-file.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a344462ccb324b14dbf17391146f78d84307cbec Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Tue, 22 Jun 2021 14:14:34 +0200 -Subject: [PATCH] Remove unused DOCTYPE from odk/examples xcu file - -The declared entities have apparently never been referenced ever since the -file's introduction in 9fa09d43d0dc0ec0ac71bad31b85ce7fc302ee90 "INTEGRATION: -CWS sdkinspector2". (And at least xmlreader skips and ignores the content of -such document type declarations anyway.) - -Change-Id: I8263200f52bb5f1692090995574619f9c0ec478f -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117658 -Tested-by: Jenkins -Reviewed-by: Stephan Bergmann ---- - odk/examples/java/Inspector/ObjectInspector.xcu | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/odk/examples/java/Inspector/ObjectInspector.xcu b/odk/examples/java/Inspector/ObjectInspector.xcu -index b7696086629c..d6fb08a0f8ce 100644 ---- a/odk/examples/java/Inspector/ObjectInspector.xcu -+++ b/odk/examples/java/Inspector/ObjectInspector.xcu -@@ -16,10 +16,6 @@ - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - --> -- -- --]> - -Date: Mon, 31 May 2021 09:36:28 +0200 -Subject: [PATCH] Replace inet_ntoa with inet_ntop - -...as inet_ntoa is potentially not thread-safe; and add a test - -Change-Id: I9df945b006ba7194c3b1444c4886101c08339ad0 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116425 -Tested-by: Jenkins -Reviewed-by: Stephan Bergmann -(cherry picked from commit 33bf4f0bcf941ee4609f558442035514f54cbc8a) - -and - -Replace inet_addr with inet_pton - -...as inet_addr is deprecated (it does not allow to distinguish successful -return for "255.255.255.255" from -1 error return); and update tests - -Change-Id: I605cb2ba18fe9bd11d2d68c8f1c94271c4503509 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116441 -Tested-by: Jenkins -Reviewed-by: Stephan Bergmann -(cherry picked from commit 1fef071c01caf6c293dd941ee7c8340e6894afc3) - -fix leak in SocketTest - -Change-Id: I8c5e2d4c4687beab08876fe3e945d19a1629bc36 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116514 -Tested-by: Jenkins -Reviewed-by: Noel Grandin -(cherry picked from commit 313eaf979ea2d69e4ffa88a5e87cc09ffe0ff088) ---- - sal/CppunitTest_sal_osl.mk | 1 + - sal/osl/unx/socket.cxx | 16 +++++++---- - sal/qa/osl/socket.cxx | 58 ++++++++++++++++++++++++++++++++++++++ - 3 files changed, 70 insertions(+), 5 deletions(-) - create mode 100644 sal/qa/osl/socket.cxx - -diff --git a/sal/CppunitTest_sal_osl.mk b/sal/CppunitTest_sal_osl.mk -index 2e4b77509f56..d8c2627d9e0f 100644 ---- a/sal/CppunitTest_sal_osl.mk -+++ b/sal/CppunitTest_sal_osl.mk -@@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl,\ - sal/qa/osl/process/osl_Thread \ - sal/qa/osl/profile/osl_old_testprofile \ - sal/qa/osl/setthreadname/test-setthreadname \ -+ sal/qa/osl/socket \ - )) - - $(eval $(call gb_CppunitTest_use_libraries,sal_osl,\ -diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx -index 56a8f6cd63ac..9fafc6d1db81 100644 ---- a/sal/osl/unx/socket.cxx -+++ b/sal/osl/unx/socket.cxx -@@ -437,7 +437,10 @@ oslSocketAddr SAL_CALL osl_createInetBroadcastAddr ( - &pDottedAddr, strDottedAddr->buffer, strDottedAddr->length, - RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS); - -- nAddr = inet_addr (pDottedAddr->buffer); -+ in_addr buf; -+ if (inet_pton (AF_INET, pDottedAddr->buffer, &buf) == 1) { -+ nAddr = buf.s_addr; -+ } - rtl_string_release (pDottedAddr); - } - -@@ -505,11 +508,11 @@ oslSocketAddr osl_psz_createInetSocketAddr ( - sal_Int32 Port) - { - oslSocketAddr pAddr = nullptr; -- sal_Int32 Addr = inet_addr(pszDottedAddr); -- if(Addr != -1) -+ in_addr buf; -+ if(inet_pton(AF_INET, pszDottedAddr, &buf) == 1) - { - /* valid dotted addr */ -- pAddr = createSocketAddrWithFamily( osl_Socket_FamilyInet, htons(Port) , Addr ); -+ pAddr = createSocketAddrWithFamily( osl_Socket_FamilyInet, htons(Port) , buf.s_addr ); - } - return pAddr; - } -@@ -1090,7 +1093,10 @@ oslSocketResult SAL_CALL osl_getDottedInetAddrOfSocketAddr(oslSocketAddr Addr, r - return osl_Socket_Error; - } - -- rtl_uString_newFromAscii(ustrDottedInetAddr,inet_ntoa(pSystemInetAddr->sin_addr)); -+ char buf[INET_ADDRSTRLEN]; -+ auto const text = inet_ntop(AF_INET, &pSystemInetAddr->sin_addr, buf, INET_ADDRSTRLEN); -+ assert(text != nullptr); -+ rtl_uString_newFromAscii(ustrDottedInetAddr,text); - - return osl_Socket_Ok; - -diff --git a/sal/qa/osl/socket.cxx b/sal/qa/osl/socket.cxx -new file mode 100644 -index 000000000000..ed31c9ede7ae ---- /dev/null -+++ b/sal/qa/osl/socket.cxx -@@ -0,0 +1,58 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ -+/* -+ * This file is part of the LibreOffice project. -+ * -+ * This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. -+ */ -+ -+#include -+#include -+#include -+ -+#include -+#include -+ -+namespace -+{ -+class SocketTest : public CppUnit::TestFixture -+{ -+ CPPUNIT_TEST_SUITE(SocketTest); -+ CPPUNIT_TEST(test_createInetSocketAddr); -+ CPPUNIT_TEST(test_createInetBroadcastAddr); -+ CPPUNIT_TEST_SUITE_END(); -+ -+ void test_createInetSocketAddr() -+ { -+ OUString const in("123.4.56.78"); -+ auto const addr = osl_createInetSocketAddr(in.pData, 100); -+ CPPUNIT_ASSERT(addr != nullptr); -+ CPPUNIT_ASSERT_EQUAL(osl_Socket_FamilyInet, osl_getFamilyOfSocketAddr(addr)); -+ OUString out; -+ auto const res = osl_getDottedInetAddrOfSocketAddr(addr, &out.pData); -+ CPPUNIT_ASSERT_EQUAL(osl_Socket_Ok, res); -+ CPPUNIT_ASSERT_EQUAL(in, out); -+ CPPUNIT_ASSERT_EQUAL(sal_Int32(100), osl_getInetPortOfSocketAddr(addr)); -+ osl_destroySocketAddr(addr); -+ } -+ -+ void test_createInetBroadcastAddr() -+ { -+ OUString const in("123.4.56.78"); -+ auto const addr = osl_createInetBroadcastAddr(in.pData, 100); -+ CPPUNIT_ASSERT(addr != nullptr); -+ CPPUNIT_ASSERT_EQUAL(osl_Socket_FamilyInet, osl_getFamilyOfSocketAddr(addr)); -+ OUString out; -+ auto const res = osl_getDottedInetAddrOfSocketAddr(addr, &out.pData); -+ CPPUNIT_ASSERT_EQUAL(osl_Socket_Ok, res); -+ CPPUNIT_ASSERT_EQUAL(OUString("123.255.255.255"), out); -+ CPPUNIT_ASSERT_EQUAL(sal_Int32(100), osl_getInetPortOfSocketAddr(addr)); -+ osl_destroySocketAddr(addr); -+ } -+}; -+ -+CPPUNIT_TEST_SUITE_REGISTRATION(SocketTest); -+} -+ -+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ --- -2.31.1 - diff --git a/0001-Resolves-tdf-132739-two-style-tags-where-there-shoul.patch b/0001-Resolves-tdf-132739-two-style-tags-where-there-shoul.patch index 35d4056..e7fd512 100644 --- a/0001-Resolves-tdf-132739-two-style-tags-where-there-shoul.patch +++ b/0001-Resolves-tdf-132739-two-style-tags-where-there-shoul.patch @@ -55,8 +55,8 @@ diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.h index ab282ba652ff..f82325ee50ae 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx -@@ -484,7 +484,7 @@ public: - void writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameFormat& rFrameFormat, const OUString& rAltText, HtmlFrmOpts nFrameOpts); +@@ -494,7 +494,7 @@ + void writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameFormat& rFrameFormat, std::u16string_view rAltText, HtmlFrmOpts nFrameOpts); void OutCSS1_TableFrameFormatOptions( const SwFrameFormat& rFrameFormat ); - void OutCSS1_TableCellBorderHack(const SwFrameFormat& rFrameFormat); diff --git a/0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch b/0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch new file mode 100644 index 0000000..5f07a44 --- /dev/null +++ b/0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch @@ -0,0 +1,1248 @@ +From 4da5b5658dff57b7540bfc97133629d2a8ccf53d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Sat, 14 Aug 2021 21:43:19 +0100 +Subject: [PATCH] Revert "tdf#101630 - gdrive support w/oAuth and Drive API v3" + +This reverts commit b8b66a26f8f519a30b8e6b860a9247a8ffbb71cc. +--- + config_host/config_oauth2.h.in | 8 +- + external/libcmis/UnpackedTarball_libcmis.mk | 2 - + external/libcmis/libcmis_gdrive.patch.1 | 702 ------------------ + .../libcmis_oauth_pw_as_refreshtoken.patch.1 | 185 ----- + .../data/org/openoffice/Office/Common.xcu | 2 +- + ucb/source/ucp/cmis/auth_provider.cxx | 130 +--- + ucb/source/ucp/cmis/auth_provider.hxx | 8 +- + ucb/source/ucp/cmis/cmis_content.cxx | 21 +- + ucb/source/ucp/cmis/cmis_repo_content.cxx | 4 +- + 9 files changed, 55 insertions(+), 1007 deletions(-) + delete mode 100644 external/libcmis/libcmis_gdrive.patch.1 + delete mode 100644 external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1 + +diff --git a/config_host/config_oauth2.h.in b/config_host/config_oauth2.h.in +index 9945dda3dda5..a95015b41f3e 100644 +--- a/config_host/config_oauth2.h.in ++++ b/config_host/config_oauth2.h.in +@@ -15,13 +15,13 @@ + + + /* Google Drive settings */ +-#define GDRIVE_BASE_URL "https://www.googleapis.com/drive/v3" ++#define GDRIVE_BASE_URL "https://www.googleapis.com/drive/v2" + #define GDRIVE_CLIENT_ID "" + #define GDRIVE_CLIENT_SECRET "" +-#define GDRIVE_AUTH_URL "https://accounts.google.com/o/oauth2/v2/auth" +-#define GDRIVE_TOKEN_URL "https://oauth2.googleapis.com/token" ++#define GDRIVE_AUTH_URL "https://accounts.google.com/o/oauth2/auth" ++#define GDRIVE_TOKEN_URL "https://accounts.google.com/o/oauth2/token" + #define GDRIVE_REDIRECT_URI "urn:ietf:wg:oauth:2.0:oob" +-#define GDRIVE_SCOPE "https://www.googleapis.com/auth/drive.file" ++#define GDRIVE_SCOPE "https://www.googleapis.com/auth/drive" + + + /* Alfresco Cloud */ +diff --git a/external/libcmis/UnpackedTarball_libcmis.mk b/external/libcmis/UnpackedTarball_libcmis.mk +index 8398853e4511..a5be3078c95a 100644 +--- a/external/libcmis/UnpackedTarball_libcmis.mk ++++ b/external/libcmis/UnpackedTarball_libcmis.mk +@@ -17,8 +17,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libcmis, \ + external/libcmis/libcmis-libxml2_compatibility.patch \ + external/libcmis/0001-rename-class-GetObject-to-avoid-name-clash-on-Window.patch \ + external/libcmis/libcmis_onedrive.patch \ +- external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1 \ +- external/libcmis/libcmis_gdrive.patch.1 \ + )) + + # vim: set noet sw=4 ts=4: +diff --git a/external/libcmis/libcmis_gdrive.patch.1 b/external/libcmis/libcmis_gdrive.patch.1 +deleted file mode 100644 +index 24ff65d1ef15..000000000000 +--- a/external/libcmis/libcmis_gdrive.patch.1 ++++ /dev/null +@@ -1,702 +0,0 @@ +-diff -ur libcmis.org/src/libcmis/gdrive-document.cxx libcmis/src/libcmis/gdrive-document.cxx +---- libcmis.org/src/libcmis/gdrive-document.cxx 2021-07-27 19:11:02.679247008 +0200 +-+++ libcmis/src/libcmis/gdrive-document.cxx 2021-07-27 19:11:18.873246420 +0200 +-@@ -145,23 +145,17 @@ +- { +- if ( !os.get( ) ) +- throw libcmis::Exception( "Missing stream" ); +-- if ( !isImmutable( ) ) +-- throw libcmis::Exception( string ( "Document " + getId( )+ +-- " is not editable" ) ); +-- string putUrl = getUploadUrl( ) + getId( ); +-- putUrl += "?uploadType=media"; +-- +-- // If it's a Google document, convert it +-- if ( isGoogleDoc( ) ) +-- putUrl += "&convert=true"; +-+ +-+ string putUrl = GDRIVE_UPLOAD_LINK + getId( ) + "?uploadType=media"; +- +- // Upload stream +- boost::shared_ptr< istream> is ( new istream ( os->rdbuf( ) ) ); +- vector headers; +- headers.push_back( string( "Content-Type: " ) + contentType ); +-+ string res; +- try +- { +-- getSession()->httpPutRequest( putUrl, *is, headers ); +-+ res = getSession()->httpPatchRequest( putUrl, *is, headers )->getStream()->str(); +- } +- catch ( const CurlException& e ) +- { +-@@ -181,35 +175,10 @@ +- { +- if ( !os.get( ) ) +- throw libcmis::Exception( "Missing stream" ); +-- +-- if ( !isImmutable( ) ) +-- throw libcmis::Exception( string ( "Document " + getId( )+ +-- " is not editable" ) ); +-- string metaUrl = getUrl( ); +-- +-- // If it's a Google document, convert it +-- if ( isGoogleDoc( ) ) +-- metaUrl += "?convert=true"; +-- +-- // Update file name meta information +-- if ( !fileName.empty( ) && fileName != getContentFilename( ) ) +-- { +-- Json metaJson; +-- Json fileJson( fileName.c_str( ) ); +-- metaJson.add("title", fileJson ); +-- +-- std::istringstream is( metaJson.toString( ) ); +-- vector headers; +-- headers.push_back( "Content-Type: application/json" ); +-- try +-- { +-- getSession()->httpPutRequest( metaUrl, is, headers ); +-- } +-- catch ( const CurlException& e ) +-- { +-- throw e.getCmisException( ); +-- } +-- } +-+ +-+ // TODO: when would the filename need an update? +-+ if (!fileName.empty() && fileName != getContentFilename()) +-+ std::cout << "filename change is not implemented in setContentStream" << std::endl; +- +- // Upload stream +- uploadStream( os, contentType ); +-@@ -251,7 +220,7 @@ +- vector< libcmis::DocumentPtr > GDriveDocument::getAllVersions( ) +- { +- vector< libcmis::DocumentPtr > revisions; +-- string versionUrl = getUrl( ) + "/revisions"; +-+ string versionUrl = GDRIVE_METADATA_LINK + getId( ) + "/revisions"; +- // Run the http request to get the properties definition +- string res; +- try +-@@ -263,7 +232,7 @@ +- throw e.getCmisException( ); +- } +- Json jsonRes = Json::parse( res ); +-- Json::JsonVector objs = jsonRes["items"].getList( ); +-+ Json::JsonVector objs = jsonRes["revisions"].getList( ); +- +- string parentId = getStringProperty( "cmis:parentId" ); +- +-diff -ur libcmis.org/src/libcmis/gdrive-folder.cxx libcmis/src/libcmis/gdrive-folder.cxx +---- libcmis.org/src/libcmis/gdrive-folder.cxx 2021-07-27 19:11:02.678247008 +0200 +-+++ libcmis/src/libcmis/gdrive-folder.cxx 2021-07-27 19:11:18.874246420 +0200 +-@@ -62,8 +62,8 @@ +- // Instead of sending multiple queries for children, +- // we send a single query to search for objects where parents +- // include the folderID. +-- string query = getSession( )->getBindingUrl( ) + +-- "/files?q=\"" + getId( ) + "\"+in+parents+and+trashed+=+false"; +-+ string query = GDRIVE_METADATA_LINK + "?q=\"" + getId( ) + "\"+in+parents+and+trashed+=+false" + +-+ "&fields=files(kind,id,name,parents,mimeType,createdTime,modifiedTime,thumbnailLink,size)"; +- +- string res; +- try +-@@ -76,7 +76,7 @@ +- } +- +- Json jsonRes = Json::parse( res ); +-- Json::JsonVector objs = jsonRes["items"].getList( ); +-+ Json::JsonVector objs = jsonRes["files"].getList( ); +- +- // Create children objects from Json objects +- for(unsigned int i = 0; i < objs.size(); i++) +-@@ -95,7 +95,7 @@ +- string GDriveFolder::uploadProperties( Json properties ) +- { +- // URL for uploading meta data +-- string metaUrl = getSession()->getBindingUrl() + "/files/"; +-+ string metaUrl = GDRIVE_METADATA_LINK + "?fields=kind,id,name,parents,mimeType,createdTime,modifiedTime"; +- +- // add parents to the properties +- properties.add( "parents", GdriveUtils::createJsonFromParentId( getId( ) ) ); +-@@ -147,9 +147,15 @@ +- +- Json propsJson = GdriveUtils::toGdriveJson( properties ); +- +-- // Add filename to properties +-- Json jsonFilename( fileName.c_str( ) ); +-- propsJson.add( "title", jsonFilename ); +-+ if(!fileName.empty()) { +-+ // use provided filename +-+ Json jsonFilename( fileName.c_str( ) ); +-+ +-+ propsJson.add( "name", jsonFilename ); +-+ } +-+ if(!contentType.empty()) { +-+ propsJson.add( "mimeType", Json(contentType.c_str())); +-+ } +- +- // Upload meta-datas +- string res = uploadProperties( propsJson); +-@@ -171,12 +177,9 @@ +- libcmis::UnfileObjects::Type /*unfile*/, +- bool /*continueOnError*/ ) +- { +-- // Object remove doesn't work with folder +-- // Using trash instead +- try +- { +-- istringstream is( "" ); +-- getSession( )->httpPostRequest( getUrl( ) + "/trash", is, "" ); +-+ getSession( )->httpDeleteRequest( GDRIVE_METADATA_LINK + getId( ) ); +- } +- catch ( const CurlException& e ) +- { +-diff -ur libcmis.org/src/libcmis/gdrive-object.cxx libcmis/src/libcmis/gdrive-object.cxx +---- libcmis.org/src/libcmis/gdrive-object.cxx 2021-07-27 19:11:02.675247009 +0200 +-+++ libcmis/src/libcmis/gdrive-object.cxx 2021-07-27 19:11:18.874246420 +0200 +-@@ -89,8 +89,8 @@ +- property.reset( new GDriveProperty( it->first, it->second ) ); +- m_properties[ property->getPropertyType( )->getId()] = property; +- +-- // we map "title" to both "cmis:name" and "cmis:getContentStreamFileName" +-- if ( it->first == "title" ) +-+ // we map "name" to both "cmis:name" and "cmis:getContentStreamFileName" +-+ if ( it->first == "name" ) +- { +- property.reset( new GDriveProperty( "cmis:name", it->second) ); +- m_properties[ property->getPropertyType( )->getId()] = property; +-@@ -142,16 +142,13 @@ +- { +- if ( m_renditions.empty( ) ) +- { +-- string downloadUrl = getStringProperty( "downloadUrl" ); +-- if ( !downloadUrl.empty( ) ) +-- { +-- string mimeType = getStringProperty( "cmis:contentStreamMimeType" ); +-- if ( !mimeType.empty( ) ) +-- { +-- RenditionPtr rendition( +-- new Rendition( mimeType, mimeType, mimeType, downloadUrl )); +-- m_renditions.push_back( rendition ); +-- } +-+ string downloadUrl = GDRIVE_METADATA_LINK + getId( ) + "?alt=media"; +-+ string mimeType = getStringProperty( "cmis:contentStreamMimeType" ); +-+ if ( !mimeType.empty( ) ) +-+ { +-+ RenditionPtr rendition( +-+ new Rendition( mimeType, mimeType, mimeType, downloadUrl )); +-+ m_renditions.push_back( rendition ); +- } +- +- vector< string > exportLinks = getMultiStringProperty( "exportLinks" ); +-@@ -192,7 +189,7 @@ +- { +- vector< string > headers; +- headers.push_back( "Content-Type: application/json" ); +-- response = getSession( )->httpPutRequest( getUrl( ), is, headers ); +-+ response = getSession( )->httpPatchRequest( getUrl( ), is, headers ); +- } +- catch ( const CurlException& e ) +- { +-@@ -228,7 +225,7 @@ +- { +- try +- { +-- getSession( )->httpDeleteRequest( getUrl( ) ); +-+ getSession( )->httpDeleteRequest( GDRIVE_METADATA_LINK + getId( ) ); +- } +- catch ( const CurlException& e ) +- { +-@@ -239,8 +236,8 @@ +- void GDriveObject::move( FolderPtr /*source*/, FolderPtr destination ) +- { +- Json parentsJson; +-- Json parentsValue = GdriveUtils::createJsonFromParentId( destination->getId( ) ); +-- parentsJson.add( "parents", parentsValue ); +-+ parentsJson.add( "addParents", Json(destination->getId( ).c_str()) ); +-+ parentsJson.add( "removeParents", Json(getStringProperty( "cmis:parentId" ).c_str()) ); +- +- istringstream is( parentsJson.toString( ) ); +- libcmis::HttpResponsePtr response; +-@@ -248,7 +245,7 @@ +- { +- vector< string > headers; +- headers.push_back( "Content-Type: application/json" ); +-- response = getSession( )->httpPutRequest( getUrl( ), is, headers ); +-+ response = getSession( )->httpPatchRequest( getUrl( ), is, headers ); +- } +- catch ( const CurlException& e ) +- { +-@@ -262,12 +259,10 @@ +- +- string GDriveObject::getUrl( ) +- { +-- return getSession( )->getBindingUrl( ) + "/files/" + getId( ); +--} +-- +--string GDriveObject::getUploadUrl( ) +--{ +-- return GDRIVE_UPLOAD_LINKS; +-+ // thumbnailLink causes some operations to fail with internal server error, +-+ // see https://issuetracker.google.com/issues/36760667 +-+ return GDRIVE_METADATA_LINK + getId( ) + +-+ "?fields=kind,id,name,parents,mimeType,createdTime,modifiedTime,size"; +- } +- +- vector< string> GDriveObject::getMultiStringProperty( const string& propertyName ) +-diff -ur libcmis.org/src/libcmis/gdrive-repository.cxx libcmis/src/libcmis/gdrive-repository.cxx +---- libcmis.org/src/libcmis/gdrive-repository.cxx 2021-07-27 19:11:02.676247009 +0200 +-+++ libcmis/src/libcmis/gdrive-repository.cxx 2021-07-27 19:11:18.874246420 +0200 +-@@ -35,7 +35,7 @@ +- m_name = "Google Drive"; +- m_description = "Google Drive repository"; +- m_productName = "Google Drive"; +-- m_productVersion = "v2"; +-+ m_productVersion = "v3"; +- m_rootId = "root"; +- +- m_capabilities[ ACL ] = "discover"; +-diff -ur libcmis.org/src/libcmis/gdrive-session.cxx libcmis/src/libcmis/gdrive-session.cxx +---- libcmis.org/src/libcmis/gdrive-session.cxx 2021-07-27 19:11:02.675247009 +0200 +-+++ libcmis/src/libcmis/gdrive-session.cxx 2021-07-27 19:11:18.874246420 +0200 +-@@ -124,9 +124,13 @@ +- +- libcmis::ObjectPtr GDriveSession::getObject( string objectId ) +- { +-+ if(objectId == "root") { +-+ return getRootFolder(); +-+ } +- // Run the http request to get the properties definition +- string res; +-- string objectLink = m_bindingUrl + "/files/" + objectId; +-+ string objectLink = GDRIVE_METADATA_LINK + objectId + +-+ "?fields=kind,id,name,parents,mimeType,createdTime,modifiedTime,thumbnailLink,size"; +- try +- { +- res = httpGetRequest( objectLink )->getStream()->str(); +-@@ -188,9 +192,10 @@ +- { +- // Normal child case +- // Ask for the ID of the child if there is any +-- string childIdUrl = m_bindingUrl + "/files/" + objectId + +-- "/children/?q=title+=+'" + segment + +-- "'&fields=items:id"; +-+ // somewhat flawed as names are not necessarily unique in GDrive... +-+ string query = libcmis::escape("'" + objectId + "' in parents and trashed = false and name='" + segment + "'"); +-+ +-+ string childIdUrl = m_bindingUrl + "/files/?q=" + query + "&fields=files(id)"; +- +- string res; +- try +-@@ -204,7 +209,7 @@ +- Json jsonRes = Json::parse( res ); +- +- // Did we get an id? +-- Json::JsonVector items = jsonRes["items"].getList(); +-+ Json::JsonVector items = jsonRes["files"].getList(); +- if ( items.empty( ) ) +- throw libcmis::Exception( "Object not found: " + path, "objectNotFound" ); +- +-@@ -219,6 +224,27 @@ +- return getObject( objectId ); +- } +- +-+libcmis::FolderPtr GDriveSession::getRootFolder() +-+{ +-+ // permissions/scope with just drive.file don't allow to get it with the "root" alias/by its actual object-ID +-+ Json propsJson; +-+ +-+ // GDrive folder is a file with a different mime type. +-+ string mimeType = GDRIVE_FOLDER_MIME_TYPE; +-+ +-+ // Add mimetype to the propsJson +-+ Json jsonMimeType( mimeType.c_str( ) ); +-+ propsJson.add( "mimeType", jsonMimeType ); +-+ propsJson.add( "id", "root" ); +-+ +-+ // Upload meta-datas +-+ propsJson.add("cmis:name", "VirtualRoot"); +-+ +-+ libcmis::FolderPtr folderPtr( new GDriveFolder( this, propsJson ) ); +-+ +-+ return folderPtr; +-+} +-+ +- libcmis::ObjectTypePtr GDriveSession::getType( string id ) +- { +- libcmis::ObjectTypePtr type( new GdriveObjectType( id ) ); +-diff -ur libcmis.org/src/libcmis/gdrive-session.hxx libcmis/src/libcmis/gdrive-session.hxx +---- libcmis.org/src/libcmis/gdrive-session.hxx 2021-07-27 19:11:02.675247009 +0200 +-+++ libcmis/src/libcmis/gdrive-session.hxx 2021-07-27 19:11:18.875246420 +0200 +-@@ -57,6 +57,8 @@ +- +- virtual std::vector< libcmis::ObjectTypePtr > getBaseTypes( ); +- +-+ virtual libcmis::FolderPtr getRootFolder(); +-+ +- virtual std::string getRefreshToken(); +- +- private: +-diff -ur libcmis.org/src/libcmis/gdrive-utils.cxx libcmis/src/libcmis/gdrive-utils.cxx +---- libcmis.org/src/libcmis/gdrive-utils.cxx 2021-07-27 19:11:02.677247008 +0200 +-+++ libcmis/src/libcmis/gdrive-utils.cxx 2021-07-27 19:11:18.875246420 +0200 +-@@ -44,17 +44,17 @@ +- convertedKey = "cmis:createdBy"; +- else if ( key == "description" ) +- convertedKey = "cmis:description"; +-- else if ( key == "createdDate" ) +-+ else if ( key == "createdTime" ) +- convertedKey = "cmis:creationDate"; +- else if ( key == "lastModifyingUserName" ) +- convertedKey = "cmis:lastModifiedBy"; +-- else if ( key == "modifiedDate" ) +-+ else if ( key == "modifiedTime" ) +- convertedKey = "cmis:lastModificationDate"; +-- else if ( key == "title" ) +-+ else if ( key == "name" ) +- convertedKey = "cmis:contentStreamFileName"; +- else if ( key == "mimeType" ) +- convertedKey = "cmis:contentStreamMimeType"; +-- else if ( key == "fileSize" ) +-+ else if ( key == "size" ) +- convertedKey = "cmis:contentStreamLength"; +- else if ( key == "editable" ) +- convertedKey = "cmis:isImmutable"; +-@@ -72,21 +72,21 @@ +- else if ( key == "cmis:createdBy" ) +- convertedKey = "ownerNames"; +- else if ( key == "cmis:creationDate" ) +-- convertedKey = "createdDate"; +-+ convertedKey = "createdTime"; +- else if ( key == "cmis:description" ) +- convertedKey = "description"; +- else if ( key == "cmis:lastModifiedBy" ) +- convertedKey = "lastModifyingUserName"; +- else if ( key == "cmis:lastModificationDate" ) +-- convertedKey = "modifiedDate"; +-+ convertedKey = "modifiedTime"; +- else if ( key == "cmis:contentStreamFileName" ) +-- convertedKey = "title"; +-+ convertedKey = "name"; +- else if ( key == "cmis:name" ) +-- convertedKey = "title"; +-+ convertedKey = "name"; +- else if ( key == "cmis:contentStreamMimeType" ) +- convertedKey = "mimeType"; +- else if ( key == "cmis:contentStreamLength" ) +-- convertedKey = "fileSize"; +-+ convertedKey = "size"; +- else if ( key == "cmis:isImmutable" ) +- convertedKey = "editable"; +- else if ( key == "cmis:parentId" ) +-@@ -124,9 +124,9 @@ +- bool GdriveUtils::checkUpdatable( const string& key ) +- { +- // taken from https://developers.google.com/drive/v2/reference/files +-- bool updatable = ( key == "title" || +-+ bool updatable = ( key == "name" || +- key == "description" || +-- key == "modifiedDate" || +-+ key == "modifiedTime" || +- key == "lastViewedByMeDate" ); +- return updatable; +- } +-@@ -143,18 +143,11 @@ +- +- Json GdriveUtils::createJsonFromParentId( const string& parentId ) +- { +-- Json parentValue( parentId.c_str( ) ); +-- +- // parents is a Json array +- Json firstParent; +-- firstParent.add( "id", parentValue ); +-- +-- Json::JsonVector parents; +-- parents.insert( parents.begin( ), firstParent ); +-+ firstParent.add( Json( parentId.c_str() ) ); +- +-- Json parentsValue( parents ); +-- +-- return parentsValue; +-+ return firstParent; +- } +- +- vector< string > GdriveUtils::parseGdriveProperty( string key, Json json ) +-diff -ur libcmis.org/src/libcmis/gdrive-utils.hxx libcmis/src/libcmis/gdrive-utils.hxx +---- libcmis.org/src/libcmis/gdrive-utils.hxx 2021-07-27 19:11:02.677247008 +0200 +-+++ libcmis/src/libcmis/gdrive-utils.hxx 2021-07-27 19:11:18.875246420 +0200 +-@@ -35,7 +35,8 @@ +- #include "json-utils.hxx" +- +- static const std::string GDRIVE_FOLDER_MIME_TYPE = "application/vnd.google-apps.folder" ; +--static const std::string GDRIVE_UPLOAD_LINKS = "https://www.googleapis.com/upload/drive/v2/files/"; +-+static const std::string GDRIVE_UPLOAD_LINK = "https://www.googleapis.com/upload/drive/v3/files/"; +-+static const std::string GDRIVE_METADATA_LINK = "https://www.googleapis.com/drive/v3/files/"; +- +- class GdriveUtils +- { +-diff -ur libcmis.org/src/libcmis/oauth2-handler.cxx libcmis/src/libcmis/oauth2-handler.cxx +---- libcmis.org/src/libcmis/oauth2-handler.cxx 2021-07-27 19:11:02.676247009 +0200 +-+++ libcmis/src/libcmis/oauth2-handler.cxx 2021-07-27 19:11:18.875246420 +0200 +-@@ -92,8 +92,11 @@ +- "code=" + authCode + +- "&client_id=" + m_data->getClientId() + +- "&redirect_uri=" + m_data->getRedirectUri() + +-- "&scope=" + libcmis::escape( m_data->getScope() ) + +- "&grant_type=authorization_code" ; +-+ if(boost::starts_with(m_data->getTokenUrl(), "https://oauth2.googleapis.com/")) +-+ post += "&client_secret=" + m_data->getClientSecret(); +-+ else +-+ post += "&scope=" + libcmis::escape( m_data->getScope() ); +- +- istringstream is( post ); +- +-@@ -104,7 +107,7 @@ +- resp = m_session->httpPostRequest ( m_data->getTokenUrl(), is, +- "application/x-www-form-urlencoded" ); +- } +-- catch ( const CurlException& ) +-+ catch ( const CurlException& e) +- { +- throw libcmis::Exception( +- "Couldn't get tokens from the authorization code "); +-@@ -122,6 +125,8 @@ +- "refresh_token=" + m_refresh + +- "&client_id=" + m_data->getClientId() + +- "&grant_type=refresh_token" ; +-+ if(boost::starts_with(m_data->getTokenUrl(), "https://oauth2.googleapis.com/")) +-+ post += "&client_secret=" + m_data->getClientSecret(); +- +- istringstream is( post ); +- libcmis::HttpResponsePtr resp; +-@@ -130,7 +135,7 @@ +- resp = m_session->httpPostRequest( m_data->getTokenUrl( ), is, +- "application/x-www-form-urlencoded" ); +- } +-- catch (const CurlException& ) +-+ catch (const CurlException& e ) +- { +- throw libcmis::Exception( "Couldn't refresh token "); +- } +-diff -ur libcmis.org/src/libcmis/oauth2-providers.cxx libcmis/src/libcmis/oauth2-providers.cxx +---- libcmis.org/src/libcmis/oauth2-providers.cxx 2021-07-27 19:11:02.679247008 +0200 +-+++ libcmis/src/libcmis/oauth2-providers.cxx 2021-07-27 19:11:18.886246420 +0200 +-@@ -80,172 +80,8 @@ +- +- } +- +--string OAuth2Providers::OAuth2Gdrive( HttpSession* session, const string& authUrl, +-- const string& username, const string& password ) +--{ +-- /* This member function implements 'Google OAuth 2.0' +-- * +-- * The interaction is carried out by libcmis, with no web browser involved. +-- * +-- * Normal sequence (without 2FA) is: +-- * 1) a get to activate login page +-- * receive first login page, html format +-- * 2) subsequent post to sent email +-- * receive html page for password input +-- * 3) subsequent post to send password +-- * receive html page for application consent +-- * 4) subsequent post to send a consent for the application +-- * receive a single-use authorization code +-- * this code is returned as a string +-- * +-- * Sequence with 2FA is: +-- * 1) a get to activate login page +-- * receive first login page, html format +-- * 2) subsequent post to sent email +-- * receive html page for password input +-- * 3) subsequent post to send password +-- * receive html page for pin input +-- * 3b) subsequent post to send pin number +-- * receive html page for application consent +-- * 4) subsequent post to send a consent for the application +-- * receive a single-use authorization code +-- * this code is returned as a string +-- */ +-- +-- static const string CONTENT_TYPE( "application/x-www-form-urlencoded" ); +-- // STEP 1: get login page +-- string res; +-- try +-- { +-- // send the first get, receive the html login page +-- res = session->httpGetRequest( authUrl )->getStream( )->str( ); +-- } +-- catch ( const CurlException& ) +-- { +-- return string( ); +-- } +-- +-- // STEP 2: send email +-- +-- string loginEmailPost, loginEmailLink; +-- if ( !parseResponse( res.c_str( ), loginEmailPost, loginEmailLink ) ) +-- return string( ); +-- +-- loginEmailPost += "Email="; +-- loginEmailPost += escapeForm( username ); +-- +-- istringstream loginEmailIs( loginEmailPost ); +-- string loginEmailRes; +-- try +-- { +-- // send a post with user email, receive the html page for password input +-- loginEmailRes = session->httpPostRequest ( loginEmailLink, loginEmailIs, CONTENT_TYPE ) +-- ->getStream( )->str( ); +-- } +-- catch ( const CurlException& ) +-- { +-- return string( ); +-- } +-- +-- // STEP 3: password page +-- +-- string loginPasswdPost, loginPasswdLink; +-- if ( !parseResponse( loginEmailRes.c_str( ), loginPasswdPost, loginPasswdLink ) ) +-- return string( ); +-- +-- loginPasswdPost += "Passwd="; +-- loginPasswdPost += escapeForm( password ); +-- +-- istringstream loginPasswdIs( loginPasswdPost ); +-- string loginPasswdRes; +-- try +-- { +-- // send a post with user password, receive the application consent page +-- loginPasswdRes = session->httpPostRequest ( loginPasswdLink, loginPasswdIs, CONTENT_TYPE ) +-- ->getStream( )->str( ); +-- } +-- catch ( const CurlException& ) +-- { +-- return string( ); +-- } +-- +-- string approvalPost, approvalLink; +-- if ( !parseResponse( loginPasswdRes. c_str( ), approvalPost, approvalLink) ) +-- return string( ); +-- +-- // when 2FA is enabled, link doesn't start with 'http' +-- if ( approvalLink.compare(0, 4, "http") != 0 ) +-- { +-- // STEP 3b: 2 Factor Authentication, pin code request +-- +-- string loginChallengePost( approvalPost ); +-- string loginChallengeLink( approvalLink ); +-- +-- libcmis::OAuth2AuthCodeProvider fallbackProvider = libcmis::SessionFactory::getOAuth2AuthCodeProvider( ); +-- unique_ptr< char, void (*)( void * ) > pin{ fallbackProvider( "", "", "" ), free }; +-- +-- if( !pin ) +-- { +-- // unset OAuth2AuthCode Provider to avoid showing pin request again in the HttpSession::oauth2Authenticate +-- libcmis::SessionFactory::setOAuth2AuthCodeProvider( NULL ); +-- return string( ); +-- } +-- +-- loginChallengeLink = "https://accounts.google.com" + loginChallengeLink; +-- loginChallengePost += string( PIN_INPUT_NAME ) + "="; +-- loginChallengePost += string( pin.get() ); +-- +-- istringstream loginChallengeIs( loginChallengePost ); +-- string loginChallengeRes; +-- try +-- { +-- // send a post with pin, receive the application consent page +-- loginChallengeRes = session->httpPostRequest ( loginChallengeLink, loginChallengeIs, CONTENT_TYPE ) +-- ->getStream( )->str( ); +-- } +-- catch ( const CurlException& ) +-- { +-- return string( ); +-- } +-- +-- approvalPost = string(); +-- approvalLink = string(); +-- +-- if ( !parseResponse( loginChallengeRes. c_str( ), approvalPost, approvalLink) ) +-- return string( ); +-- } +-- else if( approvalLink.compare( "https://accounts.google.com/ServiceLoginAuth" ) == 0 ) +-- { +-- // wrong password, +-- // unset OAuth2AuthCode Provider to avoid showing pin request again in the HttpSession::oauth2Authenticate +-- libcmis::SessionFactory::setOAuth2AuthCodeProvider( NULL ); +-- return string( ); +-- } +-- +-- // STEP 4: allow libcmis to access google drive +-- approvalPost += "submit_access=true"; +-- +-- istringstream approvalIs( approvalPost ); +-- string approvalRes; +-- try +-- { +-- // send a post with application consent +-- approvalRes = session->httpPostRequest ( approvalLink, approvalIs, +-- CONTENT_TYPE) ->getStream( )->str( ); +-- } +-- catch ( const CurlException& e ) +-- { +-- throw e.getCmisException( ); +-- } +-- +-- // Take the authentication code from the text bar +-- string code = parseCode( approvalRes.c_str( ) ); +-- +-- return code; +--} +-- +--string OAuth2Providers::OAuth2Onedrive( HttpSession* /*session*/, const string& /*authUrl*/, +-- const string& /*username*/, const string& /*password*/ ) +-+string OAuth2Providers::OAuth2Dummy( HttpSession* /*session*/, const string& /*authUrl*/, +-+ const string& /*username*/, const string& /*password*/ ) +- { +- return string( ); +- } +-@@ -314,12 +150,8 @@ +- // For Alfresco in the cloud, only match the hostname as there can be several +- // binding URLs created with it. +- return OAuth2Alfresco; +-- else if ( boost::starts_with( url, "https://www.googleapis.com/drive/v2" ) ) +-- return OAuth2Gdrive; +-- else if ( boost::starts_with( url, "https://graph.microsoft.com/v1.0" ) ) +-- return OAuth2Onedrive; +- +-- return OAuth2Gdrive; +-+ return OAuth2Dummy; +- } +- +- int OAuth2Providers::parseResponse ( const char* response, string& post, string& link ) +-diff -ur libcmis.org/src/libcmis/oauth2-providers.hxx libcmis/src/libcmis/oauth2-providers.hxx +---- libcmis.org/src/libcmis/oauth2-providers.hxx 2021-07-27 19:11:02.678247008 +0200 +-+++ libcmis/src/libcmis/oauth2-providers.hxx 2021-07-27 19:11:18.886246420 +0200 +-@@ -39,12 +39,8 @@ +- class OAuth2Providers +- { +- public : +-- static std::string OAuth2Gdrive( HttpSession* session, const std::string& authUrl, +-+ static std::string OAuth2Dummy( HttpSession* session, const std::string& authUrl, +- const std::string& username, const std::string& password ); +-- +-- static std::string OAuth2Onedrive( HttpSession* session, const std::string& authUrl, +-- const std::string& username, const std::string& password ); +-- +- static std::string OAuth2Alfresco( HttpSession* session, const std::string& authUrl, +- const std::string& username, const std::string& password ); +- +-diff -ur libcmis.org/src/libcmis/session-factory.cxx libcmis/src/libcmis/session-factory.cxx +---- libcmis.org/src/libcmis/session-factory.cxx 2021-07-27 19:11:02.679247008 +0200 +-+++ libcmis/src/libcmis/session-factory.cxx 2021-07-27 19:11:18.886246420 +0200 +-@@ -66,7 +66,7 @@ +- if ( !bindingUrl.empty( ) ) +- { +- // Try the special cases based on the binding URL +-- if ( bindingUrl == "https://www.googleapis.com/drive/v2" ) +-+ if ( bindingUrl == "https://www.googleapis.com/drive/v3" ) +- { +- session = new GDriveSession( bindingUrl, username, password, +- oauth2, verbose ); +diff --git a/external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1 b/external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1 +deleted file mode 100644 +index a8cb06509421..000000000000 +--- a/external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1 ++++ /dev/null +@@ -1,185 +0,0 @@ +-diff -ur libcmis.org/inc/libcmis/session.hxx libcmis/inc/libcmis/session.hxx +---- libcmis.org/inc/libcmis/session.hxx 2021-07-27 19:09:42.580249917 +0200 +-+++ libcmis/inc/libcmis/session.hxx 2021-07-27 19:10:02.368249199 +0200 +-@@ -95,6 +95,8 @@ +- certificate exception feature available on common web browser. +- */ +- virtual void setNoSSLCertificateCheck( bool noCheck ) = 0; +-+ +-+ virtual std::string getRefreshToken() { return ""; }; +- }; +- } +- +-diff -ur libcmis.org/src/libcmis/gdrive-session.cxx libcmis/src/libcmis/gdrive-session.cxx +---- libcmis.org/src/libcmis/gdrive-session.cxx 2021-07-27 19:09:42.581249917 +0200 +-+++ libcmis/src/libcmis/gdrive-session.cxx 2021-07-27 19:10:02.369249198 +0200 +-@@ -70,6 +70,46 @@ +- { +- } +- +-+ +-+void GDriveSession::setOAuth2Data( libcmis::OAuth2DataPtr oauth2 ) +-+{ +-+ m_oauth2Handler = new OAuth2Handler( this, oauth2 ); +-+ m_oauth2Handler->setOAuth2Parser( OAuth2Providers::getOAuth2Parser( getBindingUrl( ) ) ); +-+ +-+ oauth2Authenticate( ); +-+} +-+ +-+void GDriveSession::oauth2Authenticate() +-+{ +-+ // treat the supplied password as refresh token +-+ if (!m_password.empty()) +-+ { +-+ try +-+ { +-+ m_inOAuth2Authentication = true; +-+ +-+ m_oauth2Handler->setRefreshToken(m_password); +-+ // Try to get new access tokens using the stored refreshtoken +-+ m_oauth2Handler->refresh(); +-+ m_inOAuth2Authentication = false; +-+ } +-+ catch (const CurlException &e) +-+ { +-+ m_inOAuth2Authentication = false; +-+ // refresh token expired or invalid, trigger initial auth (that in turn will hit the fallback with copy'n'paste method) +-+ BaseSession::oauth2Authenticate(); +-+ } +-+ } +-+ else +-+ { +-+ BaseSession::oauth2Authenticate(); +-+ } +-+} +-+ +-+string GDriveSession::getRefreshToken() { +-+ return HttpSession::getRefreshToken(); +-+} +-+ +- libcmis::RepositoryPtr GDriveSession::getRepository( ) +- { +- // Return a dummy repository since GDrive doesn't have that notion +-diff -ur libcmis.org/src/libcmis/gdrive-session.hxx libcmis/src/libcmis/gdrive-session.hxx +---- libcmis.org/src/libcmis/gdrive-session.hxx 2021-07-27 19:09:42.583249917 +0200 +-+++ libcmis/src/libcmis/gdrive-session.hxx 2021-07-27 19:10:02.369249198 +0200 +-@@ -57,8 +57,14 @@ +- +- virtual std::vector< libcmis::ObjectTypePtr > getBaseTypes( ); +- +-+ virtual std::string getRefreshToken(); +-+ +- private: +- GDriveSession( ); +-+ +-+ virtual void setOAuth2Data( libcmis::OAuth2DataPtr oauth2 ); +-+ +-+ void oauth2Authenticate( ); +- }; +- +- #endif /* _GDRIVE_SESSION_HXX_ */ +-diff -ur libcmis.org/src/libcmis/http-session.hxx libcmis/src/libcmis/http-session.hxx +---- libcmis.org/src/libcmis/http-session.hxx 2021-07-27 19:09:42.582249917 +0200 +-+++ libcmis/src/libcmis/http-session.hxx 2021-07-27 19:10:02.369249198 +0200 +-@@ -148,7 +148,7 @@ +- +- void setNoSSLCertificateCheck( bool noCheck ); +- +-- std::string getRefreshToken( ); +-+ virtual std::string getRefreshToken( ); +- +- protected: +- HttpSession( ); +-diff -ur libcmis.org/src/libcmis/oauth2-handler.cxx libcmis/src/libcmis/oauth2-handler.cxx +---- libcmis.org/src/libcmis/oauth2-handler.cxx 2021-07-27 19:09:42.582249917 +0200 +-+++ libcmis/src/libcmis/oauth2-handler.cxx 2021-07-27 19:10:02.369249198 +0200 +-@@ -158,6 +158,11 @@ +- return m_refresh; +- } +- +-+void OAuth2Handler::setRefreshToken( string refreshToken ) +-+{ +-+ m_refresh = refreshToken; +-+} +-+ +- string OAuth2Handler::getHttpHeader( ) +- { +- string header; +-diff -ur libcmis.org/src/libcmis/oauth2-handler.hxx libcmis/src/libcmis/oauth2-handler.hxx +---- libcmis.org/src/libcmis/oauth2-handler.hxx 2021-07-27 19:09:42.582249917 +0200 +-+++ libcmis/src/libcmis/oauth2-handler.hxx 2021-07-27 19:10:02.370249198 +0200 +-@@ -61,6 +61,7 @@ +- +- std::string getAccessToken( ) ; +- std::string getRefreshToken( ) ; +-+ void setRefreshToken( std::string refreshToken ) ; +- +- // adding HTTP auth header +- std::string getHttpHeader( ) ; +-diff -ur libcmis.org/src/libcmis/onedrive-session.cxx libcmis/src/libcmis/onedrive-session.cxx +---- libcmis.org/src/libcmis/onedrive-session.cxx 2021-07-27 19:09:42.583249917 +0200 +-+++ libcmis/src/libcmis/onedrive-session.cxx 2021-07-27 19:10:02.370249198 +0200 +-@@ -68,6 +68,45 @@ +- { +- } +- +-+void OneDriveSession::setOAuth2Data( libcmis::OAuth2DataPtr oauth2 ) +-+{ +-+ m_oauth2Handler = new OAuth2Handler( this, oauth2 ); +-+ m_oauth2Handler->setOAuth2Parser( OAuth2Providers::getOAuth2Parser( getBindingUrl( ) ) ); +-+ +-+ oauth2Authenticate( ); +-+} +-+ +-+void OneDriveSession::oauth2Authenticate() +-+{ +-+ // treat the supplied password as refresh token +-+ if (!m_password.empty()) +-+ { +-+ try +-+ { +-+ m_inOAuth2Authentication = true; +-+ +-+ m_oauth2Handler->setRefreshToken(m_password); +-+ // Try to get new access tokens using the stored refreshtoken +-+ m_oauth2Handler->refresh(); +-+ m_inOAuth2Authentication = false; +-+ } +-+ catch (const CurlException &e) +-+ { +-+ m_inOAuth2Authentication = false; +-+ // refresh token expired or invalid, trigger initial auth (that in turn will hit the fallback with copy'n'paste method) +-+ BaseSession::oauth2Authenticate(); +-+ } +-+ } +-+ else +-+ { +-+ BaseSession::oauth2Authenticate(); +-+ } +-+} +-+ +-+string OneDriveSession::getRefreshToken() { +-+ return HttpSession::getRefreshToken(); +-+} +-+ +- libcmis::RepositoryPtr OneDriveSession::getRepository( ) +- { +- // Return a dummy repository since OneDrive doesn't have that notion +-diff -ur libcmis.org/src/libcmis/onedrive-session.hxx libcmis/src/libcmis/onedrive-session.hxx +---- libcmis.org/src/libcmis/onedrive-session.hxx 2021-07-27 19:09:42.583249917 +0200 +-+++ libcmis/src/libcmis/onedrive-session.hxx 2021-07-27 19:10:02.370249198 +0200 +-@@ -62,8 +62,14 @@ +- +- bool isAPathMatch( Json objectJson, std::string path ); +- +-+ virtual std::string getRefreshToken(); +-+ +- private: +- OneDriveSession( ); +-+ +-+ virtual void setOAuth2Data( libcmis::OAuth2DataPtr oauth2 ); +-+ +-+ void oauth2Authenticate( ); +- }; +- +- #endif /* _ONEDRIVE_SESSION_HXX_ */ +diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu +index d9c2d5df34e3..2277b42bdf74 100644 +--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu ++++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu +@@ -431,7 +431,7 @@ + + + +- https://www.googleapis.com/drive/v3 ++ https://www.googleapis.com/drive/v2 + https://graph.microsoft.com/v1.0 + https://api.alfresco.com/cmis/versions/1.0/atom/ + +diff --git a/ucb/source/ucp/cmis/auth_provider.cxx b/ucb/source/ucp/cmis/auth_provider.cxx +index 05a8846a11a7..5c2ded12986e 100644 +--- a/ucb/source/ucp/cmis/auth_provider.cxx ++++ b/ucb/source/ucp/cmis/auth_provider.cxx +@@ -11,10 +11,7 @@ + #define STD_TO_OUSTR( str ) OUString( str.c_str(), str.length( ), RTL_TEXTENCODING_UTF8 ) + + #include +-#include +-#include + +-#include + #include + #include + +@@ -67,91 +64,6 @@ namespace cmis + return false; + } + +- string AuthProvider::getRefreshToken(string& rUsername) +- { +- string refreshToken; +- const css::uno::Reference xEnv = getXEnv(); +- if (xEnv.is()) +- { +- uno::Reference xIH = xEnv->getInteractionHandler(); +- +- if (rUsername.empty()) +- { +- rtl::Reference xRequest +- = new ucbhelper::SimpleAuthenticationRequest( +- m_sUrl, m_sBindingUrl, +- ucbhelper::SimpleAuthenticationRequest::EntityType::ENTITY_NA, OUString(), +- ucbhelper::SimpleAuthenticationRequest::EntityType::ENTITY_MODIFY, +- STD_TO_OUSTR(rUsername), +- ucbhelper::SimpleAuthenticationRequest::EntityType::ENTITY_NA, OUString()); +- xIH->handle(xRequest); +- +- rtl::Reference xSelection +- = xRequest->getSelection(); +- +- if (xSelection.is()) +- { +- // Handler handled the request. +- uno::Reference xAbort(xSelection.get(), +- uno::UNO_QUERY); +- if (!xAbort.is()) +- { +- const rtl::Reference& xSupp +- = xRequest->getAuthenticationSupplier(); +- +- rUsername = OUSTR_TO_STDSTR(xSupp->getUserName()); +- } +- } +- } +- +- uno::Reference xContext +- = ::comphelper::getProcessComponentContext(); +- uno::Reference xMasterPasswd +- = task::PasswordContainer::create(xContext); +- if (xMasterPasswd->hasMasterPassword()) +- { +- xMasterPasswd->authorizateWithMasterPassword(xIH); +- } +- if (xMasterPasswd->isPersistentStoringAllowed()) +- { +- task::UrlRecord aRec +- = xMasterPasswd->findForName(m_sBindingUrl, STD_TO_OUSTR(rUsername), xIH); +- if (aRec.UserList.hasElements() && aRec.UserList[0].Passwords.hasElements()) +- refreshToken = OUSTR_TO_STDSTR(aRec.UserList[0].Passwords[0]); +- } +- } +- return refreshToken; +- } +- +- bool AuthProvider::storeRefreshToken(const string& username, const string& password, +- const string& refreshToken) +- { +- if (refreshToken.empty()) +- return false; +- if (password == refreshToken) +- return true; +- const css::uno::Reference xEnv = getXEnv(); +- if (xEnv.is()) +- { +- uno::Reference xIH = xEnv->getInteractionHandler(); +- uno::Reference xContext +- = ::comphelper::getProcessComponentContext(); +- uno::Reference xMasterPasswd +- = task::PasswordContainer::create(xContext); +- uno::Sequence aPasswd{ STD_TO_OUSTR(refreshToken) }; +- if (xMasterPasswd->isPersistentStoringAllowed()) +- { +- if (xMasterPasswd->hasMasterPassword()) +- { +- xMasterPasswd->authorizateWithMasterPassword(xIH); +- } +- xMasterPasswd->addPersistent(m_sBindingUrl, STD_TO_OUSTR(username), aPasswd, xIH); +- return true; +- } +- } +- return false; +- } +- + css::uno::WeakReference< css::ucb::XCommandEnvironment> AuthProvider::sm_xEnv; + + void AuthProvider::setXEnv(const css::uno::Reference< css::ucb::XCommandEnvironment>& xEnv ) +@@ -164,7 +76,7 @@ namespace cmis + return sm_xEnv; + } + +- char* AuthProvider::copyWebAuthCodeFallback( const char* url, ++ char* AuthProvider::onedriveAuthCodeFallback( const char* url, + const char* /*username*/, + const char* /*password*/ ) + { +@@ -208,6 +120,46 @@ namespace cmis + + return strdup( "" ); + } ++ ++ char* AuthProvider::gdriveAuthCodeFallback( const char* /*url*/, ++ const char* /*username*/, ++ const char* /*password*/ ) ++ { ++ const css::uno::Reference< ++ css::ucb::XCommandEnvironment> xEnv = getXEnv( ); ++ ++ if ( xEnv.is() ) ++ { ++ uno::Reference< task::XInteractionHandler > xIH ++ = xEnv->getInteractionHandler(); ++ ++ if ( xIH.is() ) ++ { ++ rtl::Reference< ucbhelper::AuthenticationFallbackRequest > xRequest ++ = new ucbhelper::AuthenticationFallbackRequest ( ++ "PIN:", "" ); ++ ++ xIH->handle( xRequest ); ++ ++ rtl::Reference< ucbhelper::InteractionContinuation > xSelection ++ = xRequest->getSelection(); ++ ++ if ( xSelection.is() ) ++ { ++ // Handler handled the request. ++ const rtl::Reference< ucbhelper::InteractionAuthFallback >& ++ xAuthFallback = xRequest->getAuthFallbackInter( ); ++ if ( xAuthFallback.is() ) ++ { ++ OUString code = xAuthFallback->getCode( ); ++ return strdup( OUSTR_TO_STDSTR( code ).c_str( ) ); ++ } ++ } ++ } ++ } ++ ++ return strdup( "" ); ++ } + } + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +diff --git a/ucb/source/ucp/cmis/auth_provider.hxx b/ucb/source/ucp/cmis/auth_provider.hxx +index 9092f3c6bd25..d9864c45b230 100644 +--- a/ucb/source/ucp/cmis/auth_provider.hxx ++++ b/ucb/source/ucp/cmis/auth_provider.hxx +@@ -38,11 +38,11 @@ namespace cmis + + bool authenticationQuery( std::string& username, std::string& password ) override; + +- std::string getRefreshToken( std::string& username ); +- bool storeRefreshToken(const std::string& username, const std::string& password, +- const std::string& refreshToken); ++ static char* onedriveAuthCodeFallback( const char* url, ++ const char* /*username*/, ++ const char* /*password*/ ); + +- static char* copyWebAuthCodeFallback( const char* url, ++ static char* gdriveAuthCodeFallback( const char* /*url*/, + const char* /*username*/, + const char* /*password*/ ); + +diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx +index b5fb4ac3bda3..aa7628199a8c 100644 +--- a/ucb/source/ucp/cmis/cmis_content.cxx ++++ b/ucb/source/ucp/cmis/cmis_content.cxx +@@ -347,15 +347,12 @@ namespace cmis + string rPassword = OUSTR_TO_STDSTR( m_aURL.getPassword( ) ); + + bool bSkipInitialPWAuth = false; +- if (m_aURL.getBindingUrl() == ONEDRIVE_BASE_URL +- || m_aURL.getBindingUrl() == GDRIVE_BASE_URL) +- { ++ if ( m_aURL.getBindingUrl( ) == ONEDRIVE_BASE_URL ) { + // skip the initial username and pw-auth prompt, the only supported method is the + // auth-code-fallback one (login with your browser, copy code into the dialog) + // TODO: if LO were to listen on localhost for the request, it would be much nicer + // user experience + bSkipInitialPWAuth = true; +- rPassword = aAuthProvider.getRefreshToken(rUsername); + } + + bool bIsDone = false; +@@ -368,9 +365,7 @@ namespace cmis + libcmis::OAuth2DataPtr oauth2Data; + if ( m_aURL.getBindingUrl( ) == GDRIVE_BASE_URL ) + { +- // reset the skip, so user gets a chance to cancel +- bSkipInitialPWAuth = false; +- libcmis::SessionFactory::setOAuth2AuthCodeProvider(AuthProvider::copyWebAuthCodeFallback); ++ libcmis::SessionFactory::setOAuth2AuthCodeProvider(AuthProvider::gdriveAuthCodeFallback); + oauth2Data.reset( new libcmis::OAuth2Data( + GDRIVE_AUTH_URL, GDRIVE_TOKEN_URL, + GDRIVE_SCOPE, GDRIVE_REDIRECT_URI, +@@ -385,7 +380,7 @@ namespace cmis + { + // reset the skip, so user gets a chance to cancel + bSkipInitialPWAuth = false; +- libcmis::SessionFactory::setOAuth2AuthCodeProvider(AuthProvider::copyWebAuthCodeFallback); ++ libcmis::SessionFactory::setOAuth2AuthCodeProvider(AuthProvider::onedriveAuthCodeFallback); + oauth2Data.reset( new libcmis::OAuth2Data( + ONEDRIVE_AUTH_URL, ONEDRIVE_TOKEN_URL, + ONEDRIVE_SCOPE, ONEDRIVE_REDIRECT_URI, +@@ -417,12 +412,6 @@ namespace cmis + else + { + m_pProvider->registerSession(sSessionId, m_aURL.getUsername( ), m_pSession); +- if (m_aURL.getBindingUrl() == ONEDRIVE_BASE_URL +- || m_aURL.getBindingUrl() == GDRIVE_BASE_URL) +- { +- aAuthProvider.storeRefreshToken(rUsername, rPassword, +- m_pSession->getRefreshToken()); +- } + } + + bIsDone = true; +@@ -430,10 +419,7 @@ namespace cmis + catch( const libcmis::Exception & e ) + { + if ( e.getType() != "permissionDenied" ) +- { +- SAL_INFO("ucb.ucp.cmis", "Unexpected libcmis exception: " << e.what()); + throw; +- } + } + } + else +@@ -525,7 +511,6 @@ namespace cmis + } + catch ( const libcmis::Exception& ) + { +- SAL_INFO( "ucb.ucp.cmis", "object: " << OUSTR_TO_STDSTR(m_sObjectId)); + throw libcmis::Exception( "Object not found" ); + } + } +diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx +index 87a3f38dc792..507cade426ad 100644 +--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx ++++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx +@@ -165,7 +165,7 @@ namespace cmis + libcmis::OAuth2DataPtr oauth2Data; + if ( m_aURL.getBindingUrl( ) == GDRIVE_BASE_URL ) + { +- libcmis::SessionFactory::setOAuth2AuthCodeProvider( AuthProvider::copyWebAuthCodeFallback ); ++ libcmis::SessionFactory::setOAuth2AuthCodeProvider( AuthProvider::gdriveAuthCodeFallback ); + oauth2Data.reset( new libcmis::OAuth2Data( + GDRIVE_AUTH_URL, GDRIVE_TOKEN_URL, + GDRIVE_SCOPE, GDRIVE_REDIRECT_URI, +@@ -178,7 +178,7 @@ namespace cmis + ALFRESCO_CLOUD_CLIENT_ID, ALFRESCO_CLOUD_CLIENT_SECRET ) ); + if ( m_aURL.getBindingUrl( ) == ONEDRIVE_BASE_URL ) + { +- libcmis::SessionFactory::setOAuth2AuthCodeProvider( AuthProvider::copyWebAuthCodeFallback ); ++ libcmis::SessionFactory::setOAuth2AuthCodeProvider( AuthProvider::onedriveAuthCodeFallback ); + oauth2Data.reset( new libcmis::OAuth2Data( + ONEDRIVE_AUTH_URL, ONEDRIVE_TOKEN_URL, + ONEDRIVE_SCOPE, ONEDRIVE_REDIRECT_URI, +-- +2.31.1 + diff --git a/0001-Simplify-construction-of-a-hardcoded-IPv4-address.patch b/0001-Simplify-construction-of-a-hardcoded-IPv4-address.patch deleted file mode 100644 index fcfa651..0000000 --- a/0001-Simplify-construction-of-a-hardcoded-IPv4-address.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 68a6c70f25762374f7aed0d4d755345c6f37c78d Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Mon, 31 May 2021 10:56:38 +0200 -Subject: [PATCH] Simplify construction of a hardcoded IPv4 address - -Change-Id: I822313ee708935dd4ecb636c13a961fdd054d660 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116434 -Tested-by: Jenkins -Reviewed-by: Stephan Bergmann ---- - sd/source/ui/remotecontrol/DiscoveryService.cxx | 12 +----------- - 1 file changed, 1 insertion(+), 11 deletions(-) - -diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx b/sd/source/ui/remotecontrol/DiscoveryService.cxx -index 9ed2ae727761..cf0043387403 100644 ---- a/sd/source/ui/remotecontrol/DiscoveryService.cxx -+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx -@@ -119,17 +119,7 @@ void DiscoveryService::setupSockets() - - struct ip_mreq multicastRequest; - --// the Win32 SDK 8.1 deprecates inet_addr() --#if defined(_WIN32) -- IN_ADDR addr; -- INT ret = InetPtonW(AF_INET, L"239.0.0.1", & addr); -- if (1 == ret) -- { -- multicastRequest.imr_multiaddr.s_addr = addr.S_un.S_addr; -- } --#else -- multicastRequest.imr_multiaddr.s_addr = inet_addr( "239.0.0.1" ); --#endif -+ multicastRequest.imr_multiaddr.s_addr = htonl((239U << 24) | 1U); // 239.0.0.1 - multicastRequest.imr_interface.s_addr = htonl(INADDR_ANY); - - rc = setsockopt( mSocket, IPPROTO_IP, IP_ADD_MEMBERSHIP, --- -2.31.1 - diff --git a/0001-fix-detecting-qrcodegen.patch b/0001-fix-detecting-qrcodegen.patch deleted file mode 100644 index f82e9d5..0000000 --- a/0001-fix-detecting-qrcodegen.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 83bf31d8befdcf006323966fb6a6d4a1f32c64da Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Tue, 10 Aug 2021 09:19:04 +0100 -Subject: [PATCH] fix detecting qrcodegen - -Change-Id: I26813ca12967a52a30b0032965cf707dbee4b59a ---- - configure.ac | 2 +- - cui/source/dialogs/QrCodeGenDialog.cxx | 39 ++++++++++++++++++++++++-- - 2 files changed, 38 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b3aa9d6cb566..5895bfc26af2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -10812,7 +10812,7 @@ else - AC_MSG_RESULT([external]) - SYSTEM_QRCODEGEN=TRUE - AC_LANG_PUSH([C++]) -- AC_CHECK_HEADER(qrcodegen/QrCode.hpp, [], -+ AC_CHECK_HEADER(qrcodegencpp/qrcodegen.hpp, [], - [AC_MSG_ERROR(qrcodegen headers not found.)], [#include ]) - AC_CHECK_LIB([qrcodegencpp], [main], [:], - [ AC_MSG_ERROR(qrcodegen C++ library not found.) ], []) -diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx -index 28bbfabcf845..7db4bc74da16 100644 ---- a/cui/source/dialogs/QrCodeGenDialog.cxx -+++ b/cui/source/dialogs/QrCodeGenDialog.cxx -@@ -19,7 +19,7 @@ - - #if ENABLE_QRCODEGEN - #if defined(SYSTEM_QRCODEGEN) --#include -+#include - #else - #include - #endif -@@ -263,6 +263,41 @@ void QrCodeGenDialog::Apply() - #endif - } - -+#if ENABLE_QRCODEGEN -+static std::string toSvgString(const QrCode& qr, int border) -+{ -+ if (border < 0) -+ throw std::domain_error("Border must be non-negative"); -+ if (border > INT_MAX / 2 || border * 2 > INT_MAX - qr.getSize()) -+ throw std::overflow_error("Border too large"); -+ -+ std::ostringstream sb; -+ sb << "\n"; -+ sb << "\n"; -+ sb << "\n"; -+ sb << "\t\n"; -+ sb << "\t\n"; -+ sb << "\n"; -+ return sb.str(); -+} -+#endif -+ - OUString QrCodeGenDialog::GenerateQRCode(OUString aQRText, tools::Long aQRECC, int aQRBorder) - { - #if ENABLE_QRCODEGEN -@@ -299,7 +334,7 @@ OUString QrCodeGenDialog::GenerateQRCode(OUString aQRText, tools::Long aQRECC, i - - // From QR Code library - qrcodegen::QrCode qr0 = qrcodegen::QrCode::encodeText(qrtext, bqrEcc); -- std::string svg = qr0.toSvgString(aQRBorder); -+ std::string svg = toSvgString(qr0, aQRBorder); - //cstring to OUString - return OUString::createFromAscii(svg.c_str()); - #else --- -2.31.1 - diff --git a/0001-gtk3-workaround-missing-gdk_threads_enter-calls-in-e.patch b/0001-gtk3-workaround-missing-gdk_threads_enter-calls-in-e.patch deleted file mode 100644 index c260e2d..0000000 --- a/0001-gtk3-workaround-missing-gdk_threads_enter-calls-in-e.patch +++ /dev/null @@ -1,118 +0,0 @@ -From b06e5e2b9761d242d9269b091da9a98ec705d2b1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Tue, 1 Jun 2021 13:20:43 +0100 -Subject: [PATCH] gtk3: workaround missing gdk_threads_enter calls in external - code -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -with gtk3 file dialog. file, open, +other locations, -type davs://somewhere + return - - #0 0x00007ffff7a6e2a2 in raise () at /lib64/libc.so.6 - #1 0x00007ffff7a578a4 in abort () at /lib64/libc.so.6 - #2 0x00007ffff7a57789 in _nl_load_domain.cold () at /lib64/libc.so.6 - #3 0x00007ffff7a66a16 in () at /lib64/libc.so.6 - #4 0x00007fffd9be7672 in GtkYieldMutex::ThreadsLeave() (this=0x513480) at vcl/unx/gtk3/gtkinst.cxx:354 - #5 0x00007fffd9be6a53 in GdkThreadsLeave() () at vcl/unx/gtk3/gtkinst.cxx:116 - #6 0x00007fffd947ac2d in gtk_dialog_run (dialog=0xa984310) at /usr/src/debug/gtk3-3.24.29-1.fc34.x86_64/gtk/gtkdialog.c:1397 - ^^^ this also (see #30) calls gdk_threads_leave before g_main_loop_run, but no gdk_threads_enter has been called, presumably emit_show_error_message should have called it (?) ^^^ - #7 0x00007fffd94a6dc6 in error_message_with_parent (detail=0xa97f9b0 "HTTP Error: Error resolving “nowhere”: Name or service not known", msg=, parent=) - at /usr/src/debug/gtk3-3.24.29-1.fc34.x86_64/gtk/gtkfilechooserwidget.c:763 - #8 error_message (impl=, msg=, detail=0xa97f9b0 "HTTP Error: Error resolving “nowhere”: Name or service not known") at /usr/src/debug/gtk3-3.24.29-1.fc34.x86_64/gtk/gtkfilechooserwidget.c:786 - #9 0x00007fffe996ec2f in g_closure_invoke () at /lib64/libgobject-2.0.so.0 - #10 0x00007fffe998aea6 in signal_emit_unlocked_R () at /lib64/libgobject-2.0.so.0 - #11 0x00007fffe998c76a in g_signal_emit_valist () at /lib64/libgobject-2.0.so.0 - #12 0x00007fffe998c983 in g_signal_emit () at /lib64/libgobject-2.0.so.0 - #13 0x00007fffd9561fc7 in emit_show_error_message (secondary_message=0x7fffbc0566f0 "HTTP Error: Error resolving “nowhere”: Name or service not known", primary_message=, view=0x900a240) - at /usr/src/debug/gtk3-3.24.29-1.fc34.x86_64/gtk/gtkplacesview.c:171 - #14 server_mount_ready_cb (source_file=0x7fffbc05b4c0, res=, user_data=0x900a240) at /usr/src/debug/gtk3-3.24.29-1.fc34.x86_64/gtk/gtkplacesview.c:1232 - #15 0x00007fffe9a64a7a in g_task_return_now () at /lib64/libgio-2.0.so.0 - #16 0x00007fffe9a64c7b in g_task_return () at /lib64/libgio-2.0.so.0 - #17 0x00007fffd80653b8 in mount_reply () at /usr/lib64/gio/modules/libgvfsdbus.so - #18 0x00007fffe9a64a7a in g_task_return_now () at /lib64/libgio-2.0.so.0 - #19 0x00007fffe9a64c7b in g_task_return () at /lib64/libgio-2.0.so.0 - #20 0x00007fffe9acd2dd in reply_cb () at /lib64/libgio-2.0.so.0 - #21 0x00007fffe9a64a7a in g_task_return_now () at /lib64/libgio-2.0.so.0 - #22 0x00007fffe9a64c7b in g_task_return () at /lib64/libgio-2.0.so.0 - #23 0x00007fffe9ac4c34 in g_dbus_connection_call_done () at /lib64/libgio-2.0.so.0 - #24 0x00007fffe9a64a7a in g_task_return_now () at /lib64/libgio-2.0.so.0 - #25 0x00007fffe9a64abd in complete_in_idle_cb () at /lib64/libgio-2.0.so.0 - #26 0x00007fffe987074b in g_idle_dispatch () at /lib64/libglib-2.0.so.0 - #27 0x00007fffe98744cf in g_main_context_dispatch () at /lib64/libglib-2.0.so.0 - #28 0x00007fffe98c84e8 in g_main_context_iterate.constprop () at /lib64/libglib-2.0.so.0 - #29 0x00007fffe9873a93 in g_main_loop_run () at /lib64/libglib-2.0.so.0 - #30 0x00007fffd947ac37 in gtk_dialog_run (dialog=0x1604460) at /usr/src/debug/gtk3-3.24.29-1.fc34.x86_64/gtk/gtkdialog.c:1398 - ^^^ this will call gdk_threads_leave before g_main_loop_run, (gdk_threads_enter has been called earlier, and gdk_threads_enter will be called after g_main_loop_run) ^^^ - #31 0x00007fffd9bdbd96 in RunDialog::run() (this=0x9134f00) at vcl/unx/gtk3/fpicker/SalGtkPicker.cxx:199 - #32 0x00007fffd9bbf23f in SalGtkFilePicker::execute() (this=0x9004690) at vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx:953 - #33 0x00007ffff474741a in sfx2::FileDialogHelper_Impl::implDoExecute() (this=0x1667470) at sfx2/source/dialog/filedlghelper.cxx:1279 - - #14 presumably server_mount_ready_cb of gtkplacesview.c should protect its gtk - calls with gdk_threads_enter/gdk_threads_leave like enclosing_volume_mount_cb - of gtkfilesystem.c does. - -Seeing as gdk_threads_leave/gdk_threads_enter is gone in gtk4 I doubt -there's any point looking for a fix in gtk3 and we should just try and -survive the problem. - -Change-Id: I007be4dee4f615d4431e27034dcf7f3d446c3e9a -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116559 -Tested-by: Jenkins -Reviewed-by: Caolán McNamara -(cherry picked from commit 08b7529f628eda1d209cf27f9bbe52ee336fef62) ---- - vcl/unx/gtk3/gtk3gtkinst.cxx | 30 ++++++++++++++++++++++-------- - 1 file changed, 22 insertions(+), 8 deletions(-) - -diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx -index 2d4dc36ce5fe..bba4e07f3003 100644 ---- a/vcl/unx/gtk3/gtk3gtkinst.cxx -+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx -@@ -314,20 +314,34 @@ thread_local std::stack GtkYieldMutex::yieldCounts; - void GtkYieldMutex::ThreadsEnter() - { - acquire(); -- if (!yieldCounts.empty()) { -- auto n = yieldCounts.top(); -- yieldCounts.pop(); -- assert(n > 0); -- n--; -- if (n > 0) -- acquire(n); -+ if (yieldCounts.empty()) -+ return; -+ auto n = yieldCounts.top(); -+ yieldCounts.pop(); -+ -+ const bool bUndoingLeaveWithoutEnter = n == 0; -+ // if the ThreadsLeave bLeaveWithoutEnter of true condition occurred to -+ // create this entry then return early undoing the initial acquire of the -+ // function -+ if G_UNLIKELY(bUndoingLeaveWithoutEnter) -+ { -+ release(); -+ return; - } -+ -+ assert(n > 0); -+ n--; -+ if (n > 0) -+ acquire(n); - } - - void GtkYieldMutex::ThreadsLeave() - { -- assert(m_nCount != 0); -+ const bool bLeaveWithoutEnter = m_nCount == 0; -+ SAL_WARN_IF(bLeaveWithoutEnter, "vcl.gtk", "gdk_threads_leave without matching gdk_threads_enter"); - yieldCounts.push(m_nCount); -+ if G_UNLIKELY(bLeaveWithoutEnter) // this ideally shouldn't happen, but can due to the gtk3 file dialog -+ return; - release(true); - } - --- -2.31.1 - diff --git a/0001-math.desktop-include-Spreadsheet-category.patch b/0001-math.desktop-include-Spreadsheet-category.patch deleted file mode 100644 index 2969ea8..0000000 --- a/0001-math.desktop-include-Spreadsheet-category.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f586051919d047e2b67d32637817c3d96a898494 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Wed, 9 Jun 2021 09:13:23 +0100 -Subject: [PATCH] math.desktop include "Spreadsheet" category - -but it's not a spreadsheet - -since... - -commit dad7fe7227fb80a32d3c2c777584dc9d74b9e929 -Date: Thu Jan 2 16:16:55 2014 +0100 - - Fix math categories to make SUSE rpm check happy - -Change-Id: I0397ea12cd7f29f4b0c1f0e0ad76a3429b55c455 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116884 -Tested-by: Jenkins -Reviewed-by: Adolfo Jayme Barrientos -(cherry picked from commit 2df2ce1b51d13bc9e203fab1b7eb3c88c906588c) ---- - sysui/desktop/menus/math.desktop | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop -index d2391be5c234..5a8192ae4abc 100644 ---- a/sysui/desktop/menus/math.desktop -+++ b/sysui/desktop/menus/math.desktop -@@ -21,7 +21,7 @@ Terminal=false - NoDisplay=false - Icon=math - Type=Application --Categories=Office;Spreadsheet;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other; -+Categories=Office;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other; - Exec=${UNIXBASISROOTNAME} --math %%FILE%% - MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.oasis.opendocument.formula-template;text/mathml;application/mathml+xml; - Name=%PRODUCTNAME Math --- -2.31.1 - diff --git a/0001-rhbz-1918152-fix-FTBFS.patch b/0001-rhbz-1918152-fix-FTBFS.patch deleted file mode 100644 index b2502d1..0000000 --- a/0001-rhbz-1918152-fix-FTBFS.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8b8a49e14c1010c5ab325b64fc3b65524a6a6049 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Wed, 20 Jan 2021 09:19:25 +0000 -Subject: [PATCH] rhbz#1918152 fix FTBFS - -Change-Id: I5c03c810d3b2572b0e58c62293add49bd7025e70 ---- - vcl/source/gdi/bitmap3.cxx | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx -index ec80b03c6008..8ea5c31bee3e 100644 ---- a/vcl/source/gdi/bitmap3.cxx -+++ b/vcl/source/gdi/bitmap3.cxx -@@ -17,8 +17,6 @@ - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - --#include -- - #include - #include - #include --- -2.28.0 - diff --git a/0001-rhbz-1980800-allow-convert-to-csv-to-write-each-shee.patch b/0001-rhbz-1980800-allow-convert-to-csv-to-write-each-shee.patch deleted file mode 100644 index b1224ac..0000000 --- a/0001-rhbz-1980800-allow-convert-to-csv-to-write-each-shee.patch +++ /dev/null @@ -1,428 +0,0 @@ -From aec3e189e6e9aa1eb2fe91cbb1c46f308b074cd5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Tue, 13 Jul 2021 12:38:07 +0100 -Subject: [PATCH] rhbz#1980800 allow --convert-to csv to write each sheet to a - separate file - -Related: tdf#135762 except only currently implemented for command line use - -sample usage: -soffice --convert-to csv:"Text - txt - csv (StarCalc)":44,34,UTF8,1,,0,false,true,false,false,false,-1 sample.ods -where the new (11th!) final token ("-1") enables writing each sheet to a -new file based on the suggested target name so output in this example -is files sample-Sheet1.csv and sample-Sheet2.csv - -Only -1 for 'all sheets' vs 0 for existing 'current sheet only' (which -is always sheet 0 from the command line) are currently options but the -token could be expanded in the future to select specific sheets to -export. - -Change-Id: Ib99a120f1a2c8d1008a7a3c59a6b39f572fb346e -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118850 -Tested-by: Jenkins -Reviewed-by: Eike Rathke -(cherry picked from commit b8903bc106dad036acb3d117e5c4fc955697fe02) - -Related: tdf#135762 Allow --convert-to csv to specify 1-based sheet number - -Same multifile mechanism as for -1 all sheets is used, so - -soffice --convert-to csv:"Text - txt - csv (StarCalc)":44,34,UTF8,1,,0,false,true,false,false,false,2 sample.ods - -writes a file sample-Sheet2.csv - -Change-Id: Ib9248c9561e4e340c88458ac5dfd159e443a4cfd -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118971 -Reviewed-by: Eike Rathke -Tested-by: Jenkins -(cherry picked from commit fda91f8be16ba760e360940ebafd6244c648cb8c) - -Related: tdf#135762 Suppress cout if not command line - -Change-Id: I9431221aadf97739bb197871f25fa151ef4c391c -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119294 -Reviewed-by: Eike Rathke -Tested-by: Jenkins -(cherry picked from commit 0cda081c9aa3b3dcb363f97bac60c845ce9a13e0) ---- - desktop/source/app/dispatchwatcher.cxx | 50 +++++++-- - sc/source/ui/dbgui/imoptdlg.cxx | 16 ++- - sc/source/ui/docshell/docsh.cxx | 141 +++++++++++++++++++++---- - sc/source/ui/inc/docsh.hxx | 2 +- - sc/source/ui/inc/imoptdlg.hxx | 6 +- - 5 files changed, 179 insertions(+), 36 deletions(-) - -diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx -index 50b92ecb7834..3df4f34ccf83 100644 ---- a/desktop/source/app/dispatchwatcher.cxx -+++ b/desktop/source/app/dispatchwatcher.cxx -@@ -30,6 +30,7 @@ - #include "officeipcthread.hxx" - #include - #include -+#include - #include - #include - #include -@@ -598,6 +599,8 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector conversionProperties( nProps ); -- conversionProperties[0].Name = "Overwrite"; -- conversionProperties[0].Value <<= true; -+ conversionProperties[0].Name = "ConversionRequestOrigin"; -+ conversionProperties[0].Value <<= OUString("CommandLine"); -+ conversionProperties[1].Name = "Overwrite"; -+ conversionProperties[1].Value <<= true; - -- conversionProperties[1].Name = "FilterName"; -+ conversionProperties[2].Name = "FilterName"; - if( 0 < nFilterOptionsIndex ) - { -- conversionProperties[1].Value <<= aFilter.copy(0, nFilterOptionsIndex); -+ OUString sFilterName = aFilter.copy(0, nFilterOptionsIndex); -+ OUString sFilterOptions = aFilter.copy(nFilterOptionsIndex + 1); -+ -+ if (sFilterName == "Text - txt - csv (StarCalc)") -+ { -+ sal_Int32 nIdx(0); -+ // If the 11th token is '-1' then we export a file -+ // per sheet where the file name is based on the suggested -+ // output filename concatenated with the sheet name, so adjust -+ // the output and overwrite messages -+ // If the 11th token is not present or numeric 0 then the -+ // default sheet is exported with the output filename. If it -+ // is numeric >0 then that sheet (1-based) with the output -+ // filename concatenated with the sheet name. So even if -+ // that is a single file, the multi file target mechanism is -+ // used. -+ const OUString aTok(sFilterOptions.getToken(11, ',', nIdx)); -+ // Actual validity is checked in Calc, here just check for -+ // presence of numeric value at start. -+ bMultiFileTarget = (!aTok.isEmpty() && aTok.toInt32() != 0); -+ } -+ -+ conversionProperties[2].Value <<= sFilterName; - -- conversionProperties[2].Name = "FilterOptions"; -- conversionProperties[2].Value <<= aFilter.copy(nFilterOptionsIndex + 1); -+ conversionProperties[3].Name = "FilterOptions"; -+ conversionProperties[3].Value <<= sFilterOptions; - } - else - { -- conversionProperties[1].Value <<= aFilter; -+ conversionProperties[2].Value <<= aFilter; - } - - if ( !aImgOut.isEmpty() ) - { -+ assert(conversionProperties[nProps-1].Name.isEmpty()); - conversionProperties[nProps-1].Name = "ImageFilter"; - conversionProperties[nProps-1].Value <<= aImgOut; - } -@@ -639,9 +667,11 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector " << aTargetURL8; -+ std::cout << "convert " << aSource8; -+ if (!bMultiFileTarget) -+ std::cout << " -> " << aTargetURL8; - std::cout << " using filter : " << OUStringToOString(aFilter, osl_getThreadTextEncoding()) << std::endl; -- if (FStatHelper::IsDocument(aOutFile)) -+ if (!bMultiFileTarget && FStatHelper::IsDocument(aOutFile)) - std::cout << "Overwriting: " << OUStringToOString(aTempName, osl_getThreadTextEncoding()) << std::endl ; - } - try -diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx -index 071f1b0257bc..a362e4df0ee7 100644 ---- a/sc/source/ui/dbgui/imoptdlg.cxx -+++ b/sc/source/ui/dbgui/imoptdlg.cxx -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -43,6 +44,7 @@ ScImportOptions::ScImportOptions( const OUString& rStr ) - bSaveNumberAsSuch = true; - bSaveFormulas = false; - bRemoveSpace = false; -+ nSheetToExport = 0; - sal_Int32 nTokenCount = comphelper::string::getTokenCount(rStr, ','); - if ( nTokenCount < 3 ) - return; -@@ -77,6 +79,16 @@ ScImportOptions::ScImportOptions( const OUString& rStr ) - bSaveFormulas = rStr.getToken(0, ',', nIdx) == "true"; - if ( nTokenCount >= 11 ) - bRemoveSpace = rStr.getToken(0, ',', nIdx) == "true"; -+ if ( nTokenCount >= 12 ) -+ { -+ const OUString aTok(rStr.getToken(0, ',', nIdx)); -+ if (aTok == "-1") -+ nSheetToExport = -1; // all -+ else if (aTok.isEmpty() || CharClass::isAsciiNumeric(aTok)) -+ nSheetToExport = aTok.toInt32(); -+ else -+ nSheetToExport = -23; // invalid, force error -+ } - } - } - -@@ -99,7 +111,9 @@ OUString ScImportOptions::BuildString() const - "," + - OUString::boolean( bSaveFormulas ) + // "save formulas": not in ScAsciiOptions - "," + -- OUString::boolean( bRemoveSpace ); // same as "Remove space" in ScAsciiOptions -+ OUString::boolean( bRemoveSpace ) + // same as "Remove space" in ScAsciiOptions -+ "," + -+ OUString::number(nSheetToExport) ; // Only available for command line --convert-to - - return aResult; - } -diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx -index 91020db0b2e0..5fdfddd0c89b 100644 ---- a/sc/source/ui/docshell/docsh.cxx -+++ b/sc/source/ui/docshell/docsh.cxx -@@ -44,6 +44,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -119,6 +120,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -1925,7 +1927,7 @@ void escapeTextSep(sal_Int32 nPos, const StrT& rStrDelim, StrT& rStr) - - } - --void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt ) -+void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt, SCTAB nTab ) - { - sal_Unicode cDelim = rAsciiOpt.nFieldSepCode; - sal_Unicode cStrDelim = rAsciiOpt.nTextSepCode; -@@ -1971,7 +1973,6 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt - - SCCOL nStartCol = 0; - SCROW nStartRow = 0; -- SCTAB nTab = GetSaveTab(); - SCCOL nEndCol; - SCROW nEndRow; - m_aDocument.GetCellArea( nTab, nEndCol, nEndRow ); -@@ -2389,35 +2390,129 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed ) - } - else if (aFltName == pFilterAscii) - { -- SvStream* pStream = rMed.GetOutStream(); -- if (pStream) -+ OUString sItStr; -+ SfxItemSet* pSet = rMed.GetItemSet(); -+ const SfxPoolItem* pItem; -+ if ( pSet && SfxItemState::SET == -+ pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) ) - { -- OUString sItStr; -- SfxItemSet* pSet = rMed.GetItemSet(); -- const SfxPoolItem* pItem; -- if ( pSet && SfxItemState::SET == -- pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) ) -+ sItStr = static_cast(pItem)->GetValue(); -+ } -+ -+ if ( sItStr.isEmpty() ) -+ { -+ // default for ascii export (from API without options): -+ // ISO8859-1/MS_1252 encoding, comma, double quotes -+ -+ ScImportOptions aDefOptions( ',', '"', RTL_TEXTENCODING_MS_1252 ); -+ sItStr = aDefOptions.BuildString(); -+ } -+ -+ weld::WaitObject aWait( GetActiveDialogParent() ); -+ ScImportOptions aOptions( sItStr ); -+ -+ if (aOptions.nSheetToExport) -+ { -+ // Only from command line --convert-to -+ bRet = true; -+ -+ // Verbose only from command line, not UI (in case we actually -+ // implement that) nor macro filter options. -+ bool bVerbose = false; -+ const css::uno::Sequence & rArgs = rMed.GetArgs(); -+ const auto pProp = std::find_if( rArgs.begin(), rArgs.end(), -+ [](const css::beans::PropertyValue& rProp) { return rProp.Name == "ConversionRequestOrigin"; }); -+ if (pProp != rArgs.end()) - { -- sItStr = static_cast(pItem)->GetValue(); -+ OUString aOrigin; -+ pProp->Value >>= aOrigin; -+ bVerbose = (aOrigin == "CommandLine"); - } - -- if ( sItStr.isEmpty() ) -+ SCTAB nStartTab; -+ SCTAB nCount = m_aDocument.GetTableCount(); -+ if (aOptions.nSheetToExport == -1) - { -- // default for ascii export (from API without options): -- // ISO8859-1/MS_1252 encoding, comma, double quotes -- -- ScImportOptions aDefOptions( ',', '"', RTL_TEXTENCODING_MS_1252 ); -- sItStr = aDefOptions.BuildString(); -+ // All sheets. -+ nStartTab = 0; -+ } -+ else if (0 < aOptions.nSheetToExport && aOptions.nSheetToExport <= nCount) -+ { -+ // One sheet, 1-based. -+ nCount = aOptions.nSheetToExport; -+ nStartTab = nCount - 1; -+ } -+ else -+ { -+ // Usage error, no export but log. -+ if (bVerbose) -+ { -+ if (aOptions.nSheetToExport < 0) -+ std::cout << "Bad sheet number string given." << std::endl; -+ else -+ std::cout << "No sheet number " << aOptions.nSheetToExport -+ << ", number of sheets is " << nCount << std::endl; -+ } -+ nStartTab = 0; -+ nCount = 0; -+ SetError(SCERR_EXPORT_DATA); -+ bRet = false; - } - -- weld::WaitObject aWait( GetActiveDialogParent() ); -- ScImportOptions aOptions( sItStr ); -- AsciiSave( *pStream, aOptions ); -- bRet = true; -+ INetURLObject aURLObject(rMed.GetURLObject()); -+ OUString sExt = aURLObject.CutExtension(); -+ OUString sBaseName = aURLObject.GetLastName(); -+ aURLObject.CutLastName(); - -- if (m_aDocument.GetTableCount() > 1) -- if (!rMed.GetError()) -- rMed.SetError(SCWARN_EXPORT_ASCII); -+ for (SCTAB i = nStartTab; i < nCount; ++i) -+ { -+ OUString sTabName; -+ if (!m_aDocument.GetName(i, sTabName)) -+ sTabName = OUString::number(i); -+ INetURLObject aSheetURLObject(aURLObject); -+ OUString sFileName = sBaseName + "-" + sTabName; -+ if (!sExt.isEmpty()) -+ sFileName = sFileName + "." + sExt; -+ aSheetURLObject.Append(sFileName); -+ -+ // log similar to DispatchWatcher::executeDispatchRequests -+ OUString aOutFile = aSheetURLObject.GetMainURL(INetURLObject::DecodeMechanism::NONE); -+ if (bVerbose) -+ { -+ OUString aDisplayedName; -+ if (osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL(aOutFile, aDisplayedName)) -+ aDisplayedName = aOutFile; -+ std::cout << "Writing sheet " << OUStringToOString(sTabName, osl_getThreadTextEncoding()) << " -> " -+ << OUStringToOString(aDisplayedName, osl_getThreadTextEncoding()) -+ << std::endl; -+ -+ if (FStatHelper::IsDocument(aOutFile)) -+ std::cout << "Overwriting: " << OUStringToOString(aDisplayedName, osl_getThreadTextEncoding()) -+ << std::endl ; -+ } -+ -+ std::unique_ptr xStm = ::utl::UcbStreamHelper::CreateStream(aOutFile, StreamMode::TRUNC | StreamMode::WRITE); -+ if (!xStm) -+ { -+ SetError(ERRCODE_IO_CANTCREATE); -+ bRet = false; -+ break; -+ } -+ AsciiSave(*xStm, aOptions, i); -+ } -+ } -+ else -+ { -+ SvStream* pStream = rMed.GetOutStream(); -+ if (pStream) -+ { -+ AsciiSave(*pStream, aOptions, GetSaveTab()); -+ bRet = true; -+ -+ if (m_aDocument.GetTableCount() > 1) -+ if (!rMed.GetError()) -+ rMed.SetError(SCWARN_EXPORT_ASCII); -+ } - } - } - else if (aFltName == pFilterDBase) -diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx -index 41c0b30a42a8..3aa5f6caf311 100644 ---- a/sc/source/ui/inc/docsh.hxx -+++ b/sc/source/ui/inc/docsh.hxx -@@ -227,7 +227,7 @@ public: - - ScDrawLayer* MakeDrawLayer(); - -- void AsciiSave( SvStream& rStream, const ScImportOptions& rOpt ); -+ void AsciiSave( SvStream& rStream, const ScImportOptions& rOpt, SCTAB nTab ); - - void Execute( SfxRequest& rReq ); - void GetState( SfxItemSet &rSet ); -diff --git a/sc/source/ui/inc/imoptdlg.hxx b/sc/source/ui/inc/imoptdlg.hxx -index bac941c2a377..382067d67813 100644 ---- a/sc/source/ui/inc/imoptdlg.hxx -+++ b/sc/source/ui/inc/imoptdlg.hxx -@@ -32,7 +32,8 @@ public: - ScImportOptions( sal_Unicode nFieldSep, sal_Unicode nTextSep, rtl_TextEncoding nEnc ) - : nFieldSepCode(nFieldSep), nTextSepCode(nTextSep), - bFixedWidth(false), bSaveAsShown(false), bQuoteAllText(false), -- bSaveNumberAsSuch(true), bSaveFormulas(false), bRemoveSpace(false) -+ bSaveNumberAsSuch(true), bSaveFormulas(false), bRemoveSpace(false), -+ nSheetToExport(0) - { SetTextEncoding( nEnc ); } - - ScImportOptions& operator=( const ScImportOptions& rCpy ) = default; -@@ -51,6 +52,9 @@ public: - bool bSaveNumberAsSuch; - bool bSaveFormulas; - bool bRemoveSpace; -+ // "0" for 'current sheet', "-1" for all sheets (each to a separate file), -+ // or 1-based specific sheet number (to a separate file). -+ sal_Int32 nSheetToExport; - }; - - #endif // INCLUDED_SC_SOURCE_UI_INC_IMOPTDLG_HXX --- -2.31.1 - diff --git a/libreoffice.spec b/libreoffice.spec index 8c11010..c5343de 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%global libo_version 7.1.5 +%global libo_version 7.2.0 # Should contain .alphaX / .betaX, if this is pre-release (actually # pre-RC) version. The pre-release string is part of tarball file names, # so we need a way to define it easily at one place. @@ -49,8 +49,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.2 -Release: 5%{?libo_prerelease}%{?dist} +Version: %{libo_version}.3 +Release: 1%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -129,7 +129,6 @@ BuildRequires: fontpackages-devel %ifnarch s390x BuildRequires: firebird-devel %endif -BuildRequires: libqrcodegencpp-devel %endif BuildRequires: glm-devel BuildRequires: hyphen-devel @@ -250,17 +249,9 @@ Patch1: 0001-disble-tip-of-the-day-dialog-by-default.patch # rhbz#1736810 disable opencl by default again Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch # backported -Patch3: 0001-fix-detecting-qrcodegen.patch -Patch4: 0001-rhbz-1918152-fix-FTBFS.patch -Patch5: 0001-Get-rid-of-apache-commons-logging.patch -Patch6: 0001-gtk3-workaround-missing-gdk_threads_enter-calls-in-e.patch -Patch7: 0001-Replace-inet_ntoa-with-inet_ntop.patch -Patch8: 0001-Simplify-construction-of-a-hardcoded-IPv4-address.patch -Patch9: 0001-Remove-unused-DOCTYPE-from-odk-examples-xcu-file.patch -Patch10: 0001-math.desktop-include-Spreadsheet-category.patch -Patch11: 0001-rhbz-1980800-allow-convert-to-csv-to-write-each-shee.patch -Patch12: 0001-make-with-idlc-cpp-cpp-work-for-gcc-cpp-as-a-ucpp-re.patch -Patch13: 0001-Resolves-tdf-132739-two-style-tags-where-there-shoul.patch +Patch3: 0001-make-with-idlc-cpp-cpp-work-for-gcc-cpp-as-a-ucpp-re.patch +Patch4: 0001-Resolves-tdf-132739-two-style-tags-where-there-shoul.patch +Patch5: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch @@ -1063,7 +1054,7 @@ export CFLAGS=$ARCH_FLAGS export CXXFLAGS=$ARCH_FLAGS %if 0%{?rhel} -%define distrooptions --disable-eot --disable-scripting-beanshell --disable-scripting-javascript --disable-firebird-sdbc --disable-qrcodegen +%define distrooptions --disable-eot --disable-scripting-beanshell --disable-scripting-javascript --disable-firebird-sdbc %else # fedora %ifarch s390x @@ -1108,8 +1099,8 @@ touch autogen.lastrun --enable-evolution2 \ --enable-ext-nlpsolver \ --enable-ext-wiki-publisher \ - --enable-gtk3 \ --enable-introspection \ + --enable-odk \ --enable-release-build \ --enable-scripting-beanshell \ --enable-scripting-javascript \ @@ -1127,12 +1118,19 @@ touch autogen.lastrun --with-gdrive-client-id="457862564325.apps.googleusercontent.com" \ --enable-python=system \ --with-idlc-cpp=cpp \ + --disable-zxing \ %{distrooptions} \ %{?bundling_options} \ %{?archoptions} \ %{?flatpakoptions} -make verbose=true build-nocheck +if ! make verbose=true build-nocheck; then + echo "build attempt 1 failed" + if ! make verbose=true build-nocheck; then + echo "build attempt 2 failed" + make verbose=true GMAKE_OPTIONS=-rj1 build-nocheck + fi +fi #generate the icons and mime type stuff export DESTDIR=../output @@ -1600,7 +1598,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libemfiolo.so %{baseinstdir}/program/libevoab*.so %{baseinstdir}/program/libevtattlo.so -%{baseinstdir}/program/libgielo.so %{baseinstdir}/program/libicglo.so %{baseinstdir}/program/libindex_data.so %{baseinstdir}/program/libfilelo.so @@ -1617,7 +1614,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/liblocaledata_es.so %{baseinstdir}/program/liblocaledata_euro.so %{baseinstdir}/program/liblocaledata_others.so -%{baseinstdir}/program/libmorklo.so %{baseinstdir}/program/libmozbootstraplo.so %{baseinstdir}/program/libmsfilterlo.so %{baseinstdir}/program/libmtfrendererlo.so @@ -2175,6 +2171,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/pythonloader.unorc %{baseinstdir}/program/pythonscript.py* %{baseinstdir}/program/pyuno.so +%{baseinstdir}/program/scriptforge.py* %{baseinstdir}/program/services/pyuno.rdb %{baseinstdir}/program/services/scriptproviderforpython.rdb %{baseinstdir}/program/wizards @@ -2260,6 +2257,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Sat Aug 14 2021 Caolán McNamara - 1:7.2.0.3-1 +- upgrade to 7.2.0 + * Thu Aug 12 2021 Caolán McNamara - 1:7.1.5.2-5 - replace use of ucpp with gcc cpp - Resolves: tdf#132739 two html style tags where there should be just one diff --git a/sources b/sources index d7200a8..18545f7 100644 --- a/sources +++ b/sources @@ -7,9 +7,9 @@ SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838d SHA512 (f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = 6a6d131dad5191614950a49323ae6d9385afe331983c1c85fde82ce6ee816051d95dde9ef90658b8f0a8a0a21754e72ff724bf41f6b96c046b7b4c2660f7095b SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd SHA512 (dtoa-20180411.tgz) = 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85 -SHA512 (libreoffice-7.1.5.2.tar.xz) = dad5ffd344a7bad88ed8e77df4fb17b42237715e7b1feb7a7de164f2fbf6698feefedeb57974d8275067a06c0da60e9b07a333ccc1bb2f6d55a6b52408bd9b5f -SHA512 (libreoffice-7.1.5.2.tar.xz.asc) = e29e66ef185a1404f60b153629c54676a5dbc2a8b028ee48b80984425e582293100145d5468231b27c96ca0c8d030cda2ad2b02f4d60a9c977fedfab6cc7f8f4 -SHA512 (libreoffice-help-7.1.5.2.tar.xz) = c669b6c4bfc3c6f46e4ee0bf86b158054f7178b9785273d9aba8183236b2ff6dbaf5584d5e4fb09bba3a8d010373599e7473a4ba15c229087c689198ceeee1c7 -SHA512 (libreoffice-help-7.1.5.2.tar.xz.asc) = d1717cc6871684ba00347247242b8b9d4ae2b54e23f08a874db026ff478c31ffe8f60b8260267bb7b39e54eafa42e64965ebf6e9e667bafb42350e12dfcb2260 -SHA512 (libreoffice-translations-7.1.5.2.tar.xz.asc) = 16c78d49e1a770e9daa631888eeb951dc7dd308585dcd23165c75e09c256d5b526630149c48add7885b7de2d20041105bcd6faece2cf753efc630514a4bf1bc6 -SHA512 (libreoffice-translations-7.1.5.2.tar.xz) = 0c1fc68930131568e561ed7e5456ce38415c7dd516acff3060a81513ae34361979a4348f7d14796445afff9eae934c7e817e2b506c7971b4fbd2c03468717344 +SHA512 (libreoffice-7.2.0.3.tar.xz) = 8a10f5b619d8cd6dabe388a29249d4369e70da549e132a3dce30576e47c5be27ac92b7e59b03cc963975ea3bb00339800b49a9cb875aa6ac4f22a6cff391b19b +SHA512 (libreoffice-7.2.0.3.tar.xz.asc) = 925b6961dc187b4af7732beb2b6be8f60bc008e5192f222c891e136f1925bff9c4d0556cfa28e7b4a8d4b54a4f83935c1eb7a514552c39632727c57762195cfe +SHA512 (libreoffice-help-7.2.0.3.tar.xz) = ec9607191e7ae5faaf1e399ab3cba06bfe3d24f29111753a5799d4a46c8ee48fb4f38aa1206cdd9013229eccec27c88cdbdac378c90aae0c5fc312a866c4ba75 +SHA512 (libreoffice-help-7.2.0.3.tar.xz.asc) = 1826d300562d9321c921b8470d5e283b4e018cd83e89424efe01571ed5e6b1a96d81fb21741bfaf60308a8a6c4a1c8cf43776da758f557307ba82715f4bb563e +SHA512 (libreoffice-translations-7.2.0.3.tar.xz) = ffbb29cfd340767c1cd9ab80a841c0b8fcb5024fc86b360b863f0ee3e305c0ad1b6f853580255566890bcf1d7e69d3c03f004a4c43573f8daddcdd2f593caf26 +SHA512 (libreoffice-translations-7.2.0.3.tar.xz.asc) = 7d3d853dc60b79566d3d855cf70a98bbcf9b22982de857358e6b3e301c60f0e53861552b81ee1101ea9808388234696d023f6d413420dde353d01b6c9a3dd39e