diff options
Diffstat (limited to 'svtools/source/control/valueacc.cxx')
| -rw-r--r-- | svtools/source/control/valueacc.cxx | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 985f9fb586e7..e92b7cafbf80 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -384,18 +384,17 @@ void SAL_CALL ValueSetAcc::removeAccessibleEventListener( const uno::Reference< if( rxListener.is() ) { - ::std::vector< uno::Reference< accessibility::XAccessibleEventListener > >::iterator aIter = mxEventListeners.begin(); - sal_Bool bFound = sal_False; + ::std::vector< uno::Reference< accessibility::XAccessibleEventListener > >::const_iterator aEnd = mxEventListeners.end(); - while( !bFound && ( aIter != mxEventListeners.end() ) ) + for(::std::vector< uno::Reference< accessibility::XAccessibleEventListener > >::iterator aIter = mxEventListeners.begin(); + aIter != aEnd; + ++aIter) { if( *aIter == rxListener ) { - mxEventListeners.erase( aIter ); - bFound = sal_True; + mxEventListeners.erase(aIter); + break; } - else - ++aIter; } } } @@ -1048,18 +1047,17 @@ void SAL_CALL ValueItemAcc::removeAccessibleEventListener( const uno::Reference< if( rxListener.is() ) { - ::std::vector< uno::Reference< accessibility::XAccessibleEventListener > >::iterator aIter = mxEventListeners.begin(); - sal_Bool bFound = sal_False; + ::std::vector< uno::Reference< accessibility::XAccessibleEventListener > >::const_iterator aEnd = mxEventListeners.end(); - while( !bFound && ( aIter != mxEventListeners.end() ) ) + for(::std::vector< uno::Reference< accessibility::XAccessibleEventListener > >::iterator aIter = mxEventListeners.begin(); + aIter != aEnd; + ++aIter) { if( *aIter == rxListener ) { - mxEventListeners.erase( aIter ); - bFound = sal_True; + mxEventListeners.erase(aIter); + break; } - else - ++aIter; } } } |