diff options
Diffstat (limited to 'slideshow/source/engine/slide')
| -rw-r--r-- | slideshow/source/engine/slide/slideimpl.cxx | 8 | ||||
| -rw-r--r-- | slideshow/source/engine/slide/userpaintoverlay.cxx | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 57a76f752767..4f7cf5654d34 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -601,14 +601,10 @@ void SlideImpl::viewRemoved( const UnoViewSharedPtr& rView ) if( mpLayerManager ) mpLayerManager->viewRemoved( rView ); - const VectorOfVectorOfSlideBitmaps::iterator aEnd( maSlideBitmaps.end() ); - maSlideBitmaps.erase( - std::remove_if( maSlideBitmaps.begin(), - aEnd, + std::erase_if(maSlideBitmaps, [&rView] ( const VectorOfVectorOfSlideBitmaps::value_type& cp ) - { return rView == cp.first; } ), - aEnd ); + { return rView == cp.first; } ); } void SlideImpl::viewChanged( const UnoViewSharedPtr& rView ) diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx index ffae0a17d883..460e5c5de00a 100644 --- a/slideshow/source/engine/slide/userpaintoverlay.cxx +++ b/slideshow/source/engine/slide/userpaintoverlay.cxx @@ -89,9 +89,7 @@ namespace slideshow::internal virtual void viewRemoved( const UnoViewSharedPtr& rView ) override { - maViews.erase( ::std::remove( maViews.begin(), - maViews.end(), - rView ) ); + std::erase(maViews, rView); } virtual void viewChanged( const UnoViewSharedPtr& /*rView*/ ) override |