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 <kohei@libreoffice.org>

8 files changed, 394 insertions, 12 deletions

diff --git a/external/liborcus/0001-Mark-all-untentionally-unused-variables.patch b/external/liborcus/0001-Mark-all-untentionally-unused-variables.patch
new file mode 100644
index 000000000000..b0f6a572aff7
--- /dev/null
+++ b/external/liborcus/0001-Mark-all-untentionally-unused-variables.patch
@@ -0,0 +1,376 @@
+From 6d34c41b661a9e8dddf6d08bf1f3c1fd4f5581da Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kohei.yoshida@gmail.com>
+Date: Fri, 11 Sep 2020 21:39:09 -0400
+Subject: [PATCH] Mark all untentionally unused variables.
+
+---
+ include/orcus/css_parser.hpp       | 70 ++++++++++++++++++++++++------
+ include/orcus/csv_parser.hpp       |  5 ++-
+ include/orcus/json_parser.hpp      | 15 +++++--
+ include/orcus/sax_parser.hpp       | 35 ++++++++++++---
+ include/orcus/sax_token_parser.hpp | 20 +++++++--
+ include/orcus/yaml_parser.hpp      | 10 ++++-
+ 6 files changed, 124 insertions(+), 31 deletions(-)
+
+diff --git a/include/orcus/css_parser.hpp b/include/orcus/css_parser.hpp
+index cdfae5e0..3e96980b 100644
+--- a/include/orcus/css_parser.hpp
++++ b/include/orcus/css_parser.hpp
+@@ -31,23 +31,44 @@ namespace orcus {
+ class css_handler
+ {
+ public:
+-    void at_rule_name(const char* p, size_t n) {}
++    void at_rule_name(const char* p, size_t n)
++    {
++        (void)p; (void)n;
++    }
+ 
+-    void simple_selector_type(const char* p, size_t n) {}
++    void simple_selector_type(const char* p, size_t n)
++    {
++        (void)p; (void)n;
++    }
+ 
+-    void simple_selector_class(const char* p, size_t n) {}
++    void simple_selector_class(const char* p, size_t n)
++    {
++        (void)p; (void)n;
++    }
+ 
+-    void simple_selector_pseudo_element(orcus::css::pseudo_element_t pe) {}
++    void simple_selector_pseudo_element(orcus::css::pseudo_element_t pe)
++    {
++        (void)pe;
++    }
+ 
+-    void simple_selector_pseudo_class(orcus::css::pseudo_class_t pc) {}
++    void simple_selector_pseudo_class(orcus::css::pseudo_class_t pc)
++    {
++        (void)pc;
++    }
+ 
+-    void simple_selector_id(const char* p, size_t n) {}
++    void simple_selector_id(const char* p, size_t n)
++    {
++        (void)p; (void)n;
++    }
+ 
+     void end_simple_selector() {}
+ 
+     void end_selector() {}
+ 
+-    void combinator(orcus::css::combinator_t combinator) {}
++    void combinator(orcus::css::combinator_t combinator)
++    {
++        (void)combinator;
++    }
+ 
+     /**
+      * Called at each property name.
+@@ -55,7 +76,10 @@ public:
+      * @param p pointer to the char-array containing the property name string.
+      * @param n length of the property name string.
+      */
+-    void property_name(const char* p, size_t n) {}
++    void property_name(const char* p, size_t n)
++    {
++        (void)p; (void)n;
++    }
+ 
+     /**
+      * Called at each ordinary property value string.
+@@ -63,7 +87,10 @@ public:
+      * @param p pointer to the char-array containing the value string.
+      * @param n length of the value string.
+      */
+-    void value(const char* p, size_t n) {}
++    void value(const char* p, size_t n)
++    {
++        (void)p; (void)n;
++    }
+ 
+     /**
+      * Called at each RGB color value of a property.
+@@ -72,7 +99,10 @@ public:
+      * @param green value of green (0-255)
+      * @param blue value of blue (0-255)
+      */
+-    void rgb(uint8_t red, uint8_t green, uint8_t blue) {}
++    void rgb(uint8_t red, uint8_t green, uint8_t blue)
++    {
++        (void)red; (void)green; (void)blue;
++    }
+ 
+     /**
+      * Called at each RGB color value of a property with alpha transparency
+@@ -83,7 +113,10 @@ public:
+      * @param blue value of blue (0-255)
+      * @param alpha alpha transparency value
+      */
+-    void rgba(uint8_t red, uint8_t green, uint8_t blue, double alpha) {}
++    void rgba(uint8_t red, uint8_t green, uint8_t blue, double alpha)
++    {
++        (void)red; (void)green; (void)blue; (void)alpha;
++    }
+ 
+     /**
+      * Called at each HSL color value of a property.
+@@ -92,7 +125,10 @@ public:
+      * @param sat saturation
+      * @param light lightness
+      */
+-    void hsl(uint8_t hue, uint8_t sat, uint8_t light) {}
++    void hsl(uint8_t hue, uint8_t sat, uint8_t light)
++    {
++        (void)hue; (void)sat; (void)light;
++    }
+ 
+     /**
+      * Called at each HSL color value of a property with alpha transparency
+@@ -103,7 +139,10 @@ public:
+      * @param light lightness
+      * @param alpha alpha value
+      */
+-    void hsla(uint8_t hue, uint8_t sat, uint8_t light, double alpha) {}
++    void hsla(uint8_t hue, uint8_t sat, uint8_t light, double alpha)
++    {
++        (void)hue; (void)sat; (void)light; (void)alpha;
++    }
+ 
+     /**
+      * Called at each URL value of a property.
+@@ -111,7 +150,10 @@ public:
+      * @param p pointer to the char-array containing the URL value string.
+      * @param n length of the URL value string.
+      */
+-    void url(const char* p, size_t n) {}
++    void url(const char* p, size_t n)
++    {
++        (void)p; (void)n;
++    }
+ 
+     /**
+      * Called when the parsing begins.
+diff --git a/include/orcus/csv_parser.hpp b/include/orcus/csv_parser.hpp
+index a873b0f2..27b4f924 100644
+--- a/include/orcus/csv_parser.hpp
++++ b/include/orcus/csv_parser.hpp
+@@ -47,7 +47,10 @@ public:
+      *                  the text content is guaranteed to be valid so long as
+      *                  the original CSV stream content is valid.
+      */
+-    void cell(const char* p, size_t n, bool transient) {}
++    void cell(const char* p, size_t n, bool transient)
++    {
++        (void)p; (void)n; (void)transient;
++    }
+ };
+ 
+ template<typename _Handler>
+diff --git a/include/orcus/json_parser.hpp b/include/orcus/json_parser.hpp
+index 51a3d7cc..ef22b3a8 100644
+--- a/include/orcus/json_parser.hpp
++++ b/include/orcus/json_parser.hpp
+@@ -54,7 +54,10 @@ public:
+      *                  pointer points to somewhere in the JSON stream being
+      *                  parsed.
+      */
+-    void object_key(const char* p, size_t len, bool transient) {}
++    void object_key(const char* p, size_t len, bool transient)
++    {
++        (void)p; (void)len; (void)transient;
++    }
+ 
+     /**
+      * Called when the closing curly brace of an object is encountered.
+@@ -87,14 +90,20 @@ public:
+      *                  pointer points to somewhere in the JSON stream being
+      *                  parsed.
+      */
+-    void string(const char* p, size_t len, bool transient) {}
++    void string(const char* p, size_t len, bool transient)
++    {
++        (void)p; (void)len; (void)transient;
++    }
+ 
+     /**
+      * Called when a numeric value is encountered.
+      *
+      * @param val numeric value.
+      */
+-    void number(double val) {}
++    void number(double val)
++    {
++        (void)val;
++    }
+ };
+ 
+ /**
+diff --git a/include/orcus/sax_parser.hpp b/include/orcus/sax_parser.hpp
+index 73c17d06..3b21bfdf 100644
+--- a/include/orcus/sax_parser.hpp
++++ b/include/orcus/sax_parser.hpp
+@@ -30,7 +30,10 @@ public:
+      *
+      * @param param struct containing doctype declaration data.
+      */
+-    void doctype(const orcus::sax::doctype_declaration& param) {}
++    void doctype(const orcus::sax::doctype_declaration& param)
++    {
++        (void)param;
++    }
+ 
+     /**
+      * Called when &lt;?... is encountered, where the '...' may be an
+@@ -39,28 +42,40 @@ public:
+      *
+      * @param decl name of the identifier.
+      */
+-    void start_declaration(const orcus::pstring& decl) {}
++    void start_declaration(const orcus::pstring& decl)
++    {
++        (void)decl;
++    }
+ 
+     /**
+      * Called when the closing tag (&gt;) of a &lt;?... ?&gt; is encountered.
+      *
+      * @param decl name of the identifier.
+      */
+-    void end_declaration(const orcus::pstring& decl) {}
++    void end_declaration(const orcus::pstring& decl)
++    {
++        (void)decl;
++    }
+ 
+     /**
+      * Called at the start of each element.
+      *
+      * @param elem information of the element being parsed.
+      */
+-    void start_element(const orcus::sax::parser_element& elem) {}
++    void start_element(const orcus::sax::parser_element& elem)
++    {
++        (void)elem;
++    }
+ 
+     /**
+      * Called at the end of each element.
+      *
+      * @param elem information of the element being parsed.
+      */
+-    void end_element(const orcus::sax::parser_element& elem) {}
++    void end_element(const orcus::sax::parser_element& elem)
++    {
++        (void)elem;
++    }
+ 
+     /**
+      * Called when a segment of a text content is parsed.  Each text content
+@@ -76,7 +91,10 @@ public:
+      *                  a non-text value or be interned within the scope of
+      *                  the callback</em>.
+      */
+-    void characters(const orcus::pstring& val, bool transient) {}
++    void characters(const orcus::pstring& val, bool transient)
++    {
++        (void)val; (void)transient;
++    }
+ 
+     /**
+      * Called upon parsing of an attribute of an element.  Note that <em>when
+@@ -86,7 +104,10 @@ public:
+      *
+      * @param attr struct containing attribute information.
+      */
+-    void attribute(const orcus::sax::parser_attribute& attr) {}
++    void attribute(const orcus::sax::parser_attribute& attr)
++    {
++        (void)attr;
++    }
+ };
+ 
+ /**
+diff --git a/include/orcus/sax_token_parser.hpp b/include/orcus/sax_token_parser.hpp
+index 1452bc27..6b1b1de4 100644
+--- a/include/orcus/sax_token_parser.hpp
++++ b/include/orcus/sax_token_parser.hpp
+@@ -71,7 +71,10 @@ public:
+      *
+      * @param decl struct containing the attributes of the XML declaration.
+      */
+-    void declaration(const orcus::xml_declaration_t& decl) {}
++    void declaration(const orcus::xml_declaration_t& decl)
++    {
++        (void)decl;
++    }
+ 
+     /**
+      * Called at the start of each element.
+@@ -79,7 +82,10 @@ public:
+      * @param elem struct containing the element's information as well as all
+      *             the attributes that belong to the element.
+      */
+-    void start_element(const orcus::xml_token_element_t& elem) {}
++    void start_element(const orcus::xml_token_element_t& elem)
++    {
++        (void)elem;
++    }
+ 
+     /**
+      * Called at the end of each element.
+@@ -87,7 +93,10 @@ public:
+      * @param elem struct containing the element's information as well as all
+      *             the attributes that belong to the element.
+      */
+-    void end_element(const orcus::xml_token_element_t& elem) {}
++    void end_element(const orcus::xml_token_element_t& elem)
++    {
++        (void)elem;
++    }
+ 
+     /**
+      * Called when a segment of a text content is parsed.  Each text content
+@@ -103,7 +112,10 @@ public:
+      *                  a non-text value or be interned within the scope of
+      *                  the callback</em>.
+      */
+-    void characters(const orcus::pstring& val, bool transient) {}
++    void characters(const orcus::pstring& val, bool transient)
++    {
++        (void)val; (void)transient;
++    }
+ };
+ 
+ /**
+diff --git a/include/orcus/yaml_parser.hpp b/include/orcus/yaml_parser.hpp
+index 797ebbec..8d16fbc7 100644
+--- a/include/orcus/yaml_parser.hpp
++++ b/include/orcus/yaml_parser.hpp
+@@ -72,14 +72,20 @@ public:
+      * @param p pointer to the first character of the string value.
+      * @param len length of the string value.
+      */
+-    void string(const char* p, size_t n) {}
++    void string(const char* p, size_t n)
++    {
++        (void)p; (void)n;
++    }
+ 
+     /**
+      * Called when a numeric value is encountered.
+      *
+      * @param val numeric value.
+      */
+-    void number(double val) {}
++    void number(double val)
++    {
++        (void)val;
++    }
+ 
+     /**
+      * Called when a boolean 'true' keyword is encountered.
+-- 
+2.25.1
+
diff --git a/external/liborcus/ExternalPackage_liborcus.mk b/external/liborcus/ExternalPackage_liborcus.mk
index 21dd1bfb1ce5..747691809d2e 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 136fa538397e..c2a8cdcbe4a3 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 d3cbddbb8cec..4e46591b98fe 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 ea99e7509fbf..0a0ca582882a 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/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk
index e5e33b0b1249..4736dbccab4b 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
 	external/liborcus/gcc9.patch.0 \
 	external/liborcus/libtool.patch.0 \
 	external/liborcus/fix-pch.patch.0 \
+	external/liborcus/0001-Mark-all-untentionally-unused-variables.patch \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/libtool.patch.0 b/external/liborcus/libtool.patch.0
index aa6ffa908ec3..663dbd8099d7 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=*|--ld-path=*)
+-      -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus)
++      -specs=*|-fsanitize=*|-fuse-ld=*|--ld-path=*|-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 876bc1688a31..51aabfa1fb47 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 {