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 /toolkit | |
| 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 'toolkit')
| -rw-r--r-- | toolkit/source/controls/dialogcontrol.cxx | 8 | ||||
| -rw-r--r-- | toolkit/source/controls/unocontrolcontainer.cxx | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 4aee2bc88418..fc585806aceb 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -211,12 +211,10 @@ UnoControlDialogModel::UnoControlDialogModel( const UnoControlDialogModel& rMode Reference<XNameContainer > xNameCont( new SimpleNamedThingContainer< XControlModel > ); uno::Sequence< OUString > sNames = xSrcNameCont->getElementNames(); - OUString* pName = sNames.getArray(); - OUString* pNamesEnd = pName + sNames.getLength(); - for ( ; pName != pNamesEnd; ++pName ) + for ( OUString const & name : sNames ) { - if ( xSrcNameCont->hasByName( *pName ) ) - xNameCont->insertByName( *pName, xSrcNameCont->getByName( *pName ) ); + if ( xSrcNameCont->hasByName( name ) ) + xNameCont->insertByName( name, xSrcNameCont->getByName( name ) ); } setFastPropertyValue_NoBroadcast( BASEPROPERTY_USERFORMCONTAINEES, makeAny( xNameCont ) ); } diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index 68b8a960d12a..f5d3527fdc06 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -423,14 +423,12 @@ void UnoControlContainer::dispose( ) uno::Sequence< uno::Reference< awt::XControl > > aCtrls = getControls(); - uno::Reference< awt::XControl >* pCtrls = aCtrls.getArray(); - uno::Reference< awt::XControl >* pCtrlsEnd = pCtrls + aCtrls.getLength(); - for( ; pCtrls < pCtrlsEnd; ++pCtrls ) + for( uno::Reference< awt::XControl > const & control : aCtrls ) { - removingControl( *pCtrls ); + removingControl( control ); // Delete control - (*pCtrls)->dispose(); + control->dispose(); } |