lopluign:staticmethods: Handle DECL_LINK

Change-Id: Ib27854a8470f3ff5b208cb949a7bd02f2a86c969

4 files changed, 5 insertions, 4 deletions

diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index afaa5e2349f9..b31b4260ab93 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -227,7 +227,8 @@ void DialogWindow::Command( const CommandEvent& rCEvt )
 
 
 
-IMPL_LINK( DialogWindow, NotifyUndoActionHdl, SfxUndoAction *, pUndoAction )
+IMPL_STATIC_LINK_NOINSTANCE(
+    DialogWindow, NotifyUndoActionHdl, SfxUndoAction *, pUndoAction )
 {
     // #i120515# pUndoAction needs to be deleted, this hand over is an ownership
     // change. As long as it does not get added to the undo manager, it needs at
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index 959ed582287b..36155235fea8 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -174,7 +174,7 @@ void ExtraData::SetSearchItem (const SvxSearchItem& rItem)
     pSearchItem.reset(static_cast<SvxSearchItem*>(rItem.Clone()));
 }
 
-IMPL_LINK(ExtraData, GlobalBasicBreakHdl, StarBASIC *, pBasic )
+IMPL_STATIC_LINK_NOINSTANCE(ExtraData, GlobalBasicBreakHdl, StarBASIC *, pBasic)
 {
     long nRet = 0;
     if (Shell* pShell = GetShell())
diff --git a/basctl/source/basicide/iderdll2.hxx b/basctl/source/basicide/iderdll2.hxx
index 8c1ec2efaf0d..6359d177ab57 100644
--- a/basctl/source/basicide/iderdll2.hxx
+++ b/basctl/source/basicide/iderdll2.hxx
@@ -50,7 +50,7 @@ private:
     bool            bShellInCriticalSection;
 
 protected:
-    DECL_LINK( GlobalBasicBreakHdl, StarBASIC * );
+    DECL_STATIC_LINK( ExtraData, GlobalBasicBreakHdl, StarBASIC * );
 
 public:
     ExtraData();
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 2f229c20e069..7654ef31f5d1 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -72,7 +72,7 @@ protected:
     virtual void        Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
     virtual void        LoseFocus() SAL_OVERRIDE;
 
-    DECL_LINK( NotifyUndoActionHdl, SfxUndoAction * );
+    DECL_STATIC_LINK( DialogWindow, NotifyUndoActionHdl, SfxUndoAction * );
     virtual void        DoInit() SAL_OVERRIDE;
     virtual void        DoScroll( ScrollBar* pCurScrollBar ) SAL_OVERRIDE;
     virtual void        DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;