]> git.pld-linux.org Git - packages/libreoffice.git/blame - mdds-1.5-orcus-0.15.patch
projects / packages / libreoffice.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
fix files when building without gtk
[packages/libreoffice.git] / mdds-1.5-orcus-0.15.patch
CommitLineData
4a322bc9
JR		 1From 56ffe3c0a1261cd98a3d42b8b08d5f8eb013ead4 Mon Sep 17 00:00:00 2001
2From: Kohei Yoshida <kohei@libreoffice.org>
3Date: Mon, 12 Aug 2019 13:57:34 -0400
4Subject: [PATCH] Switch mdds to 1.5.0 and liborcus to 0.15.0.
5
6Change-Id: Ibff9a5e0f0771e4cf12b4dc3985661a01195e265
7Reviewed-on: https://gerrit.libreoffice.org/77482
8Tested-by: Jenkins
9Reviewed-by: Kohei Yoshida <kohei@libreoffice.org>
10---
11 RepositoryExternal.mk | 4 +--
12 configure.ac | 4 +--
13 download.lst | 8 +++---
14 ...1-Prevent-unsigned-integer-underflow.patch | 27 -------------------
15 external/liborcus/ExternalPackage_liborcus.mk | 8 +++---
16 external/liborcus/ExternalProject_liborcus.mk | 4 +--
17 external/liborcus/Library_orcus-parser.mk | 2 ++
18 external/liborcus/Library_orcus.mk | 7 +++++
19 external/liborcus/UnpackedTarball_liborcus.mk | 3 ---
20 external/liborcus/version.patch.0 | 11 --------
21 sc/inc/mtvelements.hxx | 8 +++---
22 sc/inc/orcusxml.hxx | 1 +
23 sc/qa/unit/dataproviders_test.cxx | 1 +
24 sc/source/core/tool/scmatrix.cxx | 8 +++---
25 sc/source/filter/inc/orcusinterface.hxx | 2 ++
26 sc/source/filter/orcus/interface.cxx | 8 ++++--
27 sc/source/filter/orcus/orcusfiltersimpl.cxx | 4 +--
28 sc/source/filter/orcus/xmlcontext.cxx | 9 ++++++-
29 sc/source/ui/xmlsource/xmlsourcedlg.cxx | 6 +++++
30 svl/source/misc/gridprinter.cxx | 2 +-
31 20 files changed, 58 insertions(+), 69 deletions(-)
32 delete mode 100644 external/liborcus/0001-Prevent-unsigned-integer-underflow.patch
33 delete mode 100644 external/liborcus/version.patch.0
34
35diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
36index 54ab1dbfdcc3..57f66b8f344a 100644
37--- a/RepositoryExternal.mk
38+++ b/RepositoryExternal.mk
39@@ -3262,7 +3262,7 @@ $(call gb_LinkTarget_set_include,$(1),\
40 )
41
42 $(call gb_LinkTarget_add_libs,$(1),\
43- -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.14 \
44+ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.15 \
45 )
46
47 $(if $(SYSTEM_BOOST), \
48@@ -3281,7 +3281,7 @@ $(call gb_LinkTarget_set_include,$(1),\
49 )
50
51 $(call gb_LinkTarget_add_libs,$(1),\
52- -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.14 \
53+ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.15 \
54 )
55
56 endef
57diff --git a/configure.ac b/configure.ac
58index 1510daf22454..d0e6759b1f52 100644
59--- a/configure.ac
60+++ b/configure.ac
61@@ -9291,7 +9291,7 @@ AC_SUBST(SYSTEM_BOOST)
62 dnl ===================================================================
63 dnl Check for system mdds
64 dnl ===================================================================
65-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.4 >= 1.4.1], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
66+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.5 >= 1.5.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
67
68 dnl ===================================================================
69 dnl Check for system glm
70@@ -9597,7 +9597,7 @@ AC_SUBST(ENABLE_FUZZERS)
71 dnl ===================================================================
72 dnl Orcus
73 dnl ===================================================================
74-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.14 >= 0.14.0])
75+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.15 >= 0.15.0])
76 if test "$with_system_orcus" != "yes"; then
77 if test "$SYSTEM_BOOST" = "TRUE"; then
78 # ===========================================================
79diff --git a/download.lst b/download.lst
80index b57ed794d2a6..59b58f96347c 100644
81--- a/download.lst
82+++ b/download.lst
83@@ -168,8 +168,8 @@ export LXML_SHA256SUM := 940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a
84 export LXML_TARBALL := lxml-4.1.1.tgz
85 export MARIADB_CONNECTOR_C_SHA256SUM := fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60
86 export MARIADB_CONNECTOR_C_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
87-export MDDS_SHA256SUM := 25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81
88-export MDDS_TARBALL := mdds-1.4.3.tar.bz2
89+export MDDS_SHA256SUM := 74cda018d5aa39a2f91652608efb066fd225f3597ce54733e6ab1e99e52606f7
90+export MDDS_TARBALL := mdds-1.5.0.tar.bz2
91 export MDNSRESPONDER_SHA256SUM := e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0
92 export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz
93 export MSPUB_SHA256SUM := ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba
94@@ -194,8 +194,8 @@ export OPENLDAP_SHA256SUM := cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb89
95 export OPENLDAP_TARBALL := openldap-2.4.45.tgz
96 export OPENSSL_SHA256SUM := ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6
97 export OPENSSL_TARBALL := openssl-1.0.2r.tar.gz
98-export ORCUS_SHA256SUM := 3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f
99-export ORCUS_TARBALL := liborcus-0.14.1.tar.gz
100+export ORCUS_SHA256SUM := 06ec7567896d76ca579efada794cc281a5d6b427195def01cbcfd79795e8a944
101+export ORCUS_TARBALL := liborcus-0.15.0.tar.gz
102 export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
103 export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz
104 export PAGEMAKER_SHA256SUM := 66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d
105diff --git a/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch b/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch
106deleted file mode 100644
107index 3353857a2d10..000000000000
108--- a/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch
109+++ /dev/null
110@@ -1,27 +0,0 @@
111-From 1967be013804f4f578b53659d7ef459b4c35de9f Mon Sep 17 00:00:00 2001
112-From: Kohei Yoshida <kohei.yoshida@gmail.com>
113-Date: Wed, 7 Nov 2018 21:08:40 -0500
114-Subject: [PATCH] Prevent unsigned integer underflow.
115-
116-(cherry picked from commit 40bbce85048b77c545103af124f3d9831dd4a458)
117----
118- src/parser/parser_base.cpp | 3 ++-
119- 1 file changed, 2 insertions(+), 1 deletion(-)
120-
121-diff --git a/src/parser/parser_base.cpp b/src/parser/parser_base.cpp
122-index 586d495f..9d426efb 100644
123---- a/src/parser/parser_base.cpp
124-+++ b/src/parser/parser_base.cpp
125-@@ -120,7 +120,8 @@ double parser_base::parse_double()
126-
127- size_t parser_base::remaining_size() const
128- {
129-- return std::distance(mp_char, mp_end) - 1;
130-+ size_t n = std::distance(mp_char, mp_end);
131-+ return n ? (n - 1) : 0;
132- }
133-
134- std::ptrdiff_t parser_base::offset() const
135---
136-2.17.1
137-
138diff --git a/external/liborcus/ExternalPackage_liborcus.mk b/external/liborcus/ExternalPackage_liborcus.mk
139index ffa0b38bea19..21dd1bfb1ce5 100644
140--- a/external/liborcus/ExternalPackage_liborcus.mk
141+++ b/external/liborcus/ExternalPackage_liborcus.mk
142@@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,liborcus))
143 $(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus))
144
145 ifeq ($(OS),MACOSX)
146-$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.14.0.dylib,src/liborcus/.libs/liborcus-0.14.0.dylib))
147-$(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))
148+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.15.0.dylib,src/liborcus/.libs/liborcus-0.15.0.dylib))
149+$(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))
150 else ifeq ($(DISABLE_DYNLOADING),)
151-$(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))
152-$(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))
153+$(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))
154+$(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))
155 endif
156
157 # vim: set noet sw=4 ts=4:
158diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
159index 8cc1c030fa98..0bd36c379d9b 100644
160--- a/external/liborcus/ExternalProject_liborcus.mk
161+++ b/external/liborcus/ExternalProject_liborcus.mk
162@@ -122,8 +122,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
163 $(MAKE) \
164 $(if $(filter MACOSX,$(OS)),\
165 && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
166- $(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.14.0.dylib \
167- $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.14.0.dylib \
168+ $(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.15.0.dylib \
169+ $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.15.0.dylib \
170 ) \
171 )
172
173diff --git a/external/liborcus/Library_orcus-parser.mk b/external/liborcus/Library_orcus-parser.mk
174index 32367b843f68..d25d82163d9a 100644
175--- a/external/liborcus/Library_orcus-parser.mk
176+++ b/external/liborcus/Library_orcus-parser.mk
177@@ -13,6 +13,7 @@ $(eval $(call gb_Library_use_unpacked,orcus-parser,liborcus))
178
179 $(eval $(call gb_Library_use_externals,orcus-parser,\
180 boost_headers \
181+ boost_filesystem \
182 boost_system \
183 mdds_headers \
184 zlib \
185@@ -22,6 +23,7 @@ $(eval $(call gb_Library_set_warnings_disabled,orcus-parser))
186
187 $(eval $(call gb_Library_set_include,orcus-parser,\
188 -I$(call gb_UnpackedTarball_get_dir,liborcus)/include \
189+ -I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \
190 $$(INCLUDE) \
191 ))
192
193diff --git a/external/liborcus/Library_orcus.mk b/external/liborcus/Library_orcus.mk
194index 2b20cdf84ea4..3793805c3c00 100644
195--- a/external/liborcus/Library_orcus.mk
196+++ b/external/liborcus/Library_orcus.mk
197@@ -24,6 +24,7 @@ $(eval $(call gb_Library_set_warnings_disabled,orcus))
198
199 $(eval $(call gb_Library_set_include,orcus,\
200 -I$(call gb_UnpackedTarball_get_dir,liborcus)/include \
201+ -I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \
202 $$(INCLUDE) \
203 ))
204
205@@ -68,6 +69,9 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\
206 UnpackedTarball/liborcus/src/liborcus/info \
207 UnpackedTarball/liborcus/src/liborcus/interface \
208 UnpackedTarball/liborcus/src/liborcus/json_document_tree \
209+ UnpackedTarball/liborcus/src/liborcus/json_map_tree \
210+ UnpackedTarball/liborcus/src/liborcus/json_structure_mapper \
211+ UnpackedTarball/liborcus/src/liborcus/json_structure_tree \
212 UnpackedTarball/liborcus/src/liborcus/json_util \
213 UnpackedTarball/liborcus/src/liborcus/measurement \
214 UnpackedTarball/liborcus/src/liborcus/odf_helper \
215@@ -92,12 +96,15 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\
216 UnpackedTarball/liborcus/src/liborcus/orcus_gnumeric \
217 UnpackedTarball/liborcus/src/liborcus/orcus_import_ods \
218 UnpackedTarball/liborcus/src/liborcus/orcus_import_xlsx \
219+ UnpackedTarball/liborcus/src/liborcus/orcus_json \
220 UnpackedTarball/liborcus/src/liborcus/orcus_ods \
221 UnpackedTarball/liborcus/src/liborcus/orcus_xls_xml \
222 UnpackedTarball/liborcus/src/liborcus/orcus_xlsx \
223 UnpackedTarball/liborcus/src/liborcus/orcus_xml \
224+ UnpackedTarball/liborcus/src/liborcus/orcus_xml_map_def \
225 UnpackedTarball/liborcus/src/liborcus/session_context \
226 UnpackedTarball/liborcus/src/liborcus/spreadsheet_iface_util \
227+ UnpackedTarball/liborcus/src/liborcus/spreadsheet_impl_types \
228 UnpackedTarball/liborcus/src/liborcus/spreadsheet_interface \
229 UnpackedTarball/liborcus/src/liborcus/spreadsheet_types \
230 UnpackedTarball/liborcus/src/liborcus/string_helper \
231diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk
232index e1d810a49dc2..74fbbb2e9e33 100644
233--- a/external/liborcus/UnpackedTarball_liborcus.mk
234+++ b/external/liborcus/UnpackedTarball_liborcus.mk
235@@ -19,12 +19,9 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
236 # <https://gitlab.com/orcus/orcus/commit/0dfa88f2adca7887dbe44bdb7025985777c89673> "Remove unused
237 # VERSION file":
238 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
239- external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
240 external/liborcus/rpath.patch.0 \
241 external/liborcus/gcc9.patch.0 \
242- external/liborcus/version.patch.0 \
243 external/liborcus/libtool.patch.0 \
244- external/liborcus/0001-Prevent-unsigned-integer-underflow.patch \
245 ))
246
247 ifeq ($(OS),WNT)
248diff --git a/external/liborcus/version.patch.0 b/external/liborcus/version.patch.0
249deleted file mode 100644
250index 2c0b5ae4ca07..000000000000
251--- a/external/liborcus/version.patch.0
252+++ /dev/null
253@@ -1,11 +0,0 @@
254---- configure
255-+++ configure
256-@@ -21055,7 +21055,7 @@
257-
258- fi
259-
260--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"
261-+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"
262-
263- cat >confcache <<\_ACEOF
264- # This file is a shell script that caches the results of configure
265diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
266index 407f0392c4cd..382fb4d2b688 100644
267--- a/sc/inc/mtvelements.hxx
268+++ b/sc/inc/mtvelements.hxx
269@@ -52,9 +52,9 @@ const mdds::mtv::element_t element_type_formula = mdds::mtv::element_type_user_s
270 const mdds::mtv::element_t element_type_cellnote = mdds::mtv::element_type_user_start + 5;
271
272 /// Mapped standard element types (for convenience).
273-const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_numeric;
274+const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_double;
275 const mdds::mtv::element_t element_type_empty = mdds::mtv::element_type_empty;
276-const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_ushort;
277+const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_uint16;
278
279 /// Custom element blocks.
280
281@@ -66,8 +66,8 @@ typedef mdds::mtv::noncopyable_managed_element_block<element_type_edittext, Edit
282 typedef mdds::mtv::noncopyable_managed_element_block<element_type_formula, ScFormulaCell> formula_block;
283
284 /// Mapped standard element blocks (for convenience).
285-typedef mdds::mtv::numeric_element_block numeric_block;
286-typedef mdds::mtv::ushort_element_block uint16_block;
287+typedef mdds::mtv::double_element_block numeric_block;
288+typedef mdds::mtv::uint16_element_block uint16_block;
289
290 /// This needs to be in the same namespace as CellTextAttr.
291 MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(CellTextAttr, element_type_celltextattr, CellTextAttr(), celltextattr_block)
292diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx
293index ced991e51ded..5db292c29d54 100644
294--- a/sc/inc/orcusxml.hxx
295+++ b/sc/inc/orcusxml.hxx
296@@ -69,6 +69,7 @@ struct ScOrcusImportXMLParam
297 {
298 ScAddress maPos;
299 std::vector<OString> maFieldPaths;
300+ std::vector<OString> maRowGroups;
301 };
302
303 typedef std::vector<CellLink> CellLinksType;
304diff --git a/sc/qa/unit/dataproviders_test.cxx b/sc/qa/unit/dataproviders_test.cxx
305index 1e9cf97e8dc3..a9b6b1142c7f 100644
306--- a/sc/qa/unit/dataproviders_test.cxx
307+++ b/sc/qa/unit/dataproviders_test.cxx
308@@ -156,6 +156,7 @@ void ScDataProvidersTest::testXMLImport()
309 aRangeLink.maPos = ScAddress(0,0,0);
310 aRangeLink.maFieldPaths.push_back("/bookstore/book/title");
311 aRangeLink.maFieldPaths.push_back("/bookstore/book/author");
312+ aRangeLink.maRowGroups.push_back("/bookstore/book");
313 aParam.maRangeLinks.push_back(aRangeLink);
314
315 createFileURL("test1.", "xml", aFileURL);
316diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
317index 04660abe195c..2c03fe0a074e 100644
318--- a/sc/source/core/tool/scmatrix.cxx
319+++ b/sc/source/core/tool/scmatrix.cxx
320@@ -1935,8 +1935,8 @@ class ToDoubleArray
321 {
322 case mdds::mtm::element_numeric:
323 {
324- numeric_element_block::const_iterator it = numeric_element_block::begin(*node.data);
325- numeric_element_block::const_iterator itEnd = numeric_element_block::end(*node.data);
326+ double_element_block::const_iterator it = double_element_block::begin(*node.data);
327+ double_element_block::const_iterator itEnd = double_element_block::end(*node.data);
328 for (; it != itEnd; ++it, ++miPos)
329 *miPos = *it;
330 }
331@@ -2012,8 +2012,8 @@ class MergeDoubleArrayFunc
332 {
333 case mdds::mtm::element_numeric:
334 {
335- numeric_element_block::const_iterator it = numeric_element_block::begin(*node.data);
336- numeric_element_block::const_iterator itEnd = numeric_element_block::end(*node.data);
337+ double_element_block::const_iterator it = double_element_block::begin(*node.data);
338+ double_element_block::const_iterator itEnd = double_element_block::end(*node.data);
339 for (; it != itEnd; ++it, ++miPos)
340 {
341 if (GetDoubleErrorValue(*miPos) == FormulaError::ElementNaN)
342diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx
343index 9d090b744619..7c7c4f20bb3c 100644
344--- a/sc/source/filter/inc/orcusinterface.hxx
345+++ b/sc/source/filter/inc/orcusinterface.hxx
346@@ -332,6 +332,8 @@ public:
347
348 virtual orcus::spreadsheet::range_size_t get_sheet_size() const override;
349
350+ virtual void fill_down_cells(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::row_t range_size) override;
351+
352 SCTAB getIndex() const { return mnTab; }
353
354 const sc::SharedFormulaGroups& getSharedFormulaGroups() const;
355diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
356index 833fb278e397..23f17a1dc854 100644
357--- a/sc/source/filter/orcus/interface.cxx
358+++ b/sc/source/filter/orcus/interface.cxx
359@@ -61,8 +61,7 @@ formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( os::formula_grammar_t
360 case orcus::spreadsheet::formula_grammar_t::ods:
361 eGrammar = formula::FormulaGrammar::GRAM_ODFF;
362 break;
363- case orcus::spreadsheet::formula_grammar_t::xlsx_2007:
364- case orcus::spreadsheet::formula_grammar_t::xlsx_2010:
365+ case orcus::spreadsheet::formula_grammar_t::xlsx:
366 eGrammar = formula::FormulaGrammar::GRAM_OOXML;
367 break;
368 case orcus::spreadsheet::formula_grammar_t::gnumeric:
369@@ -1188,6 +1187,11 @@ orcus::spreadsheet::range_size_t ScOrcusSheet::get_sheet_size() const
370 return ret;
371 }
372
373+void ScOrcusSheet::fill_down_cells(os::row_t /*row*/, os::col_t /*col*/, os::row_t /*range_size*/)
374+{
375+ // TODO : implement this.
376+}
377+
378 const sc::SharedFormulaGroups& ScOrcusSheet::getSharedFormulaGroups() const
379 {
380 return maFormulaGroups;
381diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx
382index cdfb70d71c1b..8e9b0b1a5f04 100644
383--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
384+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
385@@ -139,10 +139,10 @@ bool ScOrcusFiltersImpl::importODS_Styles(ScDocument& rDoc, OUString& aPath) con
386
387 try
388 {
389- std::string content = orcus::load_file_content(path);
390+ orcus::file_content content(path);
391 ScOrcusFactory aFactory(rDoc);
392 ScOrcusStyles aStyles(aFactory);
393- orcus::import_ods::read_styles(content.c_str(), content.size(), &aStyles);
394+ orcus::import_ods::read_styles(content.data(), content.size(), &aStyles);
395 }
396 catch (const std::exception& e)
397 {
398diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx
399index 2548f5b19d9f..71c44bc35823 100644
400--- a/sc/source/filter/orcus/xmlcontext.cxx
401+++ b/sc/source/filter/orcus/xmlcontext.cxx
402@@ -269,10 +269,17 @@ void ScOrcusXMLContextImpl::importXML(const ScOrcusImportXMLParam& rParam)
403
404 std::for_each(rLink.maFieldPaths.begin(), rLink.maFieldPaths.end(), InsertFieldPath(filter));
405
406+ std::for_each(rLink.maRowGroups.begin(), rLink.maRowGroups.end(),
407+ [&filter] (const OString& rRowGroup)
408+ {
409+ filter.set_range_row_group(rRowGroup.getStr());
410+ }
411+ );
412+
413 filter.commit_range();
414 }
415
416- std::string content = orcus::load_file_content(path);
417+ orcus::file_content content(path);
418 filter.read_stream(content.data(), content.size());
419
420 aFactory.finalize();
421diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
422index 95e80068f48d..26b0cbcf4f1a 100644
423--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
424+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
425@@ -533,6 +533,12 @@ void ScXMLSourceDlg::OkPressed()
426 // Go through all its child elements.
427 getFieldLinks(aRangeLink, aParam.maNamespaces, *mxLbTree, *rEntry);
428
429+ // Add the anchor node as a grouping node, which will be used as a
430+ // row position increment point.
431+ OUString aThisEntry = getXPath(*mxLbTree, *rEntry, aParam.maNamespaces);
432+ aRangeLink.maRowGroups.push_back(
433+ OUStringToOString(aThisEntry, RTL_TEXTENCODING_UTF8));
434+
435 aParam.maRangeLinks.push_back(aRangeLink);
436 }
437 }
438diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx
439index e129457a8215..4f013d4b6b8c 100644
440--- a/svl/source/misc/gridprinter.cxx
441+++ b/svl/source/misc/gridprinter.cxx
442@@ -29,7 +29,7 @@ typedef mdds::mtv::default_element_block<element_type_string, OUString> string_b
443 struct matrix_trait
444 {
445 typedef string_block string_element_block;
446- typedef mdds::mtv::ushort_element_block integer_element_block;
447+ typedef mdds::mtv::uint16_element_block integer_element_block;
448
449 typedef mdds::mtv::custom_block_func1<string_block> element_block_func;
450 };
LibreOffice - powerful office suite
This page took 0.140361 seconds and 4 git commands to generate.