diff options
| author | Arkadiy Illarionov <qarkai@gmail.com> | 2019-03-10 21:51:45 +0300 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-12 16:10:01 +0100 |
| commit | 95a538180fd21c52b752cbef46acf2aa2b842ab8 (patch) | |
| tree | 6b248190da44e68400fbd663dbb17d5fd6c4223d /comphelper/source/container/enumerablemap.cxx | |
| parent | poppler: upgrade to release 0.74.0 (diff) | |
| download | core-95a538180fd21c52b752cbef46acf2aa2b842ab8.tar.gz core-95a538180fd21c52b752cbef46acf2aa2b842ab8.zip | |
Simplify containers iterations in chart2, cli_ure, comphelper, configmgr
Use range-based loop or replace with STL functions
Change-Id: I7c229faa96e08b76cb4f182a1bd77c15bac4ba76
Reviewed-on: https://gerrit.libreoffice.org/69010
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'comphelper/source/container/enumerablemap.cxx')
| -rw-r--r-- | comphelper/source/container/enumerablemap.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index eb21b1795834..f17610f13c71 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -124,16 +124,11 @@ namespace comphelper static void lcl_revokeMapModificationListener( MapData& _mapData, MapEnumerator& _listener ) { - for ( std::vector< MapEnumerator* >::iterator lookup = _mapData.m_aModListeners.begin(); - lookup != _mapData.m_aModListeners.end(); - ++lookup - ) + auto lookup = std::find(_mapData.m_aModListeners.begin(), _mapData.m_aModListeners.end(), &_listener); + if (lookup != _mapData.m_aModListeners.end()) { - if ( *lookup == &_listener ) - { - _mapData.m_aModListeners.erase( lookup ); - return; - } + _mapData.m_aModListeners.erase( lookup ); + return; } OSL_FAIL( "lcl_revokeMapModificationListener: the listener is not registered!" ); } |