diff options
Diffstat (limited to 'sd')
-rw-r--r-- | sd/inc/sdmod.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/annotations/annotationwindow.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/annotations/annotationwindow.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/app/sdmod1.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index fc44c68aa024..cfad16996773 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -189,7 +189,7 @@ private: @VclSimpleEvent * a poiter to a VCLSimpleEvent (see vcl/vclevent.hxx ) */ - DECL_LINK( EventListenerHdl, VclSimpleEvent* ); + DECL_STATIC_LINK( SdModule, EventListenerHdl, VclSimpleEvent* ); }; diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index a783715df715..ba881e88d41e 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -513,7 +513,7 @@ IMPL_LINK(AnnotationWindow, ScrollHdl, ScrollBar*, pScroll) return 0; } -IMPL_LINK_NOARG(AnnotationWindow, ModifyHdl) +IMPL_STATIC_LINK_NOINSTANCE_NOARG(AnnotationWindow, ModifyHdl) { return 0; } diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index f81e16d4f0c8..4eb3525af5c9 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -97,7 +97,7 @@ class AnnotationWindow : public FloatingWindow protected: void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE; - DECL_LINK(ModifyHdl, void*); + DECL_STATIC_LINK(AnnotationWindow, ModifyHdl, void*); DECL_LINK(ScrollHdl, ScrollBar*); public: diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 2b9a522e03e4..adb22b15ac53 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -416,7 +416,7 @@ void SdModule::GetState(SfxItemSet& rItemSet) } } -IMPL_LINK( SdModule, EventListenerHdl, VclSimpleEvent*, pEvent ) +IMPL_STATIC_LINK_NOINSTANCE( SdModule, EventListenerHdl, VclSimpleEvent*, pEvent ) { if( pEvent && (pEvent->GetId() == VCLEVENT_WINDOW_COMMAND) && static_cast<VclWindowEvent*>(pEvent)->GetData() ) { |