diff options
Diffstat (limited to 'extensions/source')
| -rw-r--r-- | extensions/source/propctrlr/cellbindinghelper.cxx | 6 | ||||
| -rw-r--r-- | extensions/source/propctrlr/propcontroller.cxx | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx b/extensions/source/propctrlr/cellbindinghelper.cxx index 85b0353ca738..7942a4200563 100644 --- a/extensions/source/propctrlr/cellbindinghelper.cxx +++ b/extensions/source/propctrlr/cellbindinghelper.cxx @@ -381,15 +381,11 @@ namespace pcr if ( xDocumentFactory.is() ) aAvailableServices = xDocumentFactory->getAvailableServiceNames( ); - const OUString* pFound = std::find_if( + bYesItIs = std::any_of( aAvailableServices.begin(), aAvailableServices.end(), StringCompare( _rService ) ); - if ( pFound != aAvailableServices.end() ) - { - bYesItIs = true; - } } return bYesItIs; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 8492d115e0d6..4cfbfe1e12ca 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -966,12 +966,12 @@ namespace pcr aProperties.reserve( aProperties.size() + aThisHandlersProperties.size() ); for (const auto & aThisHandlersPropertie : aThisHandlersProperties) { - std::vector< Property >::const_iterator previous = std::find_if( + auto noPrevious = std::none_of( aProperties.begin(), aProperties.end(), FindPropertyByName( aThisHandlersPropertie.Name ) ); - if ( previous == aProperties.end() ) + if ( noPrevious ) { aProperties.push_back( aThisHandlersPropertie ); continue; |