summaryrefslogtreecommitdiffstats
path: root/include/svl/urlfilter.hxx
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2017-06-28 21:48:22 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-07-03 12:21:03 +0200
commitc4ddf6cd6d97e7ce7c2e63e4d393bbeffcb34e4d (patch)
tree128225fc91bd7da687f965337a49b9b64fbe8a79 /include/svl/urlfilter.hxx
parentTranslate German comments and debug strings (leftovers in dirs sal to sc) (diff)
downloadcore-c4ddf6cd6d97e7ce7c2e63e4d393bbeffcb34e4d.tar.gz
core-c4ddf6cd6d97e7ce7c2e63e4d393bbeffcb34e4d.zip
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/svl/urlfilter.hxx')
-rw-r--r--include/svl/urlfilter.hxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/svl/urlfilter.hxx b/include/svl/urlfilter.hxx
index c607dd32c711..d7d9d1d106fd 100644
--- a/include/svl/urlfilter.hxx
+++ b/include/svl/urlfilter.hxx
@@ -21,10 +21,9 @@
#define INCLUDED_SVL_URLFILTER_HXX
#include <tools/wldcrd.hxx>
-#include <functional>
#include <vector>
-struct FilterMatch : public ::std::unary_function< bool, WildCard >
+struct FilterMatch
{
private:
const OUString& m_rCompareString;