diff options
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/core/CustomAnimationEffect.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationList.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/animations/SlideTransitionPane.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/ViewShellManager.cxx | 4 |
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) {} |