mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace find_if by none_of

Browse Source 
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.grandin@collabora.co.uk>
This commit is contained in:
Dr. David Alan Gilbert
2023-05-24 13:47:22 +01:00
committed by Noel Grandin
parent 2d6dff8d98
commit b480552d9c
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
comphelper/source/misc/docpasswordhelper.cxx
View File

@@ -621,11 +621,10 @@ OUString DocPasswordHelper::GetOoxHashAsBase64(
if (eResult == DocPasswordVerifierResult::OK && !aPassword.isEmpty()) 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) { [](const css::beans::NamedValue& val) {
return val.Name == PACKAGE_ENCRYPTIONDATA_SHA256UTF8; return val.Name == PACKAGE_ENCRYPTIONDATA_SHA256UTF8;
}) }))
== std::cend(aEncData))
{ {
// tdf#118639: We need ODF encryption data for autorecovery, where password // tdf#118639: We need ODF encryption data for autorecovery, where password
// will already be unavailable, so generate and append it here // will already be unavailable, so generate and append it here

4
sc/source/ui/app/scmod.cxx
View File

@@ -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]; 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) [rWnd](const std::pair<std::shared_ptr<SfxDialogController>, weld::Window*>& rCandidate)
{ {
return rCandidate.first.get() == rWnd.get(); return rCandidate.first.get() == rWnd.get();
}) == rlRefWindow.end()) }))
{ {
rlRefWindow.emplace_back(rWnd, pWndAncestor); rlRefWindow.emplace_back(rWnd, pWndAncestor);
} }

2
vcl/source/filter/graphicfilter.cxx
View File

@@ -691,7 +691,7 @@ void GraphicFilter::MakeGraphicsAvailableThreaded(std::vector<Graphic*>& graphic
{ {
// Graphic objects share internal ImpGraphic, do not process any of those twice. // Graphic objects share internal ImpGraphic, do not process any of those twice.
const auto predicate = [graphic](Graphic* item) { return item->ImplGetImpGraphic() == graphic->ImplGetImpGraphic(); }; 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 ); toLoad.push_back( graphic );
} }
} }