summaryrefslogtreecommitdiff
path: root/sd/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 /sd/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 'sd/source')
-rw-r--r--sd/source/core/CustomAnimationEffect.cxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationList.cxx2
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx4
-rw-r--r--sd/source/ui/view/ViewShellManager.cxx4
4 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index cc78e33da1b0..be8f7da7b81f 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -2746,7 +2746,7 @@ void EffectSequenceHelper::removeListener( ISequenceListener* pListener )
maListeners.remove( pListener );
}
-struct stl_notify_listeners_func : public std::unary_function<ISequenceListener*, void>
+struct stl_notify_listeners_func
{
stl_notify_listeners_func() {}
void operator()(ISequenceListener* pListener) { pListener->notify_change(); }
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 88a5393495d3..32553c5a4ca7 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -538,7 +538,7 @@ void CustomAnimationList::update( const MainSequencePtr& pMainSequence )
mpMainSequence->addListener( this );
}
-struct stl_append_effect_func : public std::unary_function<CustomAnimationEffectPtr, void>
+struct stl_append_effect_func
{
explicit stl_append_effect_func( CustomAnimationList& rList ) : mrList( rList ) {}
void operator()(const CustomAnimationEffectPtr& pEffect);
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index b1d803a53078..7f5b85598462 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -260,7 +260,7 @@ void lcl_CreateUndoForPages(
pManager->LeaveListAction();
}
-struct lcl_EqualsSoundFileName : public ::std::unary_function< OUString, bool >
+struct lcl_EqualsSoundFileName
{
explicit lcl_EqualsSoundFileName( const OUString & rStr ) :
maStr( rStr )
@@ -319,7 +319,7 @@ OUString lcl_getSoundFileURL(
return OUString();
}
-struct lcl_AppendSoundToListBox : public ::std::unary_function< OUString, void >
+struct lcl_AppendSoundToListBox
{
explicit lcl_AppendSoundToListBox( ListBox* rListBox ) :
mrListBox( rListBox )
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index 9762e8d90f4b..a1968d06b84a 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -65,7 +65,7 @@ public:
/** This functor can be used to search for a shell in an STL container when the
shell pointer is given.
*/
-class IsShell : public ::std::unary_function<ShellDescriptor,bool>
+class IsShell
{
public:
explicit IsShell (const SfxShell* pShell) : mpShell(pShell) {}
@@ -78,7 +78,7 @@ private:
/** This functor can be used to search for a shell in an STL container when the
id of the shell is given.
*/
-class IsId : public ::std::unary_function<ShellDescriptor,bool>
+class IsId
{
public:
explicit IsId (ShellId nId) : mnId(nId) {}