From 67db5b7c8df4aa0fab08ac2d11b732dbc28c4c62 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 18 Feb 2021 16:07:52 +0200 Subject: tdf#140486 forms "empty string is null" setting not loaded regression from commit 3de38e95561ab7ca114d9f3307702ba89c4e3e9a Date: Tue Nov 10 19:20:06 2020 +0200 use fastparser in forms Change-Id: I1e679bdca17185f20c1f755da16f02aa5661e22f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111123 Tested-by: Jenkins Reviewed-by: Noel Grandin --- xmloff/source/forms/propertyimport.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index 31d9c6e5fc55..ce1293baafea 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -285,7 +285,7 @@ void OPropertyImport::startFastElement(sal_Int32 /*nElement*/, const Reference< handleAttribute(aIter.getToken(), aIter.toString()); if (m_bTrackAttributes) - m_aEncounteredAttributes.insert(aIter.getToken()); + m_aEncounteredAttributes.insert(aIter.getToken() & TOKEN_MASK); } // TODO: create PropertyValues for all the attributes which were not present, because they were implied @@ -296,7 +296,7 @@ void OPropertyImport::startFastElement(sal_Int32 /*nElement*/, const Reference< bool OPropertyImport::encounteredAttribute(sal_Int32 nAttributeToken) const { OSL_ENSURE(m_bTrackAttributes, "OPropertyImport::encounteredAttribute: attribute tracking not enabled!"); - return m_aEncounteredAttributes.end() != m_aEncounteredAttributes.find(nAttributeToken); + return m_aEncounteredAttributes.end() != m_aEncounteredAttributes.find(nAttributeToken & TOKEN_MASK); } void OPropertyImport::characters(const OUString& _rChars ) -- cgit v1.2.3