From db7df91ea05f9093955583f165e32e218364fec3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 25 Feb 2020 19:06:32 +0200 Subject: 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 --- dbaccess/source/filter/xml/xmlComponent.cxx | 2 +- dbaccess/source/filter/xml/xmlTable.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx index c842d0c3ccd8..33bc12f00731 100644 --- a/dbaccess/source/filter/xml/xmlComponent.cxx +++ b/dbaccess/source/filter/xml/xmlComponent.cxx @@ -70,7 +70,7 @@ OXMLComponent::OXMLComponent( ODBFilter& rImport m_bAsTemplate = sValue == s_sTRUE; break; default: - SAL_WARN("dbaccess", "unknown attribute " << SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" << aIter.toString()); + SAL_WARN("dbaccess", "unknown attribute " << SvXMLImport::getNameFromToken(aIter.getToken()) << "=" << aIter.toString()); } } if ( !m_sHREF.isEmpty() && !m_sName.isEmpty() && _xParentContainer.is() ) diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx index 92c8fb680ff7..edcc68618f13 100644 --- a/dbaccess/source/filter/xml/xmlTable.cxx +++ b/dbaccess/source/filter/xml/xmlTable.cxx @@ -81,7 +81,7 @@ OXMLTable::OXMLTable( ODBFilter& _rImport m_bApplyOrder = sValue == "true"; break; default: - SAL_WARN("dbaccess", "unknown attribute " << SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" << aIter.toString()); + SAL_WARN("dbaccess", "unknown attribute " << SvXMLImport::getNameFromToken(aIter.getToken()) << "=" << aIter.toString()); } } uno::Sequence aArguments(comphelper::InitAnyPropertySequence( -- cgit