diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-07-02 17:10:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-07 08:31:48 +0200 |
| commit | db4741043d09437af871fa8ea9849ec37e946f9b (patch) | |
| tree | 3ed043060e283bc6b3b386bacc4a6ff84e42f3ab /reportdesign | |
| parent | 307e528275cb91776e8f5560b3137c3c1649b39c (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 'reportdesign')
| -rw-r--r-- | reportdesign/inc/RptDef.hxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/inc/ViewsWindow.hxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/inspection/metadata.cxx | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx index 01cea68a878c..ed4fba1721dc 100644 --- a/reportdesign/inc/RptDef.hxx +++ b/reportdesign/inc/RptDef.hxx @@ -73,7 +73,7 @@ enum class ControlModification HEIGHT_GREATEST = 10, }; -class AnyConverter : public ::std::binary_function< OUString,css::uno::Any,css::uno::Any > +class AnyConverter { public: virtual ~AnyConverter(){} diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index cb707d7961af..3c3dd882b3a9 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -45,7 +45,7 @@ namespace rptui class OSectionView; enum class ControlModification; - struct RectangleLess : public ::std::binary_function< tools::Rectangle, tools::Rectangle, bool> + struct RectangleLess { enum CompareMode { POS_LEFT,POS_RIGHT,POS_UPPER,POS_DOWN,POS_CENTER_HORIZONTAL,POS_CENTER_VERTICAL }; CompareMode m_eCompareMode; diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index bf82cc555795..d1b41f36fd70 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -23,7 +23,6 @@ #include "RptResId.hrc" #include "uistrings.hrc" -#include <functional> #include <algorithm> @@ -66,7 +65,7 @@ namespace rptui // compare PropertyInfo - struct PropertyInfoLessByName : public ::std::binary_function< OPropertyInfoImpl, OPropertyInfoImpl, bool > + struct PropertyInfoLessByName { bool operator()( const OPropertyInfoImpl& _lhs, const OPropertyInfoImpl& _rhs ) { |