diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2023-11-18 22:42:37 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2023-11-19 09:49:01 +0100 |
| commit | 0c13d8b8d97666a4e23fc93601a0ced141434d78 (patch) | |
| tree | 455928845678048afd4dbf1a83c185da100169fa | |
| parent | c++20: use std::erase(_if) instead of std::remove(_if)+erase (part 9) (diff) | |
| download | core-0c13d8b8d97666a4e23fc93601a0ced141434d78.tar.gz core-0c13d8b8d97666a4e23fc93601a0ced141434d78.zip | |
c++20: use std::erase(_if) instead of std::remove(_if)+erase (part 10)
Change-Id: I7681a3ed5af058cf4356509d54a2195e6d4833e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159641
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
| -rw-r--r-- | sfx2/source/dialog/StyleList.cxx | 5 | ||||
| -rw-r--r-- | sfx2/source/doc/Metadatable.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/sfx2/source/dialog/StyleList.cxx b/sfx2/source/dialog/StyleList.cxx index b9f9c0c62237..7e7cd347e429 100644 --- a/sfx2/source/dialog/StyleList.cxx +++ b/sfx2/source/dialog/StyleList.cxx @@ -665,10 +665,7 @@ static void MakeTree_Impl(StyleTreeArr_Impl& rArr, const OUString& aUIName) } // Only keep tree roots in rArr, child elements can be accessed through the hierarchy - rArr.erase( - std::remove_if(rArr.begin(), rArr.end(), - [](std::unique_ptr<StyleTree_Impl> const& pEntry) { return !pEntry; }), - rArr.end()); + std::erase_if(rArr, [](std::unique_ptr<StyleTree_Impl> const& pEntry) { return !pEntry; }); // tdf#91106 sort top level styles std::sort(rArr.begin(), rArr.end()); diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx index b10cc35cafa7..0952b3617739 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -488,7 +488,7 @@ rmIter(XmlIdMap_t & i_rXmlIdMap, XmlIdMap_t::iterator const& i_rIter, { XmlIdVector_t & rVector( isContentFile(i_rStream) ? i_rIter->second.first : i_rIter->second.second ); - rVector.erase(std::remove(rVector.begin(), rVector.end(), &const_cast<Metadatable&>(i_rObject)), rVector.end()); + std::erase(rVector, &const_cast<Metadatable&>(i_rObject)); if (i_rIter->second.first.empty() && i_rIter->second.second.empty()) { i_rXmlIdMap.erase(i_rIter); diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 52436ef8d4d6..860bea828122 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -1233,7 +1233,7 @@ void SAL_CALL SfxBaseModel::disconnectController( const Reference< frame::XContr return; auto& vec = m_pData->m_seqControllers; - vec.erase(std::remove(vec.begin(), vec.end(), xController), vec.end()); + std::erase(vec, xController); if ( xController == m_pData->m_xCurrent ) m_pData->m_xCurrent.clear(); |