From 28be7b98070b7475cc675e76f075c941133cb790 Mon Sep 17 00:00:00 2001 From: Noel Date: Mon, 2 Nov 2020 15:37:28 +0200 Subject: 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 --- sw/source/filter/xml/xmlbrsh.cxx | 4 ++-- sw/source/filter/xml/xmlfmt.cxx | 4 ++-- sw/source/filter/xml/xmlitem.cxx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sw/source/filter') 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; } -- cgit