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 /chart2/source/tools/PropertyHelper.cxx | |
| 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 'chart2/source/tools/PropertyHelper.cxx')
| -rw-r--r-- | chart2/source/tools/PropertyHelper.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx index 8741037b6014..3b0f71839830 100644 --- a/chart2/source/tools/PropertyHelper.cxx +++ b/chart2/source/tools/PropertyHelper.cxx @@ -27,7 +27,6 @@ #include <vector> #include <algorithm> #include <iterator> -#include <functional> using namespace ::com::sun::star; using namespace ::com::sun::star::beans; @@ -36,7 +35,7 @@ using ::com::sun::star::uno::Reference; namespace { -struct lcl_EqualsElement : public std::unary_function< OUString, bool > +struct lcl_EqualsElement { explicit lcl_EqualsElement( const Any & rValue, const Reference< container::XNameAccess > & xAccess ) : m_aValue( rValue ), m_xAccess( xAccess ) @@ -62,7 +61,7 @@ private: Reference< container::XNameAccess > m_xAccess; }; -struct lcl_StringMatches : public std::unary_function< OUString ,bool > +struct lcl_StringMatches { explicit lcl_StringMatches( const OUString & rCmpStr ) : m_aCmpStr( rCmpStr ) @@ -77,7 +76,7 @@ private: OUString m_aCmpStr; }; -struct lcl_OUStringRestToInt32 : public std::unary_function< OUString, sal_Int32 > +struct lcl_OUStringRestToInt32 { explicit lcl_OUStringRestToInt32( sal_Int32 nPrefixLength ) : m_nPrefixLength( nPrefixLength ) |