summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-05-08 19:11:38 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-05-08 19:15:32 +0200
commit5eb6bd4db7fb3d43672c386ac9cde58e981c8aa2 (patch)
treedadf670246d763449c3bacef4acfdd2c6251d198 /sd
parente6fa865b4d5c7eb0576f7b1510077bca081ce4fb (diff)
lopluign:staticmethods: Handle DECL_LINK
Change-Id: Ib27854a8470f3ff5b208cb949a7bd02f2a86c969
Diffstat (limited to 'sd')
-rw-r--r--sd/inc/sdmod.hxx2
-rw-r--r--sd/source/ui/annotations/annotationwindow.cxx2
-rw-r--r--sd/source/ui/annotations/annotationwindow.hxx2
-rw-r--r--sd/source/ui/app/sdmod1.cxx2
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() )
{