From e08efe99cdb8d2159b2714d0f23e62678348eaed Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sat, 18 Nov 2023 15:13:57 +0100 Subject: 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 --- reportdesign/source/core/sdr/UndoEnv.cxx | 3 +-- reportdesign/source/ui/report/ReportControllerObserver.cxx | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'reportdesign') 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 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 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); } -- cgit