[Libreoffice-commits] core.git: 2 commits - toolkit/source unotools/source

[Julien Nabet (via logerrit)]

 toolkit/source/awt/vclxtabpagecontainer.cxx         |    2 +-
 unotools/source/config/configmgr.cxx                |    2 +-
 unotools/source/misc/desktopterminationobserver.cxx |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2ea548e394a504a2277a17f333f862540d48b817
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sun Nov 19 21:33:18 2023 +0100
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Mon Nov 20 07:40:29 2023 +0100

    c++20: use std::erase(_if) instead of std::remove(_if)+erase (unotools)
    
    Change-Id: Iebc949486322b55f60e83b27739acc1c16d2a25e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159707
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>

diff --git a/unotools/source/config/configmgr.cxx 
b/unotools/source/config/configmgr.cxx
index f3aef792e856..e19c7c694a6a 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -157,7 +157,7 @@ utl::ConfigManager::addConfigItem(utl::ConfigItem & item) {
 }
 
 void utl::ConfigManager::removeConfigItem(utl::ConfigItem & item) {
-    items_.erase(std::remove(items_.begin(), items_.end(), &item), 
items_.end());
+    std::erase(items_, &item);
 }
 
 void utl::ConfigManager::registerConfigItem(utl::ConfigItem * item) {
diff --git a/unotools/source/misc/desktopterminationobserver.cxx 
b/unotools/source/misc/desktopterminationobserver.cxx
index 138125a4fc10..2eeb44a92dda 100644
--- a/unotools/source/misc/desktopterminationobserver.cxx
+++ b/unotools/source/misc/desktopterminationobserver.cxx
@@ -180,7 +180,7 @@ namespace utl
     {
         ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
         Listeners& rListeners = getListenerAdminData().aListeners;
-        rListeners.erase(std::remove(rListeners.begin(), rListeners.end(), 
_pListener), rListeners.end());
+        std::erase(rListeners, _pListener);
     }
 
 } // namespace utl
commit 042fb18fbcb98ee7e9b3982d987421e43b99cbff
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sun Nov 19 21:30:40 2023 +0100
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Mon Nov 20 07:40:15 2023 +0100

    c++20: use std::erase(_if) instead of std::remove(_if)+erase (toolkit)
    
    Change-Id: Ied5fc25f959e938fdd80532375486c167c370e35
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159705
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>

diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx 
b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 55a27ba2af27..afd3d843b7ef 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -199,7 +199,7 @@ void SAL_CALL VCLXTabPageContainer::elementRemoved( const 
css::container::Contai
         Reference< awt::XControl > xControl(xTabPage,UNO_QUERY );
         Reference< awt::tab::XTabPageModel > xP( xControl->getModel(), 
UNO_QUERY );
         pTabCtrl->RemovePage(xP->getTabPageID());
-        
m_aTabPages.erase(::std::remove(m_aTabPages.begin(),m_aTabPages.end(),xTabPage));
+        std::erase(m_aTabPages,xTabPage);
     }
 }
 void SAL_CALL VCLXTabPageContainer::elementReplaced( const 
css::container::ContainerEvent& /*Event*/ )