diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-06-28 21:48:22 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-07-03 12:21:03 +0200 |
| commit | c4ddf6cd6d97e7ce7c2e63e4d393bbeffcb34e4d (patch) | |
| tree | 128225fc91bd7da687f965337a49b9b64fbe8a79 /include/editeng | |
| parent | 5034e8217c9844293dc94e5dff0bdc865ad7a91a (diff) | |
C++11 remove std::unary_function bases from functors
std::unary_function is deprecated since C++11 and removed in C++17
90% done with regexp magic.
removed obsolete <functional> includes.
The std::unary_function base class was used in 3 places:
* chart2/source/tools/DataSeriesHelper.cxx: lcl_MatchesRole
is used in a std::not1 function helper who uses the members
return_type and argument_type.
- replace deprecated std::not1 with a lambda
* chart2/source/tools/ModifyListenerHelper.cxx:
lcl_weakReferenceToSame used the argument_type member in the
operator() parameter.
- inline the parameter type.
* xmloff/source/chart/SchXMLExport.cxx: lcl_SequenceToMapElement
used result_type and argument_type in operator().
- inline the types
Also fix compile error with gcc about finding std::for_each.
Change-Id: I073673beb01410c3108e7d0346d9e7d6b9ad2e2f
Reviewed-on: https://gerrit.libreoffice.org/39358
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/editeng')
| -rw-r--r-- | include/editeng/AccessibleParaManager.hxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/editeng/AccessibleParaManager.hxx b/include/editeng/AccessibleParaManager.hxx index af4687581f06..30d02dd846dc 100644 --- a/include/editeng/AccessibleParaManager.hxx +++ b/include/editeng/AccessibleParaManager.hxx @@ -22,7 +22,6 @@ #include <vector> #include <algorithm> -#include <functional> #include <utility> #include <tools/gen.hxx> #include <com/sun/star/awt/Rectangle.hpp> @@ -190,7 +189,7 @@ namespace accessibility void operator() ( AccessibleEditablePara& ) */ - template < typename Functor > class WeakChildAdapter : public ::std::unary_function< const WeakChild&, void > + template < typename Functor > class WeakChildAdapter { public: WeakChildAdapter( Functor& rFunctor ) : mrFunctor(rFunctor) {} @@ -216,7 +215,7 @@ namespace accessibility Create with pointer to member function of AccessibleEditableTextPara and the corresponding argument. */ - template < typename Argument > class MemFunAdapter : public ::std::unary_function< const WeakChild&, void > + template < typename Argument > class MemFunAdapter { public: typedef void (::accessibility::AccessibleEditableTextPara::*FunctionPointer)( Argument ); |