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 /fpicker | |
| 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 'fpicker')
| -rw-r--r-- | fpicker/source/aqua/FilterHelper.mm | 3 | ||||
| -rw-r--r-- | fpicker/source/office/OfficeFilePicker.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm index f71ea106dcfa..0454c6ef977b 100644 --- a/fpicker/source/aqua/FilterHelper.mm +++ b/fpicker/source/aqua/FilterHelper.mm @@ -19,7 +19,6 @@ #include "sal/config.h" -#include <functional> #include <algorithm> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> @@ -126,7 +125,7 @@ shrinkFilterName( const rtl::OUString& aFilterName, bool bAllowNoStar = false ) namespace { - struct FilterTitleMatch : public ::std::unary_function< FilterEntry, bool > + struct FilterTitleMatch { protected: const rtl::OUString rTitle; diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index c3ec876ce6d4..fc9a65b8e7e0 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -23,7 +23,6 @@ #include "RemoteFilesDialog.hxx" #include <list> -#include <functional> #include <algorithm> #include <tools/urlobj.hxx> #include <com/sun/star/uno/Any.hxx> @@ -331,7 +330,7 @@ void SvtFilePicker::notify( sal_Int16 _nEventId, sal_Int16 _nControlId ) namespace { - struct FilterTitleMatch : public ::std::unary_function< FilterEntry, bool > + struct FilterTitleMatch { protected: const OUString& rTitle; |