diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2023-11-18 12:55:53 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2023-11-18 20:27:47 +0100 |
| commit | d0b0908e62fd6e4901061b43deeb8ae4cf2ed799 (patch) | |
| tree | 6fd5ef7239ce4292593bde3ed7744de1f1697d0d /canvas | |
| parent | e08efe99cdb8d2159b2714d0f23e62678348eaed (diff) | |
c++20: use std::erase instead of std::removed followed by erase (part 2)
Change-Id: I0222f0f53f387dd57bd674b1e137b53487f4e1d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159611
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/tools/page.cxx | 5 | ||||
| -rw-r--r-- | canvas/source/tools/spriteredrawmanager.cxx | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/canvas/source/tools/page.cxx b/canvas/source/tools/page.cxx index ddf516a926f6..32eedb71b29f 100644 --- a/canvas/source/tools/page.cxx +++ b/canvas/source/tools/page.cxx @@ -76,10 +76,7 @@ namespace canvas // be relocated to some other page or it will // currently be deleted. in either case, simply // remove the reference from our internal storage. - FragmentContainer_t::iterator it( - std::remove( - mpFragments.begin(),mpFragments.end(),pFragment)); - mpFragments.erase(it,mpFragments.end()); + std::erase(mpFragments, pFragment); } bool Page::insert( SurfaceRect& r ) diff --git a/canvas/source/tools/spriteredrawmanager.cxx b/canvas/source/tools/spriteredrawmanager.cxx index e67fca6cce1c..06eb6d1de594 100644 --- a/canvas/source/tools/spriteredrawmanager.cxx +++ b/canvas/source/tools/spriteredrawmanager.cxx @@ -455,7 +455,7 @@ namespace canvas void SpriteRedrawManager::hideSprite( const Sprite::Reference& rSprite ) { - maSprites.erase(std::remove(maSprites.begin(), maSprites.end(), rSprite), maSprites.end()); + std::erase(maSprites, rSprite); } void SpriteRedrawManager::moveSprite( const Sprite::Reference& rSprite, |