comphelper/source/misc/docpasswordhelper.cxx | 5 ++---
sc/source/ui/app/scmod.cxx | 4 ++--
vcl/source/filter/graphicfilter.cxx | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
New commits:
commit b480552d9c4ac9be1f53edc6cac21bc45cfe29ca
Author: Dr. David Alan Gilbert <d...@treblig.org>
AuthorDate: Wed May 24 13:47:22 2023 +0100
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri May 26 12:49:14 2023 +0200
replace find_if by none_of
A set of cases where find_if is used just to test if there are no
matches; use none_of as per
tdf#153109
Change-Id: I6c705ab7a8289914743199722a444ee40d11d746
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152200
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/comphelper/source/misc/docpasswordhelper.cxx
b/comphelper/source/misc/docpasswordhelper.cxx
index d26a30e0ff20..5489690fae6a 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -621,11 +621,10 @@ OUString DocPasswordHelper::GetOoxHashAsBase64(
if (eResult == DocPasswordVerifierResult::OK && !aPassword.isEmpty())
{
- if (std::find_if(std::cbegin(aEncData), std::cend(aEncData),
+ if (std::none_of(std::cbegin(aEncData), std::cend(aEncData),
[](const css::beans::NamedValue& val) {
return val.Name ==
PACKAGE_ENCRYPTIONDATA_SHA256UTF8;
- })
- == std::cend(aEncData))
+ }))
{
// tdf#118639: We need ODF encryption data for autorecovery, where
password
// will already be unavailable, so generate and append it here
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 2f84555fd3ca..93b74d70e68e 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -2192,11 +2192,11 @@ void ScModule::RegisterRefController(sal_uInt16
nSlotId, std::shared_ptr<SfxDial
{
std::vector<std::pair<std::shared_ptr<SfxDialogController>,
weld::Window*>> & rlRefWindow = m_mapRefController[nSlotId];
- if (std::find_if(rlRefWindow.begin(), rlRefWindow.end(),
+ if (std::none_of(rlRefWindow.begin(), rlRefWindow.end(),
[rWnd](const
std::pair<std::shared_ptr<SfxDialogController>, weld::Window*>& rCandidate)
{
return rCandidate.first.get() == rWnd.get();
- }) == rlRefWindow.end())
+ }))
{
rlRefWindow.emplace_back(rWnd, pWndAncestor);
}
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index 441d32a28adf..bb478922b5a5 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -691,7 +691,7 @@ void
GraphicFilter::MakeGraphicsAvailableThreaded(std::vector<Graphic*>& graphic
{
// Graphic objects share internal ImpGraphic, do not process any
of those twice.
const auto predicate = [graphic](Graphic* item) { return
item->ImplGetImpGraphic() == graphic->ImplGetImpGraphic(); };
- if( std::find_if(toLoad.begin(), toLoad.end(), predicate ) ==
toLoad.end())
+ if( std::none_of(toLoad.begin(), toLoad.end(), predicate ))
toLoad.push_back( graphic );
}
}
