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>

6 files changed, 11 insertions, 15 deletions

diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx
index 8019a772bdb0..ecae8048537c 100644
--- a/extensions/source/bibliography/formcontrolcontainer.cxx
+++ b/extensions/source/bibliography/formcontrolcontainer.cxx
@@ -21,7 +21,6 @@
 #include <osl/diagnose.h>
 
 #include <algorithm>
-#include <functional>
 
 namespace bib
 {
@@ -71,7 +70,7 @@ namespace bib
         m_xForm = _rxForm;
     }
 
-    struct ControlModeSwitch : public std::unary_function< Reference< XControl >, void >
+    struct ControlModeSwitch
     {
         bool bDesign;
         explicit ControlModeSwitch( bool _bDesign ) : bDesign( _bDesign ) { }
diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx b/extensions/source/propctrlr/cellbindinghelper.cxx
index 47b146b0bc9c..42304b077df6 100644
--- a/extensions/source/propctrlr/cellbindinghelper.cxx
+++ b/extensions/source/propctrlr/cellbindinghelper.cxx
@@ -37,7 +37,6 @@
 #include <tools/diagnose_ex.h>
 #include "formstrings.hxx"
 
-#include <functional>
 #include <algorithm>
 
 
@@ -60,7 +59,7 @@ namespace pcr
     namespace
     {
 
-        struct StringCompare : public std::unary_function< OUString, bool >
+        struct StringCompare
         {
         private:
             OUString m_sReference;
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;
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index c468edd23fa2..19b64557c5f4 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -33,7 +33,6 @@
 #include <tools/diagnose_ex.h>
 #include <rtl/ustrbuf.hxx>
 
-#include <functional>
 #include <algorithm>
 #include <o3tl/functional.hxx>
 
@@ -571,7 +570,7 @@ namespace pcr
     namespace
     {
 
-        struct PropertyBagInserter : public std::unary_function< Property, void >
+        struct PropertyBagInserter
         {
         private:
             PropertyBag& m_rProperties;
diff --git a/extensions/source/propctrlr/formbrowsertools.hxx b/extensions/source/propctrlr/formbrowsertools.hxx
index eba6ee1155fb..6abc42d7a477 100644
--- a/extensions/source/propctrlr/formbrowsertools.hxx
+++ b/extensions/source/propctrlr/formbrowsertools.hxx
@@ -36,7 +36,7 @@ namespace pcr
     sal_Int16 classifyComponent( const css::uno::Reference< css::uno::XInterface >& _rxComponent );
 
 
-    struct FindPropertyByHandle : public std::unary_function< css::beans::Property, bool >
+    struct FindPropertyByHandle
     {
     private:
         sal_Int32 m_nId;
@@ -50,7 +50,7 @@ namespace pcr
     };
 
 
-    struct FindPropertyByName : public std::unary_function< css::beans::Property, bool >
+    struct FindPropertyByName
     {
     private:
         OUString m_sName;
diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx
index 4c51d017dafe..04c9bd82995c 100644
--- a/extensions/source/propctrlr/propertycomposer.cxx
+++ b/extensions/source/propctrlr/propertycomposer.cxx
@@ -25,7 +25,6 @@
 #include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>
 
-#include <functional>
 #include <algorithm>
 #include <iterator>
 #include <map>
@@ -46,7 +45,7 @@ namespace pcr
     namespace
     {
 
-        struct SetPropertyValue : public std::unary_function< Reference< XPropertyHandler >, void >
+        struct SetPropertyValue
         {
             OUString sPropertyName;
             const Any&      rValue;