[Libreoffice-commits] core.git: forms/source

[danlrobertson]

 forms/source/xforms/convert.cxx            |    6 +++---
 forms/source/xforms/datatyperepository.cxx |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 5a61d7f049a81d6e747d9d097f364ae45f58697b
Author: danlrobertson <danlrobertson89 at gmail.com>
Date:   Tue Jun 30 15:51:41 2015 -0400

    tdf#92459 replace unary_function in forms
    
    Remove all instances of classes that are derived from the now
    depreciated unary_function and binary_function with lambda expressions.
    
    Change-Id: Iab662159b8b8554e10dfe6886ee803da78a937ed
    Reviewed-on: https://gerrit.libreoffice.org/16631
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx
index be41419..7ed865b 100644
--- a/forms/source/xforms/convert.cxx
+++ b/forms/source/xforms/convert.cxx
@@ -23,7 +23,6 @@
 #include "unohelper.hxx"
 #include <algorithm>
 #include <functional>
-#include <o3tl/compat_functional.hxx>
 #include <rtl/math.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
@@ -39,7 +38,6 @@ using xforms::Convert;
 using com::sun::star::uno::Any;
 using com::sun::star::uno::makeAny;
 using namespace std;
-using namespace o3tl;
 using namespace utl;
 
 typedef com::sun::star::util::Date UNODate;
@@ -307,7 +305,9 @@ Convert::Types_t Convert::getTypes()
 {
     Types_t aTypes( maMap.size() );
     transform( maMap.begin(), maMap.end(), aTypes.getArray(),
-               o3tl::select1st<Map_t::value_type>() );
+            [] (::std::pair<const Type_t, Convert_t>& mpair) -> Type_t
+            { return mpair.first; }
+            );
     return aTypes;
 }
 
diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx
index 55c45b6..ac5081a 100644
--- a/forms/source/xforms/datatyperepository.cxx
+++ b/forms/source/xforms/datatyperepository.cxx
@@ -29,7 +29,6 @@
 
 #include <functional>
 #include <algorithm>
-#include <o3tl/compat_functional.hxx>
 
 namespace xforms
 {
@@ -183,7 +182,8 @@ namespace xforms
             m_aRepository.begin(),
             m_aRepository.end(),
             aNames.getArray(),
-            ::o3tl::select1st< Repository::value_type >()
+            [](::std::pair<const OUString, DataType>& rpair) -> OUString
+            { return rpair.first; }
         );
         return aNames;
     }