diff options
| author | Arkadiy Illarionov <qarkai@gmail.com> | 2018-11-18 13:43:28 +0300 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-18 17:36:54 +0100 |
| commit | 587ef41f75b8ea0bcd03366178d42a324dcf481c (patch) | |
| tree | a672c557221d4fec8abbaf83568ed9e7242323a5 /svx/source/svdraw/svdpagv.cxx | |
| parent | 8b83659bb8f3368a1df949d5bc84d7b2dd0370b4 (diff) | |
Simplify containers iterations in svx/source/[s-u]*
Use range-based loop or replace with STL functions
Change-Id: I2ec3e58cc46c9286ef863c732912ca7a729bab62
Reviewed-on: https://gerrit.libreoffice.org/63522
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/svdraw/svdpagv.cxx')
| -rw-r--r-- | svx/source/svdraw/svdpagv.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index 6f2720601d77..ed73fadf7acd 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -146,14 +146,12 @@ void SdrPageView::AddPaintWindowToPageView(SdrPaintWindow& rPaintWindow) void SdrPageView::RemovePaintWindowFromPageView(SdrPaintWindow& rPaintWindow) { - for(auto it = maPageWindows.begin(); it != maPageWindows.end(); ++it) - { - if(&((*it)->GetPaintWindow()) == &rPaintWindow) - { - maPageWindows.erase(it); - break; - } - } + auto it = std::find_if(maPageWindows.begin(), maPageWindows.end(), + [&rPaintWindow](const std::unique_ptr<SdrPageWindow>& rpWindow) { + return &(rpWindow->GetPaintWindow()) == &rPaintWindow; + }); + if (it != maPageWindows.end()) + maPageWindows.erase(it); } css::uno::Reference< css::awt::XControlContainer > SdrPageView::GetControlContainer( const OutputDevice& _rDevice ) const |