From: Kohei Yoshida Date: Thu, 10 Sep 2020 01:23:48 +0000 (-0400) Subject: Upgrade liborcus to 0.16.0. X-Git-Tag: archive/raspbian/1%7.0.4-3+rpi1^2~5 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d568edadc63a52110cefbb7b08f1eb9beb6d8f69;p=libreoffice.git Upgrade liborcus to 0.16.0. Change-Id: Iae29fb26417dfc161698a81bee84e81545969065 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102502 Tested-by: Jenkins Reviewed-by: Kohei Yoshida Gbp-Pq: Name liborcus-0.16.diff --- diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index f5fa682549c..56507e3983c 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3214,7 +3214,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.15 \ + -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.16 \ ) $(if $(SYSTEM_BOOST), \ @@ -3233,7 +3233,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.15 \ + -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.16 \ ) endef diff --git a/configure.ac b/configure.ac index f7244717743..de6d4ca8468 100644 Binary files a/configure.ac and b/configure.ac differ diff --git a/download.lst b/download.lst index 4a8f922fb9e..5fda92065ae 100644 --- a/download.lst +++ b/download.lst @@ -204,8 +204,8 @@ export OPENLDAP_SHA256SUM := cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb89 export OPENLDAP_TARBALL := openldap-2.4.45.tgz export OPENSSL_SHA256SUM := 14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc export OPENSSL_TARBALL := openssl-1.0.2t.tar.gz -export ORCUS_SHA256SUM := cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61 -export ORCUS_TARBALL := liborcus-0.15.4.tar.bz2 +export ORCUS_SHA256SUM := c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4 +export ORCUS_TARBALL := liborcus-0.16.1.tar.bz2 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/ExternalPackage_liborcus.mk b/external/liborcus/ExternalPackage_liborcus.mk index 21dd1bfb1ce..747691809d2 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.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)) +$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.16.0.dylib,src/liborcus/.libs/liborcus-0.16.0.dylib)) +$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.16.0.dylib,src/parser/.libs/liborcus-parser-0.16.0.dylib)) else ifeq ($(DISABLE_DYNLOADING),) -$(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)) +$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.16.so.0,src/liborcus/.libs/liborcus-0.16.so.0.0.0)) +$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.16.so.0,src/parser/.libs/liborcus-parser-0.16.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 38658cc8190..3671294eede 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -123,8 +123,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.15.0.dylib \ - $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.15.0.dylib \ + $(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.16.0.dylib \ + $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.16.0.dylib \ ) \ ) $(call gb_Trace_EndRange,liborcus,EXTERNAL) diff --git a/external/liborcus/Library_orcus-parser.mk b/external/liborcus/Library_orcus-parser.mk index d3cbddbb8ce..4e46591b98f 100644 --- a/external/liborcus/Library_orcus-parser.mk +++ b/external/liborcus/Library_orcus-parser.mk @@ -63,6 +63,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus-parser,\ UnpackedTarball/liborcus/src/parser/tokens \ UnpackedTarball/liborcus/src/parser/types \ UnpackedTarball/liborcus/src/parser/xml_namespace \ + UnpackedTarball/liborcus/src/parser/xml_writer \ UnpackedTarball/liborcus/src/parser/yaml_parser_base \ UnpackedTarball/liborcus/src/parser/zip_archive \ UnpackedTarball/liborcus/src/parser/zip_archive_stream \ diff --git a/external/liborcus/Library_orcus.mk b/external/liborcus/Library_orcus.mk index ea99e7509fb..0a0ca582882 100644 --- a/external/liborcus/Library_orcus.mk +++ b/external/liborcus/Library_orcus.mk @@ -85,6 +85,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\ UnpackedTarball/liborcus/src/liborcus/odf_tokens \ UnpackedTarball/liborcus/src/liborcus/ods_content_xml_context \ UnpackedTarball/liborcus/src/liborcus/ods_content_xml_handler \ + UnpackedTarball/liborcus/src/liborcus/ods_dde_links_context \ UnpackedTarball/liborcus/src/liborcus/ods_session_data \ UnpackedTarball/liborcus/src/liborcus/ooxml_content_types \ UnpackedTarball/liborcus/src/liborcus/ooxml_global \ @@ -103,6 +104,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\ 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_impl \ UnpackedTarball/liborcus/src/liborcus/orcus_xml_map_def \ UnpackedTarball/liborcus/src/liborcus/session_context \ UnpackedTarball/liborcus/src/liborcus/spreadsheet_iface_util \ @@ -134,7 +136,9 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\ UnpackedTarball/liborcus/src/liborcus/xml_simple_stream_handler \ UnpackedTarball/liborcus/src/liborcus/xml_stream_handler \ UnpackedTarball/liborcus/src/liborcus/xml_stream_parser \ + UnpackedTarball/liborcus/src/liborcus/xml_structure_mapper \ UnpackedTarball/liborcus/src/liborcus/xml_structure_tree \ + UnpackedTarball/liborcus/src/liborcus/xpath_parser \ UnpackedTarball/liborcus/src/liborcus/yaml_document_tree \ )) diff --git a/external/liborcus/libtool.patch.0 b/external/liborcus/libtool.patch.0 index 93b67730337..02781a2040c 100644 --- a/external/liborcus/libtool.patch.0 +++ b/external/liborcus/libtool.patch.0 @@ -1,11 +1,11 @@ ---- ltmain.sh.sav 2018-09-14 23:47:13.000000000 +0200 -+++ ltmain.sh 2019-05-05 23:11:30.406904472 +0200 -@@ -7278,7 +7278,7 @@ func_mode_link () +--- ltmain.sh.orig 2020-09-09 21:20:23.069433984 -0400 ++++ ltmain.sh 2020-09-09 21:27:13.168073996 -0400 +@@ -7373,7 +7373,7 @@ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ -- -specs=*|-fsanitize=*) -+ -specs=*|-fsanitize=*|-fuse-ld=*) +- -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus) ++ -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" diff --git a/external/liborcus/windows-constants-hack.patch b/external/liborcus/windows-constants-hack.patch index 876bc1688a3..51aabfa1fb4 100644 --- a/external/liborcus/windows-constants-hack.patch +++ b/external/liborcus/windows-constants-hack.patch @@ -8,7 +8,7 @@ index ae571f5..539ce18 100644 -#include "constants.inl" +#define ORCUS_MAJOR_VERSION 0 -+#define ORCUS_MINOR_VERSION 11 ++#define ORCUS_MINOR_VERSION 16 +#define ORCUS_MICRO_VERSION 0 namespace orcus { diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx index b298c711d23..00aea676495 100644 --- a/sc/source/filter/inc/orcusinterface.hxx +++ b/sc/source/filter/inc/orcusinterface.hxx @@ -62,6 +62,11 @@ public: { return mnTextEncoding; } + + ScDocumentImport& getDoc() const + { + return mrDoc; + } }; class ScOrcusRefResolver : public orcus::spreadsheet::iface::import_reference_resolver @@ -71,20 +76,28 @@ class ScOrcusRefResolver : public orcus::spreadsheet::iface::import_reference_re public: ScOrcusRefResolver( const ScOrcusGlobalSettings& rGS ); - orcus::spreadsheet::address_t resolve_address(const char* p, size_t n) override; - orcus::spreadsheet::range_t resolve_range(const char* p, size_t n) override; + orcus::spreadsheet::src_address_t resolve_address(const char* p, size_t n) override; + orcus::spreadsheet::src_range_t resolve_range(const char* p, size_t n) override; }; class ScOrcusNamedExpression : public orcus::spreadsheet::iface::import_named_expression { ScDocumentImport& mrDoc; const ScOrcusGlobalSettings& mrGlobalSettings; - SCTAB mnTab; //< negative if global, else >= 0 for sheet-local named expressions. + ScAddress maBasePos; + OUString maName; + OUString maExpr; + const SCTAB mnTab; //< negative if global, else >= 0 for sheet-local named expressions. public: ScOrcusNamedExpression( ScDocumentImport& rDoc, const ScOrcusGlobalSettings& rGS, SCTAB nTab = -1 ); - virtual void define_name(const char* p_name, size_t n_name, const char* p_exp, size_t n_exp) override; + void reset(); + + virtual void set_base_position(const orcus::spreadsheet::src_address_t& pos) override; + virtual void set_named_expression(const char* p_name, size_t n_name, const char* p_exp, size_t n_exp) override; + virtual void set_named_range(const char* p_name, size_t n_name, const char* p_range, size_t n_range) override; + virtual void commit() override; }; class ScOrcusSharedStrings : public orcus::spreadsheet::iface::import_shared_strings diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx index 220f7ce057f..aa96eb21d40 100644 --- a/sc/source/filter/orcus/interface.cxx +++ b/sc/source/filter/orcus/interface.cxx @@ -46,6 +46,7 @@ #include #include +#include using namespace com::sun::star; @@ -158,51 +159,54 @@ orcus::spreadsheet::formula_grammar_t ScOrcusGlobalSettings::get_default_formula ScOrcusRefResolver::ScOrcusRefResolver( const ScOrcusGlobalSettings& rGS ) : mrGlobalSettings(rGS) {} -os::address_t ScOrcusRefResolver::resolve_address(const char* p, size_t n) +os::src_address_t ScOrcusRefResolver::resolve_address(const char* p, size_t n) { OUString aStr(p, n, mrGlobalSettings.getTextEncoding()); ScAddress aAddr; - aAddr.Parse(aStr, nullptr, + aAddr.Parse(aStr, &mrGlobalSettings.getDoc().getDoc(), formula::FormulaGrammar::extractRefConvention( mrGlobalSettings.getCalcGrammar())); - os::address_t ret; - ret.column = 0; - ret.row = 0; - - if (aAddr.IsValid()) + if (!aAddr.IsValid()) { - ret.column = aAddr.Col(); - ret.row = aAddr.Row(); + std::ostringstream os; + os << "'" << std::string(p, n) << "' is not a valid address expression."; + throw orcus::invalid_arg_error(os.str()); } + os::src_address_t ret; + ret.sheet = aAddr.Tab(); + ret.column = aAddr.Col(); + ret.row = aAddr.Row(); + return ret; } -os::range_t ScOrcusRefResolver::resolve_range(const char* p, size_t n) +os::src_range_t ScOrcusRefResolver::resolve_range(const char* p, size_t n) { OUString aStr(p, n, mrGlobalSettings.getTextEncoding()); ScRange aRange; - aRange.Parse(aStr, nullptr, + aRange.Parse(aStr, &mrGlobalSettings.getDoc().getDoc(), formula::FormulaGrammar::extractRefConvention( mrGlobalSettings.getCalcGrammar())); - os::range_t ret; - ret.first.column = 0; - ret.first.row = 0; - ret.last.column = 0; - ret.last.row = 0; - - if (aRange.IsValid()) + if (!aRange.IsValid()) { - ret.first.column = aRange.aStart.Col(); - ret.first.row = aRange.aStart.Row(); - ret.last.column = aRange.aEnd.Col(); - ret.last.row = aRange.aEnd.Row(); + std::ostringstream os; + os << "'" << std::string(p, n) << "' is not a valid range expression."; + throw orcus::invalid_arg_error(os.str()); } + os::src_range_t ret; + ret.first.sheet = aRange.aStart.Tab(); + ret.first.column = aRange.aStart.Col(); + ret.first.row = aRange.aStart.Row(); + ret.last.sheet = aRange.aEnd.Tab(); + ret.last.column = aRange.aEnd.Col(); + ret.last.row = aRange.aEnd.Row(); + return ret; } @@ -210,20 +214,46 @@ ScOrcusNamedExpression::ScOrcusNamedExpression( ScDocumentImport& rDoc, const ScOrcusGlobalSettings& rGS, SCTAB nTab ) : mrDoc(rDoc), mrGlobalSettings(rGS), mnTab(nTab) {} -void ScOrcusNamedExpression::define_name(const char* p_name, size_t n_name, const char* p_exp, size_t n_exp) +void ScOrcusNamedExpression::reset() +{ + maBasePos.SetTab(0); + maBasePos.SetCol(0); + maBasePos.SetRow(0); + maName.clear(); + maExpr.clear(); +} + +void ScOrcusNamedExpression::set_base_position(const orcus::spreadsheet::src_address_t& pos) +{ + maBasePos.SetTab(pos.sheet); + maBasePos.SetCol(pos.column); + maBasePos.SetRow(pos.row); +} + +void ScOrcusNamedExpression::set_named_expression(const char* p_name, size_t n_name, const char* p_exp, size_t n_exp) +{ + maName = OUString(p_name, n_name, mrGlobalSettings.getTextEncoding()); + maExpr = OUString(p_exp, n_exp, mrGlobalSettings.getTextEncoding()); +} + +void ScOrcusNamedExpression::set_named_range(const char* /*p_name*/, size_t /*n_name*/, const char* /*p_range*/, size_t /*n_range*/) { - OUString aName(p_name, n_name, mrGlobalSettings.getTextEncoding()); - OUString aExpr(p_exp, n_exp, mrGlobalSettings.getTextEncoding()); + throw std::runtime_error("ScOrcusNamedExpression::set_named_range not implemented yet."); +} +void ScOrcusNamedExpression::commit() +{ ScRangeName* pNames = mnTab >= 0 ? mrDoc.getDoc().GetRangeName(mnTab) : mrDoc.getDoc().GetRangeName(); if (!pNames) return; ScRangeData* pRange = new ScRangeData( - &mrDoc.getDoc(), aName, aExpr, ScAddress(), ScRangeData::Type::Name, + &mrDoc.getDoc(), maName, maExpr, maBasePos, ScRangeData::Type::Name, mrGlobalSettings.getCalcGrammar()); pNames->insert(pRange, false); + + reset(); // make sure to reset the state for the next run. } ScOrcusFactory::CellStoreToken::CellStoreToken(const ScAddress& rPos, Type eType) diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx index ab16ae66c4b..09f3ba9db19 100644 --- a/sc/source/filter/orcus/xmlcontext.cxx +++ b/sc/source/filter/orcus/xmlcontext.cxx @@ -89,10 +89,9 @@ void populateTree( rTreeCtrl.set_image(*xEntry, rParam.maImgElementRepeat, -1); } - orcus::xml_structure_tree::entity_names_type aNames; + orcus::xml_structure_tree::entity_names_type aNames = rWalker.get_attributes(); // Insert attributes. - rWalker.get_attributes(aNames); for (const orcus::xml_structure_tree::entity_name& rAttrName : aNames) { OUString sAttr(toString(rAttrName, rWalker)); @@ -106,7 +105,7 @@ void populateTree( rTreeCtrl.set_image(*xAttr, rParam.maImgAttribute, -1); } - rWalker.get_children(aNames); + aNames = rWalker.get_children(); // Non-leaf if it has child elements, leaf otherwise. rEntryData.mbLeafNode = aNames.empty(); @@ -266,7 +265,7 @@ void ScOrcusXMLContextImpl::importXML(const ScOrcusImportXMLParam& rParam) std::for_each(rLink.maFieldPaths.begin(), rLink.maFieldPaths.end(), [&filter](const OString& rFieldPath) { - filter.append_field_link(rFieldPath.getStr()); + filter.append_field_link(rFieldPath.getStr(), orcus::pstring()); } ); diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index 1eb2e4b0607..167ecae315a 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -49,8 +49,12 @@ OUString getXPath( if (pData) rNamespaces.push_back(pData->mnNamespaceID); + // element separator is '/' whereas attribute separator is '/@' in xpath. aBuf.insert(0, rTree.get_text(*xEntry, 0)); - aBuf.insert(0, isAttribute(rTree, *xEntry) ? '@' : '/'); + if (isAttribute(rTree, *xEntry)) + aBuf.insert(0, "/@"); + else + aBuf.insert(0, '/'); } while (rTree.iter_parent(*xEntry));