diff options
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/ListBox.cxx | 7 | ||||
| -rw-r--r-- | forms/source/misc/InterfaceContainer.cxx | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index a5e6d61125ca..dd53979ebbc1 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -1425,18 +1425,15 @@ namespace frm ::std::set< sal_Int16 > aSelectionSet; // find the selection entries in our item list - const OUString* pSelectEntries = aSelectEntries.getArray(); - const OUString* pSelectEntriesEnd = pSelectEntries + aSelectEntries.getLength(); - while ( pSelectEntries != pSelectEntriesEnd ) + for ( OUString const & selectEntry : aSelectEntries ) { int idx = 0; for(const OUString& s : getStringItemList()) { - if (s==*pSelectEntries) + if (s==selectEntry) aSelectionSet.insert(idx); ++idx; } - ++pSelectEntries; } // copy the indexes to the sequence diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index c251c17d3587..2d7430ed6cfb 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -398,12 +398,8 @@ void OInterfaceContainer::transformEvents() if ( aChildEvents.getLength() ) { - // the "iterators" for the events for this child - ScriptEventDescriptor* pChildEvents = aChildEvents.getArray(); - ScriptEventDescriptor* pChildEventsEnd = pChildEvents + aChildEvents.getLength(); - // do the transformation - ::std::for_each( pChildEvents, pChildEventsEnd, TransformEventTo52Format() ); + ::std::for_each( aChildEvents.begin(), aChildEvents.end(), TransformEventTo52Format() ); // revoke the script events m_xEventAttacher->revokeScriptEvents( i ); |