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 /forms/source | |
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 'forms/source')
-rw-r--r-- | forms/source/component/ListBox.cxx | 8 | ||||
-rw-r--r-- | forms/source/component/propertybaghelper.cxx | 6 | ||||
-rw-r--r-- | forms/source/misc/InterfaceContainer.cxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 958258327049..3e50047e1803 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -87,7 +87,7 @@ namespace frm namespace { - struct RowSetValueToString : public ::std::unary_function< ORowSetValue, OUString > + struct RowSetValueToString { OUString operator()( const ORowSetValue& _value ) const { @@ -96,7 +96,7 @@ namespace frm }; - struct AppendRowSetValueString : public ::std::unary_function< OUString, void > + struct AppendRowSetValueString { explicit AppendRowSetValueString( OUString& _string ) :m_string( _string ) @@ -1473,7 +1473,7 @@ namespace frm namespace { - struct ExtractStringFromSequence_Safe : public ::std::unary_function< sal_Int16, OUString > + struct ExtractStringFromSequence_Safe { protected: const std::vector< OUString >& m_rList; @@ -1544,7 +1544,7 @@ namespace frm } - struct ExtractAnyFromValueList_Safe : public ::std::unary_function< sal_Int16, Any > + struct ExtractAnyFromValueList_Safe { protected: const ValueList& m_rList; diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx index c9f5ca0e4016..130008fd6ae2 100644 --- a/forms/source/component/propertybaghelper.cxx +++ b/forms/source/component/propertybaghelper.cxx @@ -222,19 +222,19 @@ namespace frm namespace { - struct SelectNameOfProperty : public ::std::unary_function< Property, OUString > + struct SelectNameOfProperty { const OUString& operator()( const Property& _rProp ) const { return _rProp.Name; } }; - struct SelectNameOfPropertyValue : public ::std::unary_function< PropertyValue, OUString > + struct SelectNameOfPropertyValue { const OUString& operator()( const PropertyValue& _rProp ) const { return _rProp.Name; } }; - struct SelectValueOfPropertyValue : public ::std::unary_function< PropertyValue, Any > + struct SelectValueOfPropertyValue { const Any& operator()( const PropertyValue& _rProp ) const { return _rProp.Value; } }; diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index 7b796e3d10fe..c251c17d3587 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -356,7 +356,7 @@ void SAL_CALL OInterfaceContainer::writeEvents(const Reference<XObjectOutputStre } -struct TransformEventTo52Format : public ::std::unary_function< ScriptEventDescriptor, void > +struct TransformEventTo52Format { void operator()( ScriptEventDescriptor& _rDescriptor ) { |