diff options
| author | Noel Grandin <noel@peralex.com> | 2021-02-18 16:07:52 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2021-02-23 17:07:38 +0100 |
| commit | 0caab7456935b3ce4eeaae4dec919d7407a32af9 (patch) | |
| tree | a0713bdf4bf5f9cc36d680b5b4b06a3d47f34d43 | |
| parent | edc5ea345446fc0ca484a9c854d65dc5c1a39793 (diff) | |
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 <noel.grandin@collabora.co.uk>
(cherry picked from commit 67db5b7c8df4aa0fab08ac2d11b732dbc28c4c62)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111174
(cherry picked from commit e8a598aae891a4789e770566b87e11a47015c530)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111181
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Michael Weghorn <m.weghorn@posteo.de>
| -rw-r--r-- | xmloff/source/forms/propertyimport.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index 77affdb261ab..fefa4c16ee88 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 ) |