Update liborcus to 0.17.2.

Change-Id: I76c0d57da63c1e35f80b13071793dbbb27cb218a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126655
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida <kohei@libreoffice.org>

download.lst

@@ -198,8 +198,8 @@ export OPENLDAP_SHA256SUM := 99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217
 export OPENLDAP_TARBALL := openldap-2.4.59.tgz
 export OPENSSL_SHA256SUM := 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1
 export OPENSSL_TARBALL := openssl-1.1.1l.tar.gz
-export ORCUS_SHA256SUM := 2ef9d2b5ee374c683cf631b78356b110510ab895788a68d778e225d8c4176d1b
-export ORCUS_TARBALL := liborcus-0.17.0.tar.bz2
+export ORCUS_SHA256SUM := 2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143
+export ORCUS_TARBALL := liborcus-0.17.2.tar.bz2
 export PAGEMAKER_SHA256SUM := 66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d
 export PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
 export PDFIUM_SHA256SUM := ee80fe0a3b20ef5c5babc494cd655d1b1a0bdec710acb04524789df500c563bf

external/liborcus/Library_orcus.mk

@@ -132,12 +132,15 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\
 	UnpackedTarball/liborcus/src/liborcus/xlsx_workbook_context \
 	UnpackedTarball/liborcus/src/liborcus/xml_context_base \
 	UnpackedTarball/liborcus/src/liborcus/xml_context_global \
+	UnpackedTarball/liborcus/src/liborcus/xml_element_validator \
+	UnpackedTarball/liborcus/src/liborcus/xml_empty_context \
 	UnpackedTarball/liborcus/src/liborcus/xml_map_tree \
 	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/xml_util \
 	UnpackedTarball/liborcus/src/liborcus/xpath_parser \
 	UnpackedTarball/liborcus/src/liborcus/yaml_document_tree \
 ))

external/liborcus/UnpackedTarball_liborcus.mk

@@ -24,11 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
 	external/liborcus/libtool.patch.0 \
 	external/liborcus/fix-pch.patch.0 \
 	external/liborcus/liborcus_newline.patch.1 \
-	external/liborcus/remove-unused-parameters.patch.1 \
-	external/liborcus/unused-variables.patch.1 \
-	external/liborcus/boost-filesystem.patch.1 \
 	external/liborcus/std-get-busted.patch.1 \
-	external/liborcus/crashtesting-crash-on-passing-null-to-std-string_vie.patch.1 \
 ))
 
 ifeq ($(OS),WNT)

external/liborcus/boost-filesystem.patch.1

@@ -1,41 +0,0 @@
-From e44737bad582fa2a05a23820e49d7930db710412 Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei.yoshida@gmail.com>
-Date: Tue, 2 Nov 2021 21:33:19 -0400
-Subject: [PATCH] Try using boost::filesystem instead of std::filesystem.
-
-std::filesystem still seems unreliable.
----
- src/parser/stream.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/parser/stream.cpp b/src/parser/stream.cpp
-index 09855300..00395f59 100644
---- a/src/parser/stream.cpp
-+++ b/src/parser/stream.cpp
-@@ -17,12 +17,12 @@
- #include <locale>
- #include <codecvt>
- #include <iostream>
--#include <filesystem>
- 
-+#include <boost/filesystem.hpp>
- #include <boost/interprocess/file_mapping.hpp>
- #include <boost/interprocess/mapped_region.hpp>
- 
--namespace fs = std::filesystem;
-+namespace fs = boost::filesystem;
- namespace bip = boost::interprocess;
- 
- namespace orcus {
-@@ -162,7 +162,7 @@ struct file_content::impl
-     impl() : content_size(0), content(nullptr) {}
- 
-     impl(std::string_view filepath) :
--        content_size(fs::file_size(filepath)),
-+        content_size(fs::file_size(std::string{filepath}.c_str())),
-         mapped_file(std::string{filepath}.c_str(), bip::read_only),
-         mapped_region(mapped_file, bip::read_only, 0, content_size),
-         content(nullptr)
--- 
-2.25.1
-

external/liborcus/crashtesting-crash-on-passing-null-to-std-string_vie.patch.1

@@ -1,27 +0,0 @@
-From ed21a93e132b968d8cd91aa080e1f90e980267c7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Wed, 17 Nov 2021 10:21:32 +0000
-Subject: [PATCH] crashtesting: crash on passing null to std::string_view
-
-with many documents, e.g. moz377878-1.xhtml
----
- src/parser/xml_namespace.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/parser/xml_namespace.cpp b/src/parser/xml_namespace.cpp
-index 07942563..66077d9c 100644
---- a/src/parser/xml_namespace.cpp
-+++ b/src/parser/xml_namespace.cpp
-@@ -223,7 +223,8 @@ xmlns_id_t xmlns_context::push(std::string_view key, std::string_view uri)
- #endif
-     mp_impl->m_trim_all_ns = true;
- 
--    std::string_view uri_interned = mp_impl->repo->intern(uri);
-+    xmlns_id_t id = mp_impl->repo->intern(uri);
-+    std::string_view uri_interned = id ? std::string_view(id) : std::string_view();
- 
-     if (key.empty())
-     {
--- 
-2.33.1
-

external/liborcus/unused-variables.patch.1

@@ -1,24 +0,0 @@
-From 5fccafa297ce2439ee850e13ccbeea3edb1750af Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei.yoshida@gmail.com>
-Date: Tue, 2 Nov 2021 20:42:45 -0400
-Subject: [PATCH] Unused variables.
-
----
- include/orcus/sax_parser.hpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/include/orcus/sax_parser.hpp b/include/orcus/sax_parser.hpp
-index 24b1e8ea..15e8d917 100644
---- a/include/orcus/sax_parser.hpp
-+++ b/include/orcus/sax_parser.hpp
-@@ -539,7 +539,6 @@ template<typename _Handler, typename _Config>
- void sax_parser<_Handler,_Config>::attribute()
- {
-     sax::parser_attribute attr;
--    std::string_view attr_ns_name, attr_name, attr_value;
-     attribute_name(attr.ns, attr.name);
- 
- #if ORCUS_DEBUG_SAX_PARSER
--- 
-2.25.1
-

external/liborcus/windows-constants-hack.patch

@@ -8,8 +8,8 @@ index ae571f5..539ce18 100644
  
 -#include "constants.inl"
 +#define ORCUS_MAJOR_VERSION 0
-+#define ORCUS_MINOR_VERSION 16
-+#define ORCUS_MICRO_VERSION 0
++#define ORCUS_MINOR_VERSION 17
++#define ORCUS_MICRO_VERSION 2
  
  namespace orcus {
  

sc/source/filter/orcus/interface.cxx

@@ -1725,16 +1725,15 @@ void ScOrcusStyles::set_font_underline_color(orcus::spreadsheet::color_elem_t al
             orcus::spreadsheet::color_elem_t green,
             orcus::spreadsheet::color_elem_t blue)
 {
-    maCurrentFont.maUnderlineColor = Color(ColorTransparency, alpha, red, green, blue);
+    maCurrentFont.maUnderlineColor = Color(ColorAlpha, alpha, red, green, blue);
 }
 
-void ScOrcusStyles::set_font_color(orcus::spreadsheet::color_elem_t /*alpha*/,
+void ScOrcusStyles::set_font_color(orcus::spreadsheet::color_elem_t alpha,
             orcus::spreadsheet::color_elem_t red,
             orcus::spreadsheet::color_elem_t green,
             orcus::spreadsheet::color_elem_t blue)
 {
-    // Ignore the alpha value for now.
-    maCurrentFont.maColor = Color(red, green, blue);
+    maCurrentFont.maColor = Color(ColorAlpha, alpha, red, green, blue);
     maCurrentFont.mbHasFontAttr = true;
 }