ports/contrib (3.5): libreoffice: 6.3.1.2 -> 6.3.2.1

8 Sep 2019

commit fc56b5a6175306385d813cf6116dc2dfcf34231f
Author: Tim Biermann <tbier@posteo.de>
Date:   Sun Sep 8 02:13:34 2019 +0200

    libreoffice: 6.3.1.2 -> 6.3.2.1

diff --git a/libreoffice/.signature b/libreoffice/.signature
index b4559a70..7e4127db 100644
--- a/libreoffice/.signature
+++ b/libreoffice/.signature
@@ -1,9 +1,10 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF35wfDFMTwv4M7D+lyQjMM0LUP10OjYpZpXoM4B6WGwJApP/UenSLTRMNxC3w3jHdheu+fofxEaxipYS0ilpMPwo=
-SHA256 (Pkgfile) = f3aa599f680c2466938fd4a47f8b8ff8d6da58c31a8dce181f6f787d726b68e5
+RWSagIOpLGJF39QRTboug1F4B5pTb8Xd2ml0IRFGzQ0ZbTXHJgUL9BV9PuaflaKvYszYcmsHhz6fj8f45VS/AbhS0lDhhi1O5QU=
+SHA256 (Pkgfile) = 4605ab3f42f26a3ad67bc48061c1e7b393b2c17490b3b0b707a1298fad2b8e7b
 SHA256 (.footprint) = 2e6bbd97b7bef2d1d5254ce95990280f95ad03849b3ea754fbab32ad9ff4a666
-SHA256 (libreoffice-6.3.1.2.tar.xz) = 78c7c9a4d2203daeb1d3a6e7e8a522492b5d89fd374903558876dc3300bcc251
-SHA256 (libreoffice-dictionaries-6.3.1.2.tar.xz) = 88e75f6718d46fe6f760dff91a830a1a993a90ffc6bc8d8560b0e7455ffbf0f7
+SHA256 (libreoffice-6.3.2.1.tar.xz) = d5887c16fdca32f38351474f1c8812e7c4e304599840b71b8b23953783b33549
+SHA256 (libreoffice-dictionaries-6.3.2.1.tar.xz) = f77e1602c5570dec527621465be7625c042ceaefb344309da5889b25197f5327
 SHA256 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
 SHA256 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
 SHA256 (makefile.in.patch) = 50d2f5bac605f6fdbcb3234113949971b998875e832e1ae09b2498afe27f0f10
+SHA256 (fix_mdds-orcus.patch) = 8c56a58aaee117cb3879ea1ab358e5b886334dac781f505bba8aac446100e31f
diff --git a/libreoffice/Pkgfile b/libreoffice/Pkgfile
index 2c2ff2b8..873623ab 100644
--- a/libreoffice/Pkgfile
+++ b/libreoffice/Pkgfile
@@ -5,7 +5,7 @@
 # Optional: cups gst-plugins-base kio qt5 valgrind vlc
 
 name=libreoffice
-version=6.3.1.2
+version=6.3.2.1
 release=1
 source=(
   https://downloadarchive.documentfoundation.org/libreoffice/old/$version/src/...
@@ -13,6 +13,7 @@ source=(
   https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unow...
   https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1....
   makefile.in.patch
+  fix_mdds-orcus.patch
 )
 
 unpack_source() {
@@ -35,6 +36,7 @@ unpack_source() {
 build() {
   cd $name-$version
   patch -Np0 -i ../makefile.in.patch
+  patch -Np1 -i ../fix_mdds-orcus.patch
 
   find -L . \
      \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/libreoffice/fix_mdds-orcus.patch b/libreoffice/fix_mdds-orcus.patch
new file mode 100644
index 00000000..8eba3654
--- /dev/null
+++ b/libreoffice/fix_mdds-orcus.patch
@@ -0,0 +1,453 @@
+From 56ffe3c0a1261cd98a3d42b8b08d5f8eb013ead4 Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kohei@libreoffice.org>
+Date: Mon, 12 Aug 2019 13:57:34 -0400
+Subject: 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>
+---
+ RepositoryExternal.mk                              |  4 ++--
+ configure.ac                                       |  4 ++--
+ download.lst                                       |  8 +++----
+ .../0001-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      |  3 ---
+ external/liborcus/version.patch.0                  | 11 ---------
+ 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 +-
+ 20 files changed, 58 insertions(+), 69 deletions(-)
+ delete mode 100644 external/liborcus/0001-Prevent-unsigned-integer-underflow.patch
+ delete mode 100644 external/liborcus/version.patch.0
+
+diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
+index 54ab1db..57f66b8 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 1510daf..d0e6759 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9291,7 +9291,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
+@@ -9597,7 +9597,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 b57ed79..59b58f9 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 := 74cda018d5aa39a2f91652608efb066fd225f3597ce54733e6ab1e99e52606f7
++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 3353857..0000000
+--- 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 ffa0b38..21dd1bf 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 8cc1c03..0bd36c3 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 32367b8..d25d821 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 2b20cdf..3793805 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 e1d810a..74fbbb2 100644
+--- a/external/liborcus/UnpackedTarball_liborcus.mk
++++ b/external/liborcus/UnpackedTarball_liborcus.mk
+@@ -19,12 +19,9 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
+ #   <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 \
+ ))
+ 
+ ifeq ($(OS),WNT)
+diff --git a/external/liborcus/version.patch.0 b/external/liborcus/version.patch.0
+deleted file mode 100644
+index 2c0b5ae..0000000
+--- 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/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
+index 407f039..382fb4d 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 ced991e..5db292c 100644
+--- a/sc/inc/orcusxml.hxx
++++ b/sc/inc/orcusxml.hxx
+@@ -69,6 +69,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 1e9cf97..a9b6b11 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 04660ab..2c03fe0 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 9d090b7..7c7c4f2 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 833fb27..23f17a1 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 cdfb70d..8e9b0b1 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 2548f5b..71c44bc 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 95e8006..26b0cbc 100644
+--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
++++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+@@ -533,6 +533,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 e129457..4f013d4 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;
+ };
+-- 
+cgit v1.1
+

    

crux＠crux.nu

tags

participants (1)