diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-03 10:53:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-03 14:15:37 +0200 |
| commit | 31d4562ca9e21f7b04960ac083765733e9a55118 (patch) | |
| tree | 977b0cdd4a768a2eed9fef6a0f79ecff0b3250e6 /extensions/source | |
| parent | bce779932b59990fbdf8278993f8bb9514781de2 (diff) | |
use begin()/end() when working with Sequence
Change-Id: Icf9da6a24d72c073338f6fbb513d7250b3898015
Reviewed-on: https://gerrit.libreoffice.org/39469
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'extensions/source')
| -rw-r--r-- | extensions/source/propctrlr/eformshelper.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/propctrlr/eventhandler.cxx | 4 | ||||
| -rw-r--r-- | extensions/source/propctrlr/genericpropertyhandler.cxx | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index 19b64557c5f4..bceddfcde856 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -593,7 +593,7 @@ namespace pcr if ( xInfo.is() ) { Sequence< Property > aProperties = xInfo->getProperties(); - std::for_each( aProperties.getConstArray(), aProperties.getConstArray() + aProperties.getLength(), + std::for_each( aProperties.begin(), aProperties.end(), PropertyBagInserter( _rBag ) ); } diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index be1b66519154..5ede817d6009 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -822,8 +822,8 @@ namespace pcr // the initial selection in the dialog Sequence< OUString > aNames( pEventHolder->getElementNames() ); - const OUString* pChosenEvent = std::find( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength(), rForEvent.sListenerMethodName ); - sal_uInt16 nInitialSelection = (sal_uInt16)( pChosenEvent - aNames.getConstArray() ); + const OUString* pChosenEvent = std::find( aNames.begin(), aNames.end(), rForEvent.sListenerMethodName ); + sal_uInt16 nInitialSelection = (sal_uInt16)( pChosenEvent - aNames.begin() ); // the dialog SvxAbstractDialogFactory* pFactory = SvxAbstractDialogFactory::Create(); diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index b5d931aa8182..2998a8b15a14 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.cxx @@ -116,7 +116,7 @@ namespace pcr OSL_FAIL( "EnumRepresentation::getDescriptions: caught an exception!" ); } - return std::vector< OUString >( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength() ); + return std::vector< OUString >( aNames.begin(), aNames.end() ); } void EnumRepresentation::impl_getValues( Sequence< sal_Int32 >& _out_rValues ) const @@ -162,8 +162,7 @@ namespace pcr Sequence< sal_Int32 > aValues; impl_getValues( aValues ); - sal_Int32 index = std::find( aValues.getConstArray(), aValues.getConstArray() + aValues.getLength(), - nAsInt ) - aValues.getConstArray(); + sal_Int32 index = std::find( aValues.begin(), aValues.end(), nAsInt ) - aValues.begin(); std::vector< OUString > aDescriptions( getDescriptions() ); if ( ( index >= 0 ) && ( index < (sal_Int32)aDescriptions.size() ) ) |