Kaydet (Commit) 5a61d7f0 authored tarafından danlrobertson's avatar danlrobertson Kaydeden (comit) Thorsten Behrens

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/16631Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
üst d151ed35
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "unohelper.hxx" #include "unohelper.hxx"
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <o3tl/compat_functional.hxx>
#include <rtl/math.hxx> #include <rtl/math.hxx>
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>
...@@ -39,7 +38,6 @@ using xforms::Convert; ...@@ -39,7 +38,6 @@ using xforms::Convert;
using com::sun::star::uno::Any; using com::sun::star::uno::Any;
using com::sun::star::uno::makeAny; using com::sun::star::uno::makeAny;
using namespace std; using namespace std;
using namespace o3tl;
using namespace utl; using namespace utl;
typedef com::sun::star::util::Date UNODate; typedef com::sun::star::util::Date UNODate;
...@@ -307,7 +305,9 @@ Convert::Types_t Convert::getTypes() ...@@ -307,7 +305,9 @@ Convert::Types_t Convert::getTypes()
{ {
Types_t aTypes( maMap.size() ); Types_t aTypes( maMap.size() );
transform( maMap.begin(), maMap.end(), aTypes.getArray(), 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; return aTypes;
} }
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include <functional> #include <functional>
#include <algorithm> #include <algorithm>
#include <o3tl/compat_functional.hxx>
namespace xforms namespace xforms
{ {
...@@ -183,7 +182,8 @@ namespace xforms ...@@ -183,7 +182,8 @@ namespace xforms
m_aRepository.begin(), m_aRepository.begin(),
m_aRepository.end(), m_aRepository.end(),
aNames.getArray(), aNames.getArray(),
::o3tl::select1st< Repository::value_type >() [](::std::pair<const OUString, DataType>& rpair) -> OUString
{ return rpair.first; }
); );
return aNames; return aNames;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment