diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-04-28 12:29:17 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-04-28 13:25:27 +0200 |
commit | 1705fbe9daac56ee9bea8d8fd7c7f57e2bec49b5 (patch) | |
tree | aaf39244173a4cf20df6568140ebdbe5ec055656 /reportdesign | |
parent | dfa8e18e8e6c7ad87e423393f8293a20188de1fd (diff) |
move the castToFastAttributeList function
to the slightly higher namespace, to make it easy and more readable to
use directly in a for-loop-range expression.
And make it return a reference rather than a pointer, since it is never
allowed to be nullptr.
Change-Id: I15d0b32493ef65cfc601b247c272b318f1eadfd8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93049
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign')
-rw-r--r-- | reportdesign/source/filter/xml/xmlCell.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlColumn.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlComponent.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlCondPrtExpr.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlControlProperty.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlFormatCondition.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlFormattedField.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlFunction.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlGroup.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlImage.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlMasterFields.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlReport.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlReportElement.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlSection.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlTable.cxx | 4 |
15 files changed, 15 insertions, 45 deletions
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index d61de6a70318..98fda0bf9490 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -61,9 +61,7 @@ OXMLCell::OXMLCell( ORptFilter& rImport if ( !m_pCell ) m_pCell = this; - sax_fastparser::FastAttributeList *pAttribList = - sax_fastparser::FastAttributeList::castToFastAttributeList( _xAttrList ); - for (auto &aIter : *pAttribList) + for (auto &aIter : sax_fastparser::castToFastAttributeList( _xAttrList )) { OUString sValue = aIter.toString(); diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx index 753dfbe1b35c..a9fbb05a417b 100644 --- a/reportdesign/source/filter/xml/xmlColumn.cxx +++ b/reportdesign/source/filter/xml/xmlColumn.cxx @@ -53,9 +53,7 @@ OXMLRowColumn::OXMLRowColumn( ORptFilter& rImport SvXMLImportContext( rImport ) ,m_pContainer(_pContainer) { - sax_fastparser::FastAttributeList *pAttribList = - sax_fastparser::FastAttributeList::castToFastAttributeList( _xAttrList ); - for (auto &aIter : *pAttribList) + for (auto &aIter : sax_fastparser::castToFastAttributeList( _xAttrList )) { OUString sValue = aIter.toString(); diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx index bc97551de846..4822a9cc5228 100644 --- a/reportdesign/source/filter/xml/xmlComponent.cxx +++ b/reportdesign/source/filter/xml/xmlComponent.cxx @@ -48,9 +48,7 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport { OSL_ENSURE(m_xComponent.is(),"Component is NULL!"); - sax_fastparser::FastAttributeList *pAttribList = - sax_fastparser::FastAttributeList::castToFastAttributeList( _xAttrList ); - for (auto &aIter : *pAttribList) + for (auto &aIter : sax_fastparser::castToFastAttributeList( _xAttrList )) { OUString sValue = aIter.toString(); diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx index e4f4fb9a39b4..7c3b7967652e 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx @@ -44,9 +44,7 @@ OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport OSL_ENSURE(m_xComponent.is(),"Component is NULL!"); try { - sax_fastparser::FastAttributeList *pAttribList = - sax_fastparser::FastAttributeList::castToFastAttributeList( _xAttrList ); - for (auto &aIter : *pAttribList) + for (auto &aIter : sax_fastparser::castToFastAttributeList( _xAttrList )) { OUString sValue = aIter.toString(); diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index 3fa9d751c379..f84120f124ee 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -63,9 +63,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport OSL_ENSURE(m_xControl.is(),"Control is NULL!"); - sax_fastparser::FastAttributeList *pAttribList = - sax_fastparser::FastAttributeList::castToFastAttributeList( _xAttrList ); - for (auto &aIter : *pAttribList) + for (auto &aIter : sax_fastparser::castToFastAttributeList( _xAttrList )) { OUString sValue = aIter.toString(); diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx index 15532e27e718..e802c9c5c902 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx @@ -51,9 +51,7 @@ OXMLFormatCondition::OXMLFormatCondition( ORptFilter& rImport, static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); try { - sax_fastparser::FastAttributeList *pAttribList = - sax_fastparser::FastAttributeList::castToFastAttributeList( _xAttrList ); - for (auto &aIter : *pAttribList) + for (auto &aIter : sax_fastparser::castToFastAttributeList( _xAttrList )) { OUString sValue = aIter.toString(); diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx index 348f9858c4cc..483dbfb53768 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.cxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx @@ -47,9 +47,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport try { - sax_fastparser::FastAttributeList *pAttribList = - sax_fastparser::FastAttributeList::castToFastAttributeList( _xAttrList ); - for (auto &aIter : *pAttribList) + for (auto &aIter : sax_fastparser::castToFastAttributeList( _xAttrList )) { OUString sValue = aIter.toString(); diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx index e933e603d2ac..96455cb2c1dd 100644 --- a/reportdesign/source/filter/xml/xmlFunction.cxx +++ b/reportdesign/source/filter/xml/xmlFunction.cxx @@ -49,9 +49,7 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport m_xFunction = m_xFunctions->createFunction(); static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); - sax_fastparser::FastAttributeList *pAttribList = - sax_fastparser::FastAttributeList::castToFastAttributeList( _xAttrList ); - for (auto &aIter : *pAttribList) + for (auto &aIter : sax_fastparser::castToFastAttributeList( _xAttrList )) { OUString sValue = aIter.toString(); diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx index 35582b3d6907..89487dbadfaa 100644 --- a/reportdesign/source/filter/xml/xmlGroup.cxx +++ b/reportdesign/source/filter/xml/xmlGroup.cxx @@ -60,9 +60,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport m_xGroup->setSortAscending(false);// the default value has to be set static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); - sax_fastparser::FastAttributeList *pAttribList = - sax_fastparser::FastAttributeList::castToFastAttributeList( _xAttrList ); - for (auto &aIter : *pAttribList) + for (auto &aIter : sax_fastparser::castToFastAttributeList( _xAttrList )) { OUString sValue = aIter.toString(); diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx index a88091570873..b315d5d4dcbb 100644 --- a/reportdesign/source/filter/xml/xmlImage.cxx +++ b/reportdesign/source/filter/xml/xmlImage.cxx @@ -52,9 +52,7 @@ OXMLImage::OXMLImage( ORptFilter& rImport, try { - sax_fastparser::FastAttributeList *pAttribList = - sax_fastparser::FastAttributeList::castToFastAttributeList( _xAttrList ); - for (auto &aIter : *pAttribList) + for (auto &aIter : sax_fastparser::castToFastAttributeList( _xAttrList )) { OUString sValue = aIter.toString(); diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx index 11d73c1f9155..bfa88e4ee7d1 100644 --- a/reportdesign/source/filter/xml/xmlMasterFields.cxx +++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx @@ -41,9 +41,7 @@ OXMLMasterFields::OXMLMasterFields( ORptFilter& rImport, ,m_pReport(_pReport) { OUString sMasterField,sDetailField; - sax_fastparser::FastAttributeList *pAttribList = - sax_fastparser::FastAttributeList::castToFastAttributeList( _xAttrList ); - for (auto &aIter : *pAttribList) + for (auto &aIter : sax_fastparser::castToFastAttributeList( _xAttrList )) { OUString sValue = aIter.toString(); diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx index 485dcf218989..eff07eca1803 100644 --- a/reportdesign/source/filter/xml/xmlReport.cxx +++ b/reportdesign/source/filter/xml/xmlReport.cxx @@ -53,9 +53,7 @@ OXMLReport::OXMLReport( ORptFilter& rImport, static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); try { - sax_fastparser::FastAttributeList *pAttribList = - sax_fastparser::FastAttributeList::castToFastAttributeList( _xAttrList ); - for (auto &aIter : *pAttribList) + for (auto &aIter : sax_fastparser::castToFastAttributeList( _xAttrList )) { OUString sValue = aIter.toString(); diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx index 9e6fdf902ae2..a6c22902852a 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.cxx +++ b/reportdesign/source/filter/xml/xmlReportElement.cxx @@ -48,9 +48,7 @@ OXMLReportElement::OXMLReportElement( ORptFilter& rImport, static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); try { - sax_fastparser::FastAttributeList *pAttribList = - sax_fastparser::FastAttributeList::castToFastAttributeList( _xAttrList ); - for (auto &aIter : *pAttribList) + for (auto &aIter : sax_fastparser::castToFastAttributeList( _xAttrList )) { OUString sValue = aIter.toString(); diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx index 129ea3751141..49a38f51cfc8 100644 --- a/reportdesign/source/filter/xml/xmlSection.cxx +++ b/reportdesign/source/filter/xml/xmlSection.cxx @@ -64,9 +64,7 @@ OXMLSection::OXMLSection( ORptFilter& rImport, static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); try { - sax_fastparser::FastAttributeList *pAttribList = - sax_fastparser::FastAttributeList::castToFastAttributeList( _xAttrList ); - for (auto &aIter : *pAttribList) + for (auto &aIter : sax_fastparser::castToFastAttributeList( _xAttrList )) { OUString sValue = aIter.toString(); diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx index f7f376cdaf81..460f4b4e8282 100644 --- a/reportdesign/source/filter/xml/xmlTable.cxx +++ b/reportdesign/source/filter/xml/xmlTable.cxx @@ -75,9 +75,7 @@ OXMLTable::OXMLTable( ORptFilter& rImport static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); try { - sax_fastparser::FastAttributeList *pAttribList = - sax_fastparser::FastAttributeList::castToFastAttributeList( _xAttrList ); - for (auto &aIter : *pAttribList) + for (auto &aIter : sax_fastparser::castToFastAttributeList( _xAttrList )) { OUString sValue = aIter.toString(); |