summaryrefslogtreecommitdiff
path: root/sfx2/source
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 /sfx2/source
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 'sfx2/source')
-rw-r--r--sfx2/source/dialog/filtergrouping.cxx24
-rw-r--r--sfx2/source/doc/sfxmodelfactory.cxx3
2 files changed, 13 insertions, 14 deletions
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index f6771e2e15cf..9bd048d6ae1c 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -159,7 +159,7 @@ namespace sfx2
}
- struct CreateEmptyClassRememberPos : public ::std::unary_function< FilterName, void >
+ struct CreateEmptyClassRememberPos
{
protected:
FilterClassList& m_rClassList;
@@ -186,7 +186,7 @@ namespace sfx2
};
- struct ReadGlobalFilter : public ::std::unary_function< FilterName, void >
+ struct ReadGlobalFilter
{
protected:
OConfigurationNode m_aClassesNode;
@@ -263,7 +263,7 @@ namespace sfx2
}
- struct ReadLocalFilter : public ::std::unary_function< FilterName, void >
+ struct ReadLocalFilter
{
protected:
OConfigurationNode m_aClassesNode;
@@ -332,7 +332,7 @@ namespace sfx2
// a struct which adds helps remembering a reference to a class entry
- struct ReferToFilterEntry : public ::std::unary_function< FilterName, void >
+ struct ReferToFilterEntry
{
protected:
FilterGroupEntryReferrer& m_rEntryReferrer;
@@ -357,7 +357,7 @@ namespace sfx2
};
- struct FillClassGroup : public ::std::unary_function< FilterClass, void >
+ struct FillClassGroup
{
protected:
FilterGroup& m_rClassGroup;
@@ -403,7 +403,7 @@ namespace sfx2
}
- struct CheckAppendSingleWildcard : public ::std::unary_function< OUString, void >
+ struct CheckAppendSingleWildcard
{
OUString& _rToBeExtended;
@@ -440,7 +440,7 @@ namespace sfx2
// a helper struct which adds a fixed (Sfx-)filter to a filter group entry given by iterator
- struct AppendWildcardToDescriptor : public ::std::unary_function< FilterGroupEntryReferrer::value_type, void >
+ struct AppendWildcardToDescriptor
{
protected:
::std::vector< OUString > aWildCards;
@@ -524,7 +524,7 @@ namespace sfx2
MapGroupEntry2GroupEntry;
// this is not really a map - it's just called this way because it is used as a map
- struct FindGroupEntry : public ::std::unary_function< MapGroupEntry2GroupEntry::value_type, sal_Bool >
+ struct FindGroupEntry
{
FilterGroupEntryReferrer::mapped_type aLookingFor;
explicit FindGroupEntry( FilterGroupEntryReferrer::mapped_type const & _rLookingFor ) : aLookingFor( _rLookingFor ) { }
@@ -535,7 +535,7 @@ namespace sfx2
}
};
- struct CopyGroupEntryContent : public ::std::unary_function< MapGroupEntry2GroupEntry::value_type, void >
+ struct CopyGroupEntryContent
{
void operator() ( const MapGroupEntry2GroupEntry::value_type& _rMapEntry )
{
@@ -544,7 +544,7 @@ namespace sfx2
};
- struct CopyNonEmptyFilter : public ::std::unary_function< FilterDescriptor, void >
+ struct CopyNonEmptyFilter
{
FilterGroup& rTarget;
explicit CopyNonEmptyFilter( FilterGroup& _rTarget ) :rTarget( _rTarget ) { }
@@ -716,7 +716,7 @@ namespace sfx2
}
- struct AppendFilter : public ::std::unary_function< FilterDescriptor, void >
+ struct AppendFilter
{
protected:
Reference< XFilterManager > m_xFilterManager;
@@ -786,7 +786,7 @@ namespace sfx2
// = filling an XFilterManager
- struct AppendFilterGroup : public ::std::unary_function< FilterGroup, void >
+ struct AppendFilterGroup
{
protected:
Reference< XFilterManager > m_xFilterManager;
diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx
index b1dc8c21ab7d..c50034e8ab7a 100644
--- a/sfx2/source/doc/sfxmodelfactory.cxx
+++ b/sfx2/source/doc/sfxmodelfactory.cxx
@@ -30,7 +30,6 @@
#include <osl/diagnose.h>
#include <algorithm>
-#include <functional>
namespace sfx2
@@ -121,7 +120,7 @@ namespace sfx2
namespace
{
- struct IsSpecialArgument : public ::std::unary_function< Any, bool >
+ struct IsSpecialArgument
{
static bool isSpecialArgumentName( const OUString& _rValueName )
{