summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorArkadiy Illarionov <qarkai@gmail.com>2018-08-29 00:47:33 +0300
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-08-29 11:40:29 +0200
commit085269d25a705b656436feac47149296b4b4b35d (patch)
tree3195c0526652ebd9e125507aa17cd15b2acfb368 /svtools
parentb0e74b65a86eb965c3e93da2fb77972cc5445f3c (diff)
Replace find_if with proper quantifier algorithms
Change-Id: Icc820a47ac891c358883f9c01224f676c58fdd11 Reviewed-on: https://gerrit.libreoffice.org/59744 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/misc/transfer.cxx8
-rw-r--r--svtools/source/misc/transfer2.cxx4
2 files changed, 6 insertions, 6 deletions
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index f3863e6dc6c4..5600107f8eb4 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -614,8 +614,8 @@ void TransferableHelper::RemoveFormat( const DataFlavor& rFlavor )
bool TransferableHelper::HasFormat( SotClipboardFormatId nFormat )
{
- return (std::find_if(maFormats.begin(), maFormats.end(),
- [&](const DataFlavorEx& data) { return data.mnSotId == nFormat; }) != maFormats.end());
+ return std::any_of(maFormats.begin(), maFormats.end(),
+ [&](const DataFlavorEx& data) { return data.mnSotId == nFormat; });
}
@@ -1303,8 +1303,8 @@ void TransferableDataHelper::InitFormats()
bool TransferableDataHelper::HasFormat( SotClipboardFormatId nFormat ) const
{
::osl::MutexGuard aGuard(mxImpl->maMutex);
- return (std::find_if(maFormats.begin(), maFormats.end(),
- [&](const DataFlavorEx& data) { return data.mnSotId == nFormat; }) != maFormats.end());
+ return std::any_of(maFormats.begin(), maFormats.end(),
+ [&](const DataFlavorEx& data) { return data.mnSotId == nFormat; });
}
bool TransferableDataHelper::HasFormat( const DataFlavor& rFlavor ) const
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index fb4e1c694316..a550fba22130 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -296,8 +296,8 @@ sal_Int8 DropTargetHelper::ExecuteDrop( const ExecuteDropEvent& )
bool DropTargetHelper::IsDropFormatSupported( SotClipboardFormatId nFormat )
{
- return (std::find_if(maFormats.begin(), maFormats.end(),
- [&](const DataFlavorEx& data) { return data.mnSotId == nFormat; }) != maFormats.end());
+ return std::any_of(maFormats.begin(), maFormats.end(),
+ [&](const DataFlavorEx& data) { return data.mnSotId == nFormat; });
}