update to 6.4.0

.gitignore

@@ -5,9 +5,9 @@
 /185d60944ea767075d27247c3162b3bc-unowinreg.dll
 /884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
 /libreoffice-multiliblauncher.sh
-/libreoffice-6.3.4.2.tar.xz
+/libreoffice-6.4.0.3.tar.xz
-/libreoffice-6.3.4.2.tar.xz.asc
+/libreoffice-6.4.0.3.tar.xz.asc
-/libreoffice-help-6.3.4.2.tar.xz
+/libreoffice-help-6.4.0.3.tar.xz
-/libreoffice-help-6.3.4.2.tar.xz.asc
+/libreoffice-help-6.4.0.3.tar.xz.asc
-/libreoffice-translations-6.3.4.2.tar.xz
+/libreoffice-translations-6.4.0.3.tar.xz
-/libreoffice-translations-6.3.4.2.tar.xz.asc
+/libreoffice-translations-6.4.0.3.tar.xz.asc

0001-Adapt-SAL_WARN-to-C-20-deleted-ostream-for-sal_Unico.patch

@@ -1,59 +0,0 @@
-From b8bb7fd853db5d0d7cc4ea9120efb1a707e46c22 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Tue, 3 Dec 2019 11:56:33 +0100
-Subject: [PATCH] Adapt SAL_WARN to C++20 deleted ostream << for sal_Unicode
- (aka char16_t)
-
-<http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p1423r3.html> "char8_t
-backward compatibility remediation", as implemented now by <https://gcc.gnu.org/
-git/?p=gcc.git;a=commit;h=0c5b35933e5b150df0ab487efb2f11ef5685f713> "libstdc++:
-P1423R3 char8_t remediation (2/4)" for -std=c++2a, deletes operator << overloads
-that would print an integer rather than a (presumably expected) character.
-
-Change-Id: Ic70d3e90e4b990d297e35f07379fe4952e138820
-Reviewed-on: https://gerrit.libreoffice.org/84321
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
----
- basegfx/source/polygon/b2dsvgpolypolygon.cxx | 2 +-
- starmath/source/ooxmlimport.cxx              | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
-index 2fdacad3653f..490bcd69c9a6 100644
---- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
-+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
-@@ -648,7 +648,7 @@ namespace basegfx
-                     default:
-                     {
-                         SAL_WARN("basegfx", "importFromSvgD(): skipping tags in svg:d element (unknown: \""
--                                << aCurrChar
-+                                << OUString(aCurrChar)
-                                 << "\")!");
-                         ++nPos;
-                         break;
-diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
-index f0913f157078..731daa054120 100644
---- a/starmath/source/ooxmlimport.cxx
-+++ b/starmath/source/ooxmlimport.cxx
-@@ -223,7 +223,7 @@ OUString SmOoxmlImport::handleAcc()
-             break;
-         default:
-             acc = "acute";
--            SAL_WARN( "starmath.ooxml", "Unknown m:chr in m:acc \'" << accChr << "\'" );
-+            SAL_WARN( "starmath.ooxml", "Unknown m:chr in m:acc \'" << OUString(accChr) << "\'" );
-             break;
-     }
-     OUString e = readOMathArgInElement( M_TOKEN( e ));
-@@ -554,7 +554,7 @@ OUString SmOoxmlImport::handleNary()
-             ret = "sum";
-             break;
-         default:
--            SAL_WARN( "starmath.ooxml", "Unknown m:nary chr \'" << chr << "\'" );
-+            SAL_WARN( "starmath.ooxml", "Unknown m:nary chr \'" << OUString(chr) << "\'" );
-             break;
-     }
-     if( !subHide )
--- 
-2.24.1
-

0001-Fix-build-with-poppler-0.83.patch

@@ -1,73 +0,0 @@
-From 9065cd8d9a19864f6b618f2dc10daf577badd9ee Mon Sep 17 00:00:00 2001
-From: Martin Milata <martin@martinmilata.cz>
-Date: Wed, 4 Dec 2019 02:37:40 +0100
-Subject: [PATCH] Fix build with poppler-0.83
-
-Change-Id: I7a3684932b8f9c403a3368b42fa4d8039c67f1a9
-Reviewed-on: https://gerrit.libreoffice.org/84384
-Tested-by: Jenkins
-Reviewed-by: Michael Stahl <michael.stahl@cib.de>
----
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 +++++++
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++
- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx    | 4 ++++
- 3 files changed, 15 insertions(+)
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index 26048177e..e9c2a407c 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -491,11 +491,18 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const
-     gfree(pBuf);
- }
- 
-+#if POPPLER_CHECK_VERSION(0, 83, 0)
-+void PDFOutDev::printPath( const GfxPath* pPath )
-+#else
- void PDFOutDev::printPath( GfxPath* pPath )
-+#endif
- {
-     int nSubPaths = pPath ? pPath->getNumSubpaths() : 0;
-     for( int i=0; i<nSubPaths; i++ )
-     {
-+#if POPPLER_CHECK_VERSION(0, 83, 0)
-+        const
-+#endif
-         GfxSubpath* pSub  = pPath->getSubpath( i );
-         const int nPoints = pSub->getNumPoints();
- 
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index 02f6b59f6..2e7d2186f 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -149,7 +149,11 @@ namespace pdfi
- 
-         int  parseFont( long long nNewId, GfxFont* pFont, GfxState* state ) const;
-         void writeFontFile( GfxFont* gfxFont ) const;
-+#if POPPLER_CHECK_VERSION(0, 83, 0)
-+        static void printPath( const GfxPath* pPath );
-+#else
-         static void printPath( GfxPath* pPath );
-+#endif
- 
-     public:
-         explicit PDFOutDev( PDFDoc* pDoc );
-diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-index 42178b650..b1a54bd09 100644
---- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-@@ -68,7 +68,11 @@ int main(int argc, char **argv)
-     }
- 
-     // read config file
-+#if POPPLER_CHECK_VERSION(0, 83, 0)
-+    globalParams = std::make_unique<GlobalParams>();
-+#else
-     globalParams = new GlobalParams();
-+#endif
-     globalParams->setErrQuiet(true);
- #if defined(_MSC_VER)
-     globalParams->setupBaseFonts(nullptr);
--- 
-2.24.1
-

0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch

@@ -1,621 +0,0 @@
-From 8f5dd7babe306a1c9dcdec93372a3d4378e09667 Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei@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@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@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@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@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@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@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
-

0001-replace-boost-bimap-in-sdext-pdfimport.patch

@@ -0,0 +1,110 @@
+From 193b49763a03d63ba79db50c1fa0563ec0d6b0c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Wed, 29 Jan 2020 12:44:52 +0000
+Subject: [PATCH] replace boost::bimap in sdext pdfimport
+
+Change-Id: Ie324a0b81931bbd427483878a87beeca455ada18
+---
+ sdext/source/pdfimport/inc/pdfiprocessor.hxx  | 12 ++++-------
+ sdext/source/pdfimport/tree/pdfiprocessor.cxx | 21 +++++++++++--------
+ 2 files changed, 16 insertions(+), 17 deletions(-)
+
+diff --git a/sdext/source/pdfimport/inc/pdfiprocessor.hxx b/sdext/source/pdfimport/inc/pdfiprocessor.hxx
+index 89f9d601b7b0..9e08d6a6a765 100644
+--- a/sdext/source/pdfimport/inc/pdfiprocessor.hxx
++++ b/sdext/source/pdfimport/inc/pdfiprocessor.hxx
+@@ -37,9 +37,6 @@
+ #include "treevisitorfactory.hxx"
+ #include "genericelements.hxx"
+ 
+-#include <boost/bimap/bimap.hpp>
+-#include <boost/bimap/unordered_set_of.hpp>
+-
+ namespace pdfi
+ {
+ 
+@@ -160,10 +157,8 @@ namespace pdfi
+         typedef std::unordered_map<sal_Int32,FontAttributes> IdToFontMap;
+         typedef std::unordered_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap;
+ 
+-        typedef boost::bimaps::bimap<
+-                             boost::bimaps::unordered_set_of<GraphicsContext, GraphicsContextHash>,
+-                             boost::bimaps::unordered_set_of<sal_Int32>
+-                            > GCToIdBiMap;
++        typedef std::unordered_map<sal_Int32,GraphicsContext> IdToGCMap;
++        typedef std::unordered_map<GraphicsContext, sal_Int32, GraphicsContextHash> GCToIdMap;
+ 
+         typedef std::vector<GraphicsContext> GraphicsContextStack;
+ 
+@@ -178,7 +173,8 @@ namespace pdfi
+ 
+         GraphicsContextStack               m_aGCStack;
+         sal_Int32                          m_nNextGCId;
+-        GCToIdBiMap                        m_aGCToId;
++        IdToGCMap                          m_aIdToGC;
++        GCToIdMap                          m_aGCToId;
+ 
+         ImageContainer                     m_aImages;
+ 
+diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+index c6baa7fee8b2..ed2eaf6510b9 100644
+--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
++++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+@@ -54,6 +54,7 @@ namespace pdfi
+     m_aFontToId(),
+     m_aGCStack(),
+     m_nNextGCId( 1 ),
++    m_aIdToGC(),
+     m_aGCToId(),
+     m_aImages(),
+     m_nPages(0),
+@@ -65,12 +66,13 @@ namespace pdfi
+     aDefFont.isBold     = false;
+     aDefFont.isItalic   = false;
+     aDefFont.size       = 10*PDFI_OUTDEV_RESOLUTION/72;
+-    m_aIdToFont[ 0 ]    = aDefFont;
+-    m_aFontToId[ aDefFont ] = 0;
++    m_aIdToFont.insert({0, aDefFont});
++    m_aFontToId.insert({aDefFont, 0});
+ 
+     GraphicsContext aDefGC;
+     m_aGCStack.push_back( aDefGC );
+-    m_aGCToId.insert(GCToIdBiMap::relation(aDefGC, 0));
++    m_aGCToId.insert({aDefGC, 0});
++    m_aIdToGC.insert({0, aDefGC});
+ }
+ 
+ void PDFIProcessor::setPageNum( sal_Int32 nPages )
+@@ -468,12 +470,13 @@ const FontAttributes& PDFIProcessor::getFont( sal_Int32 nFontId ) const
+ sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC )
+ {
+     sal_Int32 nGCId = 0;
+-    auto it = m_aGCToId.left.find( rGC );
+-    if( it != m_aGCToId.left.end() )
++    auto it = m_aGCToId.find( rGC );
++    if( it != m_aGCToId.end() )
+         nGCId = it->second;
+     else
+     {
+-        m_aGCToId.insert(GCToIdBiMap::relation(rGC, m_nNextGCId));
++        m_aGCToId.insert({rGC, m_nNextGCId});
++        m_aIdToGC.insert({m_nNextGCId, rGC});
+         nGCId = m_nNextGCId;
+         m_nNextGCId++;
+     }
+@@ -483,9 +486,9 @@ sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC )
+ 
+ const GraphicsContext& PDFIProcessor::getGraphicsContext( sal_Int32 nGCId ) const
+ {
+-    auto it = m_aGCToId.right.find( nGCId );
+-    if( it == m_aGCToId.right.end() )
+-        it = m_aGCToId.right.find( 0 );
++    auto it = m_aIdToGC.find( nGCId );
++    if( it == m_aIdToGC.end() )
++        it = m_aIdToGC.find( 0 );
+     return it->second;
+ }
+ 
+-- 
+2.24.1
+

libreoffice.spec

@@ -3,7 +3,7 @@
 %global _python_bytecompile_extra 1
 
 # download path contains version without the last (fourth) digit
-%global libo_version 6.3.4
+%global libo_version 6.4.0
 # Should contain .alphaX / .betaX, if this is pre-release (actually
 # pre-RC) version. The pre-release string is part of tarball file names,
 # so we need a way to define it easily at one place.
@@ -53,7 +53,7 @@
 Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
-Version:        %{libo_version}.2
+Version:        %{libo_version}.3
 Release:        1%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
 URL:            http://www.libreoffice.org/
@@ -242,9 +242,7 @@ Patch0: 0001-don-t-suppress-crashes.patch
 # rhbz#1736810 disable opencl by default again
 Patch1: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
 # backported
-Patch2: 0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch
+Patch2: 0001-replace-boost-bimap-in-sdext-pdfimport.patch
-Patch3: 0001-Fix-build-with-poppler-0.83.patch
-Patch4: 0001-Adapt-SAL_WARN-to-C-20-deleted-ostream-for-sal_Unico.patch
 
 %if 0%{?rhel}
 # not upstreamed
@@ -2137,6 +2135,9 @@ done
 %{_includedir}/LibreOfficeKit
 
 %changelog
+* Wed Jan 29 2020 Caolán McNamara <caolanm@redhat.com> - 1:6.4.0.3-1
+- latest release
+
 * Wed Jan 22 2020 Caolán McNamara <caolanm@redhat.com> - 1:6.3.4.2-1
 - latest stable release
 

sources

@@ -6,9 +6,9 @@ SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025
 SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
 SHA512 (884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf) = ce7e23e750f2c6f7ff2e590cc8941caa18eaae2727c9ca31313ab72ab19278055bd9393d38b0b5b685594e2f04ee15cb83b3bbb25d09665fe7383d7f26bf2ae8
 SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd
-SHA512 (libreoffice-6.3.4.2.tar.xz) = 2ed687ae805da36635419729066a2924f1e38a6b0f8d2692c42b366450a261012adfcd8a5d7915d9cfd292d07519fc32c596cdb56d7be6b12a49618b18d6f3d2
+SHA512 (libreoffice-6.4.0.3.tar.xz) = 1ea4b5865b7ad7d7400a775e153b00aa01d188844b580b26adb0d513db5f29a880cac145a746f139d236fff8fb5e8ed316943551de2e2eea218ab96bf177ca42
-SHA512 (libreoffice-6.3.4.2.tar.xz.asc) = 5f4d910bcb89b3b00295606b3959463be14c665f01f82b2f38d081b46c926f2c987d91f0aeb3d1a6d3691176893429a0c2bf680d9ce4f2036856de7644f1af6b
+SHA512 (libreoffice-6.4.0.3.tar.xz.asc) = bb2122c0886f1a873f11b368b54346244df08349f029c015420bbf1f9f8324a2617b48fc12daa504139d71e84b0c8f0edbb6657df60dc8b7cee8b87b3a29805b
-SHA512 (libreoffice-help-6.3.4.2.tar.xz) = 8c74c82c7d73adb1523300d1f7500769f5a623fdba60b440a63c122cbfeb631a6a34ecbcb115b0154a6957be1918306f7d0c1f465030f8e8cfd5c9a1acad17c9
+SHA512 (libreoffice-help-6.4.0.3.tar.xz) = f3f0b5e9f09e55c49a74439e4355dfebc3fe0b6ec809eee44d58fa8493454828ea6af9aab6f336c74394aab0a71fa7d0aa3485d4f662f9917bfb798ad3164e13
-SHA512 (libreoffice-help-6.3.4.2.tar.xz.asc) = f998dbc003251a43d03a80f779d36400e8fbdfe192ab45002a2343c265a018bf695fe9c17cdded095d77315629bb583234239325b67bf157259e53de80f23731
+SHA512 (libreoffice-help-6.4.0.3.tar.xz.asc) = 37af38ef5e372810bf60838d7890f79fe48c7c2c613e88bd66396d5573a33cc3abad53366f1ab94da28e9ebdb0bb579f23db3f3159e9b60a8cf4fb10229474c0
-SHA512 (libreoffice-translations-6.3.4.2.tar.xz) = 5199df82139318e9c8d7cd3e41bb99177c5726f7571ce5acacd40b5fbe32ced7efb606897f794dd0f271483595cb0bfc50f8c2750638b15a4a97889a0791e51d
+SHA512 (libreoffice-translations-6.4.0.3.tar.xz) = 168800ec5526f69febf6f37df4d04c0c42d26595587339721141c40c9812d9398bef7618732244759d65b4ccf46072b65536504c37c95f73e1ab91e6582ee75d
-SHA512 (libreoffice-translations-6.3.4.2.tar.xz.asc) = 9edb6a93da802398a9f51e0b890cd9bf326b9b3fee6e4d4aaac2fb4886dfc94730bb43d9b1fa774182986cfe6ede7bf753736ee112f11e2f4886142365ae8351
+SHA512 (libreoffice-translations-6.4.0.3.tar.xz.asc) = 5380a777341377481c828af14a04678dff776e2e13badf41ea80fe85e0b84bb0306899cd7ae489a037c4eb9ea1a759d238a5fbb3fdd78a4e708a648ee7df3b47