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