diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2020-02-25 19:06:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-29 12:04:55 +0100 |
| commit | db7df91ea05f9093955583f165e32e218364fec3 (patch) | |
| tree | 435c5dfcb81b721964718da123d0e45021679235 /sax | |
| parent | 32d08f86d20b2f7e44f6b0506feee90fb7138d33 (diff) | |
tdf#130878 Report does not show label-fields
The critical part was
(1) calling m_pFixedContent->Characters instead of
m_pFixedContent->characters in OXMLCharContent
(2) calling OXMLReportElementBase::EndElement instead of
OXMLReportElementBase::endFastElement in OXMLFixedContent
Also
(3) add a bunch of debugging logging to help find this
(4) fix various characters() methods that can no longer
rely on being called once for text content in a node
Change-Id: Ib8ea88c5ff377311ca70e4292cad6d1f7f7c7323
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89589
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sax')
| -rw-r--r-- | sax/source/fastparser/fastparser.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 80bff5e9fef6..f70995763c4c 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -1190,8 +1190,12 @@ void FastSaxParserImpl::callbackStartElement(const xmlChar *localName , const xm if( nAttributeToken != FastToken::DONTKNOW ) rEvent.mxAttributes->add( nAttributeToken, XML_CAST( attributes[ i + 3 ] ), attributes[ i + 4 ] - attributes[ i + 3 ] ); else + { + SAL_WARN("xmloff", "unknown attribute " << XML_CAST( attributes[ i ] ) << "=" << + OString( XML_CAST( attributes[ i + 3 ] ), attributes[ i + 4 ] - attributes[ i + 3 ] )); rEvent.mxAttributes->addUnknown( XML_CAST( attributes[ i ] ), OString( XML_CAST( attributes[ i + 3 ] ), attributes[ i + 4 ] - attributes[ i + 3 ] )); + } } } @@ -1260,6 +1264,7 @@ void FastSaxParserImpl::addUnknownElementWithPrefix(const xmlChar **attributes, OString aQualifiedName = (rPrefix.isEmpty())? rLocalName : rPrefix + ":" + rLocalName; xAttributes->addUnknown( aNamespaceURI, aQualifiedName, OString( XML_CAST( attributes[ i + 3 ] ), attributes[ i + 4 ] - attributes[ i + 3 ] )); + SAL_WARN("xmloff", "unknown element " << aQualifiedName << " " << aNamespaceURI); } void FastSaxParserImpl::callbackEndElement() |