diff options
| author | Noel <noelgrandin@gmail.com> | 2020-11-02 15:37:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-02 17:39:10 +0100 |
| commit | 28be7b98070b7475cc675e76f075c941133cb790 (patch) | |
| tree | 3237d5ca81cd7cc835a1200f5ae41e1008174b13 /sw | |
| parent | 3940cf7d716f3e469f47d3c831a799e58edf2eb8 (diff) | |
create common macro and method for logging unknown attributes
instead of repeating the code everywhere
Change-Id: Idb94054b392ed256e64259cdb17d1522bf3c52b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105184
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/xml/xmlbrsh.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmlfmt.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmlitem.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/config/StoredChapterNumbering.cxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx index 8ecce1f1fc78..092d3c91c03b 100644 --- a/sw/source/filter/xml/xmlbrsh.cxx +++ b/sw/source/filter/xml/xmlbrsh.cxx @@ -99,7 +99,7 @@ void SwXMLBrushItemImportContext::ProcessAttrs( *pItem, sValue, MID_GRAPHIC_FILTER, rUnitConv ); break; default: - SAL_WARN("sw", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("sw", aIter); } } @@ -118,7 +118,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SwXMLBrushItemImportCo return new XMLBase64ImportContext(GetImport(), m_xBase64Stream); } } - SAL_WARN("sw", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("sw", nElement); return nullptr; } diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 446b5fd13aa3..80d808aeeaec 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -247,7 +247,7 @@ SwXMLConditionContext_Impl::SwXMLConditionContext_Impl( sApplyStyle = sValue; break; default: - SAL_WARN("sw", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("sw", aIter); } } } @@ -613,7 +613,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SwXMLItemSetStyleConte return pTextStyle->createFastChildContext( nElement, xAttrList ); } default: - SAL_WARN("sw", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("sw", nElement); } return nullptr; diff --git a/sw/source/filter/xml/xmlitem.cxx b/sw/source/filter/xml/xmlitem.cxx index bfc287a45109..899c0b6bb1ad 100644 --- a/sw/source/filter/xml/xmlitem.cxx +++ b/sw/source/filter/xml/xmlitem.cxx @@ -63,7 +63,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SwXMLItemSetContext::c return createFastChildContext( nElement, xAttrList, *pEntry ).get(); } else - SAL_WARN("sw", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("sw", nElement); return nullptr; } diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx index 07d72b222521..eb97b1cbcee9 100644 --- a/sw/source/uibase/config/StoredChapterNumbering.cxx +++ b/sw/source/uibase/config/StoredChapterNumbering.cxx @@ -290,7 +290,7 @@ public: SAL_WARN("xmloff", "unknown value for style:family=" << aIter.toString()); } else - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); if (nFamily != XmlStyleFamily::DATA_STYLE && !name.isEmpty() && !displayName.isEmpty()) { |