diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2013-08-27 23:37:32 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2013-08-27 23:37:52 +0200 |
| commit | 9aca3570c5e4990f591900e3702efa14958776f4 (patch) | |
| tree | 0b7adc10694dc0978f11837146ef9347f99971d7 /svtools | |
| parent | 834464c787de9935a6f7f1e50c21426fb868df5f (diff) | |
Spread "Use std::find()" part2
Change-Id: I58e6f189c950dbaa5b71bb1b040f9eff20c50796
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); } } |