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 --- dbaccess/source/filter/xml/xmlColumn.cxx | 2 +- dbaccess/source/filter/xml/xmlComponent.cxx | 2 +- dbaccess/source/filter/xml/xmlConnectionResource.cxx | 2 +- dbaccess/source/filter/xml/xmlDataSource.cxx | 2 +- dbaccess/source/filter/xml/xmlDataSourceInfo.cxx | 2 +- dbaccess/source/filter/xml/xmlDataSourceSetting.cxx | 2 +- dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx | 2 +- dbaccess/source/filter/xml/xmlHierarchyCollection.cxx | 2 +- dbaccess/source/filter/xml/xmlLogin.cxx | 2 +- dbaccess/source/filter/xml/xmlQuery.cxx | 2 +- dbaccess/source/filter/xml/xmlServerDatabase.cxx | 2 +- dbaccess/source/filter/xml/xmlTable.cxx | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx index 334c4fbfcbe4..9d8560cf1364 100644 --- a/dbaccess/source/filter/xml/xmlColumn.cxx +++ b/dbaccess/source/filter/xml/xmlColumn.cxx @@ -79,7 +79,7 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport m_sCellStyleName = sValue; break; default: - SAL_WARN("dbaccess", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << " value=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN_ATTR("dbaccess", aIter.getToken(), aIter.toString()); } } } diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx index 5245c1c3423c..9d67ab95d197 100644 --- a/dbaccess/source/filter/xml/xmlComponent.cxx +++ b/dbaccess/source/filter/xml/xmlComponent.cxx @@ -66,7 +66,7 @@ OXMLComponent::OXMLComponent( ODBFilter& rImport bAsTemplate = sValue == s_sTRUE; break; default: - SAL_WARN("dbaccess", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN_ATTR("dbaccess", aIter.getToken(), aIter.toString()); } } if ( !(!sHREF.isEmpty() && !sName.isEmpty() && _xParentContainer.is()) ) diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.cxx b/dbaccess/source/filter/xml/xmlConnectionResource.cxx index 9f15cf74b81e..70f7fe210415 100644 --- a/dbaccess/source/filter/xml/xmlConnectionResource.cxx +++ b/dbaccess/source/filter/xml/xmlConnectionResource.cxx @@ -68,7 +68,7 @@ OXMLConnectionResource::OXMLConnectionResource( ODBFilter& rImport, aProperty.Name = "Actuate"; break; default: - SAL_WARN("dbaccess", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN_ATTR("dbaccess", aIter.getToken(), aIter.toString()); } if ( !aProperty.Name.isEmpty() ) { diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx index 53095dfe0e2f..c179cb23ded9 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.cxx +++ b/dbaccess/source/filter/xml/xmlDataSource.cxx @@ -148,7 +148,7 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport, aProperty.Name = "JavaDriverClassPath"; break; default: - SAL_WARN("dbaccess", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN_ATTR("dbaccess", aIter.getToken(), aIter.toString()); } if ( !aProperty.Name.isEmpty() ) { diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx index 82ab36eb2c75..ec1a42d6e9af 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx @@ -72,7 +72,7 @@ OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport bFoundCharset = true; break; default: - SAL_WARN("dbaccess", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN("dbaccess", aIter); } if ( !aProperty.Name.isEmpty() ) { diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx index 3b7e6d512dc9..f709757a5f7d 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx @@ -81,7 +81,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport m_aSetting.Name = sValue; break; default: - SAL_WARN("dbaccess", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN_ATTR("dbaccess", aIter.getToken(), aIter.toString()); } } diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx index 2f952504a242..0ee1445a8699 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx @@ -78,7 +78,7 @@ OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport, sFileTypeExtension = sValue; break; default: - SAL_WARN("dbaccess", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN("dbaccess", aIter); } if ( !aProperty.Name.isEmpty() ) { diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx index 182463181e56..b3ea220ab996 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx @@ -56,7 +56,7 @@ OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport sName = sValue; break; default: - SAL_WARN("dbaccess", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN("dbaccess", aIter); } } if ( sName.isEmpty() || !_xParentContainer.is() ) diff --git a/dbaccess/source/filter/xml/xmlLogin.cxx b/dbaccess/source/filter/xml/xmlLogin.cxx index c74d98be7ddd..a30988098595 100644 --- a/dbaccess/source/filter/xml/xmlLogin.cxx +++ b/dbaccess/source/filter/xml/xmlLogin.cxx @@ -94,7 +94,7 @@ OXMLLogin::OXMLLogin( ODBFilter& rImport, } break; default: - SAL_WARN("dbaccess", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN("dbaccess", aIter); } } catch(const Exception&) diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx index 7ab4940da9d2..6a141eb6aa3f 100644 --- a/dbaccess/source/filter/xml/xmlQuery.cxx +++ b/dbaccess/source/filter/xml/xmlQuery.cxx @@ -54,7 +54,7 @@ OXMLQuery::OXMLQuery( ODBFilter& rImport m_bEscapeProcessing = sValue == "true"; break; default: - SAL_WARN("dbaccess", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN("dbaccess", aIter); } } } diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx b/dbaccess/source/filter/xml/xmlServerDatabase.cxx index 87ff119b5a79..590db077437b 100644 --- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx @@ -64,7 +64,7 @@ OXMLServerDatabase::OXMLServerDatabase( ODBFilter& rImport, sDatabaseName = sValue; break; default: - SAL_WARN("dbaccess", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN("dbaccess", aIter); } } } diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx index 9477f13faf54..697f88a7f607 100644 --- a/dbaccess/source/filter/xml/xmlTable.cxx +++ b/dbaccess/source/filter/xml/xmlTable.cxx @@ -74,7 +74,7 @@ OXMLTable::OXMLTable( ODBFilter& _rImport m_bApplyOrder = sValue == "true"; break; default: - SAL_WARN("dbaccess", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN("dbaccess", aIter); } } uno::Sequence aArguments(comphelper::InitAnyPropertySequence( @@ -217,7 +217,7 @@ void OXMLTable::fillAttributes(const uno::Reference< XFastAttributeList > & _xAt _rsTableName = sValue; break; default: - SAL_WARN("dbaccess", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << aIter.toString()); + XMLOFF_WARN_UNKNOWN("dbaccess", aIter); } } } -- cgit