diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-08-20 20:28:48 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-08-23 15:43:50 +0200 |
| commit | fbe183bbb05220a4ccc51952445b1797bb498403 (patch) | |
| tree | 176188e3c06e6794d205671e54ea387c44f2b28d /xmloff | |
| parent | 43fc5f3aee4c06fb5983b625175d6991433945d4 (diff) | |
xmloff: avoid annoying warnings about bookmark conditions
Change-Id: I7bb15c0ab46eee1554977b275b1dfdaff8d1b0cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120794
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/XMLTextMarkImportContext.cxx | 12 | ||||
| -rw-r--r-- | xmloff/source/text/XMLTextMarkImportContext.hxx | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index 2017d8f21a3d..44f652aaf6fa 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -23,6 +23,7 @@ #include <rtl/ustring.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> +#include <sax/tools/converter.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> @@ -95,6 +96,7 @@ XMLTextMarkImportContext::XMLTextMarkImportContext( : SvXMLImportContext(rImport) , m_rHelper(rHlp) , m_rxCrossRefHeadingBookmark(io_rxCrossRefHeadingBookmark) + , m_isHidden(false) , m_bHaveAbout(false) { } @@ -166,9 +168,7 @@ void XMLTextMarkImportContext::startFastElement( sal_Int32 nElement, if ((nElement & TOKEN_MASK) == XML_BOOKMARK_START) { - const OUString sHidden = xAttrList->getOptionalValue(XML_ELEMENT(LO_EXT, XML_HIDDEN)); - const OUString sCondition = xAttrList->getOptionalValue(XML_ELEMENT(LO_EXT, XML_CONDITION)); - m_rHelper.setBookmarkAttributes(m_sBookmarkName, sHidden == "true", sCondition); + m_rHelper.setBookmarkAttributes(m_sBookmarkName, m_isHidden, m_sCondition); } } @@ -539,6 +539,12 @@ bool XMLTextMarkImportContext::FindName( case XML_ELEMENT(FIELD, XML_TYPE): m_sFieldName = sValue; break; + case XML_ELEMENT(LO_EXT, XML_HIDDEN): + ::sax::Converter::convertBool(m_isHidden, sValue); + break; + case XML_ELEMENT(LO_EXT, XML_CONDITION): + m_sCondition = sValue; + break; default: XMLOFF_WARN_UNKNOWN("xmloff", aIter); } diff --git a/xmloff/source/text/XMLTextMarkImportContext.hxx b/xmloff/source/text/XMLTextMarkImportContext.hxx index ccf04e55deeb..407cddbadf7f 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.hxx +++ b/xmloff/source/text/XMLTextMarkImportContext.hxx @@ -65,6 +65,8 @@ private: OUString m_sBookmarkName; OUString m_sFieldName; + bool m_isHidden; + OUString m_sCondition; OUString m_sXmlId; // RDFa bool m_bHaveAbout; |