Merge branch 'master' into die-autoptr-die

This commit is contained in:
Jez Higgins 2020-04-23 15:45:24 +01:00
commit 6659a9f259
3 changed files with 15 additions and 2 deletions

View file

@ -1,5 +1,10 @@
# Arabica - An XML and HTML processing toolkit
*[Latest Arabica news](https://www.jezuk.co.uk/tags/arabica.html)*
* maintenance release expected April 2020.
----
*Arabica is an XML and HTML processing toolkit*, providing *SAX2*, *DOM*, *XPath*, and *XSLT* implementations, written in *Standard C++*
* *SAX* is an event-based XML processing API. Arabica is a full SAX2 implementation, including the optional interfaces and helper classes. It provides uniform SAX2 wrappers for the Expat parser, Xerces, Libxml2 and, on Windows, for the Microsoft XML parser.

View file

@ -646,6 +646,10 @@ class msxml2_wrapper :
HRESULT hr = attributes_->getIndexFromName(wUri.data(), static_cast<int>(wUri.length()),
wLocalName.data(), static_cast<int>(wLocalName.length()),
&index);
if (FAILED(hr))
{
index = -1;
}
return index;
} // getIndex
@ -653,7 +657,11 @@ class msxml2_wrapper :
{
int index = -1;
std::wstring wQName(string_adaptor::asStdWString(qName));
attributes_->getIndexFromQName(wQName.data(), static_cast<int>(wQName.length()), &index);
HRESULT hr = attributes_->getIndexFromQName(wQName.data(), static_cast<int>(wQName.length()), &index);
if (FAILED(hr))
{
index = -1;
}
return index;
} // getIndex

View file

@ -131,7 +131,7 @@ STYLESHEETCONSTANT(Version, "1.0");
STYLESHEETCONSTANT(Vendor, "Jez Higgins, JezUK Ltd");
STYLESHEETCONSTANT(VendorUrl, "http://www.jezuk.co.uk/arabica/");
STYLESHEETCONSTANT(CDATAStart, "<[CDATA[");
STYLESHEETCONSTANT(CDATAStart, "<![CDATA[");
STYLESHEETCONSTANT(CDATAEnd, "]]>");
STYLESHEETCONSTANT(CommentStart, "<!--");
STYLESHEETCONSTANT(CommentEnd, "-->");