This is an automated email from the ASF dual-hosted git repository.

truckman pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit d75293b319778e3f582ada57973ef1e86cfb0522
Author: Don Lewis <[email protected]>
AuthorDate: Tue May 20 01:18:51 2025 -0700

    Revert "Address FreeBSD bug 281612"
    
    This reverts commit ba9d5654bd02fbc56f002b1fb9104f8cb15262fb.
    
    .../unoxml/source/xpath/xpathapi.cxx:386:27: error: assigning to 
'xmlStructuredErrorFunc' (aka 'void (*)(void *, const _xmlError *)') from 
incompatible type 'void (void *, const xmlErrorPtr)' (aka 'void (void *, 
_xmlError *const)'): type mismatch at 2nd parameter ('const xmlError *' (aka 
'const _xmlError *') vs 'const xmlErrorPtr' (aka '_xmlError *const'))
      386 |         xpathCtx->error = structured_error_func;
          |                           ^~~~~~~~~~~~~~~~~~~~~
    1 error generated.
---
 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 c2ff57fda5..f64b21354c 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(const xmlErrorPtr pError)
+    static OUString make_error_message(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, const xmlErrorPtr 
error)
+        static void structured_error_func(void * userData, xmlErrorPtr error)
         {
             (void) userData;
             ::rtl::OUStringBuffer buf(

Reply via email to