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>

6 files changed, 14 insertions, 14 deletions

diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 9cc82795d3da..75b337ff83b6 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -195,7 +195,7 @@ struct PrintBucket
 
 #endif
 
-struct LessByValue : std::binary_function<Bucket, Bucket, bool>
+struct LessByValue
 {
     bool operator() (const Bucket& left, const Bucket& right) const
     {
@@ -203,7 +203,7 @@ struct LessByValue : std::binary_function<Bucket, Bucket, bool>
     }
 };
 
-struct LessByOrderIndex : std::binary_function<Bucket, Bucket, bool>
+struct LessByOrderIndex
 {
     bool operator() (const Bucket& left, const Bucket& right) const
     {
@@ -211,7 +211,7 @@ struct LessByOrderIndex : std::binary_function<Bucket, Bucket, bool>
     }
 };
 
-struct LessByDataIndex : std::binary_function<Bucket, Bucket, bool>
+struct LessByDataIndex
 {
     bool operator() (const Bucket& left, const Bucket& right) const
     {
@@ -219,7 +219,7 @@ struct LessByDataIndex : std::binary_function<Bucket, Bucket, bool>
     }
 };
 
-struct EqualByOrderIndex : std::binary_function<Bucket, Bucket, bool>
+struct EqualByOrderIndex
 {
     bool operator() (const Bucket& left, const Bucket& right) const
     {
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index fdba353ca7ed..bc655a606e6f 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1348,7 +1348,7 @@ public:
     }
 };
 
-class LessByDimOrder : public std::binary_function<sheet::DataPilotFieldFilter, sheet::DataPilotFieldFilter, bool>
+class LessByDimOrder
 {
     const ScDPSaveData::DimOrderType& mrDimOrder;
 
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 7494f567bb24..2f340a7aa602 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -306,7 +306,7 @@ lcl_checkRangeDimensions(
     return bOk && aCur == rEnd;
 }
 
-class LessByReference : public std::binary_function<const formula::FormulaToken*, const formula::FormulaToken*, bool>
+class LessByReference
 {
     ScAddress maPos;
     DimensionSelector maFunc;
@@ -327,7 +327,7 @@ public:
  * denoted by token p1. Dimension, in which the comparison takes place, is
  * given by maFunc.
  */
-class AdjacentByReference : public std::binary_function<const formula::FormulaToken*, const formula::FormulaToken*, bool>
+class AdjacentByReference
 {
     ScAddress maPos;
     DimensionSelector maFunc;
diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx
index 3eb29a305641..5ab81b70d3a3 100644
--- a/sc/source/core/data/sortparam.cxx
+++ b/sc/source/core/data/sortparam.cxx
@@ -248,7 +248,7 @@ namespace {
 
 struct ReorderIndex
 {
-    struct LessByPos2 : std::binary_function<ReorderIndex, ReorderIndex, bool>
+    struct LessByPos2
     {
         bool operator() ( const ReorderIndex& r1, const ReorderIndex& r2 ) const
         {
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 1947af156de5..db8fd8605075 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -46,7 +46,7 @@ using namespace formula;
 
 namespace {
 
-struct MatrixAdd : public ::std::binary_function<double,double,double>
+struct MatrixAdd
 {
     double operator() (const double& lhs, const double& rhs) const
     {
@@ -54,7 +54,7 @@ struct MatrixAdd : public ::std::binary_function<double,double,double>
     }
 };
 
-struct MatrixSub : public ::std::binary_function<double,double,double>
+struct MatrixSub
 {
     double operator() (const double& lhs, const double& rhs) const
     {
@@ -62,7 +62,7 @@ struct MatrixSub : public ::std::binary_function<double,double,double>
     }
 };
 
-struct MatrixMul : public ::std::binary_function<double,double,double>
+struct MatrixMul
 {
     double operator() (const double& lhs, const double& rhs) const
     {
@@ -70,7 +70,7 @@ struct MatrixMul : public ::std::binary_function<double,double,double>
     }
 };
 
-struct MatrixDiv : public ::std::binary_function<double,double,double>
+struct MatrixDiv
 {
     double operator() (const double& lhs, const double& rhs) const
     {
@@ -78,7 +78,7 @@ struct MatrixDiv : public ::std::binary_function<double,double,double>
     }
 };
 
-struct MatrixPow : public ::std::binary_function<double,double,double>
+struct MatrixPow
 {
     double operator() (const double& lhs, const double& rhs) const
     {
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 8a33b34e64df..f1b9472e3fb2 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -1842,7 +1842,7 @@ public:
     }
 };
 
-struct ArrayMul : public std::binary_function<double, double, double>
+struct ArrayMul
 {
     double operator() (const double& lhs, const double& rhs) const
     {