summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2017-07-02 17:10:53 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-07-07 08:31:48 +0200
commitdb4741043d09437af871fa8ea9849ec37e946f9b (patch)
tree3ed043060e283bc6b3b386bacc4a6ff84e42f3ab /toolkit
parent307e528275cb91776e8f5560b3137c3c1649b39c (diff)
C++11 remove std::binary_function bases from functors
std::binary_function is deprecated since C++11 and removed in C++17 90% done with regexp magic. removed obsolete <functional> includes. The std::binary_function base class was used by deprecated std::bind2nd, this was solved in individual commits. The members first_argument_type and second_argument_type were used in chart2/source/controller/dialogs/DataBrowserModel.cxx: DataBrowserModel::implColumnLess and are inlined in this commit. Change-Id: I60ded60a8d4afd59e15ac15a58e18d2498c9be5a Reviewed-on: https://gerrit.libreoffice.org/39659 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/controls/geometrycontrolmodel.cxx3
-rw-r--r--toolkit/source/controls/grid/sortablegriddatamodel.cxx2
-rw-r--r--toolkit/source/helper/property.cxx3
3 files changed, 3 insertions, 5 deletions
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index 7a541cafa0a6..3328a822ea35 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -27,7 +27,6 @@
#include <toolkit/controls/eventcontainer.hxx>
#include <toolkit/helper/property.hxx>
#include <algorithm>
-#include <functional>
#define GCM_PROPERTY_ID_POS_X 1
@@ -492,7 +491,7 @@
}
- struct PropertyNameLess : public ::std::binary_function< Property, Property, bool >
+ struct PropertyNameLess
{
bool operator()( const Property& _rLHS, const Property& _rRHS )
{
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index 91fc53f1ef95..90e50d9a0ac7 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -509,7 +509,7 @@ public:
namespace
{
- class CellDataLessComparison : public ::std::binary_function< sal_Int32, sal_Int32, bool >
+ class CellDataLessComparison
{
public:
CellDataLessComparison(
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index 3ace75837bcb..a4b65311e9af 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -44,7 +44,6 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
-#include <functional>
#include <algorithm>
using ::com::sun::star::uno::Any;
@@ -293,7 +292,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
}
-struct ImplPropertyInfoCompareFunctor : ::std::binary_function<ImplPropertyInfo,OUString,bool>
+struct ImplPropertyInfoCompareFunctor
{
bool operator()(const ImplPropertyInfo& lhs,const ImplPropertyInfo& rhs) const
{