diff options
| author | Arkadiy Illarionov <qarkai@gmail.com> | 2018-08-29 00:47:33 +0300 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-29 11:40:29 +0200 |
| commit | 085269d25a705b656436feac47149296b4b4b35d (patch) | |
| tree | 3195c0526652ebd9e125507aa17cd15b2acfb368 /sfx2 | |
| parent | b0e74b65a86eb965c3e93da2fb77972cc5445f3c (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 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/filtergrouping.cxx | 5 | ||||
| -rw-r--r-- | sfx2/source/doc/Metadatable.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/classificationhelper.cxx | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index ba4aea583691..a24281ba1454 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -671,10 +671,7 @@ namespace sfx2 // -> append the wildcard aExtendWildcard( *aBelongsToLocal ); - MapGroupEntry2GroupEntry::iterator aThisGroupFinalPos = - ::std::find_if( aLocalFinalPositions.begin(), aLocalFinalPositions.end(), FindGroupEntry( aBelongsToLocal->second ) ); - - if ( aLocalFinalPositions.end() == aThisGroupFinalPos ) + if ( std::none_of( aLocalFinalPositions.begin(), aLocalFinalPositions.end(), FindGroupEntry( aBelongsToLocal->second ) ) ) { // the position within aCollectedLocals has not been mapped to a final position // within the "real" group (aCollectedLocals is only temporary) // -> do this now (as we just encountered the first filter belonging to this local class diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx index 55d73c46bbb9..7d7ac24f658a 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -575,7 +575,7 @@ XmlIdRegistryDocument::XmlIdRegistry_Impl::TryInsertMetadatable( // this is only called from TryRegister now, so check // if all elements in the list are deleted (in undo) or // placeholders, then "steal" the id from them - if ( pList->end() == ::std::find_if(pList->begin(), pList->end(), + if ( std::none_of(pList->begin(), pList->end(), [](Metadatable* item)->bool { return !(item->IsInUndo() || item->IsInClipboard()); } ) ) diff --git a/sfx2/source/view/classificationhelper.cxx b/sfx2/source/view/classificationhelper.cxx index d2e6f02d88fb..b05d13aa78eb 100644 --- a/sfx2/source/view/classificationhelper.cxx +++ b/sfx2/source/view/classificationhelper.cxx @@ -416,10 +416,10 @@ void SfxClassificationHelper::Impl::parsePolicy() static bool lcl_containsProperty(const uno::Sequence<beans::Property>& rProperties, const OUString& rName) { - return std::find_if(rProperties.begin(), rProperties.end(), [&](const beans::Property& rProperty) + return std::any_of(rProperties.begin(), rProperties.end(), [&](const beans::Property& rProperty) { return rProperty.Name == rName; - }) != rProperties.end(); + }); } void SfxClassificationHelper::Impl::setStartValidity(SfxClassificationPolicyType eType) |