diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2011-02-08 19:31:15 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2011-02-08 19:31:40 +0100 |
| commit | 16a917a7f110434e07353d8c7fda8145ec1f6744 (patch) | |
| tree | 21988de7ca33f67862a8a34cd632edc1e12c4e7f /chart2/source/controller | |
| parent | 4d99badbbdbb2b48dd3451115e5ce034327adb4a (diff) | |
more std:: -> o3tl:: build fixes
Diffstat (limited to 'chart2/source/controller')
3 files changed, 7 insertions, 4 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index 5e929bef2..eecc21025 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -61,6 +61,7 @@ #include <vcl/window.hxx> #include <algorithm> +#include <o3tl/compat_functional.hxx> #include "ChartElementFactory.hxx" @@ -272,7 +273,7 @@ bool AccessibleBase::ImplUpdateChildren() aAccChildren.reserve( aModelChildren.size()); ::std::transform( m_aChildOIDMap.begin(), m_aChildOIDMap.end(), ::std::back_inserter( aAccChildren ), - ::std::select1st< ChildOIDMap::value_type >()); + ::o3tl::select1st< ChildOIDMap::value_type >()); ::std::sort( aModelChildren.begin(), aModelChildren.end()); diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 9ca532435..cc87d1e72 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -78,6 +78,7 @@ #include <vector> #include <algorithm> #include <functional> +#include <o3tl/compat_functional.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::chart; @@ -1482,7 +1483,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ChartDocumentWrapper::getAvailableServ ::std::transform( rMap.begin(), rMap.end(), aResult.getArray(), - ::std::select1st< tServiceNameMap::value_type >() ); + ::o3tl::select1st< tServiceNameMap::value_type >() ); return aResult; diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index 25beb4f12..4680726ca 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -59,6 +59,7 @@ #include <iterator> #include <functional> #include <numeric> +#include <o3tl/compat_functional.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -122,10 +123,10 @@ OUString lcl_ConvertRole( const OUString & rRoleString, bool bFromInternalToUI ) { tTranslationMap::const_iterator aIt( ::std::find_if( aTranslationMap.begin(), aTranslationMap.end(), - ::std::compose1( ::std::bind2nd( + ::o3tl::compose1( ::std::bind2nd( ::std::equal_to< tTranslationMap::mapped_type >(), rRoleString ), - ::std::select2nd< tTranslationMap::value_type >()))); + ::o3tl::select2nd< tTranslationMap::value_type >()))); if( aIt != aTranslationMap.end()) aResult = (*aIt).first; |