diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-05 13:27:30 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-06 08:35:23 +0200 |
commit | ab9b38a4064141705aa3a3de9a5d73b465ad3af3 (patch) | |
tree | 888fcc6b517c44d77e2d297c13ee84fb487dd7a7 /sfx2 | |
parent | 13341ffa49d58f313a05edae4f4f04c215658e9f (diff) |
use more begin()/end() for Sequence
Change-Id: I399be6b6ef7a6ce01e883569a177c0969bc29c69
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/shutdowniconaqua.mm | 6 | ||||
-rw-r--r-- | sfx2/source/appl/shutdowniconw32.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/dialog/backingwindow.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/dialog/filtergrouping.cxx | 12 | ||||
-rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/sfxmodelfactory.cxx | 4 |
6 files changed, 16 insertions, 22 deletions
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm index 6b7fff2c60a6..eb4633eaa7c5 100644 --- a/sfx2/source/appl/shutdowniconaqua.mm +++ b/sfx2/source/appl/shutdowniconaqua.mm @@ -409,11 +409,9 @@ void aqua_init_systray() SvtDynamicMenuOptions aOpt; css::uno::Sequence < css::uno::Sequence < css::beans::PropertyValue > > aNewMenu = aOpt.GetMenu( EDynamicMenuType::NewMenu ); - const css::uno::Sequence< css::beans::PropertyValue >* pNewMenu = aNewMenu.getConstArray(); - const css::uno::Sequence< css::beans::PropertyValue >* pNewMenuEnd = aNewMenu.getConstArray() + aNewMenu.getLength(); - for ( ; pNewMenu != pNewMenuEnd; ++pNewMenu ) + for ( auto const & newMenuProp : aNewMenu ) { - comphelper::SequenceAsHashMap aEntryItems( *pNewMenu ); + comphelper::SequenceAsHashMap aEntryItems( newMenuProp ); rtl::OUString sURL( aEntryItems.getUnpackedValueOrDefault( "URL", rtl::OUString() ) ); if ( sURL.getLength() ) aFileNewAppsAvailable.insert( sURL ); diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index 502b99f55b0d..a7bd05a34f04 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -153,11 +153,9 @@ static HMENU createSystrayMenu( ) Sequence < Sequence < PropertyValue > > aNewMenu = aOpt.GetMenu( EDynamicMenuType::NewMenu ); const OUString sURLKey( "URL" ); - const Sequence< PropertyValue >* pNewMenu = aNewMenu.getConstArray(); - const Sequence< PropertyValue >* pNewMenuEnd = aNewMenu.getConstArray() + aNewMenu.getLength(); - for ( ; pNewMenu != pNewMenuEnd; ++pNewMenu ) + for ( auto const & newMenuProp : aNewMenu ) { - ::comphelper::SequenceAsHashMap aEntryItems( *pNewMenu ); + ::comphelper::SequenceAsHashMap aEntryItems( newMenuProp ); OUString sURL( aEntryItems.getUnpackedValueOrDefault( sURLKey, OUString() ) ); if ( sURL.getLength() ) aFileNewAppsAvailable.insert( sURL ); diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 67d1f7d4217d..d5703887e7ab 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -208,11 +208,9 @@ void BackingWindow::initControls() Sequence < Sequence < PropertyValue > > aNewMenu = aOpt.GetMenu( EDynamicMenuType::NewMenu ); const OUString sURLKey( "URL" ); - const Sequence< PropertyValue >* pNewMenu = aNewMenu.getConstArray(); - const Sequence< PropertyValue >* pNewMenuEnd = aNewMenu.getConstArray() + aNewMenu.getLength(); - for ( ; pNewMenu != pNewMenuEnd; ++pNewMenu ) + for ( auto const & newMenuProp : aNewMenu ) { - comphelper::SequenceAsHashMap aEntryItems( *pNewMenu ); + comphelper::SequenceAsHashMap aEntryItems( newMenuProp ); OUString sURL( aEntryItems.getUnpackedValueOrDefault( sURLKey, OUString() ) ); if ( !sURL.isEmpty() ) aFileNewAppsAvailable.insert( sURL ); diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 9bd048d6ae1c..b7a602e7ecac 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -256,8 +256,8 @@ namespace sfx2 _rFilterClassification.openNode( "GlobalFilters/Classes" ); Sequence< OUString > aFilterClasses = aFilterClassesNode.getNodeNames(); ::std::for_each( - aFilterClasses.getConstArray(), - aFilterClasses.getConstArray() + aFilterClasses.getLength(), + aFilterClasses.begin(), + aFilterClasses.end(), ReadGlobalFilter( aFilterClassesNode, aClassReferrer ) ); } @@ -299,8 +299,8 @@ namespace sfx2 Sequence< OUString > aFilterClasses = aFilterClassesNode.getNodeNames(); ::std::for_each( - aFilterClasses.getConstArray(), - aFilterClasses.getConstArray() + aFilterClasses.getLength(), + aFilterClasses.begin(), + aFilterClasses.end(), ReadLocalFilter( aFilterClassesNode, _rLocalClasses ) ); } @@ -387,8 +387,8 @@ namespace sfx2 // and for all the sub filters of the class, remember the class // (respectively the position of the class it the group) ::std::for_each( - _rClass.aSubFilters.getConstArray(), - _rClass.aSubFilters.getConstArray() + _rClass.aSubFilters.getLength(), + _rClass.aSubFilters.begin(), + _rClass.aSubFilters.end(), ReferToFilterEntry( m_rClassReferrer, aClassEntryPos ) ); } diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index faba052f4ec2..cefd4db1cb70 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -546,8 +546,8 @@ namespace { Sequence< uno::Type > aStrippedTypes( io_rTypes.getLength() - 1 ); ::std::remove_copy_if( - io_rTypes.getConstArray(), - io_rTypes.getConstArray() + io_rTypes.getLength(), + io_rTypes.begin(), + io_rTypes.end(), aStrippedTypes.getArray(), [&i_rTypeToStrip](const uno::Type& aType) { return aType == i_rTypeToStrip; } ); diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx index c50034e8ab7a..564a5dc3e0c3 100644 --- a/sfx2/source/doc/sfxmodelfactory.cxx +++ b/sfx2/source/doc/sfxmodelfactory.cxx @@ -158,8 +158,8 @@ namespace sfx2 Sequence< Any > aStrippedArguments( _rArguments.getLength() ); Any* pStrippedArgs = aStrippedArguments.getArray(); Any* pStrippedArgsEnd = ::std::remove_copy_if( - _rArguments.getConstArray(), - _rArguments.getConstArray() + _rArguments.getLength(), + _rArguments.begin(), + _rArguments.end(), pStrippedArgs, IsSpecialArgument() ); |