diff options
| author | Arkadiy Illarionov <qarkai@gmail.com> | 2019-05-12 16:07:58 +0300 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-06-11 20:32:49 +0200 |
| commit | 79d58ee14da8fbf636fb087453834abb7173d3fc (patch) | |
| tree | 2eda9470235311bdfaf542ceeaf8237406458015 /xmloff/source/transform | |
| parent | c88f76035cd1d088cc06067270677618340fd839 (diff) | |
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 <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff/source/transform')
| -rw-r--r-- | xmloff/source/transform/OOo2Oasis.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/transform/TransformerBase.cxx | 17 |
2 files changed, 8 insertions, 12 deletions
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 5d84e725de6f..1cd92c99c89e 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1917,8 +1917,7 @@ void OOo2OasisTransformer::Initialize( { Sequence<Any> aArgs( 1 + rArguments.getLength() ); aArgs[0] <<= xDocHandler; - for(sal_Int32 i = 0; i < rArguments.getLength(); i++) - aArgs[i+1] = rArguments[i]; + std::copy(rArguments.begin(), rArguments.end(), std::next(aArgs.begin())); XMLTransformerBase::initialize( aArgs ); OSL_ENSURE( GetDocHandler() == xDocHandler, 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<XDocumentHandler>::get().isAssignableFrom( pAny->getValueType() ) ) + if( cppu::UnoType<XDocumentHandler>::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<SvXMLImport*>( 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<XPropertySet>::get().isAssignableFrom( pAny->getValueType() ) ) - m_xPropSet.set( *pAny, UNO_QUERY ); + if( cppu::UnoType<XPropertySet>::get().isAssignableFrom( rArgument.getValueType() ) ) + m_xPropSet.set( rArgument, UNO_QUERY ); // xmodel - if( cppu::UnoType<css::frame::XModel>::get().isAssignableFrom( pAny->getValueType() ) ) - mxModel.set( *pAny, UNO_QUERY ); + if( cppu::UnoType<css::frame::XModel>::get().isAssignableFrom( rArgument.getValueType() ) ) + mxModel.set( rArgument, UNO_QUERY ); } if( m_xPropSet.is() ) |