summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/dobjfac.hxx2
-rw-r--r--sw/source/core/draw/dobjfac.cxx3
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx3
-rw-r--r--sw/source/ui/dialog/wordcountdialog.cxx2
-rw-r--r--sw/source/ui/table/tabledlg.cxx3
-rw-r--r--sw/source/uibase/app/apphdl.cxx7
-rw-r--r--sw/source/uibase/dbui/dbui.cxx2
-rw-r--r--sw/source/uibase/envelp/syncbtn.cxx2
-rw-r--r--sw/source/uibase/inc/dbui.hxx2
-rw-r--r--sw/source/uibase/inc/regionsw.hxx2
-rw-r--r--sw/source/uibase/inc/syncbtn.hxx2
-rw-r--r--sw/source/uibase/inc/wordcountdialog.hxx2
-rw-r--r--sw/source/uibase/inc/workctrl.hxx2
-rw-r--r--sw/source/uibase/ribbar/workctrl.cxx2
-rw-r--r--sw/source/uibase/table/tablepg.hxx2
15 files changed, 22 insertions, 16 deletions
diff --git a/sw/inc/dobjfac.hxx b/sw/inc/dobjfac.hxx
index d0787959cebf..2ea3247c8e3d 100644
--- a/sw/inc/dobjfac.hxx
+++ b/sw/inc/dobjfac.hxx
@@ -26,7 +26,7 @@ class SdrObjFactory;
class SwObjectFactory
{
public:
- DECL_LINK( MakeObject, SdrObjFactory * );
+ DECL_STATIC_LINK( SwObjectFactory, MakeObject, SdrObjFactory * );
};
extern SwObjectFactory aSwObjectFactory;
diff --git a/sw/source/core/draw/dobjfac.cxx b/sw/source/core/draw/dobjfac.cxx
index 891856b8417c..7ff5e165cda3 100644
--- a/sw/source/core/draw/dobjfac.cxx
+++ b/sw/source/core/draw/dobjfac.cxx
@@ -23,7 +23,8 @@
SwObjectFactory aSwObjectFactory;
-IMPL_LINK( SwObjectFactory, MakeObject, SdrObjFactory*, pObjFactory )
+IMPL_STATIC_LINK_NOINSTANCE(
+ SwObjectFactory, MakeObject, SdrObjFactory*, pObjFactory )
{
if ( pObjFactory->nInventor == SWGInventor )
{
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 2281069ce57f..4fda5f86b5a2 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1700,7 +1700,8 @@ IMPL_LINK( SwInsertSectionTabPage, ChangeHideHdl, CheckBox *, pBox )
return 0;
}
-IMPL_LINK_NOARG(SwInsertSectionTabPage, ChangeEditInReadonlyHdl)
+IMPL_STATIC_LINK_NOINSTANCE_NOARG(
+ SwInsertSectionTabPage, ChangeEditInReadonlyHdl)
{
return 0;
}
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
index 471309e2e92b..3eb1d4591be3 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -34,7 +34,7 @@
#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
-IMPL_LINK_NOARG(SwWordCountFloatDlg, CloseHdl)
+IMPL_STATIC_LINK_NOINSTANCE_NOARG(SwWordCountFloatDlg, CloseHdl)
{
SfxViewFrame* pVFrame = ::GetActiveView()->GetViewFrame();
if (pVFrame != NULL)
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 9d60ec655343..7f82f5e7150d 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1803,7 +1803,8 @@ IMPL_LINK( SwTextFlowPage, SplitHdl_Impl, CheckBox*, pBox )
return 0;
}
-IMPL_LINK( SwTextFlowPage, SplitRowHdl_Impl, TriStateBox*, pBox )
+IMPL_STATIC_LINK_NOINSTANCE(
+ SwTextFlowPage, SplitRowHdl_Impl, TriStateBox*, pBox )
{
pBox->EnableTriState(false);
return 0;
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index bfa7c50143bc..ff543d6d5cc6 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -247,7 +247,8 @@ class SwMailMergeWizardExecutor : public salhelper::SimpleReferenceObject
DECL_LINK( EndDialogHdl, AbstractMailMergeWizard* );
DECL_LINK( DestroyDialogHdl, void* );
- DECL_LINK( DestroyWizardHdl, AbstractMailMergeWizard* );
+ DECL_STATIC_LINK(
+ SwMailMergeWizardExecutor, DestroyWizardHdl, AbstractMailMergeWizard* );
DECL_LINK( CancelHdl, void* );
DECL_LINK( CloseFrameHdl, void* );
@@ -540,7 +541,9 @@ IMPL_LINK_NOARG(SwMailMergeWizardExecutor, DestroyDialogHdl)
return 0L;
}
-IMPL_LINK( SwMailMergeWizardExecutor, DestroyWizardHdl, AbstractMailMergeWizard*, pDialog )
+IMPL_STATIC_LINK_NOINSTANCE(
+ SwMailMergeWizardExecutor, DestroyWizardHdl, AbstractMailMergeWizard*,
+ pDialog )
{
delete pDialog;
return 0L;
diff --git a/sw/source/uibase/dbui/dbui.cxx b/sw/source/uibase/dbui/dbui.cxx
index bb5aadf78863..96f115addb5d 100644
--- a/sw/source/uibase/dbui/dbui.cxx
+++ b/sw/source/uibase/dbui/dbui.cxx
@@ -140,7 +140,7 @@ void CancelableDialog::Show()
Dialog::Show();
}
-IMPL_LINK_NOARG(CancelableDialog, DlgClosedHdl)
+IMPL_STATIC_LINK_NOINSTANCE_NOARG(CancelableDialog, DlgClosedHdl)
{
return 0;
}
diff --git a/sw/source/uibase/envelp/syncbtn.cxx b/sw/source/uibase/envelp/syncbtn.cxx
index e75751de5a31..1c38be2256cd 100644
--- a/sw/source/uibase/envelp/syncbtn.cxx
+++ b/sw/source/uibase/envelp/syncbtn.cxx
@@ -79,7 +79,7 @@ void SwSyncBtnDlg::dispose()
SfxFloatingWindow::dispose();
}
-IMPL_LINK_NOARG(SwSyncBtnDlg, BtnHdl)
+IMPL_STATIC_LINK_NOINSTANCE_NOARG(SwSyncBtnDlg, BtnHdl)
{
SfxViewFrame::Current()->GetDispatcher()->Execute(FN_UPDATE_ALL_LINKS, SfxCallMode::ASYNCHRON);
return 0;
diff --git a/sw/source/uibase/inc/dbui.hxx b/sw/source/uibase/inc/dbui.hxx
index 8f5c7fe6120d..519fad0c9562 100644
--- a/sw/source/uibase/inc/dbui.hxx
+++ b/sw/source/uibase/inc/dbui.hxx
@@ -33,7 +33,7 @@ protected:
CancelableDialog( vcl::Window *pParent, bool modal, const OUString& rID,
const OUString& rUIXMLDescription );
- DECL_LINK(DlgClosedHdl, void *);
+ DECL_STATIC_LINK(CancelableDialog, DlgClosedHdl, void *);
using Dialog::Execute;
using Dialog::StartExecuteModal;
diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx
index 91dcb6fe09f9..b0ea63315807 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.hxx
@@ -173,7 +173,7 @@ class SwInsertSectionTabPage : public SfxTabPage
DECL_LINK( ChangeHideHdl, CheckBox * );
// #114856# edit in readonly sections
- DECL_LINK(ChangeEditInReadonlyHdl, void *);
+ DECL_STATIC_LINK(SwInsertSectionTabPage, ChangeEditInReadonlyHdl, void *);
DECL_LINK( ChangeProtectHdl, CheckBox * );
DECL_LINK( ChangePasswdHdl, Button * );
DECL_LINK(NameEditHdl, void *);
diff --git a/sw/source/uibase/inc/syncbtn.hxx b/sw/source/uibase/inc/syncbtn.hxx
index 83a16070a5d7..e2fa361c4ea9 100644
--- a/sw/source/uibase/inc/syncbtn.hxx
+++ b/sw/source/uibase/inc/syncbtn.hxx
@@ -27,7 +27,7 @@ class SwSyncBtnDlg : public SfxFloatingWindow
{
VclPtr<PushButton> m_pSyncBtn;
- DECL_LINK( BtnHdl, void* );
+ DECL_STATIC_LINK( SwSyncBtnDlg, BtnHdl, void* );
public:
SwSyncBtnDlg(SfxBindings*, SfxChildWindow*, vcl::Window *pParent);
diff --git a/sw/source/uibase/inc/wordcountdialog.hxx b/sw/source/uibase/inc/wordcountdialog.hxx
index 63aa450f3aeb..d4d9bde1c1fb 100644
--- a/sw/source/uibase/inc/wordcountdialog.hxx
+++ b/sw/source/uibase/inc/wordcountdialog.hxx
@@ -50,7 +50,7 @@ class SwWordCountFloatDlg : public SfxModelessDialog
VclPtr<CloseButton> m_pClosePB;
- DECL_LINK( CloseHdl, void* );
+ DECL_STATIC_LINK( SwWordCountFloatDlg, CloseHdl, void* );
public:
SwWordCountFloatDlg( SfxBindings* pBindings,
SfxChildWindow* pChild,
diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx
index 65ea2c87fa9a..9f3287e75c3e 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -90,7 +90,7 @@ public:
SfxItemState eState,
const SfxPoolItem* pState ) SAL_OVERRIDE;
- DECL_LINK(PopupHdl, PopupMenu*);
+ DECL_STATIC_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*);
};
class SwTbxFieldCtrl : public SfxToolBoxControl
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 18d6342c8694..07faafc17683 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -238,7 +238,7 @@ void SwTbxAutoTextCtrl::StateChanged( sal_uInt16,
GetToolBox().EnableItem( GetId(), (GetItemState(pState) != SfxItemState::DISABLED) );
}
-IMPL_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu)
+IMPL_STATIC_LINK_NOINSTANCE(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu)
{
sal_uInt16 nId = pMenu->GetCurItemId();
diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx
index 3f2d8bc0734f..6d8a7670fcde 100644
--- a/sw/source/uibase/table/tablepg.hxx
+++ b/sw/source/uibase/table/tablepg.hxx
@@ -177,7 +177,7 @@ class SwTextFlowPage : public SfxTabPage
DECL_LINK( PageBreakPosHdl_Impl, RadioButton* );
DECL_LINK( PageBreakTypeHdl_Impl, RadioButton* );
DECL_LINK( SplitHdl_Impl, CheckBox* );
- DECL_LINK( SplitRowHdl_Impl, TriStateBox* );
+ DECL_STATIC_LINK( SwTextFlowPage, SplitRowHdl_Impl, TriStateBox* );
DECL_LINK( HeadLineCBClickHdl, void* p = 0 );
public:
generated by cgit (git 2.34.1) at 2025-03-09 15:53:37 +0000