diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-11 12:31:36 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-17 22:14:30 +0200 |
| commit | bdc0b3e3d7f1f5a07f4863913aef0824dedf9a69 (patch) | |
| tree | 1a8c0dc73f0d91a3f00080c5a87f85140d534bd7 /unoxml | |
| parent | 30cee1ae3e36c5b3bdae71550298abac5abc8788 (diff) | |
crashtesting: assert on fdo62508-1.odt
document, with meta:generator of "opxml2odf - Version KO 0.1" has
a styles.xml xmlns of...
xmlns:ofo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
instead of the usual xmlns:fo=...
use the importer namespace map to get the importers namespace prefix
for the fastparser namespace uri for the token
Change-Id: Ib633009f6c2b7dae5a3ceb1c921adfff84e21150
Reviewed-on: https://gerrit.libreoffice.org/52720
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'unoxml')
| -rw-r--r-- | unoxml/source/dom/saxbuilder.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unoxml/source/dom/saxbuilder.cxx b/unoxml/source/dom/saxbuilder.cxx index 698d923a3ba9..81da91c51073 100644 --- a/unoxml/source/dom/saxbuilder.cxx +++ b/unoxml/source/dom/saxbuilder.cxx @@ -210,7 +210,7 @@ namespace DOM } Reference< XElement > aElement; - const OUString& aPrefix( SvXMLImport::getNamespacePrefixFromToken( nElement ) ); + const OUString& aPrefix(SvXMLImport::getNamespacePrefixFromToken(nElement, nullptr)); const OUString& aURI( SvXMLImport::getNamespaceURIFromToken( nElement ) ); OUString aQualifiedName( SvXMLImport::getNameFromToken( nElement ) ); if( !aPrefix.isEmpty() ) @@ -280,7 +280,7 @@ namespace DOM for (auto &it : *pAttribList) { sal_Int32 nAttrToken = it.getToken(); - const OUString& aAttrPrefix( SvXMLImport::getNamespacePrefixFromToken( nAttrToken ) ); + const OUString& aAttrPrefix(SvXMLImport::getNamespacePrefixFromToken(nAttrToken, nullptr)); const OUString& aAttrURI( SvXMLImport::getNamespaceURIFromToken( nAttrToken ) ); OUString aAttrQualifiedName( SvXMLImport::getNameFromToken( nAttrToken ) ); if( !aAttrPrefix.isEmpty() ) @@ -307,7 +307,7 @@ namespace DOM throw SAXException(); Reference< XElement > aElement(aNode, UNO_QUERY); - if( aElement->getPrefix() != SvXMLImport::getNamespacePrefixFromToken( nElement ) || + if( aElement->getPrefix() != SvXMLImport::getNamespacePrefixFromToken(nElement, nullptr) || aElement->getTagName() != SvXMLImport::getNameFromToken( nElement ) ) // consistency check throw SAXException(); |