You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2024/09/22 06:21:46 UTC
(openoffice) branch trunk updated: Address FreeBSD bug 281612
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new ba9d5654bd Address FreeBSD bug 281612
ba9d5654bd is described below
commit ba9d5654bd02fbc56f002b1fb9104f8cb15262fb
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Sun Sep 22 08:20:15 2024 +0200
Address FreeBSD bug 281612
This should ensure compatibility with libxml2 2.13.4 and libxslt 1.1.42
See: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281612
---
main/unoxml/source/xpath/xpathapi.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/main/unoxml/source/xpath/xpathapi.cxx b/main/unoxml/source/xpath/xpathapi.cxx
index f64b21354c..c2ff57fda5 100644
--- a/main/unoxml/source/xpath/xpathapi.cxx
+++ b/main/unoxml/source/xpath/xpathapi.cxx
@@ -267,7 +267,7 @@ namespace XPath
return selectSingleNode(contextNode, expr);
}
- static OUString make_error_message(xmlErrorPtr pError)
+ static OUString make_error_message(const xmlErrorPtr pError)
{
::rtl::OUStringBuffer buf;
if (pError->message) {
@@ -312,7 +312,7 @@ namespace XPath
OSL_ENSURE(sal_False, msg.getStr());
}
- static void structured_error_func(void * userData, xmlErrorPtr error)
+ static void structured_error_func(void * userData, const xmlErrorPtr error)
{
(void) userData;
::rtl::OUStringBuffer buf(
Re: (openoffice) branch trunk updated: Address FreeBSD bug 281612
Posted by Don Lewis <tr...@apache.org>.
On 22 Sep, ardovm@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> ardovm pushed a commit to branch trunk
> in repository https://gitbox.apache.org/repos/asf/openoffice.git
>
>
> The following commit(s) were added to refs/heads/trunk by this push:
> new ba9d5654bd Address FreeBSD bug 281612
> ba9d5654bd is described below
>
> commit ba9d5654bd02fbc56f002b1fb9104f8cb15262fb
> Author: Arrigo Marchiori <ar...@yahoo.it>
> AuthorDate: Sun Sep 22 08:20:15 2024 +0200
>
> Address FreeBSD bug 281612
>
> This should ensure compatibility with libxml2 2.13.4 and libxslt 1.1.42
>
> See: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281612
> ---
> main/unoxml/source/xpath/xpathapi.cxx | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/main/unoxml/source/xpath/xpathapi.cxx b/main/unoxml/source/xpath/xpathapi.cxx
> index f64b21354c..c2ff57fda5 100644
> --- a/main/unoxml/source/xpath/xpathapi.cxx
> +++ b/main/unoxml/source/xpath/xpathapi.cxx
> @@ -267,7 +267,7 @@ namespace XPath
> return selectSingleNode(contextNode, expr);
> }
>
> - static OUString make_error_message(xmlErrorPtr pError)
> + static OUString make_error_message(const xmlErrorPtr pError)
> {
> ::rtl::OUStringBuffer buf;
> if (pError->message) {
> @@ -312,7 +312,7 @@ namespace XPath
> OSL_ENSURE(sal_False, msg.getStr());
> }
>
> - static void structured_error_func(void * userData, xmlErrorPtr error)
> + static void structured_error_func(void * userData, const xmlErrorPtr error)
> {
> (void) userData;
> ::rtl::OUStringBuffer buf(
>
I'm surprised that this builds.
Re: (openoffice) branch trunk updated: Address FreeBSD bug 281612
Posted by Don Lewis <tr...@apache.org>.
On 22 Sep, ardovm@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> ardovm pushed a commit to branch trunk
> in repository https://gitbox.apache.org/repos/asf/openoffice.git
>
>
> The following commit(s) were added to refs/heads/trunk by this push:
> new ba9d5654bd Address FreeBSD bug 281612
> ba9d5654bd is described below
>
> commit ba9d5654bd02fbc56f002b1fb9104f8cb15262fb
> Author: Arrigo Marchiori <ar...@yahoo.it>
> AuthorDate: Sun Sep 22 08:20:15 2024 +0200
>
> Address FreeBSD bug 281612
>
> This should ensure compatibility with libxml2 2.13.4 and libxslt 1.1.42
>
> See: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281612
> ---
> main/unoxml/source/xpath/xpathapi.cxx | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/main/unoxml/source/xpath/xpathapi.cxx b/main/unoxml/source/xpath/xpathapi.cxx
> index f64b21354c..c2ff57fda5 100644
> --- a/main/unoxml/source/xpath/xpathapi.cxx
> +++ b/main/unoxml/source/xpath/xpathapi.cxx
> @@ -267,7 +267,7 @@ namespace XPath
> return selectSingleNode(contextNode, expr);
> }
>
> - static OUString make_error_message(xmlErrorPtr pError)
> + static OUString make_error_message(const xmlErrorPtr pError)
> {
> ::rtl::OUStringBuffer buf;
> if (pError->message) {
> @@ -312,7 +312,7 @@ namespace XPath
> OSL_ENSURE(sal_False, msg.getStr());
> }
>
> - static void structured_error_func(void * userData, xmlErrorPtr error)
> + static void structured_error_func(void * userData, const xmlErrorPtr error)
> {
> (void) userData;
> ::rtl::OUStringBuffer buf(
>
I'm surprised that this builds.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org