From 950bee9154c9854364c72a3b48ddbcffff137803 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sun, 19 Nov 2023 21:29:12 +0100 Subject: c++20: use std::erase(_if) instead of std::remove(_if)+erase (sw) Change-Id: I67c231441b56f05da001beab5b893bc6a6a6a392 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159704 Tested-by: Jenkins Reviewed-by: Julien Nabet --- sw/source/ui/dbui/mmaddressblockpage.cxx | 2 +- sw/source/ui/misc/bookmark.cxx | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'sw/source/ui') diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 48d4e3dce117..73811cbf3e0e 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -1523,7 +1523,7 @@ namespace virtual void SAL_CALL removeDropTargetListener(const css::uno::Reference& xListener) override { - m_aListeners.erase(std::remove(m_aListeners.begin(), m_aListeners.end(), xListener), m_aListeners.end()); + std::erase(m_aListeners, xListener); } virtual sal_Bool SAL_CALL isActive() override diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 4eafb8c1264a..6431809c9569 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -110,9 +110,7 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, DeleteHdl, weld::Button&, void) SfxRequest aReq(m_rSh.GetView().GetViewFrame(), FN_DELETE_BOOKMARK); aReq.AppendItem(SfxStringItem(FN_DELETE_BOOKMARK, sRemoved)); aReq.Done(); - m_aTableBookmarks.erase(std::remove(m_aTableBookmarks.begin(), m_aTableBookmarks.end(), - std::make_pair(pBookmark, sRemoved)), - m_aTableBookmarks.end()); + std::erase(m_aTableBookmarks, std::make_pair(pBookmark, sRemoved)); ++nSelectedRows; -- cgit