[Libreoffice-commits] .: chart2/source

[Lubos Lunak]

 chart2/source/controller/accessibility/AccessibleBase.cxx         |    3 ++-
 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx |    3 ++-
 chart2/source/controller/dialogs/DialogModel.cxx                  |    5 +++--
 chart2/source/inc/CommonFunctors.hxx                              |    5 +++--
 chart2/source/inc/ContainerHelper.hxx                             |    5 +++--
 chart2/source/model/template/ChartTypeManager.cxx                 |    3 ++-
 6 files changed, 15 insertions(+), 9 deletions(-)

New commits:
commit 16a917a7f110434e07353d8c7fda8145ec1f6744
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Tue Feb 8 19:31:15 2011 +0100

    more std:: -> o3tl:: build fixes

diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 5e929be..eecc210 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 9ca5324..cc87d1e 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 25beb4f..4680726 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;
diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx
index af338ea..bbe0fde 100644
--- a/chart2/source/inc/CommonFunctors.hxx
+++ b/chart2/source/inc/CommonFunctors.hxx
@@ -30,6 +30,7 @@
 
 #include <algorithm>
 #include <functional>
+#include <o3tl/compat_functional.hxx>
 #include <rtl/math.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <rtl/ustring.hxx>
@@ -206,10 +207,10 @@ template< class MapType >
     findValueInMap( const MapType & rMap, const typename MapType::mapped_type & rData )
 {
     return ::std::find_if( rMap.begin(), rMap.end(),
-                           ::std::compose1( ::std::bind2nd(
+                           ::o3tl::compose1( ::std::bind2nd(
                                                 ::std::equal_to< typename MapType::mapped_type >(),
                                                 rData ),
-                                            ::std::select2nd< typename MapType::value_type >()));
+                                            ::o3tl::select2nd< typename MapType::value_type >()));
 }
 
 /** Functor that deletes the object behind the given pointer by calling the
diff --git a/chart2/source/inc/ContainerHelper.hxx b/chart2/source/inc/ContainerHelper.hxx
index 46e6544..ae1035f 100644
--- a/chart2/source/inc/ContainerHelper.hxx
+++ b/chart2/source/inc/ContainerHelper.hxx
@@ -34,6 +34,7 @@
 
 #include <algorithm>
 #include <functional>
+#include <o3tl/compat_functional.hxx>
 
 namespace chart
 {
@@ -154,7 +155,7 @@ template< class Map >
 {
     ::com::sun::star::uno::Sequence< typename Map::key_type > aResult( rCont.size());
     ::std::transform( rCont.begin(), rCont.end(), aResult.getArray(),
-                      ::std::select1st< typename Map::value_type >());
+                      ::o3tl::select1st< typename Map::value_type >());
     return aResult;
 }
 
@@ -171,7 +172,7 @@ template< class Map >
 {
     ::com::sun::star::uno::Sequence< typename Map::mapped_type > aResult( rCont.size());
     ::std::transform( rCont.begin(), rCont.end(), aResult.getArray(),
-                      ::std::select2nd< typename Map::value_type >());
+                      ::o3tl::select2nd< typename Map::value_type >());
     return aResult;
 }
 
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index b33a71e..e7280cc 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -54,6 +54,7 @@
 #include <algorithm>
 #include <iterator>
 #include <functional>
+#include <o3tl/compat_functional.hxx>
 
 using namespace ::com::sun::star;
 
@@ -575,7 +576,7 @@ uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames()
 
     // get own default templates
     ::std::transform( rMap.begin(), rMap.end(), ::std::back_inserter( aServices ),
-                      ::std::select1st< tTemplateMapType::value_type >());
+                      ::o3tl::select1st< tTemplateMapType::value_type >());
 
     // add components that were registered in the context's factory
     uno::Reference< container::XContentEnumerationAccess > xEnumAcc(