diff options
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/control/valueacc.cxx | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index e92b7cafbf80..01c60af4cc42 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -384,18 +384,11 @@ void SAL_CALL ValueSetAcc::removeAccessibleEventListener( const uno::Reference< if( rxListener.is() ) { - ::std::vector< uno::Reference< accessibility::XAccessibleEventListener > >::const_iterator aEnd = mxEventListeners.end(); + ::std::vector< uno::Reference< accessibility::XAccessibleEventListener > >::iterator aIter = + std::find(mxEventListeners.begin(), mxEventListeners.end(), rxListener); - for(::std::vector< uno::Reference< accessibility::XAccessibleEventListener > >::iterator aIter = mxEventListeners.begin(); - aIter != aEnd; - ++aIter) - { - if( *aIter == rxListener ) - { - mxEventListeners.erase(aIter); - break; - } - } + if (aIter != mxEventListeners.end()) + mxEventListeners.erase(aIter); } } @@ -1047,18 +1040,11 @@ void SAL_CALL ValueItemAcc::removeAccessibleEventListener( const uno::Reference< if( rxListener.is() ) { - ::std::vector< uno::Reference< accessibility::XAccessibleEventListener > >::const_iterator aEnd = mxEventListeners.end(); + ::std::vector< uno::Reference< accessibility::XAccessibleEventListener > >::iterator aIter = + std::find(mxEventListeners.begin(), mxEventListeners.end(), rxListener); - for(::std::vector< uno::Reference< accessibility::XAccessibleEventListener > >::iterator aIter = mxEventListeners.begin(); - aIter != aEnd; - ++aIter) - { - if( *aIter == rxListener ) - { - mxEventListeners.erase(aIter); - break; - } - } + if (aIter != mxEventListeners.end()) + mxEventListeners.erase(aIter); } } |