diff options
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/control/toolbarmenuacc.cxx | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index 1ad9cbf91711..da3ebdc04ae3 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -330,18 +330,9 @@ void SAL_CALL ToolbarMenuAcc::removeAccessibleEventListener( const Reference< XA if( rxListener.is() ) { - EventListenerVector::const_iterator aEnd = mxEventListeners.end(); - - for(EventListenerVector::iterator aIter = mxEventListeners.begin(); - aIter != aEnd; - ++aIter) - { - if( *aIter == rxListener ) - { - mxEventListeners.erase(aIter); - break; - } - } + EventListenerVector::iterator aIter = std::find(mxEventListeners.begin(), mxEventListeners.end(), rxListener); + if (aIter != mxEventListeners.end()) + mxEventListeners.erase(aIter); } } @@ -831,18 +822,9 @@ void SAL_CALL ToolbarMenuEntryAcc::removeAccessibleEventListener( const Referenc if( rxListener.is() ) { - EventListenerVector::const_iterator aEnd = mxEventListeners.end(); - - for (EventListenerVector::iterator aIter = mxEventListeners.begin(); - aIter != aEnd; - ++aIter) - { - if( *aIter == rxListener ) - { - mxEventListeners.erase( aIter ); - break; - } - } + EventListenerVector::iterator aIter = std::find(mxEventListeners.begin(), mxEventListeners.end(), rxListener); + if (aIter != mxEventListeners.end()) + mxEventListeners.erase(aIter); } } |