summaryrefslogtreecommitdiff
path: root/reportdesign/source/filter
diff options
context:
space:
mode:
authorNoel <noelgrandin@gmail.com>2020-11-02 15:37:28 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-11-02 17:39:10 +0100
commit28be7b98070b7475cc675e76f075c941133cb790 (patch)
tree3237d5ca81cd7cc835a1200f5ae41e1008174b13 /reportdesign/source/filter
parent3940cf7d716f3e469f47d3c831a799e58edf2eb8 (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 'reportdesign/source/filter')
-rw-r--r--reportdesign/source/filter/xml/xmlCell.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlColumn.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlComponent.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlCondPrtExpr.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlControlProperty.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlFormatCondition.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlFormattedField.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlFunction.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlGroup.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlImage.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlMasterFields.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlReport.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlReportElement.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlSection.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlTable.cxx2
15 files changed, 15 insertions, 15 deletions
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index 39edf6f48815..d83621317f26 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -75,7 +75,7 @@ OXMLCell::OXMLCell( ORptFilter& rImport
m_pContainer->setRowSpanned(sValue.toInt32());
break;
default:
- SAL_WARN("reportdesign", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue);
+ XMLOFF_WARN_UNKNOWN("reportdesign", aIter);
break;
}
}
diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx
index 0271084ea5cd..053535868bb1 100644
--- a/reportdesign/source/filter/xml/xmlColumn.cxx
+++ b/reportdesign/source/filter/xml/xmlColumn.cxx
@@ -63,7 +63,7 @@ OXMLRowColumn::OXMLRowColumn( ORptFilter& rImport
fillStyle(sValue);
break;
default:
- SAL_WARN("reportdesign", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << " = " << sValue);
+ XMLOFF_WARN_UNKNOWN("reportdesign", aIter);
break;
}
}
diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx
index 503537d38e28..184ed5d6558f 100644
--- a/reportdesign/source/filter/xml/xmlComponent.cxx
+++ b/reportdesign/source/filter/xml/xmlComponent.cxx
@@ -51,7 +51,7 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport
m_xComponent->setName(sValue);
break;
default:
- SAL_WARN("reportdesign", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue);
+ XMLOFF_WARN_UNKNOWN("reportdesign", aIter);
}
}
catch(const Exception&)
diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
index c0557a82de59..ba803f15e619 100644
--- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
+++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
@@ -50,7 +50,7 @@ OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport
m_xComponent->setPropertyValue(PROPERTY_CONDITIONALPRINTEXPRESSION,uno::makeAny(ORptFilter::convertFormula(sValue)));
break;
default:
- SAL_WARN("reportdesign", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << " = " << sValue);
+ XMLOFF_WARN_UNKNOWN("reportdesign", aIter);
break;
}
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index 8af7508269aa..c66453c14f9d 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -98,7 +98,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport
m_aSetting.Name = sValue;
break;
default:
- SAL_WARN("reportdesign", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << " = " << sValue);
+ XMLOFF_WARN_UNKNOWN("reportdesign", aIter);
break;
}
}
diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
index ac4e384958ee..716f0550c2ae 100644
--- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx
+++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
@@ -60,7 +60,7 @@ OXMLFormatCondition::OXMLFormatCondition( ORptFilter& rImport,
m_sStyleName = sValue;
break;
default:
- SAL_WARN("reportdesign", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << " = " << sValue);
+ XMLOFF_WARN_UNKNOWN("reportdesign", aIter);
break;
}
}
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx
index 911ac23c683d..8ef64ff62423 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.cxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx
@@ -53,7 +53,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport
_xComponent->setDataField("rpt:PageNumber()");
break;
default:
- SAL_WARN("reportdesign", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << " = " << sValue);
+ XMLOFF_WARN_UNKNOWN("reportdesign", aIter);
break;
}
}
diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx
index 13f5745156d9..bc08b77d37f1 100644
--- a/reportdesign/source/filter/xml/xmlFunction.cxx
+++ b/reportdesign/source/filter/xml/xmlFunction.cxx
@@ -70,7 +70,7 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport
m_xFunction->setDeepTraversing(sValue == s_sTRUE);
break;
default:
- SAL_WARN("reportdesign", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << " = " << sValue);
+ XMLOFF_WARN_UNKNOWN("reportdesign", aIter);
break;
}
}
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index 7cdc9e8fe740..951e9391427d 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -158,7 +158,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
m_xGroup->setKeepTogether(lcl_getKeepTogetherOption(sValue));
break;
default:
- SAL_WARN("reportdesign", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << sValue);
+ XMLOFF_WARN_UNKNOWN("reportdesign", aIter);
break;
}
}
diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx
index bb3f5c61d278..fe4d9395232f 100644
--- a/reportdesign/source/filter/xml/xmlImage.cxx
+++ b/reportdesign/source/filter/xml/xmlImage.cxx
@@ -83,7 +83,7 @@ OXMLImage::OXMLImage( ORptFilter& rImport,
_xComponent->setDataField(ORptFilter::convertFormula(sValue));
break;
default:
- SAL_WARN("reportdesign", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << " = " << sValue);
+ XMLOFF_WARN_UNKNOWN("reportdesign", aIter);
break;
}
}
diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx
index a6676d5fb7ac..64cb935db286 100644
--- a/reportdesign/source/filter/xml/xmlMasterFields.cxx
+++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx
@@ -53,7 +53,7 @@ OXMLMasterFields::OXMLMasterFields( ORptFilter& rImport,
sDetailField = sValue;
break;
default:
- SAL_WARN("reportdesign", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << " = " << sValue);
+ XMLOFF_WARN_UNKNOWN("reportdesign", aIter);
break;
}
}
diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx
index c1dd1dcca681..a60b42133f69 100644
--- a/reportdesign/source/filter/xml/xmlReport.cxx
+++ b/reportdesign/source/filter/xml/xmlReport.cxx
@@ -87,7 +87,7 @@ OXMLReport::OXMLReport( ORptFilter& rImport,
m_xReportDefinition->setName(sValue);
break;
default:
- SAL_WARN("reportdesign", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << " = " << sValue);
+ XMLOFF_WARN_UNKNOWN("reportdesign", aIter);
break;
}
}
diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx
index 726304d4e71e..b71901927cd3 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.cxx
@@ -60,7 +60,7 @@ OXMLReportElement::OXMLReportElement( ORptFilter& rImport,
m_xComponent->setPrintRepeatedValues(sValue == s_sTRUE);
break;
default:
- SAL_WARN("reportdesign", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << " = " << sValue);
+ XMLOFF_WARN_UNKNOWN("reportdesign", aIter);
break;
}
}
diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx
index e7ef44234af2..a32b6ecf97d7 100644
--- a/reportdesign/source/filter/xml/xmlSection.cxx
+++ b/reportdesign/source/filter/xml/xmlSection.cxx
@@ -73,7 +73,7 @@ OXMLSection::OXMLSection( ORptFilter& rImport,
m_xSection->setRepeatSection(sValue == s_sTRUE );
break;
default:
- SAL_WARN("reportdesign", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << " = " << sValue);
+ XMLOFF_WARN_UNKNOWN("reportdesign", aIter);
}
}
}
diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx
index 301c32541958..3a882dc7c37f 100644
--- a/reportdesign/source/filter/xml/xmlTable.cxx
+++ b/reportdesign/source/filter/xml/xmlTable.cxx
@@ -99,7 +99,7 @@ OXMLTable::OXMLTable( ORptFilter& rImport
m_sStyleName = sValue;
break;
default:
- SAL_WARN("reportdesign", "unknown attribute " << SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << " = " << sValue);
+ XMLOFF_WARN_UNKNOWN("reportdesign", aIter);
break;
}
}