[arch-commits] Commit in libreoffice-still/repos/extra-x86_64 (14 files)

Andreas Radke andyrtr at archlinux.org
Sat May 2 08:54:57 UTC 2020


    Date: Saturday, May 2, 2020 @ 08:54:57
  Author: andyrtr
Revision: 382133

archrelease: copy trunk to extra-x86_64

Added:
  libreoffice-still/repos/extra-x86_64/0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch
    (from rev 382132, libreoffice-still/trunk/0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch)
  libreoffice-still/repos/extra-x86_64/PKGBUILD
    (from rev 382132, libreoffice-still/trunk/PKGBUILD)
  libreoffice-still/repos/extra-x86_64/libreoffice-poppler-0.86.patch
    (from rev 382132, libreoffice-still/trunk/libreoffice-poppler-0.86.patch)
  libreoffice-still/repos/extra-x86_64/libreoffice-still.csh
    (from rev 382132, libreoffice-still/trunk/libreoffice-still.csh)
  libreoffice-still/repos/extra-x86_64/libreoffice-still.sh
    (from rev 382132, libreoffice-still/trunk/libreoffice-still.sh)
  libreoffice-still/repos/extra-x86_64/make-pyuno-work-with-system-wide-module-install.diff
    (from rev 382132, libreoffice-still/trunk/make-pyuno-work-with-system-wide-module-install.diff)
  libreoffice-still/repos/extra-x86_64/soffice-template.desktop.in
    (from rev 382132, libreoffice-still/trunk/soffice-template.desktop.in)
Deleted:
  libreoffice-still/repos/extra-x86_64/0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch
  libreoffice-still/repos/extra-x86_64/PKGBUILD
  libreoffice-still/repos/extra-x86_64/libreoffice-poppler-0.86.patch
  libreoffice-still/repos/extra-x86_64/libreoffice-still.csh
  libreoffice-still/repos/extra-x86_64/libreoffice-still.sh
  libreoffice-still/repos/extra-x86_64/make-pyuno-work-with-system-wide-module-install.diff
  libreoffice-still/repos/extra-x86_64/soffice-template.desktop.in

--------------------------------------------------------+
 0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch | 1242 +++++++--------
 PKGBUILD                                               |  760 ++++-----
 libreoffice-poppler-0.86.patch                         |   30 
 libreoffice-still.csh                                  |   16 
 libreoffice-still.sh                                   |   16 
 make-pyuno-work-with-system-wide-module-install.diff   |   36 
 soffice-template.desktop.in                            |   14 
 7 files changed, 1057 insertions(+), 1057 deletions(-)

Deleted: 0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch
===================================================================
--- 0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch	2020-05-02 08:54:34 UTC (rev 382132)
+++ 0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch	2020-05-02 08:54:57 UTC (rev 382133)
@@ -1,621 +0,0 @@
-From 8f5dd7babe306a1c9dcdec93372a3d4378e09667 Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei at libreoffice.org>
-Date: Mon, 12 Aug 2019 13:57:34 -0400
-Subject: [PATCH] Switch mdds to 1.5.0 and liborcus to 0.15.0.
-
-Change-Id: Ibff9a5e0f0771e4cf12b4dc3985661a01195e265
-Reviewed-on: https://gerrit.libreoffice.org/77482
-Tested-by: Jenkins
-Reviewed-by: Kohei Yoshida <kohei at libreoffice.org>
-(cherry picked from commit 56ffe3c0a1261cd98a3d42b8b08d5f8eb013ead4)
-
-Correctly pack mdds 1.5.0.
-
-Turns out the earlier mdds 1.5.0 package was not correctly packaged.
-I've fixed that now, and re-published the 1.5.0 package, which does
-contain the patch from Lubos.
-
-Change-Id: I1ff7d6568568860f7cccd3be3bc29aaaebe7fd73
-Reviewed-on: https://gerrit.libreoffice.org/77483
-Tested-by: Jenkins
-Reviewed-by: Kohei Yoshida <kohei at libreoffice.org>
-(cherry picked from commit 1c59fed7c43654736775580799f1165e8b8740a0)
-
-Fix linking of newly created element in liborcus 0.15.0
-
-After 56ffe3c0a1261cd98a3d42b8b08d5f8eb013ead4 "Switch mdds to 1.5.0 and
-liborcus to 0.15.0", CppunitTest_sc_dataprovider started to fail in ASan builds
-with
-
-> ERROR: AddressSanitizer: new-delete-type-mismatch on 0x6060005b9340 in thread T4 (XML Fetch Threa):
->   object passed to delete has wrong type:
->   size of the allocated type:   56 bytes;
->   size of the deallocated type: 16 bytes.
->  #0 in operator delete(void*, unsigned long) at llvm-project/compiler-rt/lib/asan/asan_new_delete.cpp:172:3
->  #1 in orcus::xml_map_tree::element::~element() at workdir/UnpackedTarball/liborcus/src/liborcus/xml_map_tree.cpp:238:13
-[...]
->  #25 in std::unique_ptr<orcus::orcus_xml::impl, std::default_delete<orcus::orcus_xml::impl> >::~unique_ptr()
->  #26 in orcus::orcus_xml::~orcus_xml() at workdir/UnpackedTarball/liborcus/src/liborcus/orcus_xml.cpp:530:26
->  #27 in ScOrcusXMLContextImpl::importXML(ScOrcusImportXMLParam const&) at sc/source/filter/orcus/xmlcontext.cxx:286:5
-[...]
-> 0x6060005b9340 is located 0 bytes inside of 56-byte region [0x6060005b9340,0x6060005b9378)
-> allocated by thread T4 (XML Fetch Threa) here:
->  #0 in operator new(unsigned long) at llvm-project/compiler-rt/lib/asan/asan_new_delete.cpp:99:3
->  #1 in orcus::xml_map_tree::element::element(char const*, orcus::pstring const&, orcus::xml_map_tree::element_type, orcus::xml_map_tree::reference_type) at workdir/UnpackedTarball/liborcus/src/liborcus/xml_map_tree.cpp:203:26
->  #2 in std::unique_ptr<orcus::xml_map_tree::element, std::default_delete<orcus::xml_map_tree::element> > orcus::make_unique<orcus::xml_map_tree::element, char const*&, orcus::pstring, orcus::xml_map_tree::element_type, orcus::xml_map_tree::reference_type>(char const*&, orcus::pstring&&, orcus::xml_map_tree::element_type&&, orcus::xml_map_tree::reference_type&&) at workdir/UnpackedTarball/liborcus/src/liborcus/../../include/orcus/global.hpp:61:35
->  #3 in orcus::xml_map_tree::element::get_or_create_child(orcus::string_pool&, char const*, orcus::pstring const&) at workdir/UnpackedTarball/liborcus/src/liborcus/xml_map_tree.cpp:271:9
->  #4 in orcus::xml_map_tree::get_linked_node(orcus::pstring const&, orcus::xml_map_tree::reference_type) at workdir/UnpackedTarball/liborcus/src/liborcus/xml_map_tree.cpp:722:31
-[...]
-
-Change-Id: Iad8e06ead6f2655a3e26ceeab368e9b50028402f
-Reviewed-on: https://gerrit.libreoffice.org/77519
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
-(cherry picked from commit ffdc97898b145c9b0cebd22f0393da2c27e17a47)
-
-external/liborcus/version.patch.0 is gone
-
-...since 56ffe3c0a1261cd98a3d42b8b08d5f8eb013ead4 "Switch mdds to 1.5.0 and
-liborcus to 0.15.0."
-
-Change-Id: I03c5336bbaf65a13f883a30a3fc4238b140a9cef
-Reviewed-on: https://gerrit.libreoffice.org/77521
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
-(cherry picked from commit 6c286f807c03321a79f8aaa98c6a785da005d619)
----
- RepositoryExternal.mk                         |  4 +-
- configure.ac                                  |  4 +-
- ...1-Prevent-unsigned-integer-underflow.patch | 27 ---------
- external/liborcus/ExternalPackage_liborcus.mk |  8 +--
- external/liborcus/ExternalProject_liborcus.mk |  4 +-
- external/liborcus/Library_orcus-parser.mk     |  2 +
- external/liborcus/Library_orcus.mk            |  7 +++
- external/liborcus/UnpackedTarball_liborcus.mk |  7 +--
- external/liborcus/create-element.patch.0      | 55 +++++++++++++++++++
- external/liborcus/version.patch.0             | 11 ----
- external/mdds/UnpackedTarball_mdds.mk         |  1 -
- .../mdds/use-position-hint-also-back.patch    | 50 -----------------
- sc/inc/mtvelements.hxx                        |  8 +--
- sc/inc/orcusxml.hxx                           |  1 +
- sc/qa/unit/dataproviders_test.cxx             |  1 +
- sc/source/core/tool/scmatrix.cxx              |  8 +--
- sc/source/filter/inc/orcusinterface.hxx       |  2 +
- sc/source/filter/orcus/interface.cxx          |  8 ++-
- sc/source/filter/orcus/orcusfiltersimpl.cxx   |  4 +-
- sc/source/filter/orcus/xmlcontext.cxx         |  9 ++-
- sc/source/ui/xmlsource/xmlsourcedlg.cxx       |  6 ++
- svl/source/misc/gridprinter.cxx               |  2 +-
- 23 files changed, 114 insertions(+), 123 deletions(-)
- delete mode 100644 external/liborcus/0001-Prevent-unsigned-integer-underflow.patch
- create mode 100644 external/liborcus/create-element.patch.0
- delete mode 100644 external/liborcus/version.patch.0
- delete mode 100644 external/mdds/use-position-hint-also-back.patch
-
-diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
-index a75ca5097b62..1c6c0c59538b 100644
---- a/RepositoryExternal.mk
-+++ b/RepositoryExternal.mk
-@@ -3262,7 +3262,7 @@ $(call gb_LinkTarget_set_include,$(1),\
- )
- 
- $(call gb_LinkTarget_add_libs,$(1),\
--       -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.14 \
-+       -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.15 \
- )
- 
- $(if $(SYSTEM_BOOST), \
-@@ -3281,7 +3281,7 @@ $(call gb_LinkTarget_set_include,$(1),\
- )
- 
- $(call gb_LinkTarget_add_libs,$(1),\
--	-L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.14 \
-+	-L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.15 \
- )
- 
- endef
-diff --git a/configure.ac b/configure.ac
-index c77ce67f332b..9863d02a48c6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -9250,7 +9250,7 @@ AC_SUBST(SYSTEM_BOOST)
- dnl ===================================================================
- dnl Check for system mdds
- dnl ===================================================================
--libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.4 >= 1.4.1], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
-+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.5 >= 1.5.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
- 
- dnl ===================================================================
- dnl Check for system glm
-@@ -9556,7 +9556,7 @@ AC_SUBST(ENABLE_FUZZERS)
- dnl ===================================================================
- dnl Orcus
- dnl ===================================================================
--libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.14 >= 0.14.0])
-+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.15 >= 0.15.0])
- if test "$with_system_orcus" != "yes"; then
-     if test "$SYSTEM_BOOST" = "TRUE"; then
-         # ===========================================================
-diff --git a/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch b/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch
-deleted file mode 100644
-index 3353857a2d10..000000000000
---- a/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch
-+++ /dev/null
-@@ -1,27 +0,0 @@
--From 1967be013804f4f578b53659d7ef459b4c35de9f Mon Sep 17 00:00:00 2001
--From: Kohei Yoshida <kohei.yoshida at gmail.com>
--Date: Wed, 7 Nov 2018 21:08:40 -0500
--Subject: [PATCH] Prevent unsigned integer underflow.
--
--(cherry picked from commit 40bbce85048b77c545103af124f3d9831dd4a458)
-----
-- src/parser/parser_base.cpp | 3 ++-
-- 1 file changed, 2 insertions(+), 1 deletion(-)
--
--diff --git a/src/parser/parser_base.cpp b/src/parser/parser_base.cpp
--index 586d495f..9d426efb 100644
----- a/src/parser/parser_base.cpp
--+++ b/src/parser/parser_base.cpp
--@@ -120,7 +120,8 @@ double parser_base::parse_double()
-- 
-- size_t parser_base::remaining_size() const
-- {
---    return std::distance(mp_char, mp_end) - 1;
--+    size_t n = std::distance(mp_char, mp_end);
--+    return n ? (n - 1) : 0;
-- }
-- 
-- std::ptrdiff_t parser_base::offset() const
---- 
--2.17.1
--
-diff --git a/external/liborcus/ExternalPackage_liborcus.mk b/external/liborcus/ExternalPackage_liborcus.mk
-index ffa0b38bea19..21dd1bfb1ce5 100644
---- a/external/liborcus/ExternalPackage_liborcus.mk
-+++ b/external/liborcus/ExternalPackage_liborcus.mk
-@@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,liborcus))
- $(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus))
- 
- ifeq ($(OS),MACOSX)
--$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.14.0.dylib,src/liborcus/.libs/liborcus-0.14.0.dylib))
--$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.14.0.dylib,src/parser/.libs/liborcus-parser-0.14.0.dylib))
-+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.15.0.dylib,src/liborcus/.libs/liborcus-0.15.0.dylib))
-+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.15.0.dylib,src/parser/.libs/liborcus-parser-0.15.0.dylib))
- else ifeq ($(DISABLE_DYNLOADING),)
--$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.14.so.0,src/liborcus/.libs/liborcus-0.14.so.0.0.0))
--$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.14.so.0,src/parser/.libs/liborcus-parser-0.14.so.0.0.0))
-+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.15.so.0,src/liborcus/.libs/liborcus-0.15.so.0.0.0))
-+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.15.so.0,src/parser/.libs/liborcus-parser-0.15.so.0.0.0))
- endif
- 
- # vim: set noet sw=4 ts=4:
-diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
-index 8cc1c030fa98..0bd36c379d9b 100644
---- a/external/liborcus/ExternalProject_liborcus.mk
-+++ b/external/liborcus/ExternalProject_liborcus.mk
-@@ -122,8 +122,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
- 		   $(MAKE) \
- 		$(if $(filter MACOSX,$(OS)),\
- 			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
--				$(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.14.0.dylib \
--				$(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.14.0.dylib \
-+				$(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.15.0.dylib \
-+				$(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.15.0.dylib \
- 		) \
- 	)
- 
-diff --git a/external/liborcus/Library_orcus-parser.mk b/external/liborcus/Library_orcus-parser.mk
-index 32367b843f68..d25d82163d9a 100644
---- a/external/liborcus/Library_orcus-parser.mk
-+++ b/external/liborcus/Library_orcus-parser.mk
-@@ -13,6 +13,7 @@ $(eval $(call gb_Library_use_unpacked,orcus-parser,liborcus))
- 
- $(eval $(call gb_Library_use_externals,orcus-parser,\
- 	boost_headers \
-+	boost_filesystem \
- 	boost_system \
- 	mdds_headers \
- 	zlib \
-@@ -22,6 +23,7 @@ $(eval $(call gb_Library_set_warnings_disabled,orcus-parser))
- 
- $(eval $(call gb_Library_set_include,orcus-parser,\
- 	-I$(call gb_UnpackedTarball_get_dir,liborcus)/include \
-+	-I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \
- 	$$(INCLUDE) \
- ))
- 
-diff --git a/external/liborcus/Library_orcus.mk b/external/liborcus/Library_orcus.mk
-index 2b20cdf84ea4..3793805c3c00 100644
---- a/external/liborcus/Library_orcus.mk
-+++ b/external/liborcus/Library_orcus.mk
-@@ -24,6 +24,7 @@ $(eval $(call gb_Library_set_warnings_disabled,orcus))
- 
- $(eval $(call gb_Library_set_include,orcus,\
- 	-I$(call gb_UnpackedTarball_get_dir,liborcus)/include \
-+	-I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \
- 	$$(INCLUDE) \
- ))
- 
-@@ -68,6 +69,9 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\
- 	UnpackedTarball/liborcus/src/liborcus/info \
- 	UnpackedTarball/liborcus/src/liborcus/interface \
- 	UnpackedTarball/liborcus/src/liborcus/json_document_tree \
-+	UnpackedTarball/liborcus/src/liborcus/json_map_tree \
-+	UnpackedTarball/liborcus/src/liborcus/json_structure_mapper \
-+	UnpackedTarball/liborcus/src/liborcus/json_structure_tree \
- 	UnpackedTarball/liborcus/src/liborcus/json_util \
- 	UnpackedTarball/liborcus/src/liborcus/measurement \
- 	UnpackedTarball/liborcus/src/liborcus/odf_helper \
-@@ -92,12 +96,15 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\
- 	UnpackedTarball/liborcus/src/liborcus/orcus_gnumeric \
- 	UnpackedTarball/liborcus/src/liborcus/orcus_import_ods \
- 	UnpackedTarball/liborcus/src/liborcus/orcus_import_xlsx \
-+	UnpackedTarball/liborcus/src/liborcus/orcus_json \
- 	UnpackedTarball/liborcus/src/liborcus/orcus_ods \
- 	UnpackedTarball/liborcus/src/liborcus/orcus_xls_xml \
- 	UnpackedTarball/liborcus/src/liborcus/orcus_xlsx \
- 	UnpackedTarball/liborcus/src/liborcus/orcus_xml \
-+	UnpackedTarball/liborcus/src/liborcus/orcus_xml_map_def \
- 	UnpackedTarball/liborcus/src/liborcus/session_context \
- 	UnpackedTarball/liborcus/src/liborcus/spreadsheet_iface_util \
-+	UnpackedTarball/liborcus/src/liborcus/spreadsheet_impl_types \
- 	UnpackedTarball/liborcus/src/liborcus/spreadsheet_interface \
- 	UnpackedTarball/liborcus/src/liborcus/spreadsheet_types \
- 	UnpackedTarball/liborcus/src/liborcus/string_helper \
-diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk
-index e1d810a49dc2..eb1d5af676ce 100644
---- a/external/liborcus/UnpackedTarball_liborcus.mk
-+++ b/external/liborcus/UnpackedTarball_liborcus.mk
-@@ -15,16 +15,11 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1))
- 
- $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
- 
--# * external/liborcus/version.patch.0 covered by upstream
--#   <https://gitlab.com/orcus/orcus/commit/0dfa88f2adca7887dbe44bdb7025985777c89673> "Remove unused
--#   VERSION file":
- $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
--	external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
- 	external/liborcus/rpath.patch.0 \
- 	external/liborcus/gcc9.patch.0 \
--	external/liborcus/version.patch.0 \
- 	external/liborcus/libtool.patch.0 \
--	external/liborcus/0001-Prevent-unsigned-integer-underflow.patch \
-+	external/liborcus/create-element.patch.0 \
- ))
- 
- ifeq ($(OS),WNT)
-diff --git a/external/liborcus/create-element.patch.0 b/external/liborcus/create-element.patch.0
-new file mode 100644
-index 000000000000..b1012e5c90d8
---- /dev/null
-+++ b/external/liborcus/create-element.patch.0
-@@ -0,0 +1,55 @@
-+--- src/liborcus/xml_map_tree.cpp
-++++ src/liborcus/xml_map_tree.cpp
-+@@ -723,35 +723,28 @@
-+         element* elem = r.first;
-+         bool created = r.second;
-+ 
-+-        if (created)
-+-        {
-+-            // No element of that name exists.
-+-            elem->elem_type = element_linked;
-+-            elem->ref_type = ref_type;
-+-        }
-+-        else
-++        if (!created)
-+         {
-+             // This element already exists.  Check if this is already linked.
-+             if (elem->ref_type != reference_unknown || elem->elem_type != element_unlinked)
-+                 throw xpath_error("This element is already linked.  You can't link the same element twice.");
-+-
-+-            // Turn this existing non-linked element into a linked one.
-+-            delete elem->child_elements;
-+-            elem->elem_type = element_linked;
-+-            elem->ref_type = ref_type;
-+-            switch (ref_type)
-+-            {
-+-                case reference_cell:
-+-                    elem->cell_ref = new cell_reference;
-+-                    break;
-+-                case reference_range_field:
-+-                    elem->field_ref = new field_in_range;
-+-                    break;
-+-                default:
-+-                    throw general_error("Unknown reference type in xml_map_tree::get_element_stack.");
-+-            }
-+-
-+         }
-++
-++        // Turn this existing non-linked element into a linked one.
-++        delete elem->child_elements;
-++        elem->elem_type = element_linked;
-++        elem->ref_type = ref_type;
-++        switch (ref_type)
-++        {
-++            case reference_cell:
-++                elem->cell_ref = new cell_reference;
-++                break;
-++            case reference_range_field:
-++                elem->field_ref = new field_in_range;
-++                break;
-++            default:
-++                throw general_error("Unknown reference type in xml_map_tree::get_element_stack.");
-++        }
-+ 
-+         ret.elem_stack.push_back(elem);
-+         ret.node = elem;
-diff --git a/external/liborcus/version.patch.0 b/external/liborcus/version.patch.0
-deleted file mode 100644
-index 2c0b5ae4ca07..000000000000
---- a/external/liborcus/version.patch.0
-+++ /dev/null
-@@ -1,11 +0,0 @@
----- configure
--+++ configure
--@@ -21055,7 +21055,7 @@
-- 
-- fi
-- 
---ac_config_files="$ac_config_files Makefile liborcus-$ORCUS_API_VERSION.pc:liborcus.pc.in liborcus-spreadsheet-model-$ORCUS_API_VERSION.pc:liborcus-spreadsheet-model.pc.in VERSION include/Makefile include/orcus/Makefile include/orcus/detail/Makefile include/orcus/mso/Makefile include/orcus/spreadsheet/Makefile src/Makefile src/liborcus/Makefile src/liborcus/constants.inl src/mso/Makefile src/parser/Makefile src/python/Makefile src/spreadsheet/Makefile parser_handlers/Makefile benchmark/Makefile doc_example/Makefile"
--+ac_config_files="$ac_config_files Makefile liborcus-$ORCUS_API_VERSION.pc:liborcus.pc.in liborcus-spreadsheet-model-$ORCUS_API_VERSION.pc:liborcus-spreadsheet-model.pc.in include/Makefile include/orcus/Makefile include/orcus/detail/Makefile include/orcus/mso/Makefile include/orcus/spreadsheet/Makefile src/Makefile src/liborcus/Makefile src/liborcus/constants.inl src/mso/Makefile src/parser/Makefile src/python/Makefile src/spreadsheet/Makefile parser_handlers/Makefile benchmark/Makefile doc_example/Makefile"
-- 
-- cat >confcache <<\_ACEOF
-- # This file is a shell script that caches the results of configure
-diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk
-index 625204d29619..c015f4c13f5a 100644
---- a/external/mdds/UnpackedTarball_mdds.mk
-+++ b/external/mdds/UnpackedTarball_mdds.mk
-@@ -14,7 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL)))
- $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,0))
- 
- $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
--	external/mdds/use-position-hint-also-back.patch \
- ))
- 
- # vim: set noet sw=4 ts=4:
-diff --git a/external/mdds/use-position-hint-also-back.patch b/external/mdds/use-position-hint-also-back.patch
-deleted file mode 100644
-index 0b38c38d5536..000000000000
---- a/external/mdds/use-position-hint-also-back.patch
-+++ /dev/null
-@@ -1,50 +0,0 @@
--From 726e2f02d14833bde2f7eef9677f5564c485a992 Mon Sep 17 00:00:00 2001
--From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak at centrum.cz>
--Date: Fri, 17 May 2019 13:55:20 +0200
--Subject: [PATCH] use position hint also when it is past the actual position
--
--The m_blocks data structure is a vector. It means that it can be
--also walked back, instead of resetting and starting from the very
--start.
--
--Allows a noticeable performance improvement in
--https://gerrit.libreoffice.org/#/c/72424/ .
-----
-- include/mdds/multi_type_vector_def.inl | 21 ++++++++++++++++++++-
-- 1 file changed, 20 insertions(+), 1 deletion(-)
--
--diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl
--index 22a0ee2..09894e6 100644
----- include/mdds/multi_type_vector_def.inl
--+++ include/mdds/multi_type_vector_def.inl
--@@ -861,7 +861,26 @@ void multi_type_vector<_CellBlockFunc, _EventFunc>::get_block_position(
-- 
--     if (pos < start_row)
--     {
---        // Position hint is past the insertion position. Reset.
--+        // Position hint is past the insertion position.
--+        // Walk back if that seems efficient.
--+        if (pos > start_row / 2)
--+        {
--+            for (size_type i = block_index; i > 0;)
--+            {
--+                --i;
--+                const block& blk = m_blocks[i];
--+                start_row -= blk.m_size;
--+                if (pos >= start_row)
--+                {
--+                    // Row is in this block.
--+                    block_index = i;
--+                    return;
--+                }
--+                // Specified row is not in this block.
--+            }
--+            assert(start_row == 0);
--+        }
--+        // Otherwise reset.
--         start_row = 0;
--         block_index = 0;
--     }
---- 
--2.16.4
--
-diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
-index 407f0392c4cd..382fb4d2b688 100644
---- a/sc/inc/mtvelements.hxx
-+++ b/sc/inc/mtvelements.hxx
-@@ -52,9 +52,9 @@ const mdds::mtv::element_t element_type_formula = mdds::mtv::element_type_user_s
- const mdds::mtv::element_t element_type_cellnote = mdds::mtv::element_type_user_start + 5;
- 
- /// Mapped standard element types (for convenience).
--const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_numeric;
-+const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_double;
- const mdds::mtv::element_t element_type_empty = mdds::mtv::element_type_empty;
--const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_ushort;
-+const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_uint16;
- 
- /// Custom element blocks.
- 
-@@ -66,8 +66,8 @@ typedef mdds::mtv::noncopyable_managed_element_block<element_type_edittext, Edit
- typedef mdds::mtv::noncopyable_managed_element_block<element_type_formula, ScFormulaCell> formula_block;
- 
- /// Mapped standard element blocks (for convenience).
--typedef mdds::mtv::numeric_element_block numeric_block;
--typedef mdds::mtv::ushort_element_block uint16_block;
-+typedef mdds::mtv::double_element_block numeric_block;
-+typedef mdds::mtv::uint16_element_block uint16_block;
- 
- /// This needs to be in the same namespace as CellTextAttr.
- MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(CellTextAttr, element_type_celltextattr, CellTextAttr(), celltextattr_block)
-diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx
-index b635eca2d43d..d292134597ad 100644
---- a/sc/inc/orcusxml.hxx
-+++ b/sc/inc/orcusxml.hxx
-@@ -70,6 +70,7 @@ struct ScOrcusImportXMLParam
-     {
-         ScAddress maPos;
-         std::vector<OString> maFieldPaths;
-+        std::vector<OString> maRowGroups;
-     };
- 
-     typedef std::vector<CellLink> CellLinksType;
-diff --git a/sc/qa/unit/dataproviders_test.cxx b/sc/qa/unit/dataproviders_test.cxx
-index 1e9cf97e8dc3..a9b6b1142c7f 100644
---- a/sc/qa/unit/dataproviders_test.cxx
-+++ b/sc/qa/unit/dataproviders_test.cxx
-@@ -156,6 +156,7 @@ void ScDataProvidersTest::testXMLImport()
-     aRangeLink.maPos = ScAddress(0,0,0);
-     aRangeLink.maFieldPaths.push_back("/bookstore/book/title");
-     aRangeLink.maFieldPaths.push_back("/bookstore/book/author");
-+    aRangeLink.maRowGroups.push_back("/bookstore/book");
-     aParam.maRangeLinks.push_back(aRangeLink);
- 
-     createFileURL("test1.", "xml", aFileURL);
-diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
-index 0291c84a04d7..9eaa14f751f3 100644
---- a/sc/source/core/tool/scmatrix.cxx
-+++ b/sc/source/core/tool/scmatrix.cxx
-@@ -1935,8 +1935,8 @@ public:
-         {
-             case mdds::mtm::element_numeric:
-             {
--                numeric_element_block::const_iterator it = numeric_element_block::begin(*node.data);
--                numeric_element_block::const_iterator itEnd = numeric_element_block::end(*node.data);
-+                double_element_block::const_iterator it = double_element_block::begin(*node.data);
-+                double_element_block::const_iterator itEnd = double_element_block::end(*node.data);
-                 for (; it != itEnd; ++it, ++miPos)
-                     *miPos = *it;
-             }
-@@ -2012,8 +2012,8 @@ public:
-         {
-             case mdds::mtm::element_numeric:
-             {
--                numeric_element_block::const_iterator it = numeric_element_block::begin(*node.data);
--                numeric_element_block::const_iterator itEnd = numeric_element_block::end(*node.data);
-+                double_element_block::const_iterator it = double_element_block::begin(*node.data);
-+                double_element_block::const_iterator itEnd = double_element_block::end(*node.data);
-                 for (; it != itEnd; ++it, ++miPos)
-                 {
-                     if (GetDoubleErrorValue(*miPos) == FormulaError::ElementNaN)
-diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx
-index 9d090b744619..7c7c4f20bb3c 100644
---- a/sc/source/filter/inc/orcusinterface.hxx
-+++ b/sc/source/filter/inc/orcusinterface.hxx
-@@ -332,6 +332,8 @@ public:
- 
-     virtual orcus::spreadsheet::range_size_t get_sheet_size() const override;
- 
-+    virtual void fill_down_cells(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::row_t range_size) override;
-+
-     SCTAB getIndex() const { return mnTab; }
- 
-     const sc::SharedFormulaGroups& getSharedFormulaGroups() const;
-diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
-index 833fb278e397..23f17a1dc854 100644
---- a/sc/source/filter/orcus/interface.cxx
-+++ b/sc/source/filter/orcus/interface.cxx
-@@ -61,8 +61,7 @@ formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( os::formula_grammar_t
-         case orcus::spreadsheet::formula_grammar_t::ods:
-             eGrammar = formula::FormulaGrammar::GRAM_ODFF;
-             break;
--        case orcus::spreadsheet::formula_grammar_t::xlsx_2007:
--        case orcus::spreadsheet::formula_grammar_t::xlsx_2010:
-+        case orcus::spreadsheet::formula_grammar_t::xlsx:
-             eGrammar = formula::FormulaGrammar::GRAM_OOXML;
-             break;
-         case orcus::spreadsheet::formula_grammar_t::gnumeric:
-@@ -1188,6 +1187,11 @@ orcus::spreadsheet::range_size_t ScOrcusSheet::get_sheet_size() const
-     return ret;
- }
- 
-+void ScOrcusSheet::fill_down_cells(os::row_t /*row*/, os::col_t /*col*/, os::row_t /*range_size*/)
-+{
-+    // TODO : implement this.
-+}
-+
- const sc::SharedFormulaGroups& ScOrcusSheet::getSharedFormulaGroups() const
- {
-     return maFormulaGroups;
-diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx
-index cdfb70d71c1b..8e9b0b1a5f04 100644
---- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
-+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
-@@ -139,10 +139,10 @@ bool ScOrcusFiltersImpl::importODS_Styles(ScDocument& rDoc, OUString& aPath) con
- 
-     try
-     {
--        std::string content = orcus::load_file_content(path);
-+        orcus::file_content content(path);
-         ScOrcusFactory aFactory(rDoc);
-         ScOrcusStyles aStyles(aFactory);
--        orcus::import_ods::read_styles(content.c_str(), content.size(), &aStyles);
-+        orcus::import_ods::read_styles(content.data(), content.size(), &aStyles);
-     }
-     catch (const std::exception& e)
-     {
-diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx
-index 2548f5b19d9f..71c44bc35823 100644
---- a/sc/source/filter/orcus/xmlcontext.cxx
-+++ b/sc/source/filter/orcus/xmlcontext.cxx
-@@ -269,10 +269,17 @@ void ScOrcusXMLContextImpl::importXML(const ScOrcusImportXMLParam& rParam)
- 
-             std::for_each(rLink.maFieldPaths.begin(), rLink.maFieldPaths.end(), InsertFieldPath(filter));
- 
-+            std::for_each(rLink.maRowGroups.begin(), rLink.maRowGroups.end(),
-+                [&filter] (const OString& rRowGroup)
-+                {
-+                    filter.set_range_row_group(rRowGroup.getStr());
-+                }
-+            );
-+
-             filter.commit_range();
-         }
- 
--        std::string content = orcus::load_file_content(path);
-+        orcus::file_content content(path);
-         filter.read_stream(content.data(), content.size());
- 
-         aFactory.finalize();
-diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
-index e24367342713..d9cd8b5b515c 100644
---- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
-+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
-@@ -536,6 +536,12 @@ void ScXMLSourceDlg::OkPressed()
-             // Go through all its child elements.
-             getFieldLinks(aRangeLink, aParam.maNamespaces, *mxLbTree, *rEntry);
- 
-+            // Add the anchor node as a grouping node, which will be used as a
-+            // row position increment point.
-+            OUString aThisEntry = getXPath(*mxLbTree, *rEntry, aParam.maNamespaces);
-+            aRangeLink.maRowGroups.push_back(
-+                OUStringToOString(aThisEntry, RTL_TEXTENCODING_UTF8));
-+
-             aParam.maRangeLinks.push_back(aRangeLink);
-         }
-     }
-diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx
-index 9ed7f43b41d5..21264745e4f8 100644
---- a/svl/source/misc/gridprinter.cxx
-+++ b/svl/source/misc/gridprinter.cxx
-@@ -29,7 +29,7 @@ typedef mdds::mtv::default_element_block<element_type_string, OUString> string_b
- struct matrix_trait
- {
-     typedef string_block string_element_block;
--    typedef mdds::mtv::ushort_element_block integer_element_block;
-+    typedef mdds::mtv::uint16_element_block integer_element_block;
- 
-     typedef mdds::mtv::custom_block_func1<string_block> element_block_func;
- };
--- 
-2.21.0
-

Copied: libreoffice-still/repos/extra-x86_64/0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch (from rev 382132, libreoffice-still/trunk/0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch)
===================================================================
--- 0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch	                        (rev 0)
+++ 0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch	2020-05-02 08:54:57 UTC (rev 382133)
@@ -0,0 +1,621 @@
+From 8f5dd7babe306a1c9dcdec93372a3d4378e09667 Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kohei at libreoffice.org>
+Date: Mon, 12 Aug 2019 13:57:34 -0400
+Subject: [PATCH] Switch mdds to 1.5.0 and liborcus to 0.15.0.
+
+Change-Id: Ibff9a5e0f0771e4cf12b4dc3985661a01195e265
+Reviewed-on: https://gerrit.libreoffice.org/77482
+Tested-by: Jenkins
+Reviewed-by: Kohei Yoshida <kohei at libreoffice.org>
+(cherry picked from commit 56ffe3c0a1261cd98a3d42b8b08d5f8eb013ead4)
+
+Correctly pack mdds 1.5.0.
+
+Turns out the earlier mdds 1.5.0 package was not correctly packaged.
+I've fixed that now, and re-published the 1.5.0 package, which does
+contain the patch from Lubos.
+
+Change-Id: I1ff7d6568568860f7cccd3be3bc29aaaebe7fd73
+Reviewed-on: https://gerrit.libreoffice.org/77483
+Tested-by: Jenkins
+Reviewed-by: Kohei Yoshida <kohei at libreoffice.org>
+(cherry picked from commit 1c59fed7c43654736775580799f1165e8b8740a0)
+
+Fix linking of newly created element in liborcus 0.15.0
+
+After 56ffe3c0a1261cd98a3d42b8b08d5f8eb013ead4 "Switch mdds to 1.5.0 and
+liborcus to 0.15.0", CppunitTest_sc_dataprovider started to fail in ASan builds
+with
+
+> ERROR: AddressSanitizer: new-delete-type-mismatch on 0x6060005b9340 in thread T4 (XML Fetch Threa):
+>   object passed to delete has wrong type:
+>   size of the allocated type:   56 bytes;
+>   size of the deallocated type: 16 bytes.
+>  #0 in operator delete(void*, unsigned long) at llvm-project/compiler-rt/lib/asan/asan_new_delete.cpp:172:3
+>  #1 in orcus::xml_map_tree::element::~element() at workdir/UnpackedTarball/liborcus/src/liborcus/xml_map_tree.cpp:238:13
+[...]
+>  #25 in std::unique_ptr<orcus::orcus_xml::impl, std::default_delete<orcus::orcus_xml::impl> >::~unique_ptr()
+>  #26 in orcus::orcus_xml::~orcus_xml() at workdir/UnpackedTarball/liborcus/src/liborcus/orcus_xml.cpp:530:26
+>  #27 in ScOrcusXMLContextImpl::importXML(ScOrcusImportXMLParam const&) at sc/source/filter/orcus/xmlcontext.cxx:286:5
+[...]
+> 0x6060005b9340 is located 0 bytes inside of 56-byte region [0x6060005b9340,0x6060005b9378)
+> allocated by thread T4 (XML Fetch Threa) here:
+>  #0 in operator new(unsigned long) at llvm-project/compiler-rt/lib/asan/asan_new_delete.cpp:99:3
+>  #1 in orcus::xml_map_tree::element::element(char const*, orcus::pstring const&, orcus::xml_map_tree::element_type, orcus::xml_map_tree::reference_type) at workdir/UnpackedTarball/liborcus/src/liborcus/xml_map_tree.cpp:203:26
+>  #2 in std::unique_ptr<orcus::xml_map_tree::element, std::default_delete<orcus::xml_map_tree::element> > orcus::make_unique<orcus::xml_map_tree::element, char const*&, orcus::pstring, orcus::xml_map_tree::element_type, orcus::xml_map_tree::reference_type>(char const*&, orcus::pstring&&, orcus::xml_map_tree::element_type&&, orcus::xml_map_tree::reference_type&&) at workdir/UnpackedTarball/liborcus/src/liborcus/../../include/orcus/global.hpp:61:35
+>  #3 in orcus::xml_map_tree::element::get_or_create_child(orcus::string_pool&, char const*, orcus::pstring const&) at workdir/UnpackedTarball/liborcus/src/liborcus/xml_map_tree.cpp:271:9
+>  #4 in orcus::xml_map_tree::get_linked_node(orcus::pstring const&, orcus::xml_map_tree::reference_type) at workdir/UnpackedTarball/liborcus/src/liborcus/xml_map_tree.cpp:722:31
+[...]
+
+Change-Id: Iad8e06ead6f2655a3e26ceeab368e9b50028402f
+Reviewed-on: https://gerrit.libreoffice.org/77519
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
+(cherry picked from commit ffdc97898b145c9b0cebd22f0393da2c27e17a47)
+
+external/liborcus/version.patch.0 is gone
+
+...since 56ffe3c0a1261cd98a3d42b8b08d5f8eb013ead4 "Switch mdds to 1.5.0 and
+liborcus to 0.15.0."
+
+Change-Id: I03c5336bbaf65a13f883a30a3fc4238b140a9cef
+Reviewed-on: https://gerrit.libreoffice.org/77521
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
+(cherry picked from commit 6c286f807c03321a79f8aaa98c6a785da005d619)
+---
+ RepositoryExternal.mk                         |  4 +-
+ configure.ac                                  |  4 +-
+ ...1-Prevent-unsigned-integer-underflow.patch | 27 ---------
+ external/liborcus/ExternalPackage_liborcus.mk |  8 +--
+ external/liborcus/ExternalProject_liborcus.mk |  4 +-
+ external/liborcus/Library_orcus-parser.mk     |  2 +
+ external/liborcus/Library_orcus.mk            |  7 +++
+ external/liborcus/UnpackedTarball_liborcus.mk |  7 +--
+ external/liborcus/create-element.patch.0      | 55 +++++++++++++++++++
+ external/liborcus/version.patch.0             | 11 ----
+ external/mdds/UnpackedTarball_mdds.mk         |  1 -
+ .../mdds/use-position-hint-also-back.patch    | 50 -----------------
+ sc/inc/mtvelements.hxx                        |  8 +--
+ sc/inc/orcusxml.hxx                           |  1 +
+ sc/qa/unit/dataproviders_test.cxx             |  1 +
+ sc/source/core/tool/scmatrix.cxx              |  8 +--
+ sc/source/filter/inc/orcusinterface.hxx       |  2 +
+ sc/source/filter/orcus/interface.cxx          |  8 ++-
+ sc/source/filter/orcus/orcusfiltersimpl.cxx   |  4 +-
+ sc/source/filter/orcus/xmlcontext.cxx         |  9 ++-
+ sc/source/ui/xmlsource/xmlsourcedlg.cxx       |  6 ++
+ svl/source/misc/gridprinter.cxx               |  2 +-
+ 23 files changed, 114 insertions(+), 123 deletions(-)
+ delete mode 100644 external/liborcus/0001-Prevent-unsigned-integer-underflow.patch
+ create mode 100644 external/liborcus/create-element.patch.0
+ delete mode 100644 external/liborcus/version.patch.0
+ delete mode 100644 external/mdds/use-position-hint-also-back.patch
+
+diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
+index a75ca5097b62..1c6c0c59538b 100644
+--- a/RepositoryExternal.mk
++++ b/RepositoryExternal.mk
+@@ -3262,7 +3262,7 @@ $(call gb_LinkTarget_set_include,$(1),\
+ )
+ 
+ $(call gb_LinkTarget_add_libs,$(1),\
+-       -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.14 \
++       -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.15 \
+ )
+ 
+ $(if $(SYSTEM_BOOST), \
+@@ -3281,7 +3281,7 @@ $(call gb_LinkTarget_set_include,$(1),\
+ )
+ 
+ $(call gb_LinkTarget_add_libs,$(1),\
+-	-L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.14 \
++	-L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.15 \
+ )
+ 
+ endef
+diff --git a/configure.ac b/configure.ac
+index c77ce67f332b..9863d02a48c6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9250,7 +9250,7 @@ AC_SUBST(SYSTEM_BOOST)
+ dnl ===================================================================
+ dnl Check for system mdds
+ dnl ===================================================================
+-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.4 >= 1.4.1], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
++libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.5 >= 1.5.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
+ 
+ dnl ===================================================================
+ dnl Check for system glm
+@@ -9556,7 +9556,7 @@ AC_SUBST(ENABLE_FUZZERS)
+ dnl ===================================================================
+ dnl Orcus
+ dnl ===================================================================
+-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.14 >= 0.14.0])
++libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.15 >= 0.15.0])
+ if test "$with_system_orcus" != "yes"; then
+     if test "$SYSTEM_BOOST" = "TRUE"; then
+         # ===========================================================
+diff --git a/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch b/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch
+deleted file mode 100644
+index 3353857a2d10..000000000000
+--- a/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch
++++ /dev/null
+@@ -1,27 +0,0 @@
+-From 1967be013804f4f578b53659d7ef459b4c35de9f Mon Sep 17 00:00:00 2001
+-From: Kohei Yoshida <kohei.yoshida at gmail.com>
+-Date: Wed, 7 Nov 2018 21:08:40 -0500
+-Subject: [PATCH] Prevent unsigned integer underflow.
+-
+-(cherry picked from commit 40bbce85048b77c545103af124f3d9831dd4a458)
+----
+- src/parser/parser_base.cpp | 3 ++-
+- 1 file changed, 2 insertions(+), 1 deletion(-)
+-
+-diff --git a/src/parser/parser_base.cpp b/src/parser/parser_base.cpp
+-index 586d495f..9d426efb 100644
+---- a/src/parser/parser_base.cpp
+-+++ b/src/parser/parser_base.cpp
+-@@ -120,7 +120,8 @@ double parser_base::parse_double()
+- 
+- size_t parser_base::remaining_size() const
+- {
+--    return std::distance(mp_char, mp_end) - 1;
+-+    size_t n = std::distance(mp_char, mp_end);
+-+    return n ? (n - 1) : 0;
+- }
+- 
+- std::ptrdiff_t parser_base::offset() const
+--- 
+-2.17.1
+-
+diff --git a/external/liborcus/ExternalPackage_liborcus.mk b/external/liborcus/ExternalPackage_liborcus.mk
+index ffa0b38bea19..21dd1bfb1ce5 100644
+--- a/external/liborcus/ExternalPackage_liborcus.mk
++++ b/external/liborcus/ExternalPackage_liborcus.mk
+@@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,liborcus))
+ $(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus))
+ 
+ ifeq ($(OS),MACOSX)
+-$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.14.0.dylib,src/liborcus/.libs/liborcus-0.14.0.dylib))
+-$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.14.0.dylib,src/parser/.libs/liborcus-parser-0.14.0.dylib))
++$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.15.0.dylib,src/liborcus/.libs/liborcus-0.15.0.dylib))
++$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.15.0.dylib,src/parser/.libs/liborcus-parser-0.15.0.dylib))
+ else ifeq ($(DISABLE_DYNLOADING),)
+-$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.14.so.0,src/liborcus/.libs/liborcus-0.14.so.0.0.0))
+-$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.14.so.0,src/parser/.libs/liborcus-parser-0.14.so.0.0.0))
++$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.15.so.0,src/liborcus/.libs/liborcus-0.15.so.0.0.0))
++$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.15.so.0,src/parser/.libs/liborcus-parser-0.15.so.0.0.0))
+ endif
+ 
+ # vim: set noet sw=4 ts=4:
+diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
+index 8cc1c030fa98..0bd36c379d9b 100644
+--- a/external/liborcus/ExternalProject_liborcus.mk
++++ b/external/liborcus/ExternalProject_liborcus.mk
+@@ -122,8 +122,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
+ 		   $(MAKE) \
+ 		$(if $(filter MACOSX,$(OS)),\
+ 			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+-				$(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.14.0.dylib \
+-				$(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.14.0.dylib \
++				$(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.15.0.dylib \
++				$(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.15.0.dylib \
+ 		) \
+ 	)
+ 
+diff --git a/external/liborcus/Library_orcus-parser.mk b/external/liborcus/Library_orcus-parser.mk
+index 32367b843f68..d25d82163d9a 100644
+--- a/external/liborcus/Library_orcus-parser.mk
++++ b/external/liborcus/Library_orcus-parser.mk
+@@ -13,6 +13,7 @@ $(eval $(call gb_Library_use_unpacked,orcus-parser,liborcus))
+ 
+ $(eval $(call gb_Library_use_externals,orcus-parser,\
+ 	boost_headers \
++	boost_filesystem \
+ 	boost_system \
+ 	mdds_headers \
+ 	zlib \
+@@ -22,6 +23,7 @@ $(eval $(call gb_Library_set_warnings_disabled,orcus-parser))
+ 
+ $(eval $(call gb_Library_set_include,orcus-parser,\
+ 	-I$(call gb_UnpackedTarball_get_dir,liborcus)/include \
++	-I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \
+ 	$$(INCLUDE) \
+ ))
+ 
+diff --git a/external/liborcus/Library_orcus.mk b/external/liborcus/Library_orcus.mk
+index 2b20cdf84ea4..3793805c3c00 100644
+--- a/external/liborcus/Library_orcus.mk
++++ b/external/liborcus/Library_orcus.mk
+@@ -24,6 +24,7 @@ $(eval $(call gb_Library_set_warnings_disabled,orcus))
+ 
+ $(eval $(call gb_Library_set_include,orcus,\
+ 	-I$(call gb_UnpackedTarball_get_dir,liborcus)/include \
++	-I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \
+ 	$$(INCLUDE) \
+ ))
+ 
+@@ -68,6 +69,9 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\
+ 	UnpackedTarball/liborcus/src/liborcus/info \
+ 	UnpackedTarball/liborcus/src/liborcus/interface \
+ 	UnpackedTarball/liborcus/src/liborcus/json_document_tree \
++	UnpackedTarball/liborcus/src/liborcus/json_map_tree \
++	UnpackedTarball/liborcus/src/liborcus/json_structure_mapper \
++	UnpackedTarball/liborcus/src/liborcus/json_structure_tree \
+ 	UnpackedTarball/liborcus/src/liborcus/json_util \
+ 	UnpackedTarball/liborcus/src/liborcus/measurement \
+ 	UnpackedTarball/liborcus/src/liborcus/odf_helper \
+@@ -92,12 +96,15 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\
+ 	UnpackedTarball/liborcus/src/liborcus/orcus_gnumeric \
+ 	UnpackedTarball/liborcus/src/liborcus/orcus_import_ods \
+ 	UnpackedTarball/liborcus/src/liborcus/orcus_import_xlsx \
++	UnpackedTarball/liborcus/src/liborcus/orcus_json \
+ 	UnpackedTarball/liborcus/src/liborcus/orcus_ods \
+ 	UnpackedTarball/liborcus/src/liborcus/orcus_xls_xml \
+ 	UnpackedTarball/liborcus/src/liborcus/orcus_xlsx \
+ 	UnpackedTarball/liborcus/src/liborcus/orcus_xml \
++	UnpackedTarball/liborcus/src/liborcus/orcus_xml_map_def \
+ 	UnpackedTarball/liborcus/src/liborcus/session_context \
+ 	UnpackedTarball/liborcus/src/liborcus/spreadsheet_iface_util \
++	UnpackedTarball/liborcus/src/liborcus/spreadsheet_impl_types \
+ 	UnpackedTarball/liborcus/src/liborcus/spreadsheet_interface \
+ 	UnpackedTarball/liborcus/src/liborcus/spreadsheet_types \
+ 	UnpackedTarball/liborcus/src/liborcus/string_helper \
+diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk
+index e1d810a49dc2..eb1d5af676ce 100644
+--- a/external/liborcus/UnpackedTarball_liborcus.mk
++++ b/external/liborcus/UnpackedTarball_liborcus.mk
+@@ -15,16 +15,11 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1))
+ 
+ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
+ 
+-# * external/liborcus/version.patch.0 covered by upstream
+-#   <https://gitlab.com/orcus/orcus/commit/0dfa88f2adca7887dbe44bdb7025985777c89673> "Remove unused
+-#   VERSION file":
+ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
+-	external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
+ 	external/liborcus/rpath.patch.0 \
+ 	external/liborcus/gcc9.patch.0 \
+-	external/liborcus/version.patch.0 \
+ 	external/liborcus/libtool.patch.0 \
+-	external/liborcus/0001-Prevent-unsigned-integer-underflow.patch \
++	external/liborcus/create-element.patch.0 \
+ ))
+ 
+ ifeq ($(OS),WNT)
+diff --git a/external/liborcus/create-element.patch.0 b/external/liborcus/create-element.patch.0
+new file mode 100644
+index 000000000000..b1012e5c90d8
+--- /dev/null
++++ b/external/liborcus/create-element.patch.0
+@@ -0,0 +1,55 @@
++--- src/liborcus/xml_map_tree.cpp
+++++ src/liborcus/xml_map_tree.cpp
++@@ -723,35 +723,28 @@
++         element* elem = r.first;
++         bool created = r.second;
++ 
++-        if (created)
++-        {
++-            // No element of that name exists.
++-            elem->elem_type = element_linked;
++-            elem->ref_type = ref_type;
++-        }
++-        else
+++        if (!created)
++         {
++             // This element already exists.  Check if this is already linked.
++             if (elem->ref_type != reference_unknown || elem->elem_type != element_unlinked)
++                 throw xpath_error("This element is already linked.  You can't link the same element twice.");
++-
++-            // Turn this existing non-linked element into a linked one.
++-            delete elem->child_elements;
++-            elem->elem_type = element_linked;
++-            elem->ref_type = ref_type;
++-            switch (ref_type)
++-            {
++-                case reference_cell:
++-                    elem->cell_ref = new cell_reference;
++-                    break;
++-                case reference_range_field:
++-                    elem->field_ref = new field_in_range;
++-                    break;
++-                default:
++-                    throw general_error("Unknown reference type in xml_map_tree::get_element_stack.");
++-            }
++-
++         }
+++
+++        // Turn this existing non-linked element into a linked one.
+++        delete elem->child_elements;
+++        elem->elem_type = element_linked;
+++        elem->ref_type = ref_type;
+++        switch (ref_type)
+++        {
+++            case reference_cell:
+++                elem->cell_ref = new cell_reference;
+++                break;
+++            case reference_range_field:
+++                elem->field_ref = new field_in_range;
+++                break;
+++            default:
+++                throw general_error("Unknown reference type in xml_map_tree::get_element_stack.");
+++        }
++ 
++         ret.elem_stack.push_back(elem);
++         ret.node = elem;
+diff --git a/external/liborcus/version.patch.0 b/external/liborcus/version.patch.0
+deleted file mode 100644
+index 2c0b5ae4ca07..000000000000
+--- a/external/liborcus/version.patch.0
++++ /dev/null
+@@ -1,11 +0,0 @@
+---- configure
+-+++ configure
+-@@ -21055,7 +21055,7 @@
+- 
+- fi
+- 
+--ac_config_files="$ac_config_files Makefile liborcus-$ORCUS_API_VERSION.pc:liborcus.pc.in liborcus-spreadsheet-model-$ORCUS_API_VERSION.pc:liborcus-spreadsheet-model.pc.in VERSION include/Makefile include/orcus/Makefile include/orcus/detail/Makefile include/orcus/mso/Makefile include/orcus/spreadsheet/Makefile src/Makefile src/liborcus/Makefile src/liborcus/constants.inl src/mso/Makefile src/parser/Makefile src/python/Makefile src/spreadsheet/Makefile parser_handlers/Makefile benchmark/Makefile doc_example/Makefile"
+-+ac_config_files="$ac_config_files Makefile liborcus-$ORCUS_API_VERSION.pc:liborcus.pc.in liborcus-spreadsheet-model-$ORCUS_API_VERSION.pc:liborcus-spreadsheet-model.pc.in include/Makefile include/orcus/Makefile include/orcus/detail/Makefile include/orcus/mso/Makefile include/orcus/spreadsheet/Makefile src/Makefile src/liborcus/Makefile src/liborcus/constants.inl src/mso/Makefile src/parser/Makefile src/python/Makefile src/spreadsheet/Makefile parser_handlers/Makefile benchmark/Makefile doc_example/Makefile"
+- 
+- cat >confcache <<\_ACEOF
+- # This file is a shell script that caches the results of configure
+diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk
+index 625204d29619..c015f4c13f5a 100644
+--- a/external/mdds/UnpackedTarball_mdds.mk
++++ b/external/mdds/UnpackedTarball_mdds.mk
+@@ -14,7 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL)))
+ $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,0))
+ 
+ $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
+-	external/mdds/use-position-hint-also-back.patch \
+ ))
+ 
+ # vim: set noet sw=4 ts=4:
+diff --git a/external/mdds/use-position-hint-also-back.patch b/external/mdds/use-position-hint-also-back.patch
+deleted file mode 100644
+index 0b38c38d5536..000000000000
+--- a/external/mdds/use-position-hint-also-back.patch
++++ /dev/null
+@@ -1,50 +0,0 @@
+-From 726e2f02d14833bde2f7eef9677f5564c485a992 Mon Sep 17 00:00:00 2001
+-From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak at centrum.cz>
+-Date: Fri, 17 May 2019 13:55:20 +0200
+-Subject: [PATCH] use position hint also when it is past the actual position
+-
+-The m_blocks data structure is a vector. It means that it can be
+-also walked back, instead of resetting and starting from the very
+-start.
+-
+-Allows a noticeable performance improvement in
+-https://gerrit.libreoffice.org/#/c/72424/ .
+----
+- include/mdds/multi_type_vector_def.inl | 21 ++++++++++++++++++++-
+- 1 file changed, 20 insertions(+), 1 deletion(-)
+-
+-diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl
+-index 22a0ee2..09894e6 100644
+---- include/mdds/multi_type_vector_def.inl
+-+++ include/mdds/multi_type_vector_def.inl
+-@@ -861,7 +861,26 @@ void multi_type_vector<_CellBlockFunc, _EventFunc>::get_block_position(
+- 
+-     if (pos < start_row)
+-     {
+--        // Position hint is past the insertion position. Reset.
+-+        // Position hint is past the insertion position.
+-+        // Walk back if that seems efficient.
+-+        if (pos > start_row / 2)
+-+        {
+-+            for (size_type i = block_index; i > 0;)
+-+            {
+-+                --i;
+-+                const block& blk = m_blocks[i];
+-+                start_row -= blk.m_size;
+-+                if (pos >= start_row)
+-+                {
+-+                    // Row is in this block.
+-+                    block_index = i;
+-+                    return;
+-+                }
+-+                // Specified row is not in this block.
+-+            }
+-+            assert(start_row == 0);
+-+        }
+-+        // Otherwise reset.
+-         start_row = 0;
+-         block_index = 0;
+-     }
+--- 
+-2.16.4
+-
+diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
+index 407f0392c4cd..382fb4d2b688 100644
+--- a/sc/inc/mtvelements.hxx
++++ b/sc/inc/mtvelements.hxx
+@@ -52,9 +52,9 @@ const mdds::mtv::element_t element_type_formula = mdds::mtv::element_type_user_s
+ const mdds::mtv::element_t element_type_cellnote = mdds::mtv::element_type_user_start + 5;
+ 
+ /// Mapped standard element types (for convenience).
+-const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_numeric;
++const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_double;
+ const mdds::mtv::element_t element_type_empty = mdds::mtv::element_type_empty;
+-const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_ushort;
++const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_uint16;
+ 
+ /// Custom element blocks.
+ 
+@@ -66,8 +66,8 @@ typedef mdds::mtv::noncopyable_managed_element_block<element_type_edittext, Edit
+ typedef mdds::mtv::noncopyable_managed_element_block<element_type_formula, ScFormulaCell> formula_block;
+ 
+ /// Mapped standard element blocks (for convenience).
+-typedef mdds::mtv::numeric_element_block numeric_block;
+-typedef mdds::mtv::ushort_element_block uint16_block;
++typedef mdds::mtv::double_element_block numeric_block;
++typedef mdds::mtv::uint16_element_block uint16_block;
+ 
+ /// This needs to be in the same namespace as CellTextAttr.
+ MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(CellTextAttr, element_type_celltextattr, CellTextAttr(), celltextattr_block)
+diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx
+index b635eca2d43d..d292134597ad 100644
+--- a/sc/inc/orcusxml.hxx
++++ b/sc/inc/orcusxml.hxx
+@@ -70,6 +70,7 @@ struct ScOrcusImportXMLParam
+     {
+         ScAddress maPos;
+         std::vector<OString> maFieldPaths;
++        std::vector<OString> maRowGroups;
+     };
+ 
+     typedef std::vector<CellLink> CellLinksType;
+diff --git a/sc/qa/unit/dataproviders_test.cxx b/sc/qa/unit/dataproviders_test.cxx
+index 1e9cf97e8dc3..a9b6b1142c7f 100644
+--- a/sc/qa/unit/dataproviders_test.cxx
++++ b/sc/qa/unit/dataproviders_test.cxx
+@@ -156,6 +156,7 @@ void ScDataProvidersTest::testXMLImport()
+     aRangeLink.maPos = ScAddress(0,0,0);
+     aRangeLink.maFieldPaths.push_back("/bookstore/book/title");
+     aRangeLink.maFieldPaths.push_back("/bookstore/book/author");
++    aRangeLink.maRowGroups.push_back("/bookstore/book");
+     aParam.maRangeLinks.push_back(aRangeLink);
+ 
+     createFileURL("test1.", "xml", aFileURL);
+diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
+index 0291c84a04d7..9eaa14f751f3 100644
+--- a/sc/source/core/tool/scmatrix.cxx
++++ b/sc/source/core/tool/scmatrix.cxx
+@@ -1935,8 +1935,8 @@ public:
+         {
+             case mdds::mtm::element_numeric:
+             {
+-                numeric_element_block::const_iterator it = numeric_element_block::begin(*node.data);
+-                numeric_element_block::const_iterator itEnd = numeric_element_block::end(*node.data);
++                double_element_block::const_iterator it = double_element_block::begin(*node.data);
++                double_element_block::const_iterator itEnd = double_element_block::end(*node.data);
+                 for (; it != itEnd; ++it, ++miPos)
+                     *miPos = *it;
+             }
+@@ -2012,8 +2012,8 @@ public:
+         {
+             case mdds::mtm::element_numeric:
+             {
+-                numeric_element_block::const_iterator it = numeric_element_block::begin(*node.data);
+-                numeric_element_block::const_iterator itEnd = numeric_element_block::end(*node.data);
++                double_element_block::const_iterator it = double_element_block::begin(*node.data);
++                double_element_block::const_iterator itEnd = double_element_block::end(*node.data);
+                 for (; it != itEnd; ++it, ++miPos)
+                 {
+                     if (GetDoubleErrorValue(*miPos) == FormulaError::ElementNaN)
+diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx
+index 9d090b744619..7c7c4f20bb3c 100644
+--- a/sc/source/filter/inc/orcusinterface.hxx
++++ b/sc/source/filter/inc/orcusinterface.hxx
+@@ -332,6 +332,8 @@ public:
+ 
+     virtual orcus::spreadsheet::range_size_t get_sheet_size() const override;
+ 
++    virtual void fill_down_cells(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::row_t range_size) override;
++
+     SCTAB getIndex() const { return mnTab; }
+ 
+     const sc::SharedFormulaGroups& getSharedFormulaGroups() const;
+diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
+index 833fb278e397..23f17a1dc854 100644
+--- a/sc/source/filter/orcus/interface.cxx
++++ b/sc/source/filter/orcus/interface.cxx
+@@ -61,8 +61,7 @@ formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( os::formula_grammar_t
+         case orcus::spreadsheet::formula_grammar_t::ods:
+             eGrammar = formula::FormulaGrammar::GRAM_ODFF;
+             break;
+-        case orcus::spreadsheet::formula_grammar_t::xlsx_2007:
+-        case orcus::spreadsheet::formula_grammar_t::xlsx_2010:
++        case orcus::spreadsheet::formula_grammar_t::xlsx:
+             eGrammar = formula::FormulaGrammar::GRAM_OOXML;
+             break;
+         case orcus::spreadsheet::formula_grammar_t::gnumeric:
+@@ -1188,6 +1187,11 @@ orcus::spreadsheet::range_size_t ScOrcusSheet::get_sheet_size() const
+     return ret;
+ }
+ 
++void ScOrcusSheet::fill_down_cells(os::row_t /*row*/, os::col_t /*col*/, os::row_t /*range_size*/)
++{
++    // TODO : implement this.
++}
++
+ const sc::SharedFormulaGroups& ScOrcusSheet::getSharedFormulaGroups() const
+ {
+     return maFormulaGroups;
+diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx
+index cdfb70d71c1b..8e9b0b1a5f04 100644
+--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
++++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
+@@ -139,10 +139,10 @@ bool ScOrcusFiltersImpl::importODS_Styles(ScDocument& rDoc, OUString& aPath) con
+ 
+     try
+     {
+-        std::string content = orcus::load_file_content(path);
++        orcus::file_content content(path);
+         ScOrcusFactory aFactory(rDoc);
+         ScOrcusStyles aStyles(aFactory);
+-        orcus::import_ods::read_styles(content.c_str(), content.size(), &aStyles);
++        orcus::import_ods::read_styles(content.data(), content.size(), &aStyles);
+     }
+     catch (const std::exception& e)
+     {
+diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx
+index 2548f5b19d9f..71c44bc35823 100644
+--- a/sc/source/filter/orcus/xmlcontext.cxx
++++ b/sc/source/filter/orcus/xmlcontext.cxx
+@@ -269,10 +269,17 @@ void ScOrcusXMLContextImpl::importXML(const ScOrcusImportXMLParam& rParam)
+ 
+             std::for_each(rLink.maFieldPaths.begin(), rLink.maFieldPaths.end(), InsertFieldPath(filter));
+ 
++            std::for_each(rLink.maRowGroups.begin(), rLink.maRowGroups.end(),
++                [&filter] (const OString& rRowGroup)
++                {
++                    filter.set_range_row_group(rRowGroup.getStr());
++                }
++            );
++
+             filter.commit_range();
+         }
+ 
+-        std::string content = orcus::load_file_content(path);
++        orcus::file_content content(path);
+         filter.read_stream(content.data(), content.size());
+ 
+         aFactory.finalize();
+diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+index e24367342713..d9cd8b5b515c 100644
+--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
++++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+@@ -536,6 +536,12 @@ void ScXMLSourceDlg::OkPressed()
+             // Go through all its child elements.
+             getFieldLinks(aRangeLink, aParam.maNamespaces, *mxLbTree, *rEntry);
+ 
++            // Add the anchor node as a grouping node, which will be used as a
++            // row position increment point.
++            OUString aThisEntry = getXPath(*mxLbTree, *rEntry, aParam.maNamespaces);
++            aRangeLink.maRowGroups.push_back(
++                OUStringToOString(aThisEntry, RTL_TEXTENCODING_UTF8));
++
+             aParam.maRangeLinks.push_back(aRangeLink);
+         }
+     }
+diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx
+index 9ed7f43b41d5..21264745e4f8 100644
+--- a/svl/source/misc/gridprinter.cxx
++++ b/svl/source/misc/gridprinter.cxx
+@@ -29,7 +29,7 @@ typedef mdds::mtv::default_element_block<element_type_string, OUString> string_b
+ struct matrix_trait
+ {
+     typedef string_block string_element_block;
+-    typedef mdds::mtv::ushort_element_block integer_element_block;
++    typedef mdds::mtv::uint16_element_block integer_element_block;
+ 
+     typedef mdds::mtv::custom_block_func1<string_block> element_block_func;
+ };
+-- 
+2.21.0
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-02 08:54:34 UTC (rev 382132)
+++ PKGBUILD	2020-05-02 08:54:57 UTC (rev 382133)
@@ -1,380 +0,0 @@
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-
-# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-# Note: These are for Arch Linux use ONLY. For your own distribution, please
-# get your own set of keys. Feel free to contact foutrelis at archlinux.org for
-# more information.
-_google_default_client_id=413772536636.apps.googleusercontent.com
-_google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
-
-pkgbase=libreoffice-still
-pkgname=('libreoffice-still-sdk' 'libreoffice-still')
-_LOver=6.3.5.2
-pkgver=6.3.5
-pkgrel=6
-arch=('x86_64')
-license=('LGPL3')
-url="https://www.libreoffice.org/"
-makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 'libwps'
-	'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib'
-	'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' 
-	'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
-	'libmspub' 'harfbuzz-icu' 'nss' 'hicolor-icon-theme'
-	'desktop-file-utils' 'shared-mime-info' 'gtk2' 'gst-plugins-base-libs'
-	'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'ant'
-	'gperf' 'gtk3' 'qt5-base' 'plasma-framework' 'cppunit' 'beanshell' 'clucene'
-	'junit' 'libmythes' 'libwpg'  'java-environment=8' 'postgresql-libs' 'mariadb-libs' 'libgl'
-	'bluez-libs' 'gdb' 'doxygen'  'libatomic_ops'  'mdds'
-	'apr' 'serf' 'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama' 'libpagemaker' 'glm'
-	'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' 
-	'libexttextcat' 'libcmis' 'gobject-introspection' # 'libfbclient'
-	'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode' 
-	'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice'  'boost' 'libnumbertext'
-)
-
-_mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}"
-#_mirror="https://dev-builds.libreoffice.org/pre-releases/src"
-_additional_source_url="https://dev-www.libreoffice.org/src"
-_additional_source_url2="https://dev-www.libreoffice.org/extern"
-source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
-	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip # keep old bundled version, new system version ftbs
-	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-	${_additional_source_url}/language-subtag-registry-2019-04-03.tar.bz2
-	${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	${_additional_source_url}/pdfium-3794.tar.bz2
-	${_additional_source_url}/lxml-4.1.1.tgz
-	${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2
-	${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar  # for test suite
-	${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite
-	${_additional_source_url2}/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
-	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	make-pyuno-work-with-system-wide-module-install.diff
-	soffice-template.desktop.in
-	libreoffice-still.sh libreoffice-still.csh
-	0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch
-        libreoffice-poppler-0.86.patch)
-noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-           798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-           a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-           0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-           language-subtag-registry-2019-04-03.tar.bz2
-           17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-           d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-           ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-           pdfium-3794.tar.bz2
-           lxml-4.1.1.tgz
-           Firebird-3.0.0.32483-0.tar.bz2
-           8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar  # for test suite
-           odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar  # for test suite
-           884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
-           185d60944ea767075d27247c3162b3bc-unowinreg.dll
-)
-validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
-sha256sums=('ffdb61dc01f18d85272dc798c3403ba74569b0b3e90f3cdc7d014710c3f6ca4a'
-            'SKIP'
-            'a639d5ff1fa63672e52c3ab1be49ec9720dfafacc21e3ce7958b994d19e568dc'
-            'SKIP'
-            '5bee1b53acb909b2fa70235b98a985e937032eeaa6034aa4d3b9c760d74ae005'
-            'SKIP'
-            '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
-            '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
-            '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870'
-            '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776'
-            'a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d'
-            'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370'
-            '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
-            '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
-            'e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4'
-            '940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e'
-            '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860'
-            'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
-            '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
-            '884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc'
-            'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
-            'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
-            'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
-            'c1e199f7767a4f42d9a95fc942cda4cf47737c7d67e6f334679c9b2e3e271dc2'
-            '07c28ff8f5258abfe4338efccbdfb1dd35892bd00a2ed7f53b1fc2263f71a8b6'
-            '77214ebc425916990ed80e9508572fd1d565412e1f8c2289424457e3d9bcbc79'
-            'f52ef5d64d7a74ca90bc96614260566720130d91f3764874eac673f6b3336b5e')
-
-prepare() {
-
-	cd libreoffice-$_LOver
-
-        patch -p1 -i ../libreoffice-poppler-0.86.patch # Fix build with poppler 0.86
-
-	# move external sources into place
-	mkdir "${srcdir}"/ext_sources && pushd "${srcdir}"/ext_sources
-	for source in "${noextract[@]}"; do
-		ln -s "${srcdir}"/$source .
-	done
-	popd
-	
-	# unowinreg.dll must be a file not a symlink or the result will become a broken symlink
-	# /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	rm "${srcdir}"/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	cp -f "${srcdir}"/185d60944ea767075d27247c3162b3bc-unowinreg.dll "${srcdir}"/ext_sources
-
-	# fix not upstreamable pyuno paths - FS#54250
-	patch -Np1 -i "${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff
-
-	#use the CFLAGS but remove the LibO overridden ones
-	for i in $CFLAGS; do
-		case "$i" in
-			-O?|-pipe|-Wall|-g|-fexceptions) continue;;
-		esac
-		ARCH_FLAGS="$ARCH_FLAGS $i"
-	done
-
-	# fix build with updated system liborcus/mdds; patch taken from Fedora
-	patch -Np1 -i ../0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch
-}
-
-build() {
-	cd libreoffice-$_LOver
-
-	# strip -s from Makeflags in case you use it to shorten build logs
-	_MAKEFLAGS=${MAKEFLAGS/-s/}
-
-	# http://site.icu-project.org/download/61#TOC-Migration-Issues
-	CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
-
-	./autogen.sh --with-build-version="${pkgver}-${pkgrel}" \
-		--with-vendor="Arch Linux" \
-		--enable-split-app-modules \
-		--with-parallelism=${_MAKEFLAGS/-j/} \
-		--with-external-tar="${srcdir}/ext_sources" \
-		--disable-fetch-external \
-		--enable-release-build \
-		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
-		--libdir=/usr/lib --mandir=/usr/share/man \
-		--with-lang="" \
-		--with-help=html \
-		--disable-avahi \
-		--enable-dbus \
-		--enable-evolution2\
-		--enable-gio\
-		--enable-gtk3-kde5 \
-		--enable-kde5 \
-		--enable-qt5 \
-		--enable-gtk3 \
-		--enable-introspection \
-		--disable-gstreamer-0-10 \
-		--enable-openssl \
-		--enable-odk\
-		--enable-python=system \
-		--enable-scripting-beanshell \
-		--enable-scripting-javascript \
-		--disable-dconf \
-		--disable-report-builder \
-		--enable-ext-wiki-publisher \
-		--enable-ext-nlpsolver \
-		--without-fonts\
-		--with-system-apr \
-		--with-system-libcdr \
-		--with-system-mdds\
-		--without-myspell-dicts \
-		--with-system-libvisio \
-		--with-system-libcmis \
-		--with-system-libmspub \
-		--with-system-libexttextcat \
-		--with-system-orcus \
-		--with-system-liblangtag \
-		--with-system-libodfgen \
-		--with-system-libmwaw \
-		--with-system-libetonyek \
-		--with-system-libfreehand \
-		--without-system-firebird \
-		--with-system-libtommath \
-		--with-system-libatomic-ops \
-		--with-system-libebook \
-		--with-system-libabw \
-		--with-system-coinmp \
-		--with-system-dicts \
-		--with-external-dict-dir=/usr/share/hunspell \
-		--with-external-hyph-dir=/usr/share/hyphen \
-		--with-external-thes-dir=/usr/share/mythes \
-		--with-system-beanshell \
-		--with-system-cppunit\
-		--with-system-graphite\
-		--with-system-glm \
-		--with-system-libnumbertext \
-		--with-system-libwpg \
-		--with-system-libwps \
-		--with-system-redland\
-		--with-system-libzmf \
-		--with-system-gpgmepp \
-		--with-system-libstaroffice \
-		--with-system-serf \
-		--with-jdk-home="/usr/lib/jvm/default" \
-		--with-ant-home="/usr/share/ant"\
-		--with-system-boost\
-		--with-system-icu \
-		--with-system-cairo \
-		--with-system-libs \
-		--with-system-mythes \
-		--with-system-headers \
-		--without-system-hsqldb \
-		--with-system-clucene \
-		--with-gdrive-client-id=${_google_default_client_id} \
-		--with-gdrive-client-secret=${_google_default_client_secret} \
-		--disable-dependency-tracking
-
-	touch src.downloaded
-	make build-nocheck
-
-	mkdir "${srcdir}"/fakeinstall
-	make DESTDIR="${srcdir}"/fakeinstall distro-pack-install
-}
-
-#check() {
-#	cd "${srcdir}"/build
-#	make check
-#}
-
-package_libreoffice-still-sdk() {
-	pkgdesc="Software Development Kit for LibreOffice maintenance branch"
-	depends=('libreoffice-still' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
-	provides=('libreoffice-sdk')
-	conflicts=('libreoffice-fresh-sdk')
-
-	for dir in $(grep -h ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do
-		install -dm755 "${pkgdir}"/${dir/\%dir/}
-	done
-
-	for file in $(grep -h -v ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do
-		dirname=$(dirname $file)
-		[[ -d "${pkgdir}"/$dirname ]] || install -dm755 "${pkgdir}"/$dirname
-		mv "${srcdir}"/fakeinstall/${file} "${pkgdir}"/$file
-	done
-
-	# fix environment path to keep compatibility with other java-environments
-	sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" \
-		"${pkgdir}"/usr/lib/libreoffice/sdk/setsdkenv_unix.sh
-
-	# fix permissions
-	find "${pkgdir}"/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} +
-	
-	# add LibreOfficeKit headers; FS#48066
-	install -dm755 "${pkgdir}"/usr/include/LibreOfficeKit
-	install -v -m644 "${srcdir}"/libreoffice-$_LOver/include/LibreOfficeKit/* "${pkgdir}"/usr/include/LibreOfficeKit
-}
-
-package_libreoffice-still() {
-	pkgdesc="LibreOffice maintenance branch"
-	depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 'libwps'
-		'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl'
-		'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' 
-		'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
-		'libmspub' 'harfbuzz-icu' 'nss' 'clucene' 'hicolor-icon-theme'
-		'desktop-file-utils' 'shared-mime-info' 'libpagemaker'
-		'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups'
-		'liblangtag' 'libexttextcat' 'libcmis' 'liborcus' # 'libfbclient'
-		'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'gpgme' 'libnumbertext'
-		'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy')
-	optdepends=('java-runtime:     adds java support'
-		'java-environment: required by extension-wiki-publisher and extension-nlpsolver'
-		'pstoedit:         translates PostScript and PDF graphics into other vector formats'
-		'libmythes:        for use in thesaurus'
-		'beanshell:       interactive java -- good for prototyping/macros'
-		'libwpg:           library for importing and converting WordPerfect Graphics format'
-		'sane:             for scanner access'
-		'unixodbc:         adds ODBC database support'
-		'gst-plugins-base-libs: for multimedia content, e.g. in Impress'
-		'libpaper:         takes care of papersize'
-		'postgresql-libs:  for postgresql-connector'
-		'mariadb-libs:     for mysql-connector'
-		'coin-or-mp:	   required by the Calc solver'
-		'gtk2:             for GTK2 integration'
-		'gtk3:             for GTK3 integration'
-		'kio:              for KF5 KDE desktop integration')
-	backup=(etc/libreoffice/sofficerc
-		etc/libreoffice/bootstraprc
-		etc/libreoffice/psprint.conf
-		etc/profile.d/libreoffice-still.sh
-		etc/profile.d/libreoffice-still.csh)
-	provides=('libreoffice' 'libreoffice-en-US')
-	conflicts=('libreoffice-fresh')
-
-	mv fakeinstall/* "${pkgdir}"/
-
-	# put configuration files into place
-	install -dm755 "${pkgdir}"/etc/libreoffice
-	install -m644 "${pkgdir}"/usr/lib/libreoffice/program/{bootstraprc,sofficerc} \
-		"${pkgdir}"/etc/libreoffice/
-	install -m644 "${pkgdir}"/usr/lib/libreoffice/share/psprint/psprint.conf \
-	   	"${pkgdir}"/etc/libreoffice/
-
-	# install dummy links to make them found by LibO
-	cd "${pkgdir}"/usr/lib/libreoffice/program/
-	ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
-	cd "${pkgdir}"/usr/lib/libreoffice/share/psprint/
-	ln -vsf /etc/libreoffice/psprint.conf .
-
-	# allow to preset desired VLC
-	install -dm755 "${pkgdir}"/etc/profile.d
-	install -m644 "${srcdir}"/libreoffice-still.{sh,csh} "${pkgdir}"/etc/profile.d/
-
-	# make pyuno find its modules
-	install -dm755 "${pkgdir}"/usr/lib/python3.8/site-packages
-	ln -svf /usr/lib/libreoffice/program/uno.py \
-		"${pkgdir}"/usr/lib/python3.8/site-packages/uno.py
-	ln -svf /usr/lib/libreoffice/program/unohelper.py \
-		"${pkgdir}"/usr/lib/python3.8/site-packages/unohelper.py
-		
-	# add a symlink required for gnome-documents; FS#51887
-	# https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html
-	ln -svf /usr/lib/libreoffice/program/liblibreofficekitgtk.so \
-		"${pkgdir}"/usr/lib/liblibreofficekitgtk.so  
-
-	# cleanup
-	rm -rf "${pkgdir}"/usr/share/libreoffice/sdk
-
-	# add application descriptions
-	install -dm755 "${pkgdir}"/usr/share/metainfo
-	install -v -m644 "${srcdir}"/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \
-		"${pkgdir}"/usr/share/metainfo
-
-	# add kde filemanager templates; FS#61662 - file taken from Debian
-	install -dm755 "${pkgdir}"/usr/share/templates/.source
-	install -v -m644 "${srcdir}"/libreoffice-$_LOver/extras/source/shellnew/soffice.* \
-		"${pkgdir}"/usr/share/templates/.source
-
-	cat "${srcdir}"/soffice-template.desktop.in \
-                | sed -e "s/@APP@/Writer/" \
-                | sed -e "s/@EXT@/odt/" \
-                | sed -e "s/@TYPE@/text/" \
-                > "${pkgdir}"/usr/share/templates/soffice.odt.desktop
-        cat "${srcdir}"/soffice-template.desktop.in \
-                | sed -e "s/@APP@/Calc/" \
-                | sed -e "s/@EXT@/ods/" \
-                | sed -e "s/@TYPE@/spreadsheet/" \
-                > "${pkgdir}"/usr/share/templates/soffice.ods.desktop
-        cat "${srcdir}"/soffice-template.desktop.in \
-                | sed -e "s/@APP@/Impress/" \
-                | sed -e "s/@EXT@/odp/" \
-                | sed -e "s/@TYPE@/presentation/" \
-                > "${pkgdir}"/usr/share/templates/soffice.odp.desktop
-        cat "${srcdir}"/soffice-template.desktop.in \
-                | sed -e "s/@APP@/Draw/" \
-                | sed -e "s/@EXT@/odg/" \
-                | sed -e "s/@TYPE@/drawing/" \
-                > "${pkgdir}"/usr/share/templates/soffice.odg.desktop
-
-	# make all i18n lang packages with help section ('1') available to
-	# fix "F1" not opening translated offline help opening in browser
-	# see also /usr/lib/libreoffice/help/en-US/langnames.js
-	echo "var languagesSet = new Set(['en-US','am','ar','ast','bg','bn',\
-	'bn-IN','bo','bs','ca','ca-valencia','cs','da','de','dz','el',\
-	'en-GB','en-ZA','eo','es','et','eu','fi','fr','gl','gu','he',\
-	'hi','hr','hu','id','is','it','ja','ka','km','ko','lo','lt','lv',\
-	'mk','nb','ne','nl','nn','om','pl','pt','pt-BR','ro','ru','si',\
-	'sid','sk','sl','sq','sv','ta','tg','tr','ug','uk','vi','zh-CN','zh-TW'])" \
-		> "${pkgdir}"/usr/lib/libreoffice/help/languages.js
-}

Copied: libreoffice-still/repos/extra-x86_64/PKGBUILD (from rev 382132, libreoffice-still/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-02 08:54:57 UTC (rev 382133)
@@ -0,0 +1,380 @@
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+
+# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+# Note: These are for Arch Linux use ONLY. For your own distribution, please
+# get your own set of keys. Feel free to contact foutrelis at archlinux.org for
+# more information.
+_google_default_client_id=413772536636.apps.googleusercontent.com
+_google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
+
+pkgbase=libreoffice-still
+pkgname=('libreoffice-still-sdk' 'libreoffice-still')
+_LOver=6.3.6.2
+pkgver=6.3.6
+pkgrel=1
+arch=('x86_64')
+license=('LGPL3')
+url="https://www.libreoffice.org/"
+makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 'libwps'
+	'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib'
+	'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' 
+	'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
+	'libmspub' 'harfbuzz-icu' 'nss' 'hicolor-icon-theme'
+	'desktop-file-utils' 'shared-mime-info' 'gtk2' 'gst-plugins-base-libs'
+	'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'ant'
+	'gperf' 'gtk3' 'qt5-base' 'plasma-framework' 'cppunit' 'beanshell' 'clucene'
+	'junit' 'libmythes' 'libwpg'  'java-environment=8' 'postgresql-libs' 'mariadb-libs' 'libgl'
+	'bluez-libs' 'gdb' 'doxygen'  'libatomic_ops'  'mdds'
+	'apr' 'serf' 'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama' 'libpagemaker' 'glm'
+	'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' 
+	'libexttextcat' 'libcmis' 'gobject-introspection' # 'libfbclient'
+	'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode' 
+	'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice'  'boost' 'libnumbertext'
+)
+
+_mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}"
+#_mirror="https://dev-builds.libreoffice.org/pre-releases/src"
+_additional_source_url="https://dev-www.libreoffice.org/src"
+_additional_source_url2="https://dev-www.libreoffice.org/extern"
+source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
+	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip # keep old bundled version, new system version ftbs
+	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+	${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+	${_additional_source_url}/language-subtag-registry-2019-04-03.tar.bz2
+	${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+	${_additional_source_url}/pdfium-3794.tar.bz2
+	${_additional_source_url}/lxml-4.1.1.tgz
+	${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2
+	${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar  # for test suite
+	${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite
+	${_additional_source_url2}/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
+	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+	make-pyuno-work-with-system-wide-module-install.diff
+	soffice-template.desktop.in
+	libreoffice-still.sh libreoffice-still.csh
+	0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch
+        libreoffice-poppler-0.86.patch)
+noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+           798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+           a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+           0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+           language-subtag-registry-2019-04-03.tar.bz2
+           17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+           d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+           ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+           pdfium-3794.tar.bz2
+           lxml-4.1.1.tgz
+           Firebird-3.0.0.32483-0.tar.bz2
+           8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar  # for test suite
+           odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar  # for test suite
+           884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
+           185d60944ea767075d27247c3162b3bc-unowinreg.dll
+)
+validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
+sha256sums=('c39a4c7bb6e3bea604b0bfb2743492cb908166b464336272dac92c7dcf48af58'
+            'SKIP'
+            '391723f757f30ed8c372005d64d0845fe62034f61a116dc7554981d2f7afbfc0'
+            'SKIP'
+            '20986af32f9eb656ad05989509d9d5d165f3bc496421131bd3380683ee7ea8ac'
+            'SKIP'
+            '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
+            '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
+            '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870'
+            '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776'
+            'a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d'
+            'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370'
+            '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
+            '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
+            'e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4'
+            '940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e'
+            '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860'
+            'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
+            '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
+            '884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc'
+            'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
+            'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
+            'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
+            'c1e199f7767a4f42d9a95fc942cda4cf47737c7d67e6f334679c9b2e3e271dc2'
+            '07c28ff8f5258abfe4338efccbdfb1dd35892bd00a2ed7f53b1fc2263f71a8b6'
+            '77214ebc425916990ed80e9508572fd1d565412e1f8c2289424457e3d9bcbc79'
+            'f52ef5d64d7a74ca90bc96614260566720130d91f3764874eac673f6b3336b5e')
+
+prepare() {
+
+	cd libreoffice-$_LOver
+
+        patch -p1 -i ../libreoffice-poppler-0.86.patch # Fix build with poppler 0.86
+
+	# move external sources into place
+	mkdir "${srcdir}"/ext_sources && pushd "${srcdir}"/ext_sources
+	for source in "${noextract[@]}"; do
+		ln -s "${srcdir}"/$source .
+	done
+	popd
+	
+	# unowinreg.dll must be a file not a symlink or the result will become a broken symlink
+	# /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+	rm "${srcdir}"/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+	cp -f "${srcdir}"/185d60944ea767075d27247c3162b3bc-unowinreg.dll "${srcdir}"/ext_sources
+
+	# fix not upstreamable pyuno paths - FS#54250
+	patch -Np1 -i "${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff
+
+	#use the CFLAGS but remove the LibO overridden ones
+	for i in $CFLAGS; do
+		case "$i" in
+			-O?|-pipe|-Wall|-g|-fexceptions) continue;;
+		esac
+		ARCH_FLAGS="$ARCH_FLAGS $i"
+	done
+
+	# fix build with updated system liborcus/mdds; patch taken from Fedora
+	patch -Np1 -i ../0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch
+}
+
+build() {
+	cd libreoffice-$_LOver
+
+	# strip -s from Makeflags in case you use it to shorten build logs
+	_MAKEFLAGS=${MAKEFLAGS/-s/}
+
+	# http://site.icu-project.org/download/61#TOC-Migration-Issues
+	CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
+
+	./autogen.sh --with-build-version="${pkgver}-${pkgrel}" \
+		--with-vendor="Arch Linux" \
+		--enable-split-app-modules \
+		--with-parallelism=${_MAKEFLAGS/-j/} \
+		--with-external-tar="${srcdir}/ext_sources" \
+		--disable-fetch-external \
+		--enable-release-build \
+		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
+		--libdir=/usr/lib --mandir=/usr/share/man \
+		--with-lang="" \
+		--with-help=html \
+		--disable-avahi \
+		--enable-dbus \
+		--enable-evolution2\
+		--enable-gio\
+		--enable-gtk3-kde5 \
+		--enable-kde5 \
+		--enable-qt5 \
+		--enable-gtk3 \
+		--enable-introspection \
+		--disable-gstreamer-0-10 \
+		--enable-openssl \
+		--enable-odk\
+		--enable-python=system \
+		--enable-scripting-beanshell \
+		--enable-scripting-javascript \
+		--disable-dconf \
+		--disable-report-builder \
+		--enable-ext-wiki-publisher \
+		--enable-ext-nlpsolver \
+		--without-fonts\
+		--with-system-apr \
+		--with-system-libcdr \
+		--with-system-mdds\
+		--without-myspell-dicts \
+		--with-system-libvisio \
+		--with-system-libcmis \
+		--with-system-libmspub \
+		--with-system-libexttextcat \
+		--with-system-orcus \
+		--with-system-liblangtag \
+		--with-system-libodfgen \
+		--with-system-libmwaw \
+		--with-system-libetonyek \
+		--with-system-libfreehand \
+		--without-system-firebird \
+		--with-system-libtommath \
+		--with-system-libatomic-ops \
+		--with-system-libebook \
+		--with-system-libabw \
+		--with-system-coinmp \
+		--with-system-dicts \
+		--with-external-dict-dir=/usr/share/hunspell \
+		--with-external-hyph-dir=/usr/share/hyphen \
+		--with-external-thes-dir=/usr/share/mythes \
+		--with-system-beanshell \
+		--with-system-cppunit\
+		--with-system-graphite\
+		--with-system-glm \
+		--with-system-libnumbertext \
+		--with-system-libwpg \
+		--with-system-libwps \
+		--with-system-redland\
+		--with-system-libzmf \
+		--with-system-gpgmepp \
+		--with-system-libstaroffice \
+		--with-system-serf \
+		--with-jdk-home="/usr/lib/jvm/default" \
+		--with-ant-home="/usr/share/ant"\
+		--with-system-boost\
+		--with-system-icu \
+		--with-system-cairo \
+		--with-system-libs \
+		--with-system-mythes \
+		--with-system-headers \
+		--without-system-hsqldb \
+		--with-system-clucene \
+		--with-gdrive-client-id=${_google_default_client_id} \
+		--with-gdrive-client-secret=${_google_default_client_secret} \
+		--disable-dependency-tracking
+
+	touch src.downloaded
+	make build-nocheck
+
+	mkdir "${srcdir}"/fakeinstall
+	make DESTDIR="${srcdir}"/fakeinstall distro-pack-install
+}
+
+#check() {
+#	cd "${srcdir}"/build
+#	make check
+#}
+
+package_libreoffice-still-sdk() {
+	pkgdesc="Software Development Kit for LibreOffice maintenance branch"
+	depends=('libreoffice-still' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
+	provides=('libreoffice-sdk')
+	conflicts=('libreoffice-fresh-sdk')
+
+	for dir in $(grep -h ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do
+		install -dm755 "${pkgdir}"/${dir/\%dir/}
+	done
+
+	for file in $(grep -h -v ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do
+		dirname=$(dirname $file)
+		[[ -d "${pkgdir}"/$dirname ]] || install -dm755 "${pkgdir}"/$dirname
+		mv "${srcdir}"/fakeinstall/${file} "${pkgdir}"/$file
+	done
+
+	# fix environment path to keep compatibility with other java-environments
+	sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" \
+		"${pkgdir}"/usr/lib/libreoffice/sdk/setsdkenv_unix.sh
+
+	# fix permissions
+	find "${pkgdir}"/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} +
+	
+	# add LibreOfficeKit headers; FS#48066
+	install -dm755 "${pkgdir}"/usr/include/LibreOfficeKit
+	install -v -m644 "${srcdir}"/libreoffice-$_LOver/include/LibreOfficeKit/* "${pkgdir}"/usr/include/LibreOfficeKit
+}
+
+package_libreoffice-still() {
+	pkgdesc="LibreOffice maintenance branch"
+	depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 'libwps'
+		'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl'
+		'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' 
+		'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
+		'libmspub' 'harfbuzz-icu' 'nss' 'clucene' 'hicolor-icon-theme'
+		'desktop-file-utils' 'shared-mime-info' 'libpagemaker'
+		'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups'
+		'liblangtag' 'libexttextcat' 'libcmis' 'liborcus' # 'libfbclient'
+		'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'gpgme' 'libnumbertext'
+		'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy')
+	optdepends=('java-runtime:     adds java support'
+		'java-environment: required by extension-wiki-publisher and extension-nlpsolver'
+		'pstoedit:         translates PostScript and PDF graphics into other vector formats'
+		'libmythes:        for use in thesaurus'
+		'beanshell:       interactive java -- good for prototyping/macros'
+		'libwpg:           library for importing and converting WordPerfect Graphics format'
+		'sane:             for scanner access'
+		'unixodbc:         adds ODBC database support'
+		'gst-plugins-base-libs: for multimedia content, e.g. in Impress'
+		'libpaper:         takes care of papersize'
+		'postgresql-libs:  for postgresql-connector'
+		'mariadb-libs:     for mysql-connector'
+		'coin-or-mp:	   required by the Calc solver'
+		'gtk2:             for GTK2 integration'
+		'gtk3:             for GTK3 integration'
+		'kio:              for KF5 KDE desktop integration')
+	backup=(etc/libreoffice/sofficerc
+		etc/libreoffice/bootstraprc
+		etc/libreoffice/psprint.conf
+		etc/profile.d/libreoffice-still.sh
+		etc/profile.d/libreoffice-still.csh)
+	provides=('libreoffice' 'libreoffice-en-US')
+	conflicts=('libreoffice-fresh')
+
+	mv fakeinstall/* "${pkgdir}"/
+
+	# put configuration files into place
+	install -dm755 "${pkgdir}"/etc/libreoffice
+	install -m644 "${pkgdir}"/usr/lib/libreoffice/program/{bootstraprc,sofficerc} \
+		"${pkgdir}"/etc/libreoffice/
+	install -m644 "${pkgdir}"/usr/lib/libreoffice/share/psprint/psprint.conf \
+	   	"${pkgdir}"/etc/libreoffice/
+
+	# install dummy links to make them found by LibO
+	cd "${pkgdir}"/usr/lib/libreoffice/program/
+	ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
+	cd "${pkgdir}"/usr/lib/libreoffice/share/psprint/
+	ln -vsf /etc/libreoffice/psprint.conf .
+
+	# allow to preset desired VLC
+	install -dm755 "${pkgdir}"/etc/profile.d
+	install -m644 "${srcdir}"/libreoffice-still.{sh,csh} "${pkgdir}"/etc/profile.d/
+
+	# make pyuno find its modules
+	install -dm755 "${pkgdir}"/usr/lib/python3.8/site-packages
+	ln -svf /usr/lib/libreoffice/program/uno.py \
+		"${pkgdir}"/usr/lib/python3.8/site-packages/uno.py
+	ln -svf /usr/lib/libreoffice/program/unohelper.py \
+		"${pkgdir}"/usr/lib/python3.8/site-packages/unohelper.py
+		
+	# add a symlink required for gnome-documents; FS#51887
+	# https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html
+	ln -svf /usr/lib/libreoffice/program/liblibreofficekitgtk.so \
+		"${pkgdir}"/usr/lib/liblibreofficekitgtk.so  
+
+	# cleanup
+	rm -rf "${pkgdir}"/usr/share/libreoffice/sdk
+
+	# add application descriptions
+	install -dm755 "${pkgdir}"/usr/share/metainfo
+	install -v -m644 "${srcdir}"/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \
+		"${pkgdir}"/usr/share/metainfo
+
+	# add kde filemanager templates; FS#61662 - file taken from Debian
+	install -dm755 "${pkgdir}"/usr/share/templates/.source
+	install -v -m644 "${srcdir}"/libreoffice-$_LOver/extras/source/shellnew/soffice.* \
+		"${pkgdir}"/usr/share/templates/.source
+
+	cat "${srcdir}"/soffice-template.desktop.in \
+                | sed -e "s/@APP@/Writer/" \
+                | sed -e "s/@EXT@/odt/" \
+                | sed -e "s/@TYPE@/text/" \
+                > "${pkgdir}"/usr/share/templates/soffice.odt.desktop
+        cat "${srcdir}"/soffice-template.desktop.in \
+                | sed -e "s/@APP@/Calc/" \
+                | sed -e "s/@EXT@/ods/" \
+                | sed -e "s/@TYPE@/spreadsheet/" \
+                > "${pkgdir}"/usr/share/templates/soffice.ods.desktop
+        cat "${srcdir}"/soffice-template.desktop.in \
+                | sed -e "s/@APP@/Impress/" \
+                | sed -e "s/@EXT@/odp/" \
+                | sed -e "s/@TYPE@/presentation/" \
+                > "${pkgdir}"/usr/share/templates/soffice.odp.desktop
+        cat "${srcdir}"/soffice-template.desktop.in \
+                | sed -e "s/@APP@/Draw/" \
+                | sed -e "s/@EXT@/odg/" \
+                | sed -e "s/@TYPE@/drawing/" \
+                > "${pkgdir}"/usr/share/templates/soffice.odg.desktop
+
+	# make all i18n lang packages with help section ('1') available to
+	# fix "F1" not opening translated offline help opening in browser
+	# see also /usr/lib/libreoffice/help/en-US/langnames.js
+	echo "var languagesSet = new Set(['en-US','am','ar','ast','bg','bn',\
+	'bn-IN','bo','bs','ca','ca-valencia','cs','da','de','dz','el',\
+	'en-GB','en-ZA','eo','es','et','eu','fi','fr','gl','gu','he',\
+	'hi','hr','hu','id','is','it','ja','ka','km','ko','lo','lt','lv',\
+	'mk','nb','ne','nl','nn','om','pl','pt','pt-BR','ro','ru','si',\
+	'sid','sk','sl','sq','sv','ta','tg','tr','ug','uk','vi','zh-CN','zh-TW'])" \
+		> "${pkgdir}"/usr/lib/libreoffice/help/languages.js
+}

Deleted: libreoffice-poppler-0.86.patch
===================================================================
--- libreoffice-poppler-0.86.patch	2020-05-02 08:54:34 UTC (rev 382132)
+++ libreoffice-poppler-0.86.patch	2020-05-02 08:54:57 UTC (rev 382133)
@@ -1,15 +0,0 @@
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index e9c2a407c279..16ad04bf660a 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
-     if (!(pAction && pAction->getKind() == actionURI))
-         return;
- 
--#if POPPLER_CHECK_VERSION(0, 72, 0)
-+#if POPPLER_CHECK_VERSION(0, 86, 0)
-+    const char* pURI = static_cast<LinkURI*>(pAction)->getURI().c_str();
-+#elif POPPLER_CHECK_VERSION(0, 72, 0)
-     const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
- #else
-     const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();

Copied: libreoffice-still/repos/extra-x86_64/libreoffice-poppler-0.86.patch (from rev 382132, libreoffice-still/trunk/libreoffice-poppler-0.86.patch)
===================================================================
--- libreoffice-poppler-0.86.patch	                        (rev 0)
+++ libreoffice-poppler-0.86.patch	2020-05-02 08:54:57 UTC (rev 382133)
@@ -0,0 +1,15 @@
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index e9c2a407c279..16ad04bf660a 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
+     if (!(pAction && pAction->getKind() == actionURI))
+         return;
+ 
+-#if POPPLER_CHECK_VERSION(0, 72, 0)
++#if POPPLER_CHECK_VERSION(0, 86, 0)
++    const char* pURI = static_cast<LinkURI*>(pAction)->getURI().c_str();
++#elif POPPLER_CHECK_VERSION(0, 72, 0)
+     const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
+ #else
+     const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();

Deleted: libreoffice-still.csh
===================================================================
--- libreoffice-still.csh	2020-05-02 08:54:34 UTC (rev 382132)
+++ libreoffice-still.csh	2020-05-02 08:54:57 UTC (rev 382133)
@@ -1,8 +0,0 @@
-# to force a certain look'n feel
-
-#setenv SAL_USE_VCLPLUGIN gen
-#setenv SAL_USE_VCLPLUGIN gtk3_kde5
-#setenv SAL_USE_VCLPLUGIN kde5
-#setenv SAL_USE_VCLPLUGIN qt5
-#setenv SAL_USE_VCLPLUGIN gtk
-#setenv SAL_USE_VCLPLUGIN gtk3

Copied: libreoffice-still/repos/extra-x86_64/libreoffice-still.csh (from rev 382132, libreoffice-still/trunk/libreoffice-still.csh)
===================================================================
--- libreoffice-still.csh	                        (rev 0)
+++ libreoffice-still.csh	2020-05-02 08:54:57 UTC (rev 382133)
@@ -0,0 +1,8 @@
+# to force a certain look'n feel
+
+#setenv SAL_USE_VCLPLUGIN gen
+#setenv SAL_USE_VCLPLUGIN gtk3_kde5
+#setenv SAL_USE_VCLPLUGIN kde5
+#setenv SAL_USE_VCLPLUGIN qt5
+#setenv SAL_USE_VCLPLUGIN gtk
+#setenv SAL_USE_VCLPLUGIN gtk3

Deleted: libreoffice-still.sh
===================================================================
--- libreoffice-still.sh	2020-05-02 08:54:34 UTC (rev 382132)
+++ libreoffice-still.sh	2020-05-02 08:54:57 UTC (rev 382133)
@@ -1,8 +0,0 @@
-# to force a certain look'n feel
-
-#export SAL_USE_VCLPLUGIN=gen
-#export SAL_USE_VCLPLUGIN=gtk3_kde5
-#export SAL_USE_VCLPLUGIN=kde5
-#export SAL_USE_VCLPLUGIN=qt5
-#export SAL_USE_VCLPLUGIN=gtk
-#export SAL_USE_VCLPLUGIN=gtk3

Copied: libreoffice-still/repos/extra-x86_64/libreoffice-still.sh (from rev 382132, libreoffice-still/trunk/libreoffice-still.sh)
===================================================================
--- libreoffice-still.sh	                        (rev 0)
+++ libreoffice-still.sh	2020-05-02 08:54:57 UTC (rev 382133)
@@ -0,0 +1,8 @@
+# to force a certain look'n feel
+
+#export SAL_USE_VCLPLUGIN=gen
+#export SAL_USE_VCLPLUGIN=gtk3_kde5
+#export SAL_USE_VCLPLUGIN=kde5
+#export SAL_USE_VCLPLUGIN=qt5
+#export SAL_USE_VCLPLUGIN=gtk
+#export SAL_USE_VCLPLUGIN=gtk3

Deleted: make-pyuno-work-with-system-wide-module-install.diff
===================================================================
--- make-pyuno-work-with-system-wide-module-install.diff	2020-05-02 08:54:34 UTC (rev 382132)
+++ make-pyuno-work-with-system-wide-module-install.diff	2020-05-02 08:54:57 UTC (rev 382133)
@@ -1,18 +0,0 @@
---- a/pyuno/source/module/uno.py	2017-05-03 18:46:29.000000000 +0200
-+++ b/pyuno/source/module/uno.py.new	2017-06-06 17:11:27.585959637 +0200
-@@ -16,8 +16,14 @@
- #   except in compliance with the License. You may obtain a copy of
- #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- #
--import pyuno
-+
-+# Special modification to make uno load on Arch
-+import os
- import sys
-+sys.path.append("/usr/lib/libreoffice/program/")
-+os.putenv("URE_BOOTSTRAP", "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc")
-+
-+import pyuno
- import traceback
- import warnings
- 

Copied: libreoffice-still/repos/extra-x86_64/make-pyuno-work-with-system-wide-module-install.diff (from rev 382132, libreoffice-still/trunk/make-pyuno-work-with-system-wide-module-install.diff)
===================================================================
--- make-pyuno-work-with-system-wide-module-install.diff	                        (rev 0)
+++ make-pyuno-work-with-system-wide-module-install.diff	2020-05-02 08:54:57 UTC (rev 382133)
@@ -0,0 +1,18 @@
+--- a/pyuno/source/module/uno.py	2017-05-03 18:46:29.000000000 +0200
++++ b/pyuno/source/module/uno.py.new	2017-06-06 17:11:27.585959637 +0200
+@@ -16,8 +16,14 @@
+ #   except in compliance with the License. You may obtain a copy of
+ #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ #
+-import pyuno
++
++# Special modification to make uno load on Arch
++import os
+ import sys
++sys.path.append("/usr/lib/libreoffice/program/")
++os.putenv("URE_BOOTSTRAP", "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc")
++
++import pyuno
+ import traceback
+ import warnings
+ 

Deleted: soffice-template.desktop.in
===================================================================
--- soffice-template.desktop.in	2020-05-02 08:54:34 UTC (rev 382132)
+++ soffice-template.desktop.in	2020-05-02 08:54:57 UTC (rev 382133)
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=LibreOffice @APP@  ...
-Comment=Enter LibreOffice @APP@ filename:
-Comment[de]=Name der LibreOffice @APP at -Datei eingeben:
-Type=Link
-URL=.source/soffice. at EXT@
-Icon=libreoffice-oasis- at TYPE@

Copied: libreoffice-still/repos/extra-x86_64/soffice-template.desktop.in (from rev 382132, libreoffice-still/trunk/soffice-template.desktop.in)
===================================================================
--- soffice-template.desktop.in	                        (rev 0)
+++ soffice-template.desktop.in	2020-05-02 08:54:57 UTC (rev 382133)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=LibreOffice @APP@  ...
+Comment=Enter LibreOffice @APP@ filename:
+Comment[de]=Name der LibreOffice @APP at -Datei eingeben:
+Type=Link
+URL=.source/soffice. at EXT@
+Icon=libreoffice-oasis- at TYPE@


More information about the arch-commits mailing list