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 /extensions | |
| 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 'extensions')
5 files changed, 4 insertions, 18 deletions
diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index e39932925d81..c6a1c32a7ea7 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -47,10 +47,7 @@ namespace pcr namespace { - struct HandlerLess : public std::binary_function < Reference< XPropertyHandler > - , Reference< XPropertyHandler > - , bool - > + struct HandlerLess { bool operator()( const Reference< XPropertyHandler >& lhs, const Reference< XPropertyHandler >& rhs) const { diff --git a/extensions/source/propctrlr/formbrowsertools.hxx b/extensions/source/propctrlr/formbrowsertools.hxx index 6abc42d7a477..7fede482d47f 100644 --- a/extensions/source/propctrlr/formbrowsertools.hxx +++ b/extensions/source/propctrlr/formbrowsertools.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/beans/Property.hpp> #include <rtl/ustring.hxx> -#include <functional> #include <set> @@ -65,10 +64,6 @@ namespace pcr struct PropertyLessByName - :public std::binary_function < css::beans::Property, - css::beans::Property, - bool - > { bool operator() (const css::beans::Property& _rLhs, const css::beans::Property& _rRhs) const { @@ -78,10 +73,6 @@ namespace pcr struct TypeLessByName - :public std::binary_function < css::uno::Type, - css::uno::Type, - bool - > { bool operator() (const css::uno::Type& _rLhs, const css::uno::Type& _rRhs) const { diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index 2b29a7bba297..7aea41c8c6e5 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -25,7 +25,6 @@ #include <comphelper/extract.hxx> #include <sal/macros.h> #include <algorithm> -#include <functional> namespace pcr { @@ -66,7 +65,7 @@ namespace pcr // Compare PropertyInfo - struct PropertyInfoLessByName : public std::binary_function< OPropertyInfoImpl, OPropertyInfoImpl, bool > + struct PropertyInfoLessByName { bool operator()( const OPropertyInfoImpl& _rLHS, const OPropertyInfoImpl& _rRHS ) { diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx index 1ba3b328957d..6cca09093ca4 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.hxx +++ b/extensions/source/propctrlr/genericpropertyhandler.hxx @@ -38,7 +38,7 @@ namespace pcr { - struct TypeLess : std::binary_function< css::uno::Type, css::uno::Type, bool > + struct TypeLess { bool operator()( const css::uno::Type& _rLHS, const css::uno::Type& _rRHS ) const { diff --git a/extensions/source/resource/oooresourceloader.hxx b/extensions/source/resource/oooresourceloader.hxx index dccc2c2a7fd3..82e6d1ffea71 100644 --- a/extensions/source/resource/oooresourceloader.hxx +++ b/extensions/source/resource/oooresourceloader.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> -#include <functional> #include <map> #include <utility> @@ -33,7 +32,7 @@ namespace extensions { namespace resource { typedef std::pair< OUString, css::lang::Locale> ResourceBundleDescriptor; - struct ResourceBundleDescriptorLess : public std::binary_function<ResourceBundleDescriptor, ResourceBundleDescriptor, bool> + struct ResourceBundleDescriptorLess { bool operator()( const ResourceBundleDescriptor& _lhs, const ResourceBundleDescriptor& _rhs ) const { |