diff --git a/editors/openoffice-4/files/patch-unoxml_source_xpath_xpathapi.cxx b/editors/openoffice-4/files/patch-unoxml_source_xpath_xpathapi.cxx new file mode 100644 index 000000000000..e81aaf1c06f8 --- /dev/null +++ b/editors/openoffice-4/files/patch-unoxml_source_xpath_xpathapi.cxx @@ -0,0 +1,28 @@ +--- unoxml/source/xpath/xpathapi.cxx.orig 2020-10-06 14:16:35 UTC ++++ unoxml/source/xpath/xpathapi.cxx +@@ -267,7 +267,11 @@ namespace XPath + return selectSingleNode(contextNode, expr); + } + +- static OUString make_error_message(xmlErrorPtr pError) ++#if LIBXML_VERSION >= 21200 ++ static OUString make_error_message(const xmlError *pError) ++#else ++ static OUString make_error_message(xmlError *pError) ++#endif + { + ::rtl::OUStringBuffer buf; + if (pError->message) { +@@ -312,7 +316,11 @@ namespace XPath + OSL_ENSURE(sal_False, msg.getStr()); + } + +- static void structured_error_func(void * userData, xmlErrorPtr error) ++#if LIBXML_VERSION >= 21200 ++ static void structured_error_func(void * userData, const xmlError *error) ++#else ++ static void structured_error_func(void * userData, xmlError *error) ++#endif + { + (void) userData; + ::rtl::OUStringBuffer buf( diff --git a/editors/openoffice-devel/files/patch-unoxml_source_xpath_xpathapi.cxx b/editors/openoffice-devel/files/patch-unoxml_source_xpath_xpathapi.cxx new file mode 100644 index 000000000000..9caab82e4df3 --- /dev/null +++ b/editors/openoffice-devel/files/patch-unoxml_source_xpath_xpathapi.cxx @@ -0,0 +1,28 @@ +--- unoxml/source/xpath/xpathapi.cxx.orig 2019-09-17 22:55:24 UTC ++++ unoxml/source/xpath/xpathapi.cxx +@@ -267,7 +267,11 @@ namespace XPath + return selectSingleNode(contextNode, expr); + } + +- static OUString make_error_message(xmlErrorPtr pError) ++#if LIBXML_VERSION >= 21200 ++ static OUString make_error_message(const xmlError *pError) ++#else ++ static OUString make_error_message(xmlError *pError) ++#endif + { + ::rtl::OUStringBuffer buf; + if (pError->message) { +@@ -312,7 +316,11 @@ namespace XPath + OSL_ENSURE(sal_False, msg.getStr()); + } + +- static void structured_error_func(void * userData, xmlErrorPtr error) ++#if LIBXML_VERSION >= 21200 ++ static void structured_error_func(void * userData, const xmlError *error) ++#else ++ static void structured_error_func(void * userData, xmlError *error) ++#endif + { + (void) userData; + ::rtl::OUStringBuffer buf(