diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-10 16:12:07 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-11 12:50:55 +0200 |
commit | 20571c472528c4f98fe3f55700d134915d32a49a (patch) | |
tree | 9b350824d845b8aaeb13d087ef74febb454b821b /writerfilter | |
parent | b401896a56149aa2871b65a330a6f601a9830ccd (diff) |
use more range-for on uno::Sequence
Change-Id: Ifad32425d79be5a22d33d721bdc5fb993f699759
Reviewed-on: https://gerrit.libreoffice.org/39763
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 8 | ||||
-rw-r--r-- | writerfilter/source/dmapper/PropertyMapHelper.cxx | 22 | ||||
-rw-r--r-- | writerfilter/source/dmapper/PropertyMapHelper.hxx | 4 |
3 files changed, 14 insertions, 20 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 9dfa48f1d657..7fbefaf73568 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -170,11 +170,9 @@ typedef std::unordered_map<OUString, FieldConversion, OUStringHash> FieldConvers uno::Any FloatingTableInfo::getPropertyValue(const OUString &propertyName) { - - beans::PropertyValue* pFrameProperties = m_aFrameProperties.getArray(); - for( int i = 0 ; i < m_aFrameProperties.getLength(); i++ ) - if( pFrameProperties[i].Name == propertyName ) - return pFrameProperties[i].Value ; + for( beans::PropertyValue const & propVal : m_aFrameProperties ) + if( propVal.Name == propertyName ) + return propVal.Value ; return uno::Any() ; } diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx b/writerfilter/source/dmapper/PropertyMapHelper.cxx index e1afdd6d23ed..d4735d9c7b1e 100644 --- a/writerfilter/source/dmapper/PropertyMapHelper.cxx +++ b/writerfilter/source/dmapper/PropertyMapHelper.cxx @@ -54,31 +54,29 @@ void lcl_DumpTableColumnSeparators(const uno::Any & rTableColumnSeparators) } #ifdef DEBUG_WRITERFILTER -void lcl_DumpPropertyValues(beans::PropertyValues & rValues) +void lcl_DumpPropertyValues(beans::PropertyValues const & rValues) { TagLogger::getInstance().startElement("propertyValues"); - beans::PropertyValue * pValues = rValues.getArray(); - - for (sal_Int32 n = 0; n < rValues.getLength(); ++n) + for (beans::PropertyValue const & propVal : rValues) { TagLogger::getInstance().startElement("propertyValue"); - TagLogger::getInstance().attribute("name", pValues[n].Name); + TagLogger::getInstance().attribute("name", propVal.Name); try { sal_Int32 aInt = 0; - pValues[n].Value >>= aInt; + propVal.Value >>= aInt; TagLogger::getInstance().attribute("value", aInt); } catch (...) { } - if ( pValues[n].Name == "TableColumnSeparators" ) + if ( propVal.Name == "TableColumnSeparators" ) { - lcl_DumpTableColumnSeparators(pValues[n].Value); + lcl_DumpTableColumnSeparators(propVal.Value); } TagLogger::getInstance().endElement(); @@ -86,15 +84,13 @@ void lcl_DumpPropertyValues(beans::PropertyValues & rValues) TagLogger::getInstance().endElement(); } -void lcl_DumpPropertyValueSeq(css::uno::Sequence<css::beans::PropertyValues> & rPropValSeq) +void lcl_DumpPropertyValueSeq(css::uno::Sequence<css::beans::PropertyValues> const & rPropValSeq) { TagLogger::getInstance().startElement("PropertyValueSeq"); - beans::PropertyValues * pValues = rPropValSeq.getArray(); - - for (sal_Int32 n = 0; n < rPropValSeq.getLength(); ++n) + for (auto const & propVal : rPropValSeq) { - lcl_DumpPropertyValues(pValues[n]); + lcl_DumpPropertyValues(propVal); } TagLogger::getInstance().endElement(); diff --git a/writerfilter/source/dmapper/PropertyMapHelper.hxx b/writerfilter/source/dmapper/PropertyMapHelper.hxx index 4bc6ad8f65f1..84ad696c619d 100644 --- a/writerfilter/source/dmapper/PropertyMapHelper.hxx +++ b/writerfilter/source/dmapper/PropertyMapHelper.hxx @@ -30,9 +30,9 @@ namespace dmapper void lcl_DumpTableColumnSeparators(const css::uno::Any & rTableColumnSeparators); #ifdef DEBUG_WRITERFILTER -void lcl_DumpPropertyValues(css::beans::PropertyValues & rValues); +void lcl_DumpPropertyValues(css::beans::PropertyValues const & rValues); -void lcl_DumpPropertyValueSeq(css::uno::Sequence<css::beans::PropertyValues> & rPropValSeq); +void lcl_DumpPropertyValueSeq(css::uno::Sequence<css::beans::PropertyValues> const & rPropValSeq); #endif // DEBUG_WRITERFILTER } } |