include/docmodel/color/ComplexColor.hxx | 8 +++-----
reportdesign/source/core/sdr/UndoEnv.cxx | 3 +--
reportdesign/source/ui/report/ReportControllerObserver.cxx | 3 +--
sal/qa/osl/process/osl_process.cxx | 12 ++++--------
4 files changed, 9 insertions(+), 17 deletions(-)
New commits:
commit e08efe99cdb8d2159b2714d0f23e62678348eaed
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Nov 18 15:13:57 2023 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sat Nov 18 18:39:25 2023 +0100
c++20: use std::erase(_if) instead of std::remove(_if)+erase (part 7)
Change-Id: I2a72422a6c8185d17876daac41a86137048b034c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159627
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx
b/reportdesign/source/core/sdr/UndoEnv.cxx
index b64e5451b566..bba8d5ae91f1 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -498,8 +498,7 @@ void OXUndoEnvironment::RemoveSection(const Reference<
report::XSection > & _xSe
try
{
uno::Reference<container::XChild> xChild(_xSection);
-
m_pImpl->m_aSections.erase(::std::remove(m_pImpl->m_aSections.begin(),m_pImpl->m_aSections.end(),
- xChild), m_pImpl->m_aSections.end());
+ std::erase(m_pImpl->m_aSections, xChild);
Reference< XInterface > xInt(_xSection);
RemoveElement(xInt);
}
diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx
b/reportdesign/source/ui/report/ReportControllerObserver.cxx
index b05d3b3d1359..d693c1787116 100644
--- a/reportdesign/source/ui/report/ReportControllerObserver.cxx
+++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx
@@ -166,8 +166,7 @@ void OXReportControllerObserver::RemoveSection(const
uno::Reference< report::XSe
try
{
uno::Reference<container::XChild> xChild(_xSection);
- m_aSections.erase(::std::remove(m_aSections.begin(), m_aSections.end(),
- xChild), m_aSections.end());
+ std::erase(m_aSections, xChild);
uno::Reference< uno::XInterface > xInt(_xSection);
RemoveElement(xInt);
}
diff --git a/sal/qa/osl/process/osl_process.cxx
b/sal/qa/osl/process/osl_process.cxx
index e648d2467984..cab3bffd2d17 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -116,13 +116,11 @@ private:
std::sort(env_container.begin(), env_container.end());
if (RUNNING_ON_VALGRIND)
{
- env_container.erase(
- std::remove_if(
- env_container.begin(), env_container.end(),
+ std::erase_if(
+ env_container,
[](OString const & s) {
return s.startsWith("LD_PRELOAD=")
- || s.startsWith("VALGRIND_LIB="); }),
- env_container.end());
+ || s.startsWith("VALGRIND_LIB="); });
}
}
}
@@ -245,9 +243,7 @@ public:
//remove the environment variables that we have changed
//in the child environment from the read parent environment
- parent_env.erase(
- std::remove_if(parent_env.begin(), parent_env.end(),
exclude(different_env_vars)),
- parent_env.end());
+ std::erase_if(parent_env, exclude(different_env_vars));
for (auto& env : parent_env)
std::cout << "stripped parent env: " << env << "\n";
commit 4aa5e93a802af2228e4418aceec29d2aafa9b5de
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Nov 18 13:16:31 2023 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sat Nov 18 18:39:14 2023 +0100
c++20: use std::erase(_if) instead of std::remove(_if)+erase (include part)
Change-Id: I32ac73e1ada08bfaa29e654f26fc89257733cd79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159614
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/include/docmodel/color/ComplexColor.hxx
b/include/docmodel/color/ComplexColor.hxx
index b12db79411c5..01709b12f0a3 100644
--- a/include/docmodel/color/ComplexColor.hxx
+++ b/include/docmodel/color/ComplexColor.hxx
@@ -136,11 +136,9 @@ public:
void removeTransformations(TransformationType eType)
{
- maTransformations.erase(std::remove_if(maTransformations.begin(),
maTransformations.end(),
- [eType](Transformation const&
rTransform) {
- return rTransform.meType ==
eType;
- }),
- maTransformations.end());
+ std::erase_if(maTransformations, [eType](Transformation const&
rTransform) {
+ return rTransform.meType == eType;
+ });
}
void clearTransformations() { maTransformations.clear(); }
