diff options
| author | Daniel Robertson <danlrobertson89@gmail.com> | 2015-07-31 10:24:01 -0400 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2015-08-01 06:25:49 +0000 |
| commit | 5916d5866c109b17471a9c8604635612a0aa69ae (patch) | |
| tree | adcf88686cd5d0472edcd06908eb84b3e670e3d9 /chart2/source/controller | |
| parent | b593044e9c3d549d0edda43ba00cda67e089322a (diff) | |
tdf#92459 replace deprecated o3tl features
Replace all uses of deprecated features from o3tl/compat_functional.hxx
with lambda expressions.
Change-Id: I6370c80dbe675da517904e535e19bf63830c3e2c
Reviewed-on: https://gerrit.libreoffice.org/17450
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'chart2/source/controller')
3 files changed, 8 insertions, 9 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index c2726669d643..dc3832dd5a29 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -50,7 +50,6 @@ #include <vcl/settings.hxx> #include <algorithm> -#include <o3tl/compat_functional.hxx> #include "ChartElementFactory.hxx" @@ -252,7 +251,8 @@ bool AccessibleBase::ImplUpdateChildren() aAccChildren.reserve( aModelChildren.size()); ::std::transform( m_aChildOIDMap.begin(), m_aChildOIDMap.end(), ::std::back_inserter( aAccChildren ), - ::o3tl::select1st< ChildOIDMap::value_type >()); + []( const ::std::pair<ObjectIdentifier, tAccessible>& cp ) + { return cp.first; } ); ::std::sort( aModelChildren.begin(), aModelChildren.end()); diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index d89abccf42ae..d34d9977aa23 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -66,7 +66,6 @@ #include <vector> #include <algorithm> #include <functional> -#include <o3tl/compat_functional.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::chart; @@ -1460,7 +1459,8 @@ uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getAvailableServiceName ::std::transform( rMap.begin(), rMap.end(), aResult.getArray(), - ::o3tl::select1st< tServiceNameMap::value_type >() ); + []( const ::std::pair< OUString, eServiceType >& cp ) + { return cp.first; } ); return aResult; diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index 6127ee9cb6d9..e017ddc9e377 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -47,7 +47,6 @@ #include <iterator> #include <functional> #include <numeric> -#include <o3tl/compat_functional.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -110,10 +109,10 @@ OUString lcl_ConvertRole( const OUString & rRoleString, bool bFromInternalToUI ) { tTranslationMap::const_iterator aIt( ::std::find_if( aTranslationMap.begin(), aTranslationMap.end(), - ::o3tl::compose1( ::std::bind2nd( - ::std::equal_to< tTranslationMap::mapped_type >(), - rRoleString ), - ::o3tl::select2nd< tTranslationMap::value_type >()))); + [&rRoleString] + ( const ::std::pair< OUString, OUString >& cp ) + { return rRoleString == cp.second; } ) + ); if( aIt != aTranslationMap.end()) aResult = (*aIt).first; |