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 --- xmloff/source/chart/SchXMLParagraphContext.cxx | 2 +- xmloff/source/chart/XMLLabelSeparatorContext.cxx | 2 +- xmloff/source/chart/XMLSymbolImageContext.cxx | 4 ++-- xmloff/source/core/xmlictxt.cxx | 5 +++++ xmloff/source/draw/XMLNumberStyles.cxx | 4 ++-- xmloff/source/draw/animimp.cxx | 6 +++--- xmloff/source/draw/ximpbody.cxx | 2 +- xmloff/source/draw/ximppage.cxx | 3 ++- xmloff/source/draw/ximpstyl.cxx | 18 +++++++++--------- xmloff/source/meta/xmlversion.cxx | 2 +- xmloff/source/style/DashStyle.cxx | 2 +- xmloff/source/style/GradientStyle.cxx | 2 +- xmloff/source/style/HatchStyle.cxx | 2 +- xmloff/source/style/ImageStyle.cxx | 2 +- xmloff/source/style/MarkerStyle.cxx | 2 +- xmloff/source/style/PageHeaderFooterContext.cxx | 2 +- xmloff/source/style/TransGradientStyle.cxx | 2 +- xmloff/source/style/XMLBackgroundImageContext.cxx | 4 ++-- xmloff/source/style/XMLFontStylesContext.cxx | 6 +++--- xmloff/source/style/XMLFootnoteSeparatorImport.cxx | 2 +- xmloff/source/style/prstylei.cxx | 2 +- xmloff/source/style/xmlnumfi.cxx | 12 ++++++------ xmloff/source/style/xmlnumi.cxx | 12 ++++++------ xmloff/source/style/xmlprcon.cxx | 4 ++-- xmloff/source/style/xmltabi.cxx | 4 ++-- xmloff/source/table/XMLTableImport.cxx | 4 ++-- .../text/XMLIndexBibliographyConfigurationContext.cxx | 2 +- xmloff/source/text/XMLSectionFootnoteConfigImport.cxx | 2 +- xmloff/source/text/XMLTextColumnsContext.cxx | 8 ++++---- xmloff/source/text/XMLTextMasterPageContext.cxx | 2 +- xmloff/source/text/txtdropi.cxx | 2 +- xmloff/source/text/txtparai.cxx | 2 +- 32 files changed, 68 insertions(+), 62 deletions(-) (limited to 'xmloff') diff --git a/xmloff/source/chart/SchXMLParagraphContext.cxx b/xmloff/source/chart/SchXMLParagraphContext.cxx index 95f484888d08..75c8be5e4764 100644 --- a/xmloff/source/chart/SchXMLParagraphContext.cxx +++ b/xmloff/source/chart/SchXMLParagraphContext.cxx @@ -80,7 +80,7 @@ void SchXMLParagraphContext::startFastElement( break; } default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } } diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.cxx b/xmloff/source/chart/XMLLabelSeparatorContext.cxx index 11c3710d9d10..1d05bfca1cfb 100644 --- a/xmloff/source/chart/XMLLabelSeparatorContext.cxx +++ b/xmloff/source/chart/XMLLabelSeparatorContext.cxx @@ -48,7 +48,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > XMLLabelSeparatorConte { return new SchXMLParagraphContext( GetImport(), m_aSeparator ); } - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement); return nullptr; } diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx index 9475abaaf947..536392d9d892 100644 --- a/xmloff/source/chart/XMLSymbolImageContext.cxx +++ b/xmloff/source/chart/XMLSymbolImageContext.cxx @@ -75,7 +75,7 @@ void XMLSymbolImageContext::startFastElement( // it is always assumed 'actuate=onLoad', 'type=simple', 'show=embed' break; default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } } @@ -93,7 +93,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > XMLSymbolImageContext: return new XMLBase64ImportContext( GetImport(), mxBase64Stream ); } } - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement); return nullptr; } diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx index a0b22219b29e..69fce5c5208a 100644 --- a/xmloff/source/core/xmlictxt.cxx +++ b/xmloff/source/core/xmlictxt.cxx @@ -147,4 +147,9 @@ css::uno::Sequence< sal_Int8 > SAL_CALL SvXMLImportContext::getImplementationId( return css::uno::Sequence(); } +void XMLOFF_WARN_UNKNOWN(const char *area, sax_fastparser::FastAttributeList::FastAttributeIter const & rIter) +{ + SAL_WARN(area, "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(rIter.getToken()) << " value=" << rIter.toString()); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index 2894b0a04616..1696fc038ac8 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -545,7 +545,7 @@ SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( mbTextual = IsXMLToken( sValue, XML_TRUE ); break; default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } @@ -595,7 +595,7 @@ SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rIm if( aIter.getToken() == XML_ELEMENT(NUMBER, XML_AUTOMATIC_ORDER) ) mbAutomatic = IsXMLToken( sValue, XML_TRUE ); else - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index 47417bcc27a1..89cf45a37540 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -405,7 +405,7 @@ XMLAnimationsSoundContext::XMLAnimationsSoundContext( SvXMLImport& rImport, sal_ pParent->mbPlayFull = IsXMLToken( sValue, XML_TRUE ); break; default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } } @@ -443,7 +443,7 @@ XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport, meKind = XMLE_PLAY; break; default: - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement); // unknown action, overread return; } @@ -480,7 +480,7 @@ XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport, maPathShapeId = sValue; break; default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } } diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx index ac2015982a19..1fb556828199 100644 --- a/xmloff/source/draw/ximpbody.cxx +++ b/xmloff/source/draw/ximpbody.cxx @@ -339,7 +339,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SdXMLBodyContext::crea break; } default: - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement); } return nullptr; } diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index 6b987c42d417..96265c78bb9f 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -134,7 +134,8 @@ DrawAnnotationContext::DrawAnnotationContext( SvXMLImport& rImport, const Refere } break; default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); } + XMLOFF_WARN_UNKNOWN("xmloff", aIter); + } } mxAnnotation->setPosition( aPosition ); diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index f875ba196e65..10720869eaa3 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -106,7 +106,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SdXMLDrawingPageProper rProperties.push_back( aPropState ); } else - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } break; } @@ -348,7 +348,7 @@ SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext( break; } default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } } @@ -380,7 +380,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SdXMLPageMasterContext return mxPageMasterStyle.get(); } else - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement); return nullptr; } @@ -413,7 +413,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SdXMLPresentationPageL maList.push_back(xLclContext); } else - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement); return xContext.get(); } @@ -664,7 +664,7 @@ SdXMLPresentationPlaceholderContext::SdXMLPresentationPlaceholderContext( break; } default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } } @@ -730,7 +730,7 @@ SdXMLMasterPageContext::SdXMLMasterPageContext( break; } default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } @@ -882,7 +882,7 @@ SvXMLStyleContext* SdXMLStylesContext::CreateStyleChildContext( case XML_ELEMENT(STYLE, XML_STYLE): break; // ignore default: - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement); } // call base class @@ -1397,7 +1397,7 @@ SdXMLHeaderFooterDeclContext::SdXMLHeaderFooterDeclContext(SvXMLImport& rImport, } else { - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } } @@ -1425,7 +1425,7 @@ void SdXMLHeaderFooterDeclContext::endFastElement(sal_Int32 nToken) } else { - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nToken)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nToken); } } diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index 7ae17f80c130..76fe43b5d2fb 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -186,7 +186,7 @@ XMLVersionContext::XMLVersionContext( XMLVersionListImport& rImport, break; } default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); break; } } diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx index 59bcc14d2b6b..f2303dc2273e 100644 --- a/xmloff/source/style/DashStyle.cxx +++ b/xmloff/source/style/DashStyle.cxx @@ -175,7 +175,7 @@ void XMLDashStyleImport::importXML( } break; default: - SAL_WARN("xmloff.style", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aStrValue); + XMLOFF_WARN_UNKNOWN("xmloff.style", aIter); } } diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx index 46567e5f8c11..47349c515ea1 100644 --- a/xmloff/source/style/GradientStyle.cxx +++ b/xmloff/source/style/GradientStyle.cxx @@ -155,7 +155,7 @@ void XMLGradientStyleImport::importXML( break; default: - SAL_WARN("xmloff.style", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aStrValue); + XMLOFF_WARN_UNKNOWN("xmloff.style", aIter); } } diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx index 61a51fbd7c02..45f0059f0023 100644 --- a/xmloff/source/style/HatchStyle.cxx +++ b/xmloff/source/style/HatchStyle.cxx @@ -122,7 +122,7 @@ void XMLHatchStyleImport::importXML( break; } default: - SAL_WARN("xmloff.style", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aStrValue); + XMLOFF_WARN_UNKNOWN("xmloff.style", aIter); } } diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx index b9be2e5318d0..59b4095c24e2 100644 --- a/xmloff/source/style/ImageStyle.cxx +++ b/xmloff/source/style/ImageStyle.cxx @@ -129,7 +129,7 @@ bool XMLImageStyle::importXML(uno::Reference const // ignore break; default: - SAL_WARN("xmloff.style", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aStrValue); + XMLOFF_WARN_UNKNOWN("xmloff.style", aIter); } } diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx index ac19851fb3d6..181699026d8f 100644 --- a/xmloff/source/style/MarkerStyle.cxx +++ b/xmloff/source/style/MarkerStyle.cxx @@ -84,7 +84,7 @@ void XMLMarkerStyleImport::importXML( bHasPathData = true; break; default: - SAL_WARN("xmloff.style", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aStrValue); + XMLOFF_WARN_UNKNOWN("xmloff.style", aIter); } } diff --git a/xmloff/source/style/PageHeaderFooterContext.cxx b/xmloff/source/style/PageHeaderFooterContext.cxx index 231ce63b1269..3c9e0993b559 100644 --- a/xmloff/source/style/PageHeaderFooterContext.cxx +++ b/xmloff/source/style/PageHeaderFooterContext.cxx @@ -63,7 +63,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > PageHeaderFooterContex rMap, nStartIndex, nEndIndex, aType); } else - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement); return nullptr; } diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx index 811dc2e0ea0b..2acd54ad7bdb 100644 --- a/xmloff/source/style/TransGradientStyle.cxx +++ b/xmloff/source/style/TransGradientStyle.cxx @@ -168,7 +168,7 @@ void XMLTransGradientStyleImport::importXML( break; default: - SAL_WARN("xmloff.style", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aStrValue); + XMLOFF_WARN_UNKNOWN("xmloff.style", aIter); } } diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index 8d546a2b7135..fc5293b831da 100644 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -311,7 +311,7 @@ void XMLBackgroundImageContext::ProcessAttrs( } break; default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } @@ -353,7 +353,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > XMLBackgroundImageCont return new XMLBase64ImportContext( GetImport(), m_xBase64Stream ); } } - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement); return nullptr; } diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx index c98bbc212e4c..bdd86c93bd73 100644 --- a/xmloff/source/style/XMLFontStylesContext.cxx +++ b/xmloff/source/style/XMLFontStylesContext.cxx @@ -181,7 +181,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > XMLFontStyleContextFon nElement == XML_ELEMENT(SVG_COMPAT, XML_FONT_FACE_SRC) ) return new XMLFontStyleContextFontFaceSrc( GetImport(), *this ); else - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement); return nullptr; } @@ -224,7 +224,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > XMLFontStyleContextFon if( nElement == XML_ELEMENT(SVG, XML_FONT_FACE_URI) || nElement == XML_ELEMENT(SVG_COMPAT, XML_FONT_FACE_URI) ) return new XMLFontStyleContextFontFaceUri( GetImport(), font ); - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement); return nullptr; } @@ -253,7 +253,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > XMLFontStyleContextFon } } else - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement); return nullptr; } diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx index b3a790302acd..f2b776510e6c 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx @@ -159,7 +159,7 @@ void XMLFootnoteSeparatorImport::startFastElement( break; } default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sAttrValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index 2d2ef1b4b047..5ed852e98e48 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -216,7 +216,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > XMLPropStyleContext::c maProperties, xImpPrMap ); } - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement); return nullptr; } diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index f02d8964c2d3..a7f9f1822cca 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -396,7 +396,7 @@ SvXMLNumFmtMapContext::SvXMLNumFmtMapContext( SvXMLImport& rImport, sName = sValue; break; default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } } @@ -429,7 +429,7 @@ SvXMLNumFmtPropContext::SvXMLNumFmtPropContext( SvXMLImport& rImport, bColSet = ::sax::Converter::convertColor( m_nColor, sValue ); break; default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } } @@ -463,7 +463,7 @@ SvXMLNumFmtEmbeddedTextContext::SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rIm nTextPosition = nAttrVal; } else - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } @@ -772,7 +772,7 @@ SvXMLNumFmtElementContext::SvXMLNumFmtElementContext( SvXMLImport& rImport, sCalendar = sValue; break; default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } if ( aNumInfo.nMinDecimalDigits == -1) @@ -838,7 +838,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SvXMLNumFmtElementCont return new SvXMLNumFmtEmbeddedTextContext( GetImport(), nElement, *this, xAttrList ); } else - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement); return nullptr; } @@ -1201,7 +1201,7 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport, aNatNumAttr.Style = sValue; break; default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index a0325c5abc9a..4650f4e1c422 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -337,7 +337,7 @@ SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl( } break; default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } } @@ -363,7 +363,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SvxXMLListLevelStyleCo return new XMLBase64ImportContext( GetImport(), xBase64Stream ); } } - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement); return nullptr; } @@ -689,7 +689,7 @@ SvxXMLListLevelStyleAttrContext_Impl::SvxXMLListLevelStyleAttrContext_Impl( } break; default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } @@ -832,7 +832,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SvxXMLListLevelStyleAt xAttrList, rListLevel ); } - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement); return nullptr; } @@ -893,7 +893,7 @@ SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl::SvxXMLListLevelStyleLabelAli rLLevel.SetIndentAt( nVal ); break; default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } rLLevel.SetLabelFollowedBy( eLabelFollowedBy ); @@ -946,7 +946,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SvxXMLListStyleContext return xLevelStyle.get(); } - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement); return nullptr; } diff --git a/xmloff/source/style/xmlprcon.cxx b/xmloff/source/style/xmlprcon.cxx index 119e5bb86c17..cb0a6eca9e2f 100644 --- a/xmloff/source/style/xmlprcon.cxx +++ b/xmloff/source/style/xmlprcon.cxx @@ -67,7 +67,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SvXMLPropertySetContex XMLPropertyState aProp( nEntryIndex ); return createFastChildContext( nElement, xAttrList, mrProperties, aProp ); } - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement); return nullptr; } @@ -81,7 +81,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SvXMLPropertySetContex ::std::vector< XMLPropertyState > &/*rProperties*/, const XMLPropertyState& /*rProp*/ ) { - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement); return nullptr; } diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx index a841402fed03..5cee4ae99234 100644 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -134,7 +134,7 @@ SvxXMLTabStopContext_Impl::SvxXMLTabStopContext_Impl( cTextFillChar = sValue[0]; break; default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } @@ -170,7 +170,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SvxXMLTabStopImportCon return xTabStopContext.get(); } else - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement); return nullptr; } diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx index 0498ae89a37f..b12f0d677318 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.cxx @@ -799,7 +799,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > XMLTableTemplateContex maTableTemplate[pElements->msStyleName] = aIter.toString(); break; default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } } @@ -821,7 +821,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > XMLTableTemplateContex maTableTemplate[pElements->msStyleName] = aIter.toString(); break; default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } } diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx index 81d9f32af949..6b1b7e5d37bf 100644 --- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx @@ -157,7 +157,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > XMLIndexBibliographyCo break; } default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); break; } } diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx index 4849e46a4b81..26e8af646d37 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx @@ -122,7 +122,7 @@ void XMLSectionFootnoteConfigImport::startFastElement( break; } default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sAttrValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx index 6c5bc01077d3..0f42c9ff8de8 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.cxx @@ -137,7 +137,7 @@ XMLTextColumnContext_Impl::XMLTextColumnContext_Impl( aColumn.RightMargin = nVal; break; default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); break; } } @@ -205,7 +205,7 @@ XMLTextColumnSepContext_Impl::XMLTextColumnSepContext_Impl( pXML_Sep_Style_Enum ); break; default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } } @@ -247,7 +247,7 @@ XMLTextColumnsContext::XMLTextColumnsContext( break; } default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } } @@ -276,7 +276,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > XMLTextColumnsContext: return mxColumnSep.get(); } - SAL_WARN("xmloff", "unknown element " << SvXMLImport::getPrefixAndNameFromToken(nElement)); + XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement); return nullptr; } diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx index 5803ec5790a8..a94b431cc009 100644 --- a/xmloff/source/text/XMLTextMasterPageContext.cxx +++ b/xmloff/source/text/XMLTextMasterPageContext.cxx @@ -103,7 +103,7 @@ XMLTextMasterPageContext::XMLTextMasterPageContext( SvXMLImport& rImport, m_sDrawingPageStyle = aValue; break; default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } diff --git a/xmloff/source/text/txtdropi.cxx b/xmloff/source/text/txtdropi.cxx index cf67eb8fcbc4..cd1d4701ca5d 100644 --- a/xmloff/source/text/txtdropi.cxx +++ b/xmloff/source/text/txtdropi.cxx @@ -104,7 +104,7 @@ void XMLTextDropCapImportContext::ProcessAttrs( break; default: - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 0ba8d3f36230..d56ef2791f73 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -170,7 +170,7 @@ XMLCharContext::XMLCharContext( } } else - SAL_WARN("xmloff", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << " = " << aIter.toString()); + XMLOFF_WARN_UNKNOWN("xmloff", aIter); } } -- cgit