diff options
author | Arkadiy Illarionov <qarkai@gmail.com> | 2018-09-16 13:53:43 +0300 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-17 08:12:03 +0200 |
commit | 30530afaaa715473a2f9c3f068beeed5f3a98daf (patch) | |
tree | 5d5b499a75c4b363eec63e11b822de0da3cd5f60 /xmloff/source/forms/layerexport.cxx | |
parent | ffe2b51a4919fb64a8debecb724d1e959abf343a (diff) |
Simplify containers iterations in xmloff/source/[f-t]*
Use range-based loop or replace with STL functions.
Change-Id: Ic94c7e292f44d460038d3ca99c7e4cc02958d8a3
Reviewed-on: https://gerrit.libreoffice.org/60549
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff/source/forms/layerexport.cxx')
-rw-r--r-- | xmloff/source/forms/layerexport.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index 6ce24c9bfa95..957395408d03 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -478,16 +478,10 @@ namespace xmloff // Check if the id is already used. It shouldn't, as we currently have no mechanism for removing entries // from the map, so the approach used above (take the accumulated map size) should be sufficient. But if // somebody changes this (e.g. allows removing entries from the map), the assertion below probably will fail. - for ( MapPropertySet2Map::const_iterator outer = _rAllPagesControlIds.begin(); - outer != _rAllPagesControlIds.end(); - ++outer - ) - for ( MapPropertySet2String::const_iterator inner = outer->second.begin(); - inner != outer->second.end(); - ++inner - ) + for ( const auto& outer : _rAllPagesControlIds ) + for ( const auto& inner : outer.second ) { - OSL_ENSURE( inner->second != sControlId, + OSL_ENSURE( inner.second != sControlId, "lcl_findFreeControlId: auto-generated control ID is already used!" ); } #endif |