From 79d58ee14da8fbf636fb087453834abb7173d3fc Mon Sep 17 00:00:00 2001 From: Arkadiy Illarionov Date: Sun, 12 May 2019 16:07:58 +0300 Subject: Simplify Sequence iterations in xmloff/source/{style..xforms} Use range-based loops or replace with comphelper or STL functions Change-Id: Ie268d80b9c01d38c745c14a81c219d9930860562 Reviewed-on: https://gerrit.libreoffice.org/72189 Tested-by: Jenkins Reviewed-by: Noel Grandin --- xmloff/source/transform/TransformerBase.cxx | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'xmloff/source/transform/TransformerBase.cxx') diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 249f06752fa3..23c32d8d0d95 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -374,10 +374,7 @@ void SAL_CALL XMLTransformerBase::unknown( const OUString& /*rString*/ ) // XInitialize void SAL_CALL XMLTransformerBase::initialize( const Sequence< Any >& aArguments ) { - const sal_Int32 nAnyCount = aArguments.getLength(); - const Any* pAny = aArguments.getConstArray(); - - for( sal_Int32 nIndex = 0; nIndex < nAnyCount; nIndex++, pAny++ ) + for( const auto& rArgument : aArguments ) { // use isAssignableFrom instead of comparing the types to // allow XExtendedDocumentHandler instead of XDocumentHandler (used in @@ -386,9 +383,9 @@ void SAL_CALL XMLTransformerBase::initialize( const Sequence< Any >& aArguments // uses queryInterface, and the model also has a XPropertySet interface. // document handler - if( cppu::UnoType::get().isAssignableFrom( pAny->getValueType() ) ) + if( cppu::UnoType::get().isAssignableFrom( rArgument.getValueType() ) ) { - m_xHandler.set( *pAny, UNO_QUERY ); + m_xHandler.set( rArgument, UNO_QUERY ); // Type change to avoid crashing of dynamic_cast if (SvXMLImport *pFastHandler = dynamic_cast( uno::Reference< XFastDocumentHandler >( m_xHandler, uno::UNO_QUERY ).get() ) ) @@ -396,12 +393,12 @@ void SAL_CALL XMLTransformerBase::initialize( const Sequence< Any >& aArguments } // property set to transport data across - if( cppu::UnoType::get().isAssignableFrom( pAny->getValueType() ) ) - m_xPropSet.set( *pAny, UNO_QUERY ); + if( cppu::UnoType::get().isAssignableFrom( rArgument.getValueType() ) ) + m_xPropSet.set( rArgument, UNO_QUERY ); // xmodel - if( cppu::UnoType::get().isAssignableFrom( pAny->getValueType() ) ) - mxModel.set( *pAny, UNO_QUERY ); + if( cppu::UnoType::get().isAssignableFrom( rArgument.getValueType() ) ) + mxModel.set( rArgument, UNO_QUERY ); } if( m_xPropSet.is() ) -- cgit