diff --git a/0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch b/0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch new file mode 100644 index 0000000..19c35b2 --- /dev/null +++ b/0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch @@ -0,0 +1,648 @@ +From 8f5dd7babe306a1c9dcdec93372a3d4378e09667 Mon Sep 17 00:00:00 2001 +From: Kohei Yoshida +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 +(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 +(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 >::~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::make_unique(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 +(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 +(cherry picked from commit 6c286f807c03321a79f8aaa98c6a785da005d619) +--- + RepositoryExternal.mk | 4 +- + configure.ac | 4 +- + download.lst | 8 +-- + ...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/download.lst b/download.lst +index 2b4a0b1b4688..3984819b885e 100644 +--- a/download.lst ++++ b/download.lst +@@ -168,8 +168,8 @@ export LXML_SHA256SUM := 940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a + export LXML_TARBALL := lxml-4.1.1.tgz + export MARIADB_CONNECTOR_C_SHA256SUM := fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60 + export MARIADB_CONNECTOR_C_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz +-export MDDS_SHA256SUM := 25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81 +-export MDDS_TARBALL := mdds-1.4.3.tar.bz2 ++export MDDS_SHA256SUM := 144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d ++export MDDS_TARBALL := mdds-1.5.0.tar.bz2 + export MDNSRESPONDER_SHA256SUM := e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0 + export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz + export MSPUB_SHA256SUM := ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba +@@ -194,8 +194,8 @@ export OPENLDAP_SHA256SUM := cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb89 + export OPENLDAP_TARBALL := openldap-2.4.45.tgz + export OPENSSL_SHA256SUM := ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6 + export OPENSSL_TARBALL := openssl-1.0.2r.tar.gz +-export ORCUS_SHA256SUM := 3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f +-export ORCUS_TARBALL := liborcus-0.14.1.tar.gz ++export ORCUS_SHA256SUM := 06ec7567896d76ca579efada794cc281a5d6b427195def01cbcfd79795e8a944 ++export ORCUS_TARBALL := liborcus-0.15.0.tar.gz + export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb + export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz + export PAGEMAKER_SHA256SUM := 66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d +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 +-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 +-# "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?= +-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 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 maFieldPaths; ++ std::vector maRowGroups; + }; + + typedef std::vector 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 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 element_block_func; + }; +-- +2.21.0 + diff --git a/libreoffice.spec b/libreoffice.spec index aaabe91..76a5819 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -54,7 +54,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.4 -Release: 2%{?libo_prerelease}%{?dist} +Release: 3%{?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/ @@ -210,8 +210,8 @@ BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(libeot) BuildRequires: pkgconfig(libepubgen-0.1) BuildRequires: pkgconfig(libqxp-0.0) -BuildRequires: pkgconfig(liborcus-0.14) -BuildRequires: pkgconfig(mdds-1.4) +BuildRequires: pkgconfig(liborcus-0.15) +BuildRequires: pkgconfig(mdds-1.5) BuildRequires: libnumbertext-devel # java stuff @@ -239,6 +239,8 @@ Requires: %{name}-emailmerge%{?_isa} = %{epoch}:%{version}-%{release} # not upstreamed: upstream wants an automatic restart after a crash; we # want a nice abrt report Patch0: 0001-don-t-suppress-crashes.patch +# backported +Patch1: 0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch %if 0%{?rhel} # not upstreamed @@ -2128,6 +2130,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Wed Aug 21 2019 Caolán McNamara - 1:6.3.0.4-3 +- Resolves: rhbz#1743894 make build with mdds-1.5 + * Mon Aug 19 2019 Miro Hrončok - 1:6.3.0.4-2 - Rebuilt for Python 3.8