lopluign:staticmethods: Handle DECL_LINK

Change-Id: Ib27854a8470f3ff5b208cb949a7bd02f2a86c969

16 files changed, 19 insertions, 17 deletions

diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 76e09e47e6e3..9af6eef3765d 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -78,7 +78,7 @@ private:
     ScExternalRefLink() SAL_DELETED_FUNCTION;
     ScExternalRefLink(const ScExternalRefLink&) SAL_DELETED_FUNCTION;
 
-    DECL_LINK( ExternalRefEndEditHdl, void* );
+    DECL_STATIC_LINK( ScExternalRefLink, ExternalRefEndEditHdl, void* );
 
     sal_uInt16  mnFileId;
     OUString    maFilterName;
diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx
index 5083c989a105..c01cbf57be89 100644
--- a/sc/inc/userdat.hxx
+++ b/sc/inc/userdat.hxx
@@ -35,7 +35,7 @@
 
 class ScDrawObjFactory
 {
-    DECL_LINK( MakeUserData, SdrObjFactory * );
+    DECL_STATIC_LINK( ScDrawObjFactory, MakeUserData, SdrObjFactory * );
 public:
     ScDrawObjFactory();
    ~ScDrawObjFactory();
diff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxx
index 371c6e471715..4581edf6df35 100644
--- a/sc/source/core/data/userdat.cxx
+++ b/sc/source/core/data/userdat.cxx
@@ -31,7 +31,8 @@ ScDrawObjFactory::~ScDrawObjFactory()
     SdrObjFactory::RemoveMakeUserDataHdl( LINK ( this, ScDrawObjFactory, MakeUserData ) );
 }
 
-IMPL_LINK( ScDrawObjFactory, MakeUserData, SdrObjFactory *, pObjFactory )
+IMPL_STATIC_LINK_NOINSTANCE(
+    ScDrawObjFactory, MakeUserData, SdrObjFactory *, pObjFactory )
 {
     if ( pObjFactory->nInventor == SC_DRAWLAYER )
     {
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index d4ea0caee1ad..fe916024471c 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -573,7 +573,7 @@ IMPL_LINK( ScCondFormatDlg, RangeGetFocusHdl, formula::RefEdit*, pEdit )
     return 0;
 }
 
-IMPL_LINK_NOARG( ScCondFormatDlg, RangeLoseFocusHdl )
+IMPL_STATIC_LINK_NOINSTANCE_NOARG( ScCondFormatDlg, RangeLoseFocusHdl )
 {
     //mpLastEdit = NULL;
     return 0;
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 5e8c66e8d96e..cccf39c102a0 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1337,7 +1337,7 @@ void ScExternalRefLink::SetDoReferesh(bool b)
     mbDoRefresh = b;
 }
 
-IMPL_LINK_NOARG(ScExternalRefLink, ExternalRefEndEditHdl)
+IMPL_STATIC_LINK_NOINSTANCE_NOARG(ScExternalRefLink, ExternalRefEndEditHdl)
 {
     return 0;
 }
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index 96d43e3efd36..f85567083fda 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -139,7 +139,7 @@ private:
 
     DECL_LINK( FilterHandle, SvxTPFilter* );
     DECL_LINK( RefHandle, void* );
-    DECL_LINK( FilterModified, void* );
+    DECL_STATIC_LINK( ScAcceptChgDlg, FilterModified, void* );
     DECL_LINK( RejectHandle, SvxTPView*);
     DECL_LINK( AcceptHandle, SvxTPView*);
     DECL_LINK( RejectAllHandle, void*);
diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx
index eaf90aa2dcfb..603686122756 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -129,7 +129,7 @@ public:
     void InvalidateRefData();
 
     DECL_LINK( RangeGetFocusHdl, formula::RefEdit* );
-    DECL_LINK( RangeLoseFocusHdl, void* );
+    DECL_STATIC_LINK( ScCondFormatDlg, RangeLoseFocusHdl, void* );
 };
 
 #endif
diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx
index adfb4062a266..477422f6203e 100644
--- a/sc/source/ui/inc/opredlin.hxx
+++ b/sc/source/ui/inc/opredlin.hxx
@@ -41,7 +41,7 @@ class ScRedlineOptionsTabPage : public SfxTabPage
     VclPtr<ColorListBox>       m_pInsertColorLB;
     VclPtr<ColorListBox>       m_pMoveColorLB;
     OUString            aAuthorStr;
-    DECL_LINK(ColorHdl, void *);
+    DECL_STATIC_LINK(ScRedlineOptionsTabPage, ColorHdl, void *);
 
 public:
 
diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx
index fa0cc5dfc913..c22ec2510525 100644
--- a/sc/source/ui/inc/scuitphfedit.hxx
+++ b/sc/source/ui/inc/scuitphfedit.hxx
@@ -99,7 +99,7 @@ private:
     static bool IsExtFileNameEntry(EditTextObject* pTextObj);
     DECL_LINK( ListHdl_Impl, ListBox* );
     DECL_LINK( ClickHdl,  PushButton* );
-    DECL_LINK( MenuHdl, ScExtIButton* );
+    DECL_STATIC_LINK( ScHFEditPage, MenuHdl, ScExtIButton* );
 };
 
 class ScRightHeaderEditPage : public ScHFEditPage
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index b5348cdfdb4d..20854ee45a69 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -211,8 +211,8 @@ private:
     bool                bPagebreak:1;               // Page break preview mode
     bool                bSelCtrlMouseClick:1;       // special selection handling for ctrl-mouse-click
 
-    SAL_DLLPRIVATE DECL_LINK (EmptyEditHdl, void*);
-    SAL_DLLPRIVATE DECL_LINK (EditEngineHdl, EditStatus*);
+    DECL_DLLPRIVATE_STATIC_LINK (ScViewData, EmptyEditHdl, void*);
+    DECL_DLLPRIVATE_LINK (EditEngineHdl, EditStatus*);
 
     SAL_DLLPRIVATE void          CalcPPT();
     SAL_DLLPRIVATE void          CreateTabData( SCTAB nNewTab );
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 71d7d2e7f72d..18b7b24b94cc 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -1864,7 +1864,7 @@ void ScAcceptChgDlg::InitFilter()
     }
 }
 
-IMPL_LINK_NOARG(ScAcceptChgDlg, FilterModified)
+IMPL_STATIC_LINK_NOINSTANCE_NOARG(ScAcceptChgDlg, FilterModified)
 {
     return 0;
 }
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 92d88f6471ff..85141b020c85 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -673,7 +673,8 @@ struct Reduction : Op
 
 }
 
-IMPL_LINK( ScCalcOptionsDialog, TestClickHdl, PushButton*, pButton)
+IMPL_STATIC_LINK_NOINSTANCE(
+    ScCalcOptionsDialog, TestClickHdl, PushButton*, pButton)
 {
     pButton->Disable();
 
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx
index 254a18c1e0a2..179b48819bc1 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.hxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx
@@ -42,7 +42,7 @@ public:
     DECL_LINK( DeviceSelHdl, void* );
     DECL_LINK( NumModifiedHdl, void * );
     DECL_LINK( EditModifiedHdl, Edit * );
-    DECL_LINK( TestClickHdl, PushButton* );
+    DECL_STATIC_LINK( ScCalcOptionsDialog, TestClickHdl, PushButton* );
     DECL_LINK( AsZeroModifiedHdl, CheckBox*);
     DECL_LINK( ConversionModifiedHdl, ListBox*);
     DECL_LINK( SyntaxModifiedHdl, ListBox*);
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index 3560c01e2a58..08c807309e00 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -194,7 +194,7 @@ void ScRedlineOptionsTabPage::Reset( const SfxItemSet* /* rSet */ )
 
 }
 
-IMPL_LINK_NOARG(ScRedlineOptionsTabPage, ColorHdl)
+IMPL_STATIC_LINK_NOINSTANCE_NOARG(ScRedlineOptionsTabPage, ColorHdl)
 {
     return 0;
 }
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 5bfa114ef7c3..ee68914de2ec 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -828,7 +828,7 @@ IMPL_LINK( ScHFEditPage, ClickHdl, PushButton*, pBtn )
     return 0;
 }
 
-IMPL_LINK( ScHFEditPage, MenuHdl, ScExtIButton*, pBtn )
+IMPL_STATIC_LINK_NOINSTANCE( ScHFEditPage, MenuHdl, ScExtIButton*, pBtn )
 {
     pActiveEdWnd = ::GetScEditWindow();
     if ( !pActiveEdWnd )
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 1f824dce2871..71ef92a8564d 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -1090,7 +1090,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
     //  needed, wenn position changed
 }
 
-IMPL_LINK_NOARG(ScViewData, EmptyEditHdl)
+IMPL_STATIC_LINK_NOINSTANCE_NOARG(ScViewData, EmptyEditHdl)
 {
     return 0;
 }