[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - xmloff/source

[Noel Grandin (via logerrit)]

 xmloff/source/core/xmlimp.cxx |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit b89ba9d0d0090ce50079e2ae8bc6f9ec3386b283
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Nov 19 08:41:37 2019 +0200
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Jun 16 11:20:16 2020 +0200

    disable spurious SAL_WARN
    
    in the FastParser case, those name/prefix fields in context are not
    initialised, so don't warn for that case
    
    Change-Id: I485dd1b86d81ea2b6f03fa6a8ecf5fb23d46a8e1
    Reviewed-on: https://gerrit.libreoffice.org/83153
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96433
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 2c809d1112cb..fc0b407da3f2 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -778,12 +778,15 @@ rName
 
 #ifdef DBG_UTIL
         // Non product only: check if endElement call matches startELement call.
-        OUString aLocalName;
-        sal_uInt16 nPrefix =
-            mpNamespaceMap->GetKeyByAttrName( rName, &aLocalName );
-        SAL_WARN_IF( xContext->GetPrefix() != nPrefix,  "xmloff.core", "SvXMLImport::endElement: popped context has wrong prefix" );
-        SAL_WARN_IF( xContext->GetLocalName() != aLocalName, "xmloff.core", "SvXMLImport::endElement: popped context has wrong lname '"
-                     << aLocalName << "' expected. '" << xContext->GetLocalName() << "' with impl " << getImplementationName() );
+        if (!xContext->GetLocalName().isEmpty()) // prefix+localname are only valid in the non-FastParser case
+        {
+            OUString aLocalName;
+            sal_uInt16 nPrefix =
+                mpNamespaceMap->GetKeyByAttrName( rName, &aLocalName );
+            SAL_WARN_IF( xContext->GetPrefix() != nPrefix,  "xmloff.core", "SvXMLImport::endElement: popped context has wrong prefix" );
+            SAL_WARN_IF( xContext->GetLocalName() != aLocalName, "xmloff.core", "SvXMLImport::endElement: popped context has wrong lname '"
+                         << aLocalName << "' expected. '" << xContext->GetLocalName() << "' with impl " << getImplementationName() );
+        }
 #endif
 
         // Call a EndElement at the current context.