external/libxml2/deprecated.patch.0 | 10 ----------
forms/source/xforms/xpathlib/xpathlib.cxx | 12 ++++++------
2 files changed, 6 insertions(+), 16 deletions(-)
New commits:
commit 4cfed5c6c17ca08ea797114065033bc85c4b467c
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon Jun 9 13:55:50 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Jun 9 15:37:31 2025 +0200
libxml2: replace deprecated xmlXPathNAN
Follow-up to
commit e3b5e3aebcf178ccfbba3f7510062d5f2c5abb4a
Author: Xisco Fauli <xiscofa...@libreoffice.org>
Date: Wed Apr 23 13:38:50 2025 +0200
libxml2: upgrade to 2.14.3
Change-Id: I02ba6c55dbf3919e811f6731bc4c081ffa6bdde2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186293
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/external/libxml2/deprecated.patch.0
b/external/libxml2/deprecated.patch.0
index c063e5057704..bcdd0be5ac32 100644
--- a/external/libxml2/deprecated.patch.0
+++ b/external/libxml2/deprecated.patch.0
@@ -1,13 +1,3 @@
---- include/libxml/xpath.h 2025-05-13 16:42:31.000000000 +0200
-+++ include/libxml/xpath.h 2025-06-03 14:10:14.539373167 +0200
-@@ -401,7 +401,6 @@
- * Objects and Nodesets handling
- */
-
--XML_DEPRECATED
- XMLPUBVAR double xmlXPathNAN;
- XML_DEPRECATED
- XMLPUBVAR double xmlXPathPINF;
--- include/libxml/parser.h 2025-05-13 16:42:31.000000000 +0200
+++ include/libxml/parser.h 2025-06-03 14:00:37.833979131 +0200
@@ -268,20 +268,20 @@
diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx
b/forms/source/xforms/xpathlib/xpathlib.cxx
index ffae5a59ca34..68ff19a19f7f 100644
--- a/forms/source/xforms/xpathlib/xpathlib.cxx
+++ b/forms/source/xforms/xpathlib/xpathlib.cxx
@@ -160,7 +160,7 @@ void xforms_minFunction(xmlXPathParserContextPtr ctxt, int
nargs)
double nNumber =
xmlXPathCastNodeToNumber(xmlXPathNodeSetItem(pNodeSet, i));
if (xmlXPathIsNaN(nNumber))
{
- xmlXPathReturnNumber(ctxt, xmlXPathNAN);
+ xmlXPathReturnNumber(ctxt,
std::numeric_limits<double>::quiet_NaN());
return;
}
if (i == 0)
@@ -182,7 +182,7 @@ void xforms_maxFunction(xmlXPathParserContextPtr ctxt, int
nargs)
double nNumber =
xmlXPathCastNodeToNumber(xmlXPathNodeSetItem(pNodeSet, i));
if (xmlXPathIsNaN(nNumber))
{
- xmlXPathReturnNumber(ctxt, xmlXPathNAN);
+ xmlXPathReturnNumber(ctxt,
std::numeric_limits<double>::quiet_NaN());
return;
}
if (i == 0)
@@ -336,7 +336,7 @@ void xforms_daysFromDateFunction(xmlXPathParserContextPtr
ctxt, int nargs)
xmlXPathReturnNumber(ctxt, nDays);
}
else
- xmlXPathReturnNumber(ctxt, xmlXPathNAN);
+ xmlXPathReturnNumber(ctxt, std::numeric_limits<double>::quiet_NaN());
}
@@ -364,7 +364,7 @@ void
xforms_secondsFromDateTimeFunction(xmlXPathParserContextPtr ctxt, int nargs
xmlXPathReturnNumber(ctxt, nSeconds);
}
else
- xmlXPathReturnNumber(ctxt, xmlXPathNAN);
+ xmlXPathReturnNumber(ctxt, std::numeric_limits<double>::quiet_NaN());
}
@@ -450,7 +450,7 @@ void xforms_secondsFunction(xmlXPathParserContextPtr ctxt,
int nargs)
xmlXPathReturnNumber(ctxt, nSeconds);
}
else
- xmlXPathReturnNumber(ctxt, xmlXPathNAN);
+ xmlXPathReturnNumber(ctxt, std::numeric_limits<double>::quiet_NaN());
}
void xforms_monthsFunction(xmlXPathParserContextPtr ctxt, int nargs)
@@ -478,7 +478,7 @@ void xforms_monthsFunction(xmlXPathParserContextPtr ctxt,
int nargs)
xmlXPathReturnNumber(ctxt, nMonths);
}
else
- xmlXPathReturnNumber(ctxt, xmlXPathNAN);
+ xmlXPathReturnNumber(ctxt, std::numeric_limits<double>::quiet_NaN());
}
