summaryrefslogtreecommitdiff
path: root/extensions/source/propctrlr/composeduiupdate.cxx
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 /extensions/source/propctrlr/composeduiupdate.cxx
parent5034e8217c9844293dc94e5dff0bdc865ad7a91a (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 'extensions/source/propctrlr/composeduiupdate.cxx')
-rw-r--r--extensions/source/propctrlr/composeduiupdate.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx
index c438f3207400..e39932925d81 100644
--- a/extensions/source/propctrlr/composeduiupdate.cxx
+++ b/extensions/source/propctrlr/composeduiupdate.cxx
@@ -393,7 +393,7 @@ namespace pcr
{
// an STL-compatible structure which collects strings from a CachedInspectorUI instances
- struct StringBagCollector : public std::unary_function< ImplMapHandlerToUI::value_type, void >
+ struct StringBagCollector
{
private:
StringBag& m_rBag;
@@ -416,7 +416,7 @@ namespace pcr
// an STL-compatible structure which cleans a certain string bag in a CachedInspectorUI instances
- struct StringBagClearer : public std::unary_function< ImplMapHandlerToUI::value_type, void >
+ struct StringBagClearer
{
private:
CachedInspectorUI::FGetStringBag m_pGetter;
@@ -441,7 +441,7 @@ namespace pcr
// an STL-compatible struct which calls a certain member method (taking a string) at a
// given ->XObjectInspectorUI instance
- struct PropertyUIOperator : public std::unary_function< OUString, void >
+ struct PropertyUIOperator
{
private:
Reference< XObjectInspectorUI > m_xUpdater;
@@ -541,7 +541,7 @@ namespace pcr
// an STL-compatible structure which applies a ->IStringKeyBooleanUIUpdate::updateUIForKey
// operation with a fixed boolean value, for a given string value
- struct BooleanUIAspectUpdate : public std::unary_function< OUString, void >
+ struct BooleanUIAspectUpdate
{
private:
const IStringKeyBooleanUIUpdate& m_rUpdater;
@@ -569,7 +569,7 @@ namespace pcr
// BooleanUIAspectUpdate
// an STL-compatible structure subtracting a given string from a fixed ->StringBag
- struct StringBagComplement : public std::unary_function< OUString, void >
+ struct StringBagComplement
{
private:
StringBag& m_rMinuend;