[Libreoffice-commits] core.git: basctl/source basic/source binaryurp/source

[Julien Nabet (via logerrit)]

 basctl/source/dlged/dlgedobj.cxx   |    2 +-
 basic/source/classes/sb.cxx        |    2 +-
 binaryurp/source/bridgefactory.cxx |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c05595d2420b92a428b45cfaf65a3adf88fd8bed
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Nov 18 12:41:05 2023 +0100
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sat Nov 18 18:38:01 2023 +0100

    c++20: use std::erase instead of std::removed followed by erase (part 1)
    
    Change-Id: I8d038fc37a4de25bdeff2e2cc55775e3981240b7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159610
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>

diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index a3c2b396f791..5b87393e51bc 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -1288,7 +1288,7 @@ void DlgEdForm::AddChild( DlgEdObj* pDlgEdObj )
 
 void DlgEdForm::RemoveChild( DlgEdObj* pDlgEdObj )
 {
-    pChildren.erase( std::remove( pChildren.begin() , pChildren.end() , 
pDlgEdObj ) );
+    std::erase(pChildren, pDlgEdObj);
 }
 
 void DlgEdForm::PositionAndSizeChange( const beans::PropertyChangeEvent& evt )
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index eeef54222647..8187e6126651 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1074,7 +1074,7 @@ void StarBASIC::Remove( SbxVariable* pVar )
     {
         // #87540 Can be last reference!
         SbModuleRef xVar = pModule;
-        pModules.erase(std::remove(pModules.begin(), pModules.end(), xVar));
+        std::erase(pModules, xVar);
         pVar->SetParent( nullptr );
         EndListening( pVar->GetBroadcaster() );
     }
diff --git a/binaryurp/source/bridgefactory.cxx 
b/binaryurp/source/bridgefactory.cxx
index 835c264a9d92..cd43fe592b0e 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -49,7 +49,7 @@ void BridgeFactory::removeBridge(
     osl::MutexGuard g(m_aMutex);
     if (n.isEmpty())
     {
-        unnamed_.erase(std::remove(unnamed_.begin(), unnamed_.end(), bridge), 
unnamed_.end());
+        std::erase(unnamed_, bridge);
     }
     else
     {