diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
| commit | 106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb (patch) | |
| tree | e55ab4706654d10a5f9b75acfdecec72fda804c3 /sw/source/uibase | |
| parent | 36efdec23b86fe28c79fe672bb6862fb57b6e09a (diff) | |
Remove _TYPED suffix from tools/link.hxx macros
...which was introduced with 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed "Gradually
typed Link" to distinguish the new, typed versions from the old, untyped ones,
but is no longer necessary since 382eb1a23c390154619c385414bdbe6f6e461173
"remove untyped Link<>" removed the old versions.
Change-Id: I494025df486a16a45861fcd8192dfe0275b1103c
Diffstat (limited to 'sw/source/uibase')
134 files changed, 571 insertions, 571 deletions
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 4f2a5ee6f7c1..8d575cc80672 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -385,11 +385,11 @@ class SwMailMergeWizardExecutor : public salhelper::SimpleReferenceObject AbstractMailMergeWizard* m_pWizard; // always owner bool m_bDestroyMMToolbarOnCancel; - DECL_LINK_TYPED( EndDialogHdl, Dialog&, void ); - DECL_LINK_TYPED( DestroyDialogHdl, void*, void ); - DECL_STATIC_LINK_TYPED( SwMailMergeWizardExecutor, DestroyWizardHdl, void*, void ); - DECL_LINK_TYPED( CancelHdl, void*, void ); - DECL_LINK_TYPED( CloseFrameHdl, void*, void ); + DECL_LINK( EndDialogHdl, Dialog&, void ); + DECL_LINK( DestroyDialogHdl, void*, void ); + DECL_STATIC_LINK( SwMailMergeWizardExecutor, DestroyWizardHdl, void*, void ); + DECL_LINK( CancelHdl, void*, void ); + DECL_LINK( CloseFrameHdl, void*, void ); void ExecutionFinished(); void ExecuteWizard(); @@ -494,7 +494,7 @@ void SwMailMergeWizardExecutor::ExecuteWizard() LINK( this, SwMailMergeWizardExecutor, EndDialogHdl ) ); } -IMPL_LINK_NOARG_TYPED( SwMailMergeWizardExecutor, EndDialogHdl, Dialog&, void ) +IMPL_LINK_NOARG( SwMailMergeWizardExecutor, EndDialogHdl, Dialog&, void ) { long nRet = m_pWizard->GetResult(); sal_uInt16 nRestartPage = m_pWizard->GetRestartPage(); @@ -609,7 +609,7 @@ IMPL_LINK_NOARG_TYPED( SwMailMergeWizardExecutor, EndDialogHdl, Dialog&, void ) } // switch } -IMPL_LINK_NOARG_TYPED(SwMailMergeWizardExecutor, DestroyDialogHdl, void*, void) +IMPL_LINK_NOARG(SwMailMergeWizardExecutor, DestroyDialogHdl, void*, void) { delete m_pWizard; m_pWizard = nullptr; @@ -617,12 +617,12 @@ IMPL_LINK_NOARG_TYPED(SwMailMergeWizardExecutor, DestroyDialogHdl, void*, void) release(); } -IMPL_STATIC_LINK_TYPED(SwMailMergeWizardExecutor, DestroyWizardHdl, void*, pDialog, void ) +IMPL_STATIC_LINK(SwMailMergeWizardExecutor, DestroyWizardHdl, void*, pDialog, void ) { delete static_cast<AbstractMailMergeWizard*>(pDialog); } -IMPL_LINK_NOARG_TYPED(SwMailMergeWizardExecutor, CancelHdl, void*, void) +IMPL_LINK_NOARG(SwMailMergeWizardExecutor, CancelHdl, void*, void) { std::shared_ptr<SwMailMergeConfigItem> xMMConfig = m_pView->GetMailMergeConfigItem(); if (xMMConfig) @@ -658,7 +658,7 @@ IMPL_LINK_NOARG_TYPED(SwMailMergeWizardExecutor, CancelHdl, void*, void) release(); } -IMPL_LINK_NOARG_TYPED(SwMailMergeWizardExecutor, CloseFrameHdl, void*, void) +IMPL_LINK_NOARG(SwMailMergeWizardExecutor, CloseFrameHdl, void*, void) { if ( m_pView2Close ) { diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index e0d0140a652c..235c553c4f6d 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -1087,7 +1087,7 @@ void SwDocShell::GetState(SfxItemSet& rSet) } // OLE-Hdls -IMPL_LINK_TYPED( SwDocShell, Ole2ModifiedHdl, bool, bNewStatus, void ) +IMPL_LINK( SwDocShell, Ole2ModifiedHdl, bool, bNewStatus, void ) { if( IsEnableSetModified() ) SetModified( bNewStatus ); diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index e95bbc3414dc..0d2e8ccb7648 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -541,7 +541,7 @@ public: , m_bModified(bModified) { } - DECL_LINK_TYPED( ApplyHdl, LinkParamNone*, void ); + DECL_LINK( ApplyHdl, LinkParamNone*, void ); void apply() { ApplyHdl(nullptr); @@ -559,7 +559,7 @@ private: bool m_bModified; }; -IMPL_LINK_NOARG_TYPED(ApplyStyle, ApplyHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(ApplyStyle, ApplyHdl, LinkParamNone*, void) { SwWrtShell* pWrtShell = m_rDocSh.GetWrtShell(); SwDoc* pDoc = m_rDocSh.GetDoc(); diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index a9a6da81aaf8..781ca39149ca 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1631,7 +1631,7 @@ void SwDBManager::MergeCancel() m_aMergeStatus = MergeStatus::CANCEL; } -IMPL_LINK_TYPED( SwDBManager, PrtCancelHdl, Button *, pButton, void ) +IMPL_LINK( SwDBManager, PrtCancelHdl, Button *, pButton, void ) { pButton->GetParent()->Hide(); MergeCancel(); diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index a5b31c6d8e05..441239e69272 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -378,7 +378,7 @@ void SwDBTreeList::RequestingChildren(SvTreeListEntry* pParent) } } -IMPL_LINK_TYPED( SwDBTreeList, DBCompare, const SvSortData&, rData, sal_Int32 ) +IMPL_LINK( SwDBTreeList, DBCompare, const SvSortData&, rData, sal_Int32 ) { SvTreeListEntry* pRight = const_cast<SvTreeListEntry*>(rData.pRight); diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index f83659b7a3d0..85fc4988feb3 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -225,7 +225,7 @@ void SwAddressPreview::Resize() positionScrollBar(); } -IMPL_LINK_NOARG_TYPED(SwAddressPreview, ScrollHdl, ScrollBar*, void) +IMPL_LINK_NOARG(SwAddressPreview, ScrollHdl, ScrollBar*, void) { Invalidate(); } diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx index 44317c4085a5..e119d5f790ce 100644 --- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx +++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx @@ -41,7 +41,7 @@ class MMCurrentEntryController : public svt::ToolboxController, public lang::XSe { VclPtr<Edit> m_pCurrentEdit; - DECL_LINK_TYPED(CurrentEditUpdatedHdl, Edit&, void); + DECL_LINK(CurrentEditUpdatedHdl, Edit&, void); public: explicit MMCurrentEntryController(const uno::Reference<uno::XComponentContext>& rContext) @@ -106,7 +106,7 @@ class MMExcludeEntryController : public svt::ToolboxController, public lang::XSe { VclPtr<CheckBox> m_pExcludeCheckbox; - DECL_STATIC_LINK_TYPED(MMExcludeEntryController, ExcludeHdl, CheckBox&, void); + DECL_STATIC_LINK(MMExcludeEntryController, ExcludeHdl, CheckBox&, void); public: explicit MMExcludeEntryController(const uno::Reference<uno::XComponentContext>& rContext) @@ -191,7 +191,7 @@ uno::Reference<awt::XWindow> MMCurrentEntryController::createItemWindow(const un return uno::Reference<awt::XWindow>(VCLUnoHelper::GetInterface(m_pCurrentEdit)); } -IMPL_LINK_TYPED(MMCurrentEntryController, CurrentEditUpdatedHdl, Edit&, rEdit, void) +IMPL_LINK(MMCurrentEntryController, CurrentEditUpdatedHdl, Edit&, rEdit, void) { SwView* pView = ::GetActiveView(); std::shared_ptr<SwMailMergeConfigItem> xConfigItem; @@ -262,7 +262,7 @@ uno::Reference<awt::XWindow> MMExcludeEntryController::createItemWindow(const un return uno::Reference<awt::XWindow>(VCLUnoHelper::GetInterface(m_pExcludeCheckbox)); } -IMPL_STATIC_LINK_TYPED(MMExcludeEntryController, ExcludeHdl, CheckBox&, rCheckbox, void) +IMPL_STATIC_LINK(MMExcludeEntryController, ExcludeHdl, CheckBox&, rCheckbox, void) { SwView* pView = ::GetActiveView(); std::shared_ptr<SwMailMergeConfigItem> xConfigItem; diff --git a/sw/source/uibase/dialog/regionsw.cxx b/sw/source/uibase/dialog/regionsw.cxx index df7ae60cf74d..6bd43d628e78 100644 --- a/sw/source/uibase/dialog/regionsw.cxx +++ b/sw/source/uibase/dialog/regionsw.cxx @@ -174,7 +174,7 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq) } } -IMPL_LINK_TYPED( SwWrtShell, InsertRegionDialog, void*, p, void ) +IMPL_LINK( SwWrtShell, InsertRegionDialog, void*, p, void ) { SwSectionData* pSect = static_cast<SwSectionData*>(p); std::unique_ptr<SwSectionData> xSectionData(pSect); diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index 54348396cb19..c443ccfe5763 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -501,7 +501,7 @@ void SwHeaderFooterWin::Select() ExecuteCommand(GetCurItemId()); } -IMPL_LINK_NOARG_TYPED(SwHeaderFooterWin, FadeHandler, Timer *, void) +IMPL_LINK_NOARG(SwHeaderFooterWin, FadeHandler, Timer *, void) { if (m_bIsAppearing && m_nFadeRate > 0) m_nFadeRate -= 25; diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index a7fdc12835a6..a081b8ed19b5 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -430,14 +430,14 @@ void SwPageBreakWin::Fade( bool bFadeIn ) m_aFadeTimer.Start( ); } -IMPL_LINK_NOARG_TYPED(SwPageBreakWin, HideHandler, Menu *, bool) +IMPL_LINK_NOARG(SwPageBreakWin, HideHandler, Menu *, bool) { Fade( false ); return false; } -IMPL_LINK_NOARG_TYPED(SwPageBreakWin, FadeHandler, Timer *, void) +IMPL_LINK_NOARG(SwPageBreakWin, FadeHandler, Timer *, void) { const int TICKS_BEFORE_WE_APPEAR = 10; if ( m_bIsAppearing && m_nDelayAppearing < TICKS_BEFORE_WE_APPEAR ) diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 962755d3ea51..e09dc6ab34cc 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -1965,7 +1965,7 @@ void SwPostItMgr::SetActiveSidebarWin( SwSidebarWin* p) } } -IMPL_LINK_NOARG_TYPED( SwPostItMgr, CalcHdl, void*, void ) +IMPL_LINK_NOARG( SwPostItMgr, CalcHdl, void*, void ) { mnEventId = nullptr; if ( mbLayouting ) diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx index 9a21fe6522c5..5ec2a0580d8a 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx @@ -362,7 +362,7 @@ void SidebarTextControl::MouseButtonUp( const MouseEvent& rMEvt ) GetTextView()->MouseButtonUp( rMEvt ); } -IMPL_LINK_TYPED( SidebarTextControl, OnlineSpellCallback, SpellCallbackInfo&, rInfo, void ) +IMPL_LINK( SidebarTextControl, OnlineSpellCallback, SpellCallbackInfo&, rInfo, void ) { if ( rInfo.nCommand == SpellCallbackCommand::STARTSPELLDLG ) { diff --git a/sw/source/uibase/docvw/SidebarTxtControl.hxx b/sw/source/uibase/docvw/SidebarTxtControl.hxx index e290a87c2d2e..f6e49a4d508a 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.hxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.hxx @@ -64,7 +64,7 @@ class SidebarTextControl : public Control OutlinerView* GetTextView() const; - DECL_LINK_TYPED( OnlineSpellCallback, SpellCallbackInfo&, void ); + DECL_LINK( OnlineSpellCallback, SpellCallbackInfo&, void ); virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx index 87f30a65ee21..ffc62edf5049 100644 --- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx @@ -55,7 +55,7 @@ class SidebarTextEditSource : public SvxEditSource, virtual void UpdateData() override; virtual SfxBroadcaster& GetBroadcaster() const override; - DECL_LINK_TYPED( NotifyHdl, EENotify&, void ); + DECL_LINK( NotifyHdl, EENotify&, void ); private: SidebarTextControl& mrSidebarTextControl; @@ -113,7 +113,7 @@ SfxBroadcaster& SidebarTextEditSource::GetBroadcaster() const return *( const_cast< SidebarTextEditSource* > (this) ); } -IMPL_LINK_TYPED(SidebarTextEditSource, NotifyHdl, EENotify&, rNotify, void) +IMPL_LINK(SidebarTextEditSource, NotifyHdl, EENotify&, rNotify, void) { std::unique_ptr< SfxHint > aHint( SvxEditSourceHelper::EENotification2Hint( &rNotify ) ); diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index c1560832a43d..cbccdcc21a1f 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -1360,7 +1360,7 @@ void SwSidebarWin::SwitchToPostIt(sal_uInt16 aDirection) pPostIt->GrabFocus(); } -IMPL_LINK_TYPED( SwSidebarWin, WindowEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( SwSidebarWin, WindowEventListener, VclWindowEvent&, rEvent, void ) { if ( rEvent.GetId() == VCLEVENT_WINDOW_MOUSEMOVE ) { @@ -1417,18 +1417,18 @@ void SwSidebarWin::Delete() } } -IMPL_LINK_TYPED(SwSidebarWin, ScrollHdl, ScrollBar*, pScroll, void) +IMPL_LINK(SwSidebarWin, ScrollHdl, ScrollBar*, pScroll, void) { long nDiff = GetOutlinerView()->GetEditView().GetVisArea().Top() - pScroll->GetThumbPos(); GetOutlinerView()->Scroll( 0, nDiff ); } -IMPL_LINK_NOARG_TYPED(SwSidebarWin, ModifyHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(SwSidebarWin, ModifyHdl, LinkParamNone*, void) { mrView.GetDocShell()->SetModified(); } -IMPL_LINK_NOARG_TYPED(SwSidebarWin, DeleteHdl, void*, void) +IMPL_LINK_NOARG(SwSidebarWin, DeleteHdl, void*, void) { mnEventId = nullptr; Delete(); diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx index f38daa7324a9..4a496dacba7d 100644 --- a/sw/source/uibase/docvw/edtdd.cxx +++ b/sw/source/uibase/docvw/edtdd.cxx @@ -476,7 +476,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt ) return DND_ACTION_NONE; } -IMPL_LINK_NOARG_TYPED(SwEditWin, DDHandler, Timer *, void) +IMPL_LINK_NOARG(SwEditWin, DDHandler, Timer *, void) { g_bDDTimerStarted = false; m_aTimer.Stop(); diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index bf319f586943..a32e294d42f4 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -625,7 +625,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier ) /** * Increase timer for selection */ -IMPL_LINK_NOARG_TYPED(SwEditWin, TimerHandler, Timer *, void) +IMPL_LINK_NOARG(SwEditWin, TimerHandler, Timer *, void) { SwWrtShell &rSh = m_rView.GetWrtShell(); Point aModPt( m_aMovePos ); @@ -5907,12 +5907,12 @@ static SfxShell* lcl_GetTextShellFromDispatcher( SwView& rView ) return pShell; } -IMPL_LINK_NOARG_TYPED(SwEditWin, KeyInputFlushHandler, Timer *, void) +IMPL_LINK_NOARG(SwEditWin, KeyInputFlushHandler, Timer *, void) { FlushInBuffer(); } -IMPL_LINK_NOARG_TYPED(SwEditWin, KeyInputTimerHandler, Timer *, void) +IMPL_LINK_NOARG(SwEditWin, KeyInputTimerHandler, Timer *, void) { m_bTableInsDelMode = false; } @@ -5934,7 +5934,7 @@ void SwEditWin::StopQuickHelp() m_pQuickHlpData->Stop( m_rView.GetWrtShell() ); } -IMPL_LINK_NOARG_TYPED(SwEditWin, TemplateTimerHdl, Idle *, void) +IMPL_LINK_NOARG(SwEditWin, TemplateTimerHdl, Idle *, void) { SetApplyTemplate(SwApplyTemplate()); } diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 6b34e90133e9..4998f49882db 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -573,7 +573,7 @@ void SwSrcEditWindow::InitScrollBars() } -IMPL_LINK_TYPED(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll, void) +IMPL_LINK(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll, void) { if(pScroll == m_pVScrollbar) { @@ -592,7 +592,7 @@ IMPL_LINK_TYPED(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll, void) GetSrcView()->GetViewFrame()->GetBindings().Invalidate( SID_TABLE_CELL ); } -IMPL_LINK_TYPED( SwSrcEditWindow, SyntaxTimerHdl, Idle *, pIdle, void ) +IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Idle *, pIdle, void ) { tools::Time aSyntaxCheckStart( tools::Time::SYSTEM ); SAL_WARN_IF(m_pTextView == nullptr, "sw", "No View yet, but syntax highlighting?!"); diff --git a/sw/source/uibase/envelp/syncbtn.cxx b/sw/source/uibase/envelp/syncbtn.cxx index 8a446b80af98..1237d50a3076 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_STATIC_LINK_NOARG_TYPED(SwSyncBtnDlg, BtnHdl, Button*, void) +IMPL_STATIC_LINK_NOARG(SwSyncBtnDlg, BtnHdl, Button*, void) { SfxViewFrame::Current()->GetDispatcher()->Execute(FN_UPDATE_ALL_LINKS, SfxCallMode::ASYNCHRON); } diff --git a/sw/source/uibase/fldui/fldwrap.cxx b/sw/source/uibase/fldui/fldwrap.cxx index 5c35092b4cdb..f2fee6e4c260 100644 --- a/sw/source/uibase/fldui/fldwrap.cxx +++ b/sw/source/uibase/fldui/fldwrap.cxx @@ -46,7 +46,7 @@ SwChildWinWrapper::SwChildWinWrapper(vcl::Window *pParentWindow, sal_uInt16 nId) m_aUpdateTimer.SetTimeoutHdl(LINK(this, SwChildWinWrapper, UpdateHdl)); } -IMPL_LINK_NOARG_TYPED(SwChildWinWrapper, UpdateHdl, Timer *, void) +IMPL_LINK_NOARG(SwChildWinWrapper, UpdateHdl, Timer *, void) { GetWindow()->Activate(); // update dialog } diff --git a/sw/source/uibase/inc/DropDownFieldDialog.hxx b/sw/source/uibase/inc/DropDownFieldDialog.hxx index 7b18b6bc918c..d670afb55c70 100644 --- a/sw/source/uibase/inc/DropDownFieldDialog.hxx +++ b/sw/source/uibase/inc/DropDownFieldDialog.hxx @@ -43,9 +43,9 @@ class DropDownFieldDialog : public SvxStandardDialog SwWrtShell &rSh; SwDropDownField* pDropField; - DECL_LINK_TYPED(ButtonHdl, Button*, void); + DECL_LINK(ButtonHdl, Button*, void); virtual void Apply() override; - DECL_LINK_TYPED(DoubleClickHdl, ListBox&, void); + DECL_LINK(DoubleClickHdl, ListBox&, void); public: DropDownFieldDialog( vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton ); diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx index 9a451b9a0bdf..6e9fec7be6a1 100644 --- a/sw/source/uibase/inc/HeaderFooterWin.hxx +++ b/sw/source/uibase/inc/HeaderFooterWin.hxx @@ -50,7 +50,7 @@ public: void SetReadonly( bool bReadonly ) override; private: - DECL_LINK_TYPED( FadeHandler, Timer *, void ); + DECL_LINK( FadeHandler, Timer *, void ); }; #endif diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx index 8d2ff93610ae..0f2e7dc8a04f 100644 --- a/sw/source/uibase/inc/PageBreakWin.hxx +++ b/sw/source/uibase/inc/PageBreakWin.hxx @@ -53,8 +53,8 @@ public: private: /// Hide the button (used when the popup menu is closed by clicking outside) - DECL_LINK_TYPED( HideHandler, Menu *, bool ); - DECL_LINK_TYPED( FadeHandler, Timer *, void ); + DECL_LINK( HideHandler, Menu *, bool ); + DECL_LINK( FadeHandler, Timer *, void ); }; #endif diff --git a/sw/source/uibase/inc/ascfldlg.hxx b/sw/source/uibase/inc/ascfldlg.hxx index c85a0ca5fff3..99fbba32833f 100644 --- a/sw/source/uibase/inc/ascfldlg.hxx +++ b/sw/source/uibase/inc/ascfldlg.hxx @@ -42,8 +42,8 @@ class SwAsciiFilterDlg : public SfxModalDialog VclPtr<RadioButton> m_pLF_RB; bool m_bSaveLineStatus; - DECL_LINK_TYPED( CharSetSelHdl, ListBox&, void ); - DECL_LINK_TYPED( LineEndHdl, RadioButton&, void ); + DECL_LINK( CharSetSelHdl, ListBox&, void ); + DECL_LINK( LineEndHdl, RadioButton&, void ); void SetCRLF( LineEnd eEnd ); LineEnd GetCRLF() const; diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx index 694ccc47ec7d..52133ede7095 100644 --- a/sw/source/uibase/inc/basesh.hxx +++ b/sw/source/uibase/inc/basesh.hxx @@ -50,7 +50,7 @@ class SwBaseShell: public SfxShell // Update-Timer for graphic std::set<sal_uInt16> aGrfUpdateSlots; - DECL_LINK_TYPED( GraphicArrivedHdl, SwCursorShell&, void ); + DECL_LINK( GraphicArrivedHdl, SwCursorShell&, void ); protected: SwWrtShell& GetShell(); @@ -60,7 +60,7 @@ protected: inline void SetGetStateSet( SfxItemSet* p ) { pGetStateSet = p; } inline bool AddGrfUpdateSlot( sal_uInt16 nSlot ){ return aGrfUpdateSlots.insert( nSlot ).second; } - DECL_LINK_TYPED( InsertDBTextHdl, void*, void ); + DECL_LINK( InsertDBTextHdl, void*, void ); void InsertURLButton( const OUString& rURL, const OUString& rTarget, const OUString& rText ); void InsertTable( SfxRequest& _rRequest ); diff --git a/sw/source/uibase/inc/bookmark.hxx b/sw/source/uibase/inc/bookmark.hxx index c7fbd5c5b53b..9d6d471222d9 100644 --- a/sw/source/uibase/inc/bookmark.hxx +++ b/sw/source/uibase/inc/bookmark.hxx @@ -63,13 +63,13 @@ class SwInsertBookmarkDlg: public SvxStandardDialog std::vector<std::pair<sw::mark::IMark*, OUString>> aTableBookmarks; sal_Int32 m_nLastBookmarksCount; - DECL_LINK_TYPED(ModifyHdl, Edit&, void); - DECL_LINK_TYPED(InsertHdl, Button*, void); - DECL_LINK_TYPED(DeleteHdl, Button*, void); - DECL_LINK_TYPED(RenameHdl, Button*, void); - DECL_LINK_TYPED(GotoHdl, Button*, void); - DECL_LINK_TYPED(SelectionChangedHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(DoubleClickHdl, SvTreeListBox*, bool); + DECL_LINK(ModifyHdl, Edit&, void); + DECL_LINK(InsertHdl, Button*, void); + DECL_LINK(DeleteHdl, Button*, void); + DECL_LINK(RenameHdl, Button*, void); + DECL_LINK(GotoHdl, Button*, void); + DECL_LINK(SelectionChangedHdl, SvTreeListBox*, void); + DECL_LINK(DoubleClickHdl, SvTreeListBox*, bool); // Fill table with bookmarks void PopulateTable(); diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx index e77362b66603..822e0e436bde 100644 --- a/sw/source/uibase/inc/break.hxx +++ b/sw/source/uibase/inc/break.hxx @@ -51,11 +51,11 @@ class SwBreakDlg: public SvxStandardDialog bool bHtmlMode; - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( PageNumHdl, Button*, void ); - DECL_LINK_TYPED(PageNumModifyHdl, Edit&, void); - DECL_LINK_TYPED(OkHdl, Button*, void); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( PageNumHdl, Button*, void ); + DECL_LINK(PageNumModifyHdl, Edit&, void); + DECL_LINK(OkHdl, Button*, void); void CheckEnable(); diff --git a/sw/source/uibase/inc/changedb.hxx b/sw/source/uibase/inc/changedb.hxx index cc742de2f208..0696c1ff456f 100644 --- a/sw/source/uibase/inc/changedb.hxx +++ b/sw/source/uibase/inc/changedb.hxx @@ -45,9 +45,9 @@ class SwChangeDBDlg: public SvxStandardDialog SwWrtShell *pSh; - DECL_LINK_TYPED(TreeSelectHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(ButtonHdl, Button*, void); - DECL_LINK_TYPED(AddDBHdl, Button*, void); + DECL_LINK(TreeSelectHdl, SvTreeListBox*, void); + DECL_LINK(ButtonHdl, Button*, void); + DECL_LINK(AddDBHdl, Button*, void); virtual void Apply() override; void UpdateFields(); diff --git a/sw/source/uibase/inc/chldwrap.hxx b/sw/source/uibase/inc/chldwrap.hxx index ac457f1f8a31..7f0b46e4f13e 100644 --- a/sw/source/uibase/inc/chldwrap.hxx +++ b/sw/source/uibase/inc/chldwrap.hxx @@ -29,7 +29,7 @@ class SwChildWinWrapper : public SfxChildWindow Timer m_aUpdateTimer; SwDocShell* m_pDocSh; - DECL_LINK_TYPED( UpdateHdl, Timer*, void ); + DECL_LINK( UpdateHdl, Timer*, void ); // Implementation in fldtdlg.cxx protected: diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index 97534091109f..5a955aa3dd60 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -70,8 +70,8 @@ class SwCharURLPage : public SfxTabPage SvxMacroItem* pINetItem; bool bModified; - DECL_LINK_TYPED(InsertFileHdl, Button*, void); - DECL_LINK_TYPED(EventHdl, Button*, void); + DECL_LINK(InsertFileHdl, Button*, void); + DECL_LINK(EventHdl, Button*, void); public: SwCharURLPage( vcl::Window* pParent, diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 446221c6681e..bbaaef6cad08 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -60,8 +60,8 @@ class SwColumnDlg : public SfxModalDialog bool bSelSectionChanged : 1; bool bFrameChanged : 1; - DECL_LINK_TYPED(ObjectListBoxHdl, ListBox&, void); - DECL_LINK_TYPED(OkHdl, Button*, void); + DECL_LINK(ObjectListBoxHdl, ListBox&, void); + DECL_LINK(OkHdl, Button*, void); void ObjectHdl(ListBox*); public: @@ -135,17 +135,17 @@ class SwColumnPage : public SfxTabPage bool m_bLockUpdate; // Handler - DECL_LINK_TYPED( ColModify, Edit&, void ); + DECL_LINK( ColModify, Edit&, void ); void ColModify(NumericField*); - DECL_LINK_TYPED( GapModify, Edit&, void ); - DECL_LINK_TYPED( EdModify, Edit&, void ); - DECL_LINK_TYPED( AutoWidthHdl, Button *, void ); - DECL_LINK_TYPED( SetDefaultsHdl, ValueSet *, void ); - - DECL_LINK_TYPED( Up, Button *, void ); - DECL_LINK_TYPED( Down, Button *, void ); - DECL_LINK_TYPED( UpdateColMgr, Edit&, void ); - DECL_LINK_TYPED( UpdateColMgrListBox, ListBox&, void ); + DECL_LINK( GapModify, Edit&, void ); + DECL_LINK( EdModify, Edit&, void ); + DECL_LINK( AutoWidthHdl, Button *, void ); + DECL_LINK( SetDefaultsHdl, ValueSet *, void ); + + DECL_LINK( Up, Button *, void ); + DECL_LINK( Down, Button *, void ); + DECL_LINK( UpdateColMgr, Edit&, void ); + DECL_LINK( UpdateColMgrListBox, ListBox&, void ); void Timeout(); void Update(MetricField *pInteractiveField); diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index 3138f90c873c..9598b76e6999 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -212,8 +212,8 @@ public: const SwWrtShell* GetActiveWrtShell() {return m_pActiveShell;} SwWrtShell* GetHiddenWrtShell() {return m_pHiddenShell;} - DECL_LINK_TYPED( ContentDoubleClickHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( TimerUpdate, Timer *, void ); + DECL_LINK( ContentDoubleClickHdl, SvTreeListBox*, bool ); + DECL_LINK( TimerUpdate, Timer *, void ); virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) override; virtual void RequestingChildren( SvTreeListEntry* pParent ) override; @@ -269,7 +269,7 @@ private: void InsertRegion( const SwGlblDocContent* _pContent, const css::uno::Sequence< OUString >& _rFiles ); - DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); + DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void ); using SvTreeListBox::DoubleClickHdl; using SvTreeListBox::ExecuteDrop; @@ -312,9 +312,9 @@ protected: void Clear(); - DECL_LINK_TYPED( PopupHdl, Menu*, bool ); - DECL_LINK_TYPED( Timeout, Timer*, void ); - DECL_LINK_TYPED( DoubleClickHdl, SvTreeListBox*, bool ); + DECL_LINK( PopupHdl, Menu*, bool ); + DECL_LINK( Timeout, Timer*, void ); + DECL_LINK( DoubleClickHdl, SvTreeListBox*, bool ); SwNavigationPI* GetParentWindow(); @@ -324,7 +324,7 @@ protected: static const SfxObjectShell* GetShowShell() {return pShowShell;} static void SetShowShell(const SfxObjectShell*pSet) {pShowShell = pSet;} - DECL_STATIC_LINK_TYPED(SwGlobalTree, ShowFrameHdl, void*, void); + DECL_STATIC_LINK(SwGlobalTree, ShowFrameHdl, void*, void); virtual VclPtr<PopupMenu> CreateContextMenu() override; virtual void ExecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) override; diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx index d8bfbebd406b..d28bd47cc4b8 100644 --- a/sw/source/uibase/inc/convert.hxx +++ b/sw/source/uibase/inc/convert.hxx @@ -55,10 +55,10 @@ class SwConvertTableDlg: public SfxModalDialog SwTableAutoFormat* pTAutoFormat; SwWrtShell* pShell; - DECL_LINK_TYPED( AutoFormatHdl, Button*, void ); - DECL_LINK_TYPED( BtnHdl, Button*, void ); - DECL_LINK_TYPED( CheckBoxHdl, Button* = nullptr, void ); - DECL_LINK_TYPED( ReapeatHeaderCheckBoxHdl, Button* = nullptr, void ); + DECL_LINK( AutoFormatHdl, Button*, void ); + DECL_LINK( BtnHdl, Button*, void ); + DECL_LINK( CheckBoxHdl, Button* = nullptr, void ); + DECL_LINK( ReapeatHeaderCheckBoxHdl, Button* = nullptr, void ); public: SwConvertTableDlg( SwView& rView, bool bToTable ); diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx index 36b5d2c98226..75d664c1a60d 100644 --- a/sw/source/uibase/inc/cption.hxx +++ b/sw/source/uibase/inc/cption.hxx @@ -93,11 +93,11 @@ class SwCaptionDialog : public SvxStandardDialog css::uno::Reference< css::container::XNameAccess > xNameAccess; - DECL_LINK_TYPED(SelectHdl, ComboBox&, void); - DECL_LINK_TYPED(SelectListBoxHdl, ListBox&, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); - DECL_LINK_TYPED(OptionHdl, Button *, void); - DECL_LINK_TYPED(CaptionHdl, Button *, void); + DECL_LINK(SelectHdl, ComboBox&, void); + DECL_LINK(SelectListBoxHdl, ListBox&, void); + DECL_LINK(ModifyHdl, Edit&, void); + DECL_LINK(OptionHdl, Button *, void); + DECL_LINK(CaptionHdl, Button *, void); virtual void Apply() override; diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx index d7d9bf953d79..ef71b6492e9e 100644 --- a/sw/source/uibase/inc/dbinsdlg.hxx +++ b/sw/source/uibase/inc/dbinsdlg.hxx @@ -132,14 +132,14 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem SwTableRep* pRep; sal_Int32 nGBFormatLen; - DECL_LINK_TYPED( PageHdl, Button*, void ); - DECL_LINK_TYPED( AutoFormatHdl, Button*, void ); - DECL_LINK_TYPED( TableFormatHdl, Button*, void ); - DECL_LINK_TYPED( DBFormatHdl, Button*, void ); - DECL_LINK_TYPED( TableToFromHdl, Button*, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( DblClickHdl, ListBox&, void ); - DECL_LINK_TYPED( HeaderHdl, Button*, void ); + DECL_LINK( PageHdl, Button*, void ); + DECL_LINK( AutoFormatHdl, Button*, void ); + DECL_LINK( TableFormatHdl, Button*, void ); + DECL_LINK( DBFormatHdl, Button*, void ); + DECL_LINK( TableToFromHdl, Button*, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( DblClickHdl, ListBox&, void ); + DECL_LINK( HeaderHdl, Button*, void ); bool SplitTextToColArr( const OUString& rText, DB_Columns& rColArr, bool bInsField ); using SfxModalDialog::Notify; diff --git a/sw/source/uibase/inc/dbtree.hxx b/sw/source/uibase/inc/dbtree.hxx index a12a0f7fddb5..fb94bc51aa86 100644 --- a/sw/source/uibase/inc/dbtree.hxx +++ b/sw/source/uibase/inc/dbtree.hxx @@ -37,7 +37,7 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox SwDBTreeList_Impl* pImpl; - DECL_DLLPRIVATE_LINK_TYPED( DBCompare, const SvSortData&, sal_Int32 ); + DECL_DLLPRIVATE_LINK( DBCompare, const SvSortData&, sal_Int32 ); SAL_DLLPRIVATE void InitTreeList(); SAL_DLLPRIVATE virtual void RequestingChildren( SvTreeListEntry* pParent ) override; diff --git a/sw/source/uibase/inc/docfnote.hxx b/sw/source/uibase/inc/docfnote.hxx index 3a66f8bc4637..61393659cc51 100644 --- a/sw/source/uibase/inc/docfnote.hxx +++ b/sw/source/uibase/inc/docfnote.hxx @@ -33,7 +33,7 @@ class SwFootNoteOptionDlg :public SfxTabDialog virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; - DECL_LINK_TYPED( OkHdl, Button *, void ); + DECL_LINK( OkHdl, Button *, void ); public: SwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rSh ); diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx index ef9505685598..a238c1c2b7f1 100644 --- a/sw/source/uibase/inc/docstdlg.hxx +++ b/sw/source/uibase/inc/docstdlg.hxx @@ -40,7 +40,7 @@ protected: virtual bool FillItemSet( SfxItemSet *rSet) override; virtual void Reset (const SfxItemSet *rSet) override; - DECL_LINK_TYPED(UpdateHdl, Button*, void); + DECL_LINK(UpdateHdl, Button*, void); private: VclPtr<FixedText> m_pPageNo; diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index ca92eb943f5f..c5e698b926f3 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -69,10 +69,10 @@ friend class SwDropCapsPict; virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; void FillSet( SfxItemSet &rSet ); - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( WholeWordHdl, Button*, void ); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( WholeWordHdl, Button*, void ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; diff --git a/sw/source/uibase/inc/drwbassh.hxx b/sw/source/uibase/inc/drwbassh.hxx index 9ae0f9fd28a3..65565443dd66 100644 --- a/sw/source/uibase/inc/drwbassh.hxx +++ b/sw/source/uibase/inc/drwbassh.hxx @@ -30,8 +30,8 @@ struct SvxSwFrameValidation; class SwDrawBaseShell: public SwBaseShell { - DECL_LINK_TYPED( CheckGroupShapeNameHdl, AbstractSvxObjectNameDialog&, bool ); - DECL_LINK_TYPED(ValidatePosition, SvxSwFrameValidation&, void ); + DECL_LINK( CheckGroupShapeNameHdl, AbstractSvxObjectNameDialog&, bool ); + DECL_LINK(ValidatePosition, SvxSwFrameValidation&, void ); public: SwDrawBaseShell(SwView &rShell); virtual ~SwDrawBaseShell() override; diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index a988735e88ac..bc390609a41b 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -167,19 +167,19 @@ friend void PageNumNotify( SwViewShell* pVwSh, * The selection is regularly increased towards the mouse * position. */ - DECL_LINK_TYPED( TimerHandler, Timer *, void ); + DECL_LINK( TimerHandler, Timer *, void ); void StartDDTimer(); void StopDDTimer(SwWrtShell *, const Point &); - DECL_LINK_TYPED( DDHandler, Timer *, void ); + DECL_LINK( DDHandler, Timer *, void ); // timer for ANY-KeyInut question without a following KeyInputEvent - DECL_LINK_TYPED( KeyInputFlushHandler, Timer *, void ); + DECL_LINK( KeyInputFlushHandler, Timer *, void ); // timer for overlapping KeyInputs (e.g. for tables) - DECL_LINK_TYPED( KeyInputTimerHandler, Timer *, void ); + DECL_LINK( KeyInputTimerHandler, Timer *, void ); // timer for ApplyTemplates via mouse (in disguise Drag&Drop) - DECL_LINK_TYPED( TemplateTimerHdl, Idle *, void ); + DECL_LINK( TemplateTimerHdl, Idle *, void ); void MoveCursor( SwWrtShell &rSh, const Point& rDocPos, const bool bOnlyText, bool bLockView ); diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 33edd2b73acb..d454715ec010 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -90,9 +90,9 @@ class SwEnvPage : public SfxTabPage SwWrtShell* pSh; OUString sActDBName; - DECL_LINK_TYPED( DatabaseHdl, ListBox&, void ); - DECL_LINK_TYPED(FieldHdl, Button*, void ); - DECL_LINK_TYPED(SenderHdl, Button*, void ); + DECL_LINK( DatabaseHdl, ListBox&, void ); + DECL_LINK(FieldHdl, Button*, void ); + DECL_LINK(SenderHdl, Button*, void ); void InitDatabaseBox(); diff --git a/sw/source/uibase/inc/fldedt.hxx b/sw/source/uibase/inc/fldedt.hxx index 7673e6231e59..54e8b05df01a 100644 --- a/sw/source/uibase/inc/fldedt.hxx +++ b/sw/source/uibase/inc/fldedt.hxx @@ -32,8 +32,8 @@ class SwFieldEditDlg : public SfxSingleTabDialog VclPtr<PushButton> m_pNextBT; VclPtr<PushButton> m_pAddressBT; - DECL_LINK_TYPED(AddressHdl, Button *, void); - DECL_LINK_TYPED(NextPrevHdl, Button *, void); + DECL_LINK(AddressHdl, Button *, void); + DECL_LINK(NextPrevHdl, Button *, void); void Init(); VclPtr<SfxTabPage> CreatePage(sal_uInt16 nGroup); @@ -45,7 +45,7 @@ public: virtual ~SwFieldEditDlg() override; virtual void dispose() override; - DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); virtual short Execute() override; diff --git a/sw/source/uibase/inc/fldtdlg.hxx b/sw/source/uibase/inc/fldtdlg.hxx index fd4de61d23c2..59972d880000 100644 --- a/sw/source/uibase/inc/fldtdlg.hxx +++ b/sw/source/uibase/inc/fldtdlg.hxx @@ -50,8 +50,8 @@ public: SwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent); virtual ~SwFieldDlg() override; - DECL_LINK_TYPED(OKHdl, Button*, void); - DECL_LINK_TYPED(CancelHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); + DECL_LINK(CancelHdl, Button*, void); void Initialize(SfxChildWinInfo *pInfo); void ReInitDlg(); diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 7978ef994198..cd49e402dbad 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -130,26 +130,26 @@ class SwFramePage: public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; - DECL_LINK_TYPED(RangeModifyLoseFocusHdl, Control&, void); - DECL_LINK_TYPED(RangeModifyClickHdl, Button*, void); + DECL_LINK(RangeModifyLoseFocusHdl, Control&, void); + DECL_LINK(RangeModifyClickHdl, Button*, void); void RangeModifyHdl(); - DECL_LINK_TYPED(AnchorTypeHdl, Button*, void); - DECL_LINK_TYPED( PosHdl, ListBox&, void ); - DECL_LINK_TYPED( RelHdl, ListBox&, void ); + DECL_LINK(AnchorTypeHdl, Button*, void); + DECL_LINK( PosHdl, ListBox&, void ); + DECL_LINK( RelHdl, ListBox&, void ); void InitPos(RndStdIds eId, sal_Int16 nH, sal_Int16 nHRel, sal_Int16 nV, sal_Int16 nVRel, long nX, long nY); - DECL_LINK_TYPED(RealSizeHdl, Button *, void); - DECL_LINK_TYPED( RelSizeClickHdl, Button *, void ); - DECL_LINK_TYPED(MirrorHdl, Button *, void); + DECL_LINK(RealSizeHdl, Button *, void); + DECL_LINK( RelSizeClickHdl, Button *, void ); + DECL_LINK(MirrorHdl, Button *, void); - DECL_LINK_TYPED( AutoWidthClickHdl, Button *, void); - DECL_LINK_TYPED( AutoHeightClickHdl, Button *, void); + DECL_LINK( AutoWidthClickHdl, Button *, void); + DECL_LINK( AutoHeightClickHdl, Button *, void); // update example void UpdateExample(); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); void Init(const SfxItemSet& rSet, bool bReset = false); // OD 12.11.2003 #i22341# - adjustment to handle maps, that are ambigous @@ -223,8 +223,8 @@ class SwGrfExtPage: public SfxTabPage bool bHtmlMode; // handler for mirroring - DECL_LINK_TYPED(MirrorHdl, Button*, void); - DECL_LINK_TYPED(BrowseHdl, Button*, void); + DECL_LINK(MirrorHdl, Button*, void); + DECL_LINK(BrowseHdl, Button*, void); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual ~SwGrfExtPage() override; @@ -255,7 +255,7 @@ class SwFrameURLPage : public SfxTabPage VclPtr<CheckBox> pServerCB; VclPtr<CheckBox> pClientCB; - DECL_LINK_TYPED(InsertFileHdl, Button*, void); + DECL_LINK(InsertFileHdl, Button*, void); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -304,8 +304,8 @@ class SwFrameAddPage : public SfxTabPage bool m_bFormat; bool m_bNew; - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); - DECL_LINK_TYPED(ChainModifyHdl, ListBox&, void); + DECL_LINK(EditModifyHdl, Edit&, void); + DECL_LINK(ChainModifyHdl, ListBox&, void); static const sal_uInt16 aAddPgRg[]; diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx index 34cf12a19cda..eb2ca5888665 100644 --- a/sw/source/uibase/inc/glosbib.hxx +++ b/sw/source/uibase/inc/glosbib.hxx @@ -86,12 +86,12 @@ class SwGlossaryGroupDlg : public SvxStandardDialog protected: virtual void Apply() override; - DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( NewHdl, Button *, void ); - DECL_LINK_TYPED( DeleteHdl, Button*, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( ModifyListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( RenameHdl, Button *, void ); + DECL_LINK( SelectHdl, SvTreeListBox*, void ); + DECL_LINK( NewHdl, Button *, void ); + DECL_LINK( DeleteHdl, Button*, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( ModifyListBoxHdl, ListBox&, void ); + DECL_LINK( RenameHdl, Button *, void ); public: SwGlossaryGroupDlg(vcl::Window * pParent, diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx index bbf7f1fc57e7..9cefe618c554 100644 --- a/sw/source/uibase/inc/glossary.hxx +++ b/sw/source/uibase/inc/glossary.hxx @@ -125,17 +125,17 @@ class SwGlossaryDlg : public SvxStandardDialog void EnableShortName(bool bOn = true); void ShowPreview(); - DECL_LINK_TYPED( NameModify, Edit&, void ); - DECL_LINK_TYPED( NameDoubleClick, SvTreeListBox*, bool ); - DECL_LINK_TYPED( GrpSelect, SvTreeListBox *, void ); - DECL_LINK_TYPED( MenuHdl, Menu *, bool ); - DECL_LINK_TYPED( EnableHdl, Menu *, bool ); - DECL_LINK_TYPED( BibHdl, Button *, void ); - DECL_LINK_TYPED( EditHdl, MenuButton *, void ); - DECL_LINK_TYPED( InsertHdl, Button *, void ); - DECL_LINK_TYPED( PathHdl, Button *, void ); - DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); - DECL_LINK_TYPED( PreviewLoadedHdl, SwOneExampleFrame&, void ); + DECL_LINK( NameModify, Edit&, void ); + DECL_LINK( NameDoubleClick, SvTreeListBox*, bool ); + DECL_LINK( GrpSelect, SvTreeListBox *, void ); + DECL_LINK( MenuHdl, Menu *, bool ); + DECL_LINK( EnableHdl, Menu *, bool ); + DECL_LINK( BibHdl, Button *, void ); + DECL_LINK( EditHdl, MenuButton *, void ); + DECL_LINK( InsertHdl, Button *, void ); + DECL_LINK( PathHdl, Button *, void ); + DECL_LINK( CheckBoxHdl, Button*, void ); + DECL_LINK( PreviewLoadedHdl, SwOneExampleFrame&, void ); virtual void Apply() override; void Init(); diff --git a/sw/source/uibase/inc/inpdlg.hxx b/sw/source/uibase/inc/inpdlg.hxx index 1c75245edf55..505ed6d52958 100644 --- a/sw/source/uibase/inc/inpdlg.hxx +++ b/sw/source/uibase/inc/inpdlg.hxx @@ -49,7 +49,7 @@ class SwFieldInputDlg: public SvxStandardDialog VclPtr<OKButton> m_pOKBT; VclPtr<PushButton> m_pNextBT; - DECL_LINK_TYPED(NextHdl, Button*, void); + DECL_LINK(NextHdl, Button*, void); public: SwFieldInputDlg( vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton ); diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx index 0f999eb61565..8f1249d7800b 100644 --- a/sw/source/uibase/inc/inputwin.hxx +++ b/sw/source/uibase/inc/inputwin.hxx @@ -66,15 +66,15 @@ friend class InputEdit; void CleanupUglyHackWithUndo(); void DelBoxContent(); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); using Window::IsActive; protected: virtual void Resize() override; virtual void Click() override; - DECL_LINK_TYPED( MenuHdl, Menu *, bool ); - DECL_LINK_TYPED( DropdownClickHdl, ToolBox*, void ); + DECL_LINK( MenuHdl, Menu *, bool ); + DECL_LINK( DropdownClickHdl, ToolBox*, void ); void ApplyFormula(); void CancelFormula(); @@ -87,7 +87,7 @@ public: void ShowWin(); - DECL_LINK_TYPED( SelTableCellsNotify, SwWrtShell&, void ); + DECL_LINK( SelTableCellsNotify, SwWrtShell&, void ); void SetFormula( const OUString& rFormula ); const SwView* GetView() const{return pView;} diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx index f8c24464d0ab..9f83638fd88d 100644 --- a/sw/source/uibase/inc/insfnote.hxx +++ b/sw/source/uibase/inc/insfnote.hxx @@ -54,11 +54,11 @@ class SwInsFootNoteDlg: public SvxStandardDialog VclPtr<PushButton> m_pPrevBT; VclPtr<PushButton> m_pNextBT; - DECL_LINK_TYPED(NumberCharHdl, Button *, void); - DECL_LINK_TYPED(NumberEditHdl, Edit&, void); - DECL_LINK_TYPED(NumberAutoBtnHdl, Button *, void); - DECL_LINK_TYPED(NumberExtCharHdl, Button *, void); - DECL_LINK_TYPED(NextPrevHdl, Button *, void); + DECL_LINK(NumberCharHdl, Button *, void); + DECL_LINK(NumberEditHdl, Edit&, void); + DECL_LINK(NumberAutoBtnHdl, Button *, void); + DECL_LINK(NumberExtCharHdl, Button *, void); + DECL_LINK(NextPrevHdl, Button *, void); virtual void Apply() override; diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx index 51523e42b8a5..c1698b02654a 100644 --- a/sw/source/uibase/inc/instable.hxx +++ b/sw/source/uibase/inc/instable.hxx @@ -55,13 +55,13 @@ class SwInsTableDlg : public SfxModalDialog SwTableAutoFormat* pTAutoFormat; sal_Int64 nEnteredValRepeatHeaderNF; - DECL_LINK_TYPED( ModifyName, Edit&, void ); - DECL_LINK_TYPED( ModifyRowCol, Edit&, void ); - DECL_LINK_TYPED( AutoFormatHdl, Button*, void ); - DECL_LINK_TYPED( OKHdl, Button*, void); - DECL_LINK_TYPED( CheckBoxHdl, Button* = nullptr, void); - DECL_LINK_TYPED( ReapeatHeaderCheckBoxHdl, Button* = nullptr, void); - DECL_LINK_TYPED( ModifyRepeatHeaderNF_Hdl, Edit&, void ); + DECL_LINK( ModifyName, Edit&, void ); + DECL_LINK( ModifyRowCol, Edit&, void ); + DECL_LINK( AutoFormatHdl, Button*, void ); + DECL_LINK( OKHdl, Button*, void); + DECL_LINK( CheckBoxHdl, Button* = nullptr, void); + DECL_LINK( ReapeatHeaderCheckBoxHdl, Button* = nullptr, void); + DECL_LINK( ModifyRepeatHeaderNF_Hdl, Edit&, void ); public: SwInsTableDlg( SwView& rView ); diff --git a/sw/source/uibase/inc/javaedit.hxx b/sw/source/uibase/inc/javaedit.hxx index 14d1a4b8ff9c..22b8c4ce7c4f 100644 --- a/sw/source/uibase/inc/javaedit.hxx +++ b/sw/source/uibase/inc/javaedit.hxx @@ -55,12 +55,12 @@ private: SwWrtShell* pSh; sfx2::FileDialogHelper* pFileDlg; - DECL_LINK_TYPED(OKHdl, Button*, void); - DECL_LINK_TYPED(PrevHdl, Button*, void); - DECL_LINK_TYPED(NextHdl, Button*, void); - DECL_LINK_TYPED(RadioButtonHdl, Button*, void); - DECL_LINK_TYPED(InsertFileHdl, Button *, void); - DECL_LINK_TYPED(DlgClosedHdl, sfx2::FileDialogHelper *, void); + DECL_LINK(OKHdl, Button*, void); + DECL_LINK(PrevHdl, Button*, void); + DECL_LINK(NextHdl, Button*, void); + DECL_LINK(RadioButtonHdl, Button*, void); + DECL_LINK(InsertFileHdl, Button *, void); + DECL_LINK(DlgClosedHdl, sfx2::FileDialogHelper *, void); virtual void Apply() override; diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx index 387b2b647197..92dcf8eaf616 100644 --- a/sw/source/uibase/inc/linenum.hxx +++ b/sw/source/uibase/inc/linenum.hxx @@ -48,9 +48,9 @@ private: VclPtr<CheckBox> m_pRestartEachPageCB; VclPtr<CheckBox> m_pNumberingOnCB; VclPtr<CheckBox> m_pNumberingOnFooterHeader; - DECL_LINK_TYPED(OKHdl, Button*, void); - DECL_LINK_TYPED(LineOnOffHdl, Button* = nullptr, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(OKHdl, Button*, void); + DECL_LINK(LineOnOffHdl, Button* = nullptr, void); + DECL_LINK(ModifyHdl, Edit&, void); public: SwLineNumberingDlg(SwView *pVw); diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx index f00b0a55caf0..063712110d89 100644 --- a/sw/source/uibase/inc/mailconfigpage.hxx +++ b/sw/source/uibase/inc/mailconfigpage.hxx @@ -50,9 +50,9 @@ class SwMailConfigPage : public SfxTabPage SwMailMergeConfigItem* m_pConfigItem; - DECL_LINK_TYPED(ReplyToHdl, Button*, void); - DECL_LINK_TYPED(AuthenticationHdl, Button*, void); - DECL_LINK_TYPED(TestHdl, Button*, void); + DECL_LINK(ReplyToHdl, Button*, void); + DECL_LINK(AuthenticationHdl, Button*, void); + DECL_LINK(TestHdl, Button*, void); public: SwMailConfigPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx index cb9b4a20789b..11f5c00ded6e 100644 --- a/sw/source/uibase/inc/mailmergehelper.hxx +++ b/sw/source/uibase/inc/mailmergehelper.hxx @@ -73,7 +73,7 @@ class SW_DLLPUBLIC SwAddressPreview : public vcl::Window virtual void StateChanged( StateChangedType nStateChange ) override; void UpdateScrollBar(); - DECL_LINK_TYPED(ScrollHdl, ScrollBar*,void); + DECL_LINK(ScrollHdl, ScrollBar*,void); public: SwAddressPreview(vcl::Window* pParent, WinBits nStyle); diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index a0d801fb7654..d2a9d2bc2856 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -105,12 +105,12 @@ class SwMailMergeDlg : public SvxStandardDialog OUString m_sSaveFilter; OUString m_sFilename; - DECL_LINK_TYPED( ButtonHdl, Button*, void ); - DECL_LINK_TYPED( InsertPathHdl, Button*, void ); - DECL_LINK_TYPED( OutputTypeHdl, Button*, void ); - DECL_LINK_TYPED( FilenameHdl, Button*, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( SaveTypeHdl, Button*, void ); + DECL_LINK( ButtonHdl, Button*, void ); + DECL_LINK( InsertPathHdl, Button*, void ); + DECL_LINK( OutputTypeHdl, Button*, void ); + DECL_LINK( FilenameHdl, Button*, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( SaveTypeHdl, Button*, void ); virtual void Apply() override; bool ExecQryShell(); diff --git a/sw/source/uibase/inc/multmrk.hxx b/sw/source/uibase/inc/multmrk.hxx index 0134db097567..2d69df0f18af 100644 --- a/sw/source/uibase/inc/multmrk.hxx +++ b/sw/source/uibase/inc/multmrk.hxx @@ -31,7 +31,7 @@ class SwTOXMgr; // insert mark for index entry class SwMultiTOXMarkDlg : public SvxStandardDialog { - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); VclPtr<FixedText> m_pTextFT; VclPtr<ListBox> m_pTOXLB; diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index daeed3fc94f1..7e50ebf19aeb 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -100,18 +100,18 @@ class SwNavigationPI : public vcl::Window, void FillBox(); void MakeMark(); - DECL_LINK_TYPED( DocListBoxSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ToolBoxSelectHdl, ToolBox *, void ); - DECL_LINK_TYPED( ToolBoxClickHdl, ToolBox *, void ); - DECL_LINK_TYPED( ToolBoxDropdownClickHdl, ToolBox*, void ); - DECL_LINK_TYPED( EditAction, NumEditAction&, void ); - DECL_LINK_TYPED( EditGetFocus, Control&, void ); - DECL_LINK_TYPED( DoneLink, SfxPoolItem *, void ); - DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool ); - DECL_LINK_TYPED( ChangePageHdl, Idle*, void ); - DECL_LINK_TYPED( PageEditModifyHdl, SpinField&, void ); - DECL_LINK_TYPED( PopupModeEndHdl, FloatingWindow*, void ); - DECL_LINK_TYPED( ClosePopupWindow, SfxPopupWindow *, void ); + DECL_LINK( DocListBoxSelectHdl, ListBox&, void ); + DECL_LINK( ToolBoxSelectHdl, ToolBox *, void ); + DECL_LINK( ToolBoxClickHdl, ToolBox *, void ); + DECL_LINK( ToolBoxDropdownClickHdl, ToolBox*, void ); + DECL_LINK( EditAction, NumEditAction&, void ); + DECL_LINK( EditGetFocus, Control&, void ); + DECL_LINK( DoneLink, SfxPoolItem *, void ); + DECL_LINK( MenuSelectHdl, Menu *, bool ); + DECL_LINK( ChangePageHdl, Idle*, void ); + DECL_LINK( PageEditModifyHdl, SpinField&, void ); + DECL_LINK( PopupModeEndHdl, FloatingWindow*, void ); + DECL_LINK( ClosePopupWindow, SfxPopupWindow *, void ); void UsePage(); void InitImageList(); diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index 5d98778ee079..a93d2095692e 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -84,23 +84,23 @@ class SwNumPositionTabPage : public SfxTabPage void InitControls(); - DECL_LINK_TYPED( LevelHdl, ListBox&, void ); - DECL_LINK_TYPED(EditModifyHdl, ListBox&, void); - DECL_LINK_TYPED( DistanceHdl, SpinField&, void ); - DECL_LINK_TYPED( DistanceLoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( RelativeHdl, Button*, void ); - DECL_LINK_TYPED(StandardHdl, Button*, void); + DECL_LINK( LevelHdl, ListBox&, void ); + DECL_LINK(EditModifyHdl, ListBox&, void); + DECL_LINK( DistanceHdl, SpinField&, void ); + DECL_LINK( DistanceLoseFocusHdl, Control&, void ); + DECL_LINK( RelativeHdl, Button*, void ); + DECL_LINK(StandardHdl, Button*, void); void InitPosAndSpaceMode(); void ShowControlsDependingOnPosAndSpaceMode(); - DECL_LINK_TYPED(LabelFollowedByHdl_Impl, ListBox&, void); - DECL_LINK_TYPED( ListtabPosHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( ListtabPosFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( AlignAtHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( AlignAtFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( IndentAtHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( IndentAtFocusHdl_Impl, Control&, void ); + DECL_LINK(LabelFollowedByHdl_Impl, ListBox&, void); + DECL_LINK( ListtabPosHdl_Impl, SpinField&, void ); + DECL_LINK( ListtabPosFocusHdl_Impl, Control&, void ); + DECL_LINK( AlignAtHdl_Impl, SpinField&, void ); + DECL_LINK( AlignAtFocusHdl_Impl, Control&, void ); + DECL_LINK( IndentAtHdl_Impl, SpinField&, void ); + DECL_LINK( IndentAtFocusHdl_Impl, Control&, void ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -144,7 +144,7 @@ class SwSvxNumBulletTabDialog : public SfxTabDialog protected: virtual short Ok() override; virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) override; - DECL_LINK_TYPED(RemoveNumberingHdl, Button*, void); + DECL_LINK(RemoveNumberingHdl, Button*, void); public: SwSvxNumBulletTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet, diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index 8214b6ddcb3f..d5c69e645599 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -38,7 +38,7 @@ class SW_DLLPUBLIC NumFormatListBox : public ListBox //to be shown in the number format dialog bool bUseAutomaticLanguage;//determine whether language is automatically assigned - DECL_DLLPRIVATE_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_DLLPRIVATE_LINK( SelectHdl, ListBox&, void ); SAL_DLLPRIVATE double GetDefValue(const short nFormatType) const; SAL_DLLPRIVATE void Init(); diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index 1a2b9dbd18ad..a60dba1c0aa5 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -53,11 +53,11 @@ class SwParagraphNumTabPage : public SfxTabPage bool bModified : 1; bool bCurNumrule : 1; - DECL_LINK_TYPED(NewStartHdl_Impl, Button*, void); - DECL_LINK_TYPED( StyleHdl_Impl, ListBox&,void ); - DECL_LINK_TYPED(LineCountHdl_Impl, Button*, void); - DECL_LINK_TYPED(EditNumStyleHdl_Impl, Button*, void); - DECL_LINK_TYPED(EditNumStyleSelectHdl_Impl, ListBox&, void); + DECL_LINK(NewStartHdl_Impl, Button*, void); + DECL_LINK( StyleHdl_Impl, ListBox&,void ); + DECL_LINK(LineCountHdl_Impl, Button*, void); + DECL_LINK(EditNumStyleHdl_Impl, Button*, void); + DECL_LINK(EditNumStyleSelectHdl_Impl, ListBox&, void); static const sal_uInt16 aPageRg[]; diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx index 27119d3caad7..370abbd660ec 100644 --- a/sw/source/uibase/inc/optcomp.hxx +++ b/sw/source/uibase/inc/optcomp.hxx @@ -50,8 +50,8 @@ private: sal_uLong m_nSavedOptions; // handler - DECL_LINK_TYPED(SelectHdl, ListBox&, void); - DECL_LINK_TYPED(UseAsDefaultHdl, Button*, void); + DECL_LINK(SelectHdl, ListBox&, void); + DECL_LINK(UseAsDefaultHdl, Button*, void); // private methods void InitControls( const SfxItemSet& rSet ); diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index e9ecea4448c4..829008b26a2a 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -59,8 +59,8 @@ private: sal_uInt16 m_nLastTab; sal_Int32 m_nOldLinkMode; - DECL_LINK_TYPED(MetricHdl, ListBox&, void); - DECL_LINK_TYPED(StandardizedPageCountCheckHdl, Button*, void); + DECL_LINK(MetricHdl, ListBox&, void); + DECL_LINK(StandardizedPageCountCheckHdl, Button*, void); public: SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet); @@ -153,12 +153,12 @@ private: SwFieldMgr* pMgr; bool bHTMLMode; - DECL_LINK_TYPED(SelectHdl, ComboBox&, void); - DECL_LINK_TYPED(SelectListBoxHdl, ListBox&, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); - DECL_LINK_TYPED( OrderHdl, ListBox&, void ); - DECL_LINK_TYPED(ShowEntryHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(SaveEntryHdl, SvTreeListBox*, void); + DECL_LINK(SelectHdl, ComboBox&, void); + DECL_LINK(SelectListBoxHdl, ListBox&, void); + DECL_LINK(ModifyHdl, Edit&, void); + DECL_LINK( OrderHdl, ListBox&, void ); + DECL_LINK(ShowEntryHdl, SvTreeListBox*, void); + DECL_LINK(SaveEntryHdl, SvTreeListBox*, void); void DelUserData(); void SetOptions(const sal_uLong nPos, const SwCapObjType eType, const SvGlobalName *pOleId = nullptr); diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index bf7df696d0e4..a76a1fc27f93 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -60,7 +60,7 @@ class SwContentOptPage : public SfxTabPage VclPtr<FixedText> m_pMetricLabel; VclPtr<ListBox> m_pMetricLB; - DECL_LINK_TYPED(VertRulerHdl, Button*, void); + DECL_LINK(VertRulerHdl, Button*, void); public: SwContentOptPage( vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwContentOptPage() override; @@ -105,8 +105,8 @@ class SwAddPrinterTabPage : public SfxTabPage bool bAttrModified; bool bPreview; - DECL_LINK_TYPED(AutoClickHdl, Button*, void); - DECL_LINK_TYPED(SelectHdl, ListBox&, void); + DECL_LINK(AutoClickHdl, Button*, void); + DECL_LINK(SelectHdl, ListBox&, void); public: SwAddPrinterTabPage(vcl::Window* pParent, const SfxItemSet& rSet); @@ -172,10 +172,10 @@ class SwStdFontTabPage : public SfxTabPage OUString m_sScriptAsian; OUString m_sScriptComplex; - DECL_LINK_TYPED(StandardHdl, Button*, void ); - DECL_LINK_TYPED(ModifyHdl, Edit&, void ); - DECL_LINK_TYPED(ModifyHeightHdl, Edit&, void ); - DECL_LINK_TYPED(LoseFocusHdl, Control&, void ); + DECL_LINK(StandardHdl, Button*, void ); + DECL_LINK(ModifyHdl, Edit&, void ); + DECL_LINK(ModifyHeightHdl, Edit&, void ); + DECL_LINK(LoseFocusHdl, Control&, void ); SwStdFontTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwStdFontTabPage() override; @@ -218,7 +218,7 @@ class SwTableOptionsTabPage : public SfxTabPage SwWrtShell* m_pWrtShell; bool m_bHTMLMode; - DECL_LINK_TYPED(CheckBoxHdl, Button*, void); + DECL_LINK(CheckBoxHdl, Button*, void); public: SwTableOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet); @@ -339,9 +339,9 @@ class SwRedlineOptionsTabPage : public SfxTabPage OUString sAuthor; OUString sNone; - DECL_LINK_TYPED(AttribHdl, ListBox&, void); - DECL_LINK_TYPED(ChangedMaskPrevHdl, ListBox&, void); - DECL_LINK_TYPED(ColorHdl, ListBox&, void); + DECL_LINK(AttribHdl, ListBox&, void); + DECL_LINK(ChangedMaskPrevHdl, ListBox&, void); + DECL_LINK(ColorHdl, ListBox&, void); static void InitFontStyle(SvxFontPrevWindow& rExampleWin); @@ -387,7 +387,7 @@ private: bool bAttrModified; void Init(); - DECL_LINK_TYPED(AutoClickHdl, Button*, void); + DECL_LINK(AutoClickHdl, Button*, void); }; #endif // DBG_UTIL @@ -402,8 +402,8 @@ class SwCompareOptionsTabPage : public SfxTabPage VclPtr<NumericField> m_pLenNF; VclPtr<CheckBox> m_pStoreRsidCB; - DECL_LINK_TYPED(ComparisonHdl, Button*, void); - DECL_LINK_TYPED(IgnoreHdl, Button*, void); + DECL_LINK(ComparisonHdl, Button*, void); + DECL_LINK(IgnoreHdl, Button*, void); public: SwCompareOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index a6faad129f4c..0c8701f455aa 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -59,9 +59,9 @@ class SwOutlineTabDialog : public SfxTabDialog bool bModified : 1; protected: - DECL_LINK_TYPED(CancelHdl, Button*, void); - DECL_LINK_TYPED( FormHdl, Button *, void ); - DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool ); + DECL_LINK(CancelHdl, Button*, void); + DECL_LINK( FormHdl, Button *, void ); + DECL_LINK( MenuSelectHdl, Menu *, bool ); virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) override; virtual short Ok() override; @@ -102,14 +102,14 @@ class SwOutlineSettingsTabPage : public SfxTabPage OUString* pCollNames; sal_uInt16 nActLevel; - DECL_LINK_TYPED( LevelHdl, ListBox&, void ); - DECL_LINK_TYPED( ToggleComplete, Edit&, void ); - DECL_LINK_TYPED( CollSelect, ListBox&, void ); - DECL_LINK_TYPED( CollSelectGetFocus, Control&, void ); - DECL_LINK_TYPED( NumberSelect, ListBox&, void ); - DECL_LINK_TYPED( DelimModify, Edit&, void ); - DECL_LINK_TYPED( StartModified, Edit&, void ); - DECL_LINK_TYPED( CharFormatHdl, ListBox&, void ); + DECL_LINK( LevelHdl, ListBox&, void ); + DECL_LINK( ToggleComplete, Edit&, void ); + DECL_LINK( CollSelect, ListBox&, void ); + DECL_LINK( CollSelectGetFocus, Control&, void ); + DECL_LINK( NumberSelect, ListBox&, void ); + DECL_LINK( DelimModify, Edit&, void ); + DECL_LINK( StartModified, Edit&, void ); + DECL_LINK( CharFormatHdl, ListBox&, void ); void Update(); diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index b1f72c8f42cc..4ca6e8d8edc1 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -57,11 +57,11 @@ private: VclPtr<MetricField> m_pLineLengthEdit; VclPtr<MetricField> m_pLineDistEdit; - DECL_LINK_TYPED( HeightPage, Button*, void ); - DECL_LINK_TYPED( HeightMetric, Button*, void ); - DECL_LINK_TYPED( HeightModify, Control&, void ); - DECL_LINK_TYPED( LineWidthChanged_Impl, Edit&, void ); - DECL_LINK_TYPED( LineColorSelected_Impl, ListBox&, void ); + DECL_LINK( HeightPage, Button*, void ); + DECL_LINK( HeightMetric, Button*, void ); + DECL_LINK( HeightModify, Control&, void ); + DECL_LINK( LineWidthChanged_Impl, Edit&, void ); + DECL_LINK( LineColorSelected_Impl, ListBox&, void ); long lMaxHeight; diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index f139b7376667..be73daec9483 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -71,14 +71,14 @@ class SwTextGridPage: public SfxTabPage void PutGridItem(SfxItemSet& rSet); static void SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 nValue ); - DECL_LINK_TYPED(GridTypeHdl, Button*, void); - DECL_LINK_TYPED(CharorLineChangedHdl, SpinField&, void); - DECL_LINK_TYPED(CharorLineLoseFocusdHdl, Control&, void); - DECL_LINK_TYPED(TextSizeChangedHdl, SpinField&, void); - DECL_LINK_TYPED(TextSizeLoseFocusHdl, Control&, void); - DECL_LINK_TYPED(GridModifyHdl, ListBox&, void); - DECL_LINK_TYPED(GridModifyClickHdl, Button*, void); - DECL_LINK_TYPED(DisplayGridHdl, Button*, void); + DECL_LINK(GridTypeHdl, Button*, void); + DECL_LINK(CharorLineChangedHdl, SpinField&, void); + DECL_LINK(CharorLineLoseFocusdHdl, Control&, void); + DECL_LINK(TextSizeChangedHdl, SpinField&, void); + DECL_LINK(TextSizeLoseFocusHdl, Control&, void); + DECL_LINK(GridModifyHdl, ListBox&, void); + DECL_LINK(GridModifyClickHdl, Button*, void); + DECL_LINK(DisplayGridHdl, Button*, void); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index 2ddeee6ac546..4f62b6c1ca58 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -194,8 +194,8 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SAL_DLLPRIVATE Point AlignToPixel(const Point& rPt) const; SAL_DLLPRIVATE void CreateScrollbar( bool bHori); - DECL_DLLPRIVATE_LINK_TYPED(ScrollHdl, ScrollBar*, void); - DECL_DLLPRIVATE_LINK_TYPED(EndScrollHdl, ScrollBar*, void); + DECL_DLLPRIVATE_LINK(ScrollHdl, ScrollBar*, void); + DECL_DLLPRIVATE_LINK(EndScrollHdl, ScrollBar*, void); SAL_DLLPRIVATE bool ChgPage( int eMvMode, bool bUpdateScrollbar = true ); SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) override; diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 7b55dfc1a3cd..ddd7f0007fd6 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -92,16 +92,16 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg Image m_aTableChgd; Image m_aFormatCollSet; - DECL_DLLPRIVATE_LINK_TYPED( AcceptHdl, SvxTPView*, void ); - DECL_DLLPRIVATE_LINK_TYPED( AcceptAllHdl, SvxTPView*, void ); - DECL_DLLPRIVATE_LINK_TYPED( RejectHdl, SvxTPView*, void ); - DECL_DLLPRIVATE_LINK_TYPED( RejectAllHdl, SvxTPView*, void ); - DECL_DLLPRIVATE_LINK_TYPED( UndoHdl, SvxTPView*, void ); - DECL_DLLPRIVATE_LINK_TYPED( DeselectHdl, SvTreeListBox*, void ); - DECL_DLLPRIVATE_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); - DECL_DLLPRIVATE_LINK_TYPED( SelectTimerHdl, Timer*, void ); - DECL_DLLPRIVATE_LINK_TYPED( GotoHdl, Timer*, void ); - DECL_DLLPRIVATE_LINK_TYPED( CommandHdl, SvSimpleTable*, void ); + DECL_DLLPRIVATE_LINK( AcceptHdl, SvxTPView*, void ); + DECL_DLLPRIVATE_LINK( AcceptAllHdl, SvxTPView*, void ); + DECL_DLLPRIVATE_LINK( RejectHdl, SvxTPView*, void ); + DECL_DLLPRIVATE_LINK( RejectAllHdl, SvxTPView*, void ); + DECL_DLLPRIVATE_LINK( UndoHdl, SvxTPView*, void ); + DECL_DLLPRIVATE_LINK( DeselectHdl, SvTreeListBox*, void ); + DECL_DLLPRIVATE_LINK( SelectHdl, SvTreeListBox*, void ); + DECL_DLLPRIVATE_LINK( SelectTimerHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( GotoHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( CommandHdl, SvSimpleTable*, void ); SAL_DLLPRIVATE sal_uInt16 CalcDiff(sal_uInt16 nStart, bool bChild); SAL_DLLPRIVATE void InsertChildren(SwRedlineDataParent *pParent, const SwRangeRedline& rRedln, const sal_uInt16 nAutoFormat); @@ -121,7 +121,7 @@ public: SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer *pBuilder, vcl::Window *pContentArea, bool bAutoFormat = false); virtual ~SwRedlineAcceptDlg(); - DECL_LINK_TYPED( FilterChangedHdl, SvxTPFilter*, void ); + DECL_LINK( FilterChangedHdl, SvxTPFilter*, void ); inline SvxAcceptChgCtr& GetChgCtrl() { return *m_aTabPagesCTRL.get(); } inline bool HasRedlineAutoFormat() const { return m_bRedlnAutoFormat; } diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index e674c491a1bb..8bc5e03e54a8 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -104,26 +104,26 @@ class SwEditRegionDlg : public SfxModalDialog void RecurseList( const SwSectionFormat* pFormat, SvTreeListEntry* pEntry); size_t FindArrPos(const SwSectionFormat* pFormat); - DECL_LINK_TYPED( GetFirstEntryHdl, SvTreeListBox *, void ); - DECL_LINK_TYPED( DeselectHdl, SvTreeListBox *, void ); + DECL_LINK( GetFirstEntryHdl, SvTreeListBox *, void ); + DECL_LINK( DeselectHdl, SvTreeListBox *, void ); - DECL_LINK_TYPED( OkHdl, Button*, void ); - DECL_LINK_TYPED( NameEditHdl, Edit&, void ); - DECL_LINK_TYPED( ConditionEditHdl, Edit&, void ); + DECL_LINK( OkHdl, Button*, void ); + DECL_LINK( NameEditHdl, Edit&, void ); + DECL_LINK( ConditionEditHdl, Edit&, void ); - DECL_LINK_TYPED( ChangePasswdHdl, Button *, void ); - DECL_LINK_TYPED( ChangeProtectHdl, Button *, void ); - DECL_LINK_TYPED( ChangeHideHdl, Button *, void ); + DECL_LINK( ChangePasswdHdl, Button *, void ); + DECL_LINK( ChangeProtectHdl, Button *, void ); + DECL_LINK( ChangeHideHdl, Button *, void ); // #114856# edit in readonly sections - DECL_LINK_TYPED( ChangeEditInReadonlyHdl, Button *, void ); - DECL_LINK_TYPED( ChangeDismissHdl, Button*, void); - DECL_LINK_TYPED( UseFileHdl, Button*, void ); - DECL_LINK_TYPED( FileSearchHdl, Button*, void ); - DECL_LINK_TYPED( OptionsHdl, Button*, void ); - DECL_LINK_TYPED( FileNameHdl, Edit&, void ); - DECL_LINK_TYPED( DDEHdl, Button*, void ); - DECL_LINK_TYPED( DlgClosedHdl, sfx2::FileDialogHelper*, void ); - DECL_LINK_TYPED( SubRegionEventHdl, VclWindowEvent&, void ); + DECL_LINK( ChangeEditInReadonlyHdl, Button *, void ); + DECL_LINK( ChangeDismissHdl, Button*, void); + DECL_LINK( UseFileHdl, Button*, void ); + DECL_LINK( FileSearchHdl, Button*, void ); + DECL_LINK( OptionsHdl, Button*, void ); + DECL_LINK( FileNameHdl, Edit&, void ); + DECL_LINK( DDEHdl, Button*, void ); + DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper*, void ); + DECL_LINK( SubRegionEventHdl, VclWindowEvent&, void ); bool CheckPasswd(CheckBox* pBox = nullptr); @@ -169,14 +169,14 @@ class SwInsertSectionTabPage : public SfxTabPage SwWrtShell* m_pWrtSh; sfx2::DocumentInserter* m_pDocInserter; - DECL_LINK_TYPED( ChangeHideHdl, Button *, void ); - DECL_LINK_TYPED( ChangeProtectHdl, Button *, void ); - DECL_LINK_TYPED( ChangePasswdHdl, Button *, void ); - DECL_LINK_TYPED( NameEditHdl, Edit&, void ); - DECL_LINK_TYPED( UseFileHdl, Button*, void ); - DECL_LINK_TYPED( FileSearchHdl, Button*, void ); - DECL_LINK_TYPED( DDEHdl, Button*, void ); - DECL_LINK_TYPED( DlgClosedHdl, sfx2::FileDialogHelper*, void ); + DECL_LINK( ChangeHideHdl, Button *, void ); + DECL_LINK( ChangeProtectHdl, Button *, void ); + DECL_LINK( ChangePasswdHdl, Button *, void ); + DECL_LINK( NameEditHdl, Edit&, void ); + DECL_LINK( UseFileHdl, Button*, void ); + DECL_LINK( FileSearchHdl, Button*, void ); + DECL_LINK( DDEHdl, Button*, void ); + DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper*, void ); public: SwInsertSectionTabPage(vcl::Window *pParent, const SfxItemSet &rAttrSet); @@ -220,7 +220,7 @@ class SwSectionFootnoteEndTabPage : public SfxTabPage VclPtr<FixedText> m_pEndSuffixFT; VclPtr<Edit> m_pEndSuffixED; - DECL_LINK_TYPED( FootEndHdl, Button*, void ); + DECL_LINK( FootEndHdl, Button*, void ); void ResetState( bool bFootnote, const SwFormatFootnoteEndAtTextEnd& ); public: @@ -241,7 +241,7 @@ class SwSectionIndentTabPage : public SfxTabPage VclPtr<MetricField> m_pAfterMF; VclPtr<SvxParaPrevWindow> m_pPreviewWin; - DECL_LINK_TYPED(IndentModifyHdl, Edit&, void); + DECL_LINK(IndentModifyHdl, Edit&, void); public: SwSectionIndentTabPage( vcl::Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionIndentTabPage() override; diff --git a/sw/source/uibase/inc/selglos.hxx b/sw/source/uibase/inc/selglos.hxx index 32784f684480..0fa5e8a6b058 100644 --- a/sw/source/uibase/inc/selglos.hxx +++ b/sw/source/uibase/inc/selglos.hxx @@ -31,7 +31,7 @@ class SwSelGlossaryDlg : public ModalDialog protected: VclPtr<ListBox> m_pGlosBox; - DECL_LINK_TYPED(DoubleClickHdl, ListBox&, void); + DECL_LINK(DoubleClickHdl, ListBox&, void); public: SwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName); virtual ~SwSelGlossaryDlg() override; diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx index 3e04eb77a7d9..c78199b89b4b 100644 --- a/sw/source/uibase/inc/srcedtw.hxx +++ b/sw/source/uibase/inc/srcedtw.hxx @@ -92,7 +92,7 @@ private: using OutputDevice::SetFont; void SetFont(); - DECL_LINK_TYPED( SyntaxTimerHdl, Idle *, void ); + DECL_LINK( SyntaxTimerHdl, Idle *, void ); using Window::Notify; using Window::Invalidate; @@ -109,7 +109,7 @@ protected: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void); + DECL_LINK(ScrollHdl, ScrollBar*, void); public: SwSrcEditWindow( vcl::Window* pParent, SwSrcView* pParentView ); diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx index d83649eba3a6..c280a917db4e 100644 --- a/sw/source/uibase/inc/srtdlg.hxx +++ b/sw/source/uibase/inc/srtdlg.hxx @@ -77,11 +77,11 @@ class SwSortDlg : public SvxStandardDialog virtual void Apply() override; sal_Unicode GetDelimChar() const; - DECL_LINK_TYPED( CheckHdl, Button*, void ); - DECL_LINK_TYPED( DelimHdl, Button*, void ); - DECL_LINK_TYPED( LanguageListBoxHdl, ListBox&, void ); + DECL_LINK( CheckHdl, Button*, void ); + DECL_LINK( DelimHdl, Button*, void ); + DECL_LINK( LanguageListBoxHdl, ListBox&, void ); void LanguageHdl(ListBox*); - DECL_LINK_TYPED(DelimCharHdl, Button*,void); + DECL_LINK(DelimCharHdl, Button*,void); public: SwSortDlg(vcl::Window * pParent, SwWrtShell &rSh); diff --git a/sw/source/uibase/inc/swrenamexnameddlg.hxx b/sw/source/uibase/inc/swrenamexnameddlg.hxx index cdbfad81251a..af29999fe0c3 100644 --- a/sw/source/uibase/inc/swrenamexnameddlg.hxx +++ b/sw/source/uibase/inc/swrenamexnameddlg.hxx @@ -41,8 +41,8 @@ class SwRenameXNamedDlg : public ModalDialog css::uno::Reference< css::container::XNameAccess > xSecondAccess; css::uno::Reference< css::container::XNameAccess > xThirdAccess; - DECL_LINK_TYPED(OkHdl, Button*, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(OkHdl, Button*, void); + DECL_LINK(ModifyHdl, Edit&, void); public: SwRenameXNamedDlg( vcl::Window* pParent, diff --git a/sw/source/uibase/inc/swruler.hxx b/sw/source/uibase/inc/swruler.hxx index e5adb77b6ff9..824eaca10642 100644 --- a/sw/source/uibase/inc/swruler.hxx +++ b/sw/source/uibase/inc/swruler.hxx @@ -107,7 +107,7 @@ protected: Color GetFadedColor(const Color &rHighColor, const Color &rLowColor); /// Fade timer callback. - DECL_LINK_TYPED(FadeHandler, Timer *, void); + DECL_LINK(FadeHandler, Timer *, void); }; #endif diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index eae1ef00933c..a74362bf8135 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -52,12 +52,12 @@ class SwCondCollPage : public SfxTabPage virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; - DECL_LINK_TYPED( OnOffHdl, Button*, void ); - DECL_LINK_TYPED( AssignRemoveHdl, ListBox&, void); - DECL_LINK_TYPED( AssignRemoveTreeListBoxHdl, SvTreeListBox*, bool); - DECL_LINK_TYPED( AssignRemoveClickHdl, Button*, void); - DECL_LINK_TYPED( SelectTreeListBoxHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( SelectListBoxHdl, ListBox&, void ); + DECL_LINK( OnOffHdl, Button*, void ); + DECL_LINK( AssignRemoveHdl, ListBox&, void); + DECL_LINK( AssignRemoveTreeListBoxHdl, SvTreeListBox*, bool); + DECL_LINK( AssignRemoveClickHdl, Button*, void); + DECL_LINK( SelectTreeListBoxHdl, SvTreeListBox*, void ); + DECL_LINK( SelectListBoxHdl, ListBox&, void ); void AssignRemove(void*); void SelectHdl(void*); diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index f6e6d1dd14c6..aafae34192d2 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -93,8 +93,8 @@ class SwMultiTOXTabDialog : public SfxTabDialog virtual short Ok() override; SwTOXDescription* CreateTOXDescFromTOXBase(const SwTOXBase*pCurTOX); - DECL_LINK_TYPED(CreateExample_Hdl, SwOneExampleFrame&, void); - DECL_LINK_TYPED(ShowPreviewHdl, Button*, void); + DECL_LINK(CreateExample_Hdl, SwOneExampleFrame&, void); + DECL_LINK(ShowPreviewHdl, Button*, void); public: SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet& rSet, @@ -202,16 +202,16 @@ class SwTOXSelectTabPage : public SfxTabPage bool m_bWaitingInitialSettings; - DECL_LINK_TYPED(TOXTypeHdl, ListBox&, void ); - DECL_LINK_TYPED(AddStylesHdl, Button*, void ); - DECL_LINK_TYPED(MenuEnableHdl, Menu*, bool); - DECL_LINK_TYPED(MenuExecuteHdl, Menu*, bool); - DECL_LINK_TYPED(LanguageListBoxHdl, ListBox&, void); + DECL_LINK(TOXTypeHdl, ListBox&, void ); + DECL_LINK(AddStylesHdl, Button*, void ); + DECL_LINK(MenuEnableHdl, Menu*, bool); + DECL_LINK(MenuExecuteHdl, Menu*, bool); + DECL_LINK(LanguageListBoxHdl, ListBox&, void); void LanguageHdl(ListBox*); - DECL_LINK_TYPED(CheckBoxHdl, Button*, void ); - DECL_LINK_TYPED(RadioButtonHdl, Button*, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); - DECL_LINK_TYPED(ModifyListBoxHdl, ListBox&, void); + DECL_LINK(CheckBoxHdl, Button*, void ); + DECL_LINK(RadioButtonHdl, Button*, void); + DECL_LINK(ModifyHdl, Edit&, void); + DECL_LINK(ModifyListBoxHdl, ListBox&, void); void ApplyTOXDescription(); void FillTOXDescription(); @@ -268,12 +268,12 @@ class SwTokenWindow : public VclHBox, public VclBuilderContainer VclPtr<SwTOXEntryTabPage> m_pParent; - DECL_LINK_TYPED( EditResize, Edit&, void ); - DECL_LINK_TYPED( NextItemHdl, SwTOXEdit&, void ); - DECL_LINK_TYPED( TbxFocusHdl, Control&, void ); - DECL_LINK_TYPED( NextItemBtnHdl, SwTOXButton&, void ); - DECL_LINK_TYPED( TbxFocusBtnHdl, Control&, void ); - DECL_LINK_TYPED( ScrollHdl, Button*, void ); + DECL_LINK( EditResize, Edit&, void ); + DECL_LINK( NextItemHdl, SwTOXEdit&, void ); + DECL_LINK( TbxFocusHdl, Control&, void ); + DECL_LINK( NextItemBtnHdl, SwTOXButton&, void ); + DECL_LINK( TbxFocusBtnHdl, Control&, void ); + DECL_LINK( ScrollHdl, Button*, void ); void SetActiveControl(Control* pSet); @@ -410,27 +410,27 @@ class SwTOXEntryTabPage : public SfxTabPage CurTOXType aLastTOXType; bool bInLevelHdl; - DECL_LINK_TYPED(StyleSelectHdl, ListBox&, void); - DECL_LINK_TYPED(EditStyleHdl, Button*, void); - DECL_LINK_TYPED(InsertTokenHdl, Button*, void); - DECL_LINK_TYPED(LevelHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(AutoRightHdl, Button*, void); - DECL_LINK_TYPED(TokenSelectedHdl, SwFormToken&, void); - DECL_LINK_TYPED(TabPosHdl, Edit&, void); - DECL_LINK_TYPED(FillCharHdl, Edit&, void); - DECL_LINK_TYPED(RemoveInsertAuthHdl, Button*, void); - DECL_LINK_TYPED(SortKeyHdl, Button*, void); - DECL_LINK_TYPED(ChapterInfoHdl, ListBox&, void); - DECL_LINK_TYPED(ChapterInfoOutlineHdl, Edit&, void); - DECL_LINK_TYPED(NumberFormatHdl, ListBox&, void); - - DECL_LINK_TYPED(AllLevelsHdl, Button*, void); + DECL_LINK(StyleSelectHdl, ListBox&, void); + DECL_LINK(EditStyleHdl, Button*, void); + DECL_LINK(InsertTokenHdl, Button*, void); + DECL_LINK(LevelHdl, SvTreeListBox*, void); + DECL_LINK(AutoRightHdl, Button*, void); + DECL_LINK(TokenSelectedHdl, SwFormToken&, void); + DECL_LINK(TabPosHdl, Edit&, void); + DECL_LINK(FillCharHdl, Edit&, void); + DECL_LINK(RemoveInsertAuthHdl, Button*, void); + DECL_LINK(SortKeyHdl, Button*, void); + DECL_LINK(ChapterInfoHdl, ListBox&, void); + DECL_LINK(ChapterInfoOutlineHdl, Edit&, void); + DECL_LINK(NumberFormatHdl, ListBox&, void); + + DECL_LINK(AllLevelsHdl, Button*, void); void WriteBackLevel(); void UpdateDescriptor(); - DECL_LINK_TYPED(ModifyHdl, LinkParamNone*, void); + DECL_LINK(ModifyHdl, LinkParamNone*, void); void OnModify(void*); - DECL_LINK_TYPED(ModifyClickHdl, Button*, void); + DECL_LINK(ModifyClickHdl, Button*, void); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -466,11 +466,11 @@ class SwTOXStylesTabPage : public SfxTabPage SwForm* m_pCurrentForm; - DECL_LINK_TYPED( EditStyleHdl, Button *, void ); - DECL_LINK_TYPED( StdHdl, Button*, void ); - DECL_LINK_TYPED(EnableSelectHdl, ListBox&, void); - DECL_LINK_TYPED( DoubleClickHdl, ListBox&, void ); - DECL_LINK_TYPED( AssignHdl, Button*, void ); + DECL_LINK( EditStyleHdl, Button *, void ); + DECL_LINK( StdHdl, Button*, void ); + DECL_LINK(EnableSelectHdl, ListBox&, void); + DECL_LINK( DoubleClickHdl, ListBox&, void ); + DECL_LINK( AssignHdl, Button*, void ); void Modify(); SwForm& GetForm() diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx index a6c084f53ff1..06687dd029be 100644 --- a/sw/source/uibase/inc/swuiidxmrk.hxx +++ b/sw/source/uibase/inc/swuiidxmrk.hxx @@ -108,21 +108,21 @@ class SwIndexMarkPane void InsertMark(); void UpdateMark(); - DECL_LINK_TYPED( InsertHdl, Button *, void ); - DECL_LINK_TYPED( CloseHdl, Button*, void ); - DECL_LINK_TYPED( SyncSelectionHdl, Button*, void ); - DECL_LINK_TYPED( DelHdl, Button*, void ); - DECL_LINK_TYPED( NextHdl, Button*, void ); - DECL_LINK_TYPED( NextSameHdl, Button*, void ); - DECL_LINK_TYPED( PrevHdl, Button*, void ); - DECL_LINK_TYPED( PrevSameHdl, Button*, void ); - DECL_LINK_TYPED( ModifyListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyEditHdl, Edit&, void ); + DECL_LINK( InsertHdl, Button *, void ); + DECL_LINK( CloseHdl, Button*, void ); + DECL_LINK( SyncSelectionHdl, Button*, void ); + DECL_LINK( DelHdl, Button*, void ); + DECL_LINK( NextHdl, Button*, void ); + DECL_LINK( NextSameHdl, Button*, void ); + DECL_LINK( PrevHdl, Button*, void ); + DECL_LINK( PrevSameHdl, Button*, void ); + DECL_LINK( ModifyListBoxHdl, ListBox&, void ); + DECL_LINK( ModifyEditHdl, Edit&, void ); void ModifyHdl(Control*); - DECL_LINK_TYPED( KeyDCBModifyHdl, Edit&, void ); - DECL_LINK_TYPED( NewUserIdxHdl, Button*, void ); - DECL_LINK_TYPED( SearchTypeHdl, Button*, void ); - DECL_LINK_TYPED( PhoneticEDModifyHdl, Edit&, void ); + DECL_LINK( KeyDCBModifyHdl, Edit&, void ); + DECL_LINK( NewUserIdxHdl, Button*, void ); + DECL_LINK( SearchTypeHdl, Button*, void ); + DECL_LINK( PhoneticEDModifyHdl, Edit&, void ); //this method updates the values from 'nLangForPhoneticReading' and 'bIsPhoneticReadingEnabled' //it needs to be called ones if this dialog is opened to create a new entry (in InitControls), @@ -210,13 +210,13 @@ class SwAuthorMarkPane css::uno::Reference< css::container::XNameAccess > xBibAccess; - DECL_LINK_TYPED(InsertHdl, Button*, void); - DECL_LINK_TYPED(CloseHdl, Button*, void); - DECL_LINK_TYPED(CreateEntryHdl, Button*, void); - DECL_LINK_TYPED(CompEntryHdl, ListBox&, void); - DECL_LINK_TYPED(ChangeSourceHdl, Button*, void); - DECL_LINK_TYPED(IsEntryAllowedHdl, Edit*, bool); - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(InsertHdl, Button*, void); + DECL_LINK(CloseHdl, Button*, void); + DECL_LINK(CreateEntryHdl, Button*, void); + DECL_LINK(CompEntryHdl, ListBox&, void); + DECL_LINK(ChangeSourceHdl, Button*, void); + DECL_LINK(IsEntryAllowedHdl, Edit*, bool); + DECL_LINK(EditModifyHdl, Edit&, void); void InitControls(); void Activate(); diff --git a/sw/source/uibase/inc/syncbtn.hxx b/sw/source/uibase/inc/syncbtn.hxx index 88729b8c3698..4934b41f9b9a 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_STATIC_LINK_TYPED( SwSyncBtnDlg, BtnHdl, Button*, void ); + DECL_STATIC_LINK( SwSyncBtnDlg, BtnHdl, Button*, void ); public: SwSyncBtnDlg(SfxBindings*, SfxChildWindow*, vcl::Window *pParent); diff --git a/sw/source/uibase/inc/tautofmt.hxx b/sw/source/uibase/inc/tautofmt.hxx index bf790bfe4611..169b741a150a 100644 --- a/sw/source/uibase/inc/tautofmt.hxx +++ b/sw/source/uibase/inc/tautofmt.hxx @@ -70,12 +70,12 @@ class SwAutoFormatDlg : public SfxModalDialog void Init( const SwTableAutoFormat* pSelFormat ); void UpdateChecks( const SwTableAutoFormat&, bool bEnableBtn ); - DECL_LINK_TYPED( CheckHdl, Button*, void ); - DECL_LINK_TYPED(OkHdl, Button*, void); - DECL_LINK_TYPED( AddHdl, Button*, void ); - DECL_LINK_TYPED( RemoveHdl, Button*, void ); - DECL_LINK_TYPED( RenameHdl, Button*, void ); - DECL_LINK_TYPED( SelFormatHdl, ListBox&, void ); + DECL_LINK( CheckHdl, Button*, void ); + DECL_LINK(OkHdl, Button*, void); + DECL_LINK( AddHdl, Button*, void ); + DECL_LINK( RemoveHdl, Button*, void ); + DECL_LINK( RenameHdl, Button*, void ); + DECL_LINK( SelFormatHdl, ListBox&, void ); public: SwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell, diff --git a/sw/source/uibase/inc/textsh.hxx b/sw/source/uibase/inc/textsh.hxx index 69f42eb31b57..b99290e632d5 100644 --- a/sw/source/uibase/inc/textsh.hxx +++ b/sw/source/uibase/inc/textsh.hxx @@ -44,8 +44,8 @@ private: static void InitInterface_Impl(); public: - DECL_LINK_TYPED( RedlineNextHdl, AbstractSvxPostItDialog&, void ); - DECL_LINK_TYPED( RedlinePrevHdl, AbstractSvxPostItDialog&, void ); + DECL_LINK( RedlineNextHdl, AbstractSvxPostItDialog&, void ); + DECL_LINK( RedlinePrevHdl, AbstractSvxPostItDialog&, void ); void Execute(SfxRequest &); void GetState(SfxItemSet &); diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx index f83fc93a32bd..de709bc702f5 100644 --- a/sw/source/uibase/inc/titlepage.hxx +++ b/sw/source/uibase/inc/titlepage.hxx @@ -53,13 +53,13 @@ private: sal_uInt16 GetInsertPosition() const; - DECL_LINK_TYPED(OKHdl, Button*, void); - DECL_LINK_TYPED(EditHdl, Button*, void); - DECL_LINK_TYPED(RestartNumberingHdl, Button*, void); - DECL_LINK_TYPED(SetPageNumberHdl, Button*, void); - DECL_LINK_TYPED(UpHdl, SpinField&, void); - DECL_LINK_TYPED(DownHdl, SpinField&, void); - DECL_LINK_TYPED(StartPageHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); + DECL_LINK(EditHdl, Button*, void); + DECL_LINK(RestartNumberingHdl, Button*, void); + DECL_LINK(SetPageNumberHdl, Button*, void); + DECL_LINK(UpHdl, SpinField&, void); + DECL_LINK(DownHdl, SpinField&, void); + DECL_LINK(StartPageHdl, Button*, void); public: SwTitlePageDlg( vcl::Window *pParent ); virtual ~SwTitlePageDlg() override; diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx index 71a96fc908f8..a79b85a0b529 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -89,8 +89,8 @@ class SW_DLLPUBLIC SwOneExampleFrame static bool bShowServiceNotAvailableMessage; - DECL_DLLPRIVATE_LINK_TYPED( TimeoutHdl, Idle*, void ); - DECL_DLLPRIVATE_LINK_TYPED( PopupHdl, Menu*, bool ); + DECL_DLLPRIVATE_LINK( TimeoutHdl, Idle*, void ); + DECL_DLLPRIVATE_LINK( PopupHdl, Menu*, bool ); SAL_DLLPRIVATE void CreateControl(); SAL_DLLPRIVATE void DisposeControl(); diff --git a/sw/source/uibase/inc/wordcountdialog.hxx b/sw/source/uibase/inc/wordcountdialog.hxx index a494df7e5dcd..dde606841299 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_STATIC_LINK_TYPED( SwWordCountFloatDlg, CloseHdl, Button*, void ); + DECL_STATIC_LINK( SwWordCountFloatDlg, CloseHdl, Button*, void ); public: SwWordCountFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx index 81b9d85c90fd..afc83927b7fe 100644 --- a/sw/source/uibase/inc/workctrl.hxx +++ b/sw/source/uibase/inc/workctrl.hxx @@ -68,7 +68,7 @@ public: SfxItemState eState, const SfxPoolItem* pState ) override; - DECL_STATIC_LINK_TYPED(SwTbxAutoTextCtrl, PopupHdl, Menu*, bool); + DECL_STATIC_LINK(SwTbxAutoTextCtrl, PopupHdl, Menu*, bool); }; class SwScrollNaviPopup; @@ -103,7 +103,7 @@ class SwScrollNaviPopup : public SfxPopupWindow using Window::GetQuickHelpText; protected: - DECL_LINK_TYPED(SelectHdl, ToolBox*, void); + DECL_LINK(SelectHdl, ToolBox*, void); virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; public: diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index 802ff82e6b81..b596dc511158 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -85,10 +85,10 @@ class SwWrapTabPage: public SfxTabPage virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - DECL_LINK_TYPED( RangeModifyHdl, SpinField&, void ); - DECL_LINK_TYPED( RangeLoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( WrapTypeHdl, Button *, void ); - DECL_LINK_TYPED( ContourHdl, Button *, void); + DECL_LINK( RangeModifyHdl, SpinField&, void ); + DECL_LINK( RangeLoseFocusHdl, Control&, void ); + DECL_LINK( WrapTypeHdl, Button *, void ); + DECL_LINK( ContourHdl, Button *, void); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index f8ec6a41797a..72cc0e066ccd 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -242,7 +242,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); bool GotoPage( sal_uInt16 nPage, bool bRecord ); // setting the cursor; remember the old position for turning back - DECL_LINK_TYPED( ExecFlyMac, const SwFlyFrameFormat*, void ); + DECL_LINK( ExecFlyMac, const SwFlyFrameFormat*, void ); bool PageCursor(SwTwips lOffset, bool bSelect); @@ -439,7 +439,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); void AutoUpdatePara(SwTextFormatColl* pColl, const SfxItemSet& rStyleSet, SwPaM* pPaM = nullptr ); // link for inserting ranges via Drag&Drop/Clipboard - DECL_LINK_TYPED( InsertRegionDialog, void*, void ); + DECL_LINK( InsertRegionDialog, void*, void ); // ctor, the first one is a kind of a controlled copy ctor for more views of a document SwWrtShell( SwWrtShell&, vcl::Window *pWin, SwView &rShell); diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 8afcea8794e9..33c4dacc4cd6 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -883,27 +883,27 @@ sal_uInt16 SwRedlineAcceptDlg::GetRedlinePos( const SvTreeListEntry& rEntry ) co rEntry.GetUserData())->pData)->pData ); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, AcceptHdl, SvxTPView*, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, AcceptHdl, SvxTPView*, void) { CallAcceptReject( true, true ); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, AcceptAllHdl, SvxTPView*, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, AcceptAllHdl, SvxTPView*, void) { CallAcceptReject( false, true ); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, RejectHdl, SvxTPView*, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, RejectHdl, SvxTPView*, void) { CallAcceptReject( true, false ); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, RejectAllHdl, SvxTPView*, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, RejectAllHdl, SvxTPView*, void) { CallAcceptReject( false, false ); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, UndoHdl, SvxTPView*, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, UndoHdl, SvxTPView*, void) { SwView * pView = ::GetActiveView(); pView->GetViewFrame()->GetDispatcher()-> @@ -913,7 +913,7 @@ IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, UndoHdl, SvxTPView*, void) Activate(); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, FilterChangedHdl, SvxTPFilter*, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, FilterChangedHdl, SvxTPFilter*, void) { SvxTPFilter *pFilterTP = m_aTabPagesCTRL->GetFilterPage(); @@ -925,24 +925,24 @@ IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, FilterChangedHdl, SvxTPFilter*, void) Init(); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, DeselectHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, DeselectHdl, SvTreeListBox*, void) { // avoid flickering of buttons: m_aDeselectTimer.Start(); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, SelectHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, SelectHdl, SvTreeListBox*, void) { SelectTimerHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, SelectTimerHdl, Timer *, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, SelectTimerHdl, Timer *, void) { m_aDeselectTimer.Stop(); m_aSelectTimer.Start(); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, GotoHdl, Timer *, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, GotoHdl, Timer *, void) { SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr(); m_aSelectTimer.Stop(); @@ -1009,7 +1009,7 @@ IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, GotoHdl, Timer *, void) m_pTPView->EnableRejectAll( bEnable && !m_bOnlyFormatedRedlines ); } -IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, CommandHdl, SvSimpleTable*, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl, SvSimpleTable*, void) { const CommandEvent aCEvt(m_pTable->GetCommandEvent()); diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx index 5eabc7c1589d..e84b6a04c90e 100644 --- a/sw/source/uibase/misc/swruler.cxx +++ b/sw/source/uibase/misc/swruler.cxx @@ -300,7 +300,7 @@ Color SwCommentRuler::GetFadedColor(const Color &rHighColor, const Color &rLowCo return aColor; } -IMPL_LINK_NOARG_TYPED(SwCommentRuler, FadeHandler, Timer *, void) +IMPL_LINK_NOARG(SwCommentRuler, FadeHandler, Timer *, void) { const int nStep = 25; if ( mbIsHighlighted && mnFadeRate < 100 ) diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index 71cdc006cb21..cd2347fd2ce4 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -302,7 +302,7 @@ void SwInputWindow::ShowWin() ToolBox::Show(); } -IMPL_LINK_TYPED( SwInputWindow, MenuHdl, Menu *, pMenu, bool ) +IMPL_LINK( SwInputWindow, MenuHdl, Menu *, pMenu, bool ) { static const char * const aStrArr[] = { sCalc_Phd, @@ -342,7 +342,7 @@ static const char * const aStrArr[] = { return false; } -IMPL_LINK_NOARG_TYPED(SwInputWindow, DropdownClickHdl, ToolBox *, void) +IMPL_LINK_NOARG(SwInputWindow, DropdownClickHdl, ToolBox *, void) { sal_uInt16 nCurID = GetCurItemId(); EndSelection(); // reset back CurItemId ! @@ -421,7 +421,7 @@ void SwInputWindow::CancelFormula() const sal_Unicode CH_LRE = 0x202a; const sal_Unicode CH_PDF = 0x202c; -IMPL_LINK_TYPED( SwInputWindow, SelTableCellsNotify, SwWrtShell&, rCaller, void ) +IMPL_LINK( SwInputWindow, SelTableCellsNotify, SwWrtShell&, rCaller, void ) { if(bIsTable) { @@ -475,7 +475,7 @@ void SwInputWindow::SetFormula( const OUString& rFormula ) bDelSel = true; } -IMPL_LINK_NOARG_TYPED(SwInputWindow, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwInputWindow, ModifyHdl, Edit&, void) { if (bIsTable && m_bResetUndo) { diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 1c773f59408c..e49564f12bdc 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -135,7 +135,7 @@ void SwTbxAutoTextCtrl::StateChanged( sal_uInt16, GetToolBox().EnableItem( GetId(), (GetItemState(pState) != SfxItemState::DISABLED) ); } -IMPL_STATIC_LINK_TYPED(SwTbxAutoTextCtrl, PopupHdl, Menu*, pMenu, bool) +IMPL_STATIC_LINK(SwTbxAutoTextCtrl, PopupHdl, Menu*, pMenu, bool) { sal_uInt16 nId = pMenu->GetCurItemId(); @@ -306,7 +306,7 @@ void SwScrollNaviPopup::ApplyImageList() } } -IMPL_LINK_TYPED(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet, void) +IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet, void) { sal_uInt16 nSet = pSet->GetCurItemId(); if( nSet != NID_PREV && nSet != NID_NEXT ) diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index c40a2eaa4ba3..832da5fd261a 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -1249,7 +1249,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) // Here the state fpr SID_IMAP / SID_CONTOUR will be handled // until the swapping of the graphic is finished. -IMPL_LINK_NOARG_TYPED(SwBaseShell, GraphicArrivedHdl, SwCursorShell&, void) +IMPL_LINK_NOARG(SwBaseShell, GraphicArrivedHdl, SwCursorShell&, void) { GraphicType nGrfType; SwWrtShell &rSh = GetShell(); diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx index ab0c55bc7bed..9f3145a805ca 100644 --- a/sw/source/uibase/shells/drwbassh.cxx +++ b/sw/source/uibase/shells/drwbassh.cxx @@ -587,7 +587,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) // Checks whether a given name is allowed for a group shape -IMPL_LINK_TYPED( SwDrawBaseShell, CheckGroupShapeNameHdl, AbstractSvxObjectNameDialog&, rNameDialog, bool ) +IMPL_LINK( SwDrawBaseShell, CheckGroupShapeNameHdl, AbstractSvxObjectNameDialog&, rNameDialog, bool ) { SwWrtShell &rSh = GetShell(); SdrView *pSdrView = rSh.GetDrawView(); @@ -747,7 +747,7 @@ bool SwDrawBaseShell::Disable(SfxItemSet& rSet, sal_uInt16 nWhich) // Validate of drawing positions -IMPL_LINK_TYPED(SwDrawBaseShell, ValidatePosition, SvxSwFrameValidation&, rValidation, void ) +IMPL_LINK(SwDrawBaseShell, ValidatePosition, SvxSwFrameValidation&, rValidation, void ) { SwWrtShell *pSh = &GetShell(); rValidation.nMinHeight = MINFLY; diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index c6d580c5450e..c96d62c48030 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -850,7 +850,7 @@ void SwTextShell::InsertHyperlink(const SvxHyperlinkItem& rHlnkItem) } } -IMPL_LINK_TYPED( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog&, rDlg, void ) +IMPL_LINK( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog&, rDlg, void ) { SwWrtShell* pSh = GetShellPtr(); @@ -897,7 +897,7 @@ IMPL_LINK_TYPED( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog&, rDlg, vo } } -IMPL_LINK_TYPED( SwTextShell, RedlinePrevHdl, AbstractSvxPostItDialog&, rDlg, void ) +IMPL_LINK( SwTextShell, RedlinePrevHdl, AbstractSvxPostItDialog&, rDlg, void ) { SwWrtShell* pSh = GetShellPtr(); diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx index 5e5d384a3d38..48ebf4406298 100644 --- a/sw/source/uibase/shells/textsh2.cxx +++ b/sw/source/uibase/shells/textsh2.cxx @@ -230,7 +230,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq) } } -IMPL_LINK_TYPED( SwBaseShell, InsertDBTextHdl, void*, p, void ) +IMPL_LINK( SwBaseShell, InsertDBTextHdl, void*, p, void ) { DBTextStruct_Impl* pDBStruct = static_cast<DBTextStruct_Impl*>(p); if( pDBStruct ) diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx index 3b1fd05f2d30..4aea45b41b33 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.cxx +++ b/sw/source/uibase/sidebar/PageColumnControl.cxx @@ -102,7 +102,7 @@ void PageColumnControl::ExecuteColumnChange( const sal_uInt16 nColumnType ) SfxCallMode::RECORD, { mpPageColumnTypeItem.get() }); } -IMPL_LINK_TYPED( PageColumnControl, ColumnButtonClickHdl_Impl, Button*, pButton, void ) +IMPL_LINK( PageColumnControl, ColumnButtonClickHdl_Impl, Button*, pButton, void ) { if ( pButton == m_pOneColumn.get() ) ExecuteColumnChange( 1 ); @@ -118,7 +118,7 @@ IMPL_LINK_TYPED( PageColumnControl, ColumnButtonClickHdl_Impl, Button*, pButton, EndPopupMode(); } -IMPL_LINK_NOARG_TYPED( PageColumnControl, MoreButtonClickHdl_Impl, Button*, void ) +IMPL_LINK_NOARG( PageColumnControl, MoreButtonClickHdl_Impl, Button*, void ) { if ( SfxViewFrame::Current() ) SfxViewFrame::Current()->GetBindings().GetDispatcher()->Execute( FN_FORMAT_PAGE_COLUMN_DLG, SfxCallMode::ASYNCHRON ); diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx b/sw/source/uibase/sidebar/PageColumnControl.hxx index f83943dee1c2..cb16460a6b3c 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.hxx +++ b/sw/source/uibase/sidebar/PageColumnControl.hxx @@ -48,8 +48,8 @@ private: static void ExecuteColumnChange( const sal_uInt16 nColumnType ); - DECL_LINK_TYPED( ColumnButtonClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( MoreButtonClickHdl_Impl, Button*, void ); + DECL_LINK( ColumnButtonClickHdl_Impl, Button*, void ); + DECL_LINK( MoreButtonClickHdl_Impl, Button*, void ); }; } } // end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/PageFooterPanel.cxx b/sw/source/uibase/sidebar/PageFooterPanel.cxx index 68fb1e8ed731..82813700de11 100644 --- a/sw/source/uibase/sidebar/PageFooterPanel.cxx +++ b/sw/source/uibase/sidebar/PageFooterPanel.cxx @@ -225,7 +225,7 @@ void PageFooterPanel::NotifyItemUpdate( } } -IMPL_LINK_NOARG_TYPED( PageFooterPanel, FooterToggleHdl, Button*, void ) +IMPL_LINK_NOARG( PageFooterPanel, FooterToggleHdl, Button*, void ) { bool IsChecked = mpFooterToggle->IsChecked(); mpFooterItem->SetValue(IsChecked); @@ -233,7 +233,7 @@ IMPL_LINK_NOARG_TYPED( PageFooterPanel, FooterToggleHdl, Button*, void ) UpdateFooterCheck(); } -IMPL_LINK_NOARG_TYPED( PageFooterPanel, FooterLRMarginHdl, ListBox&, void ) +IMPL_LINK_NOARG( PageFooterPanel, FooterLRMarginHdl, ListBox&, void ) { sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(mpFooterMarginPresetLB->GetSelectEntryData()); mpFooterLRMarginItem->SetLeft(nVal); @@ -242,7 +242,7 @@ IMPL_LINK_NOARG_TYPED( PageFooterPanel, FooterLRMarginHdl, ListBox&, void ) SfxCallMode::RECORD, { mpFooterLRMarginItem.get() } ); } -IMPL_LINK_NOARG_TYPED( PageFooterPanel, FooterSpacingHdl, ListBox&, void ) +IMPL_LINK_NOARG( PageFooterPanel, FooterSpacingHdl, ListBox&, void ) { sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(mpFooterSpacingLB->GetSelectEntryData()); mpFooterSpacingItem->SetUpper(nVal); @@ -250,7 +250,7 @@ IMPL_LINK_NOARG_TYPED( PageFooterPanel, FooterSpacingHdl, ListBox&, void ) SfxCallMode::RECORD, { mpFooterSpacingItem.get() } ); } -IMPL_LINK_NOARG_TYPED( PageFooterPanel, FooterLayoutHdl, ListBox&, void ) +IMPL_LINK_NOARG( PageFooterPanel, FooterLayoutHdl, ListBox&, void ) { sal_uInt16 nVal = mpFooterLayoutLB->GetSelectEntryPos(); mpFooterLayoutItem->SetValue(nVal); diff --git a/sw/source/uibase/sidebar/PageFooterPanel.hxx b/sw/source/uibase/sidebar/PageFooterPanel.hxx index c1357ad0942b..8845b5add9e3 100644 --- a/sw/source/uibase/sidebar/PageFooterPanel.hxx +++ b/sw/source/uibase/sidebar/PageFooterPanel.hxx @@ -98,10 +98,10 @@ private: ::std::unique_ptr<SvxLongULSpaceItem> mpFooterSpacingItem; ::std::unique_ptr<SfxInt16Item> mpFooterLayoutItem; - DECL_LINK_TYPED( FooterToggleHdl, Button*, void ); - DECL_LINK_TYPED( FooterLRMarginHdl, ListBox&, void); - DECL_LINK_TYPED( FooterSpacingHdl, ListBox&, void); - DECL_LINK_TYPED( FooterLayoutHdl, ListBox&, void); + DECL_LINK( FooterToggleHdl, Button*, void ); + DECL_LINK( FooterLRMarginHdl, ListBox&, void); + DECL_LINK( FooterSpacingHdl, ListBox&, void); + DECL_LINK( FooterLayoutHdl, ListBox&, void); }; } } //end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx b/sw/source/uibase/sidebar/PageFormatPanel.cxx index 6d7bac0dd684..8e3b1a343e98 100644 --- a/sw/source/uibase/sidebar/PageFormatPanel.cxx +++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx @@ -217,7 +217,7 @@ void PageFormatPanel::NotifyItemUpdate( } } -IMPL_LINK_NOARG_TYPED(PageFormatPanel, PaperFormatModifyHdl, ListBox&, void) +IMPL_LINK_NOARG(PageFormatPanel, PaperFormatModifyHdl, ListBox&, void) { Paper ePaper = mpPaperSizeBox->GetSelection(); Size aSize(SvxPaperInfo::GetPaperSize(ePaper, (MapUnit)(meUnit))); @@ -230,14 +230,14 @@ IMPL_LINK_NOARG_TYPED(PageFormatPanel, PaperFormatModifyHdl, ListBox&, void) mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_SIZE, SfxCallMode::RECORD, { &aSizeItem, mpPageItem.get() }); } -IMPL_LINK_NOARG_TYPED(PageFormatPanel, PaperSizeModifyHdl, Edit&, void) +IMPL_LINK_NOARG(PageFormatPanel, PaperSizeModifyHdl, Edit&, void) { Size aSize( GetCoreValue( *mpPaperWidth, meUnit ), GetCoreValue( *mpPaperHeight, meUnit)); SvxSizeItem aSizeItem(SID_ATTR_PAGE_SIZE, aSize); mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_SIZE, SfxCallMode::RECORD, { &aSizeItem }); } -IMPL_LINK_NOARG_TYPED(PageFormatPanel, PaperModifyMarginHdl, ListBox&, void) +IMPL_LINK_NOARG(PageFormatPanel, PaperModifyMarginHdl, ListBox&, void) { bool bMirrored = false; bool bApplyNewPageMargins = true; diff --git a/sw/source/uibase/sidebar/PageFormatPanel.hxx b/sw/source/uibase/sidebar/PageFormatPanel.hxx index 5fc5f2c9914c..ef9d1bcbafc9 100644 --- a/sw/source/uibase/sidebar/PageFormatPanel.hxx +++ b/sw/source/uibase/sidebar/PageFormatPanel.hxx @@ -108,9 +108,9 @@ private: void UpdateMarginBox(); void ExecuteMarginLRChange( const long nPageLeftMargin, const long nPageRightMargin ); void ExecuteMarginULChange( const long nPageTopMargin, const long nPageBottomMargin); - DECL_LINK_TYPED(PaperFormatModifyHdl, ListBox&, void); - DECL_LINK_TYPED(PaperSizeModifyHdl, Edit&, void); - DECL_LINK_TYPED(PaperModifyMarginHdl, ListBox&, void ); + DECL_LINK(PaperFormatModifyHdl, ListBox&, void); + DECL_LINK(PaperSizeModifyHdl, Edit&, void); + DECL_LINK(PaperModifyMarginHdl, ListBox&, void ); }; } } //end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.cxx b/sw/source/uibase/sidebar/PageHeaderPanel.cxx index c88960ba6b9b..75ac6d7fa720 100644 --- a/sw/source/uibase/sidebar/PageHeaderPanel.cxx +++ b/sw/source/uibase/sidebar/PageHeaderPanel.cxx @@ -228,7 +228,7 @@ void PageHeaderPanel::NotifyItemUpdate( } } -IMPL_LINK_NOARG_TYPED( PageHeaderPanel, HeaderToggleHdl, Button*, void ) +IMPL_LINK_NOARG( PageHeaderPanel, HeaderToggleHdl, Button*, void ) { bool IsChecked = mpHeaderToggle->IsChecked(); mpHeaderItem->SetValue(IsChecked); @@ -236,7 +236,7 @@ IMPL_LINK_NOARG_TYPED( PageHeaderPanel, HeaderToggleHdl, Button*, void ) UpdateHeaderCheck(); } -IMPL_LINK_NOARG_TYPED( PageHeaderPanel, HeaderLRMarginHdl, ListBox&, void ) +IMPL_LINK_NOARG( PageHeaderPanel, HeaderLRMarginHdl, ListBox&, void ) { sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(mpHeaderMarginPresetLB->GetSelectEntryData()); mpHeaderLRMarginItem->SetLeft(nVal); @@ -245,14 +245,14 @@ IMPL_LINK_NOARG_TYPED( PageHeaderPanel, HeaderLRMarginHdl, ListBox&, void ) SfxCallMode::RECORD, { mpHeaderLRMarginItem.get() } ); } -IMPL_LINK_NOARG_TYPED( PageHeaderPanel, HeaderSpacingHdl, ListBox&, void ) +IMPL_LINK_NOARG( PageHeaderPanel, HeaderSpacingHdl, ListBox&, void ) { sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(mpHeaderSpacingLB->GetSelectEntryData()); mpHeaderSpacingItem->SetLower(nVal); GetBindings()->GetDispatcher()->ExecuteList( SID_ATTR_PAGE_HEADER_SPACING, SfxCallMode::RECORD, { mpHeaderSpacingItem.get() } ); } -IMPL_LINK_NOARG_TYPED( PageHeaderPanel, HeaderLayoutHdl, ListBox&, void ) +IMPL_LINK_NOARG( PageHeaderPanel, HeaderLayoutHdl, ListBox&, void ) { sal_uInt16 nVal = mpHeaderLayoutLB->GetSelectEntryPos(); mpHeaderLayoutItem->SetValue(nVal); diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.hxx b/sw/source/uibase/sidebar/PageHeaderPanel.hxx index ffce2057730c..35db413ffbf8 100644 --- a/sw/source/uibase/sidebar/PageHeaderPanel.hxx +++ b/sw/source/uibase/sidebar/PageHeaderPanel.hxx @@ -98,10 +98,10 @@ private: ::std::unique_ptr<SvxLongULSpaceItem> mpHeaderSpacingItem; ::std::unique_ptr<SfxInt16Item> mpHeaderLayoutItem; - DECL_LINK_TYPED( HeaderToggleHdl, Button*, void ); - DECL_LINK_TYPED( HeaderLRMarginHdl, ListBox&, void); - DECL_LINK_TYPED( HeaderSpacingHdl, ListBox&, void); - DECL_LINK_TYPED( HeaderLayoutHdl, ListBox&, void); + DECL_LINK( HeaderToggleHdl, Button*, void ); + DECL_LINK( HeaderLRMarginHdl, ListBox&, void); + DECL_LINK( HeaderSpacingHdl, ListBox&, void); + DECL_LINK( HeaderLayoutHdl, ListBox&, void); }; } } //end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx index 1576c6ac8678..885bb515b26c 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.cxx +++ b/sw/source/uibase/sidebar/PageMarginControl.cxx @@ -362,7 +362,7 @@ void PageMarginControl::FillHelpText( const bool bUserCustomValuesAvailable ) m_pLast->SetQuickHelpText( aHelpText ); } -IMPL_LINK_TYPED( PageMarginControl, SelectMarginHdl, Button*, pControl, void ) +IMPL_LINK( PageMarginControl, SelectMarginHdl, Button*, pControl, void ) { bool bMirrored = false; bool bApplyNewPageMargins = true; @@ -478,7 +478,7 @@ void PageMarginControl::ExecutePageLayoutChange( const bool bMirrored ) } } -IMPL_LINK_NOARG_TYPED( PageMarginControl, ModifyLRMarginHdl, Edit&, void ) +IMPL_LINK_NOARG( PageMarginControl, ModifyLRMarginHdl, Edit&, void ) { m_nPageLeftMargin = GetCoreValue( *m_pLeftMarginEdit.get(), m_eUnit ); m_nPageRightMargin = GetCoreValue( *m_pRightMarginEdit.get(), m_eUnit ); @@ -487,7 +487,7 @@ IMPL_LINK_NOARG_TYPED( PageMarginControl, ModifyLRMarginHdl, Edit&, void ) m_bCustomValuesUsed = true; } -IMPL_LINK_NOARG_TYPED( PageMarginControl, ModifyULMarginHdl, Edit&, void ) +IMPL_LINK_NOARG( PageMarginControl, ModifyULMarginHdl, Edit&, void ) { m_nPageTopMargin = GetCoreValue( *m_pTopMarginEdit.get(), m_eUnit ); m_nPageBottomMargin = GetCoreValue( *m_pBottomMarginEdit.get(), m_eUnit ); diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx index 822d7a8bdd40..fd82641c204c 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.hxx +++ b/sw/source/uibase/sidebar/PageMarginControl.hxx @@ -91,9 +91,9 @@ private: bool m_bCustomValuesUsed; - DECL_LINK_TYPED( SelectMarginHdl, Button*, void ); - DECL_LINK_TYPED( ModifyLRMarginHdl, Edit&, void ); - DECL_LINK_TYPED( ModifyULMarginHdl, Edit&, void ); + DECL_LINK( SelectMarginHdl, Button*, void ); + DECL_LINK( ModifyLRMarginHdl, Edit&, void ); + DECL_LINK( ModifyULMarginHdl, Edit&, void ); static void ExecuteMarginLRChange( const long nPageLeftMargin, diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx b/sw/source/uibase/sidebar/PageOrientationControl.cxx index 20e3bb83b7f8..2140923116aa 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.cxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx @@ -187,7 +187,7 @@ void PageOrientationControl::ExecuteOrientationChange( const bool bLandscape ) mxUndoManager->leaveUndoContext(); } -IMPL_LINK_TYPED(PageOrientationControl, ImplOrientationHdl, Button*, pControl, void) +IMPL_LINK(PageOrientationControl, ImplOrientationHdl, Button*, pControl, void) { if ( pControl == m_pPortrait.get() ) ExecuteOrientationChange( false ); diff --git a/sw/source/uibase/sidebar/PageOrientationControl.hxx b/sw/source/uibase/sidebar/PageOrientationControl.hxx index 590659200faa..cc9c1b3fc539 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.hxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.hxx @@ -52,7 +52,7 @@ private: void ExecuteMarginLRChange(const long nPageLeftMargin, const long nPageRightMargin); void ExecuteOrientationChange(const bool bLandscape); - DECL_LINK_TYPED(ImplOrientationHdl, Button*, void); + DECL_LINK(ImplOrientationHdl, Button*, void); }; } } // end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index 29a2f0304814..cd6acf721600 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -218,7 +218,7 @@ void PageSizeControl::ExecuteSizeChange( const Paper ePaper ) } -IMPL_LINK_TYPED(PageSizeControl, ImplSizeHdl, ValueSet*, pControl, void) +IMPL_LINK(PageSizeControl, ImplSizeHdl, ValueSet*, pControl, void) { mpSizeValueSet->SetNoSelection(); if ( pControl == mpSizeValueSet ) @@ -231,7 +231,7 @@ IMPL_LINK_TYPED(PageSizeControl, ImplSizeHdl, ValueSet*, pControl, void) EndPopupMode(); } -IMPL_LINK_NOARG_TYPED(PageSizeControl, MoreButtonClickHdl_Impl, Button*, void) +IMPL_LINK_NOARG(PageSizeControl, MoreButtonClickHdl_Impl, Button*, void) { if ( SfxViewFrame::Current() ) SfxViewFrame::Current()->GetDispatcher()->Execute( FN_FORMAT_PAGE_SETTING_DLG, SfxCallMode::ASYNCHRON ); diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx index 3bd1da17beb1..0d3321a17f97 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.hxx +++ b/sw/source/uibase/sidebar/PageSizeControl.hxx @@ -58,8 +58,8 @@ private: static void ExecuteSizeChange( const Paper ePaper ); - DECL_LINK_TYPED(ImplSizeHdl, ::ValueSet*, void); - DECL_LINK_TYPED(MoreButtonClickHdl_Impl, Button*, void); + DECL_LINK(ImplSizeHdl, ::ValueSet*, void); + DECL_LINK(MoreButtonClickHdl_Impl, Button*, void); }; } } // end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx b/sw/source/uibase/sidebar/PageStylesPanel.cxx index 3221eae389aa..7cc75c5da45c 100644 --- a/sw/source/uibase/sidebar/PageStylesPanel.cxx +++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx @@ -444,7 +444,7 @@ void PageStylesPanel::NotifyItemUpdate( } } -IMPL_LINK_NOARG_TYPED( PageStylesPanel, ModifyColumnCountHdl, ListBox&, void ) +IMPL_LINK_NOARG( PageStylesPanel, ModifyColumnCountHdl, ListBox&, void ) { sal_uInt16 nColumnType = mpColumnCount->GetSelectEntryPos() + 1; mpPageColumnItem->SetValue( nColumnType ); @@ -452,21 +452,21 @@ IMPL_LINK_NOARG_TYPED( PageStylesPanel, ModifyColumnCountHdl, ListBox&, void ) SfxCallMode::RECORD, { mpPageColumnItem.get() }); } -IMPL_LINK_NOARG_TYPED( PageStylesPanel, ModifyNumberingHdl, ListBox&, void ) +IMPL_LINK_NOARG( PageStylesPanel, ModifyNumberingHdl, ListBox&, void ) { SvxNumType nEntryData = static_cast<SvxNumType>(reinterpret_cast<sal_uLong>(mpNumberSelectLB->GetEntryData(mpNumberSelectLB->GetSelectEntryPos()))); mpPageItem->SetNumType(nEntryData); mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_PAGE, SfxCallMode::RECORD, { mpPageItem.get() }); } -IMPL_LINK_NOARG_TYPED( PageStylesPanel, ModifyLayoutHdl, ListBox&, void ) +IMPL_LINK_NOARG( PageStylesPanel, ModifyLayoutHdl, ListBox&, void ) { sal_uInt16 nUse = mpLayoutSelectLB->GetSelectEntryPos(); mpPageItem->SetPageUsage(PosToPageUsage_Impl(nUse)); mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_PAGE, SfxCallMode::RECORD, { mpPageItem.get() }); } -IMPL_LINK_NOARG_TYPED(PageStylesPanel, ModifyFillStyleHdl, ListBox&, void) +IMPL_LINK_NOARG(PageStylesPanel, ModifyFillStyleHdl, ListBox&, void) { const drawing::FillStyle eXFS = (drawing::FillStyle)mpBgFillType->GetSelectEntryPos(); const XFillStyleItem aXFillStyleItem(eXFS); @@ -514,7 +514,7 @@ IMPL_LINK_NOARG_TYPED(PageStylesPanel, ModifyFillStyleHdl, ListBox&, void) mpBgFillType->Selected(); } -IMPL_LINK_NOARG_TYPED(PageStylesPanel, ModifyFillColorHdl, ListBox&, void) +IMPL_LINK_NOARG(PageStylesPanel, ModifyFillColorHdl, ListBox&, void) { const drawing::FillStyle eXFS = (drawing::FillStyle)mpBgFillType->GetSelectEntryPos(); SfxObjectShell* pSh = SfxObjectShell::Current(); diff --git a/sw/source/uibase/sidebar/PageStylesPanel.hxx b/sw/source/uibase/sidebar/PageStylesPanel.hxx index 2f3f401df976..c0dacdbfb10f 100644 --- a/sw/source/uibase/sidebar/PageStylesPanel.hxx +++ b/sw/source/uibase/sidebar/PageStylesPanel.hxx @@ -112,11 +112,11 @@ private: const OUString GetHatchingSetOrDefault(); const OUString GetBitmapSetOrDefault(); - DECL_LINK_TYPED( ModifyColumnCountHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyNumberingHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyLayoutHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyFillStyleHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyFillColorHdl, ListBox&, void ); + DECL_LINK( ModifyColumnCountHdl, ListBox&, void ); + DECL_LINK( ModifyNumberingHdl, ListBox&, void ); + DECL_LINK( ModifyLayoutHdl, ListBox&, void ); + DECL_LINK( ModifyFillStyleHdl, ListBox&, void ); + DECL_LINK( ModifyFillColorHdl, ListBox&, void ); }; } } //end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx index 863fe2cf3b2b..e8caaca34efa 100644 --- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx +++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx @@ -202,7 +202,7 @@ void StylePresetsPanel::dispose() PanelLayout::dispose(); } -IMPL_LINK_NOARG_TYPED(StylePresetsPanel, DoubleClickHdl, ValueSet*, void) +IMPL_LINK_NOARG(StylePresetsPanel, DoubleClickHdl, ValueSet*, void) { sal_Int32 nItemId = mpValueSet->GetSelectItemId(); TemplateEntry* pEntry = static_cast<TemplateEntry*>(mpValueSet->GetItemData(nItemId)); diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.hxx b/sw/source/uibase/sidebar/StylePresetsPanel.hxx index 3f4afbf07dcc..0fd077f140fd 100644 --- a/sw/source/uibase/sidebar/StylePresetsPanel.hxx +++ b/sw/source/uibase/sidebar/StylePresetsPanel.hxx @@ -76,7 +76,7 @@ private: std::vector<std::unique_ptr<TemplateEntry>> maTemplateEntries; - DECL_LINK_TYPED(DoubleClickHdl, ValueSet*, void); + DECL_LINK(DoubleClickHdl, ValueSet*, void); }; }} // end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx index 3c84adbda75d..20d418c62029 100644 --- a/sw/source/uibase/sidebar/ThemePanel.cxx +++ b/sw/source/uibase/sidebar/ThemePanel.cxx @@ -485,15 +485,15 @@ void ThemePanel::dispose() PanelLayout::dispose(); } -IMPL_LINK_NOARG_TYPED(ThemePanel, ClickHdl, Button*, void) +IMPL_LINK_NOARG(ThemePanel, ClickHdl, Button*, void) { DoubleClickHdl(); } -IMPL_LINK_NOARG_TYPED(ThemePanel, DoubleClickValueSetHdl, ValueSet*, void) +IMPL_LINK_NOARG(ThemePanel, DoubleClickValueSetHdl, ValueSet*, void) { DoubleClickHdl(); } -IMPL_LINK_NOARG_TYPED(ThemePanel, DoubleClickHdl, ListBox&, void) +IMPL_LINK_NOARG(ThemePanel, DoubleClickHdl, ListBox&, void) { DoubleClickHdl(); } diff --git a/sw/source/uibase/sidebar/ThemePanel.hxx b/sw/source/uibase/sidebar/ThemePanel.hxx index d9833afff080..d22b303f5101 100644 --- a/sw/source/uibase/sidebar/ThemePanel.hxx +++ b/sw/source/uibase/sidebar/ThemePanel.hxx @@ -67,9 +67,9 @@ private: svx::ColorSets maColorSets; - DECL_LINK_TYPED(ClickHdl, Button*, void); - DECL_LINK_TYPED(DoubleClickHdl, ListBox&, void); - DECL_LINK_TYPED(DoubleClickValueSetHdl, ValueSet*, void); + DECL_LINK(ClickHdl, Button*, void); + DECL_LINK(DoubleClickHdl, ListBox&, void); + DECL_LINK(DoubleClickValueSetHdl, ValueSet*, void); void DoubleClickHdl(); }; diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx index 8897123ea3dc..a81222e65e81 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx @@ -211,14 +211,14 @@ void WrapPropertyPanel::UpdateSpacingLB() mpSpacingLB->SelectEntry(aCustomEntry); } -IMPL_LINK_NOARG_TYPED(WrapPropertyPanel, EditContourHdl, Button*, void) +IMPL_LINK_NOARG(WrapPropertyPanel, EditContourHdl, Button*, void) { SfxBoolItem aItem(SID_CONTOUR_DLG, true); mpBindings->GetDispatcher()->ExecuteList(SID_CONTOUR_DLG, SfxCallMode::RECORD, { &aItem }); } -IMPL_LINK_NOARG_TYPED(WrapPropertyPanel, EnableContourHdl, Button*, void) +IMPL_LINK_NOARG(WrapPropertyPanel, EnableContourHdl, Button*, void) { bool IsContour = mpEnableContour->IsChecked(); SfxBoolItem aItem(FN_FRAME_WRAP_CONTOUR, IsContour); @@ -226,7 +226,7 @@ IMPL_LINK_NOARG_TYPED(WrapPropertyPanel, EnableContourHdl, Button*, void) SfxCallMode::RECORD, { &aItem }); } -IMPL_LINK_TYPED(WrapPropertyPanel, SpacingLBHdl, ListBox&, rBox, void) +IMPL_LINK(WrapPropertyPanel, SpacingLBHdl, ListBox&, rBox, void) { sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(rBox.GetSelectEntryData()); @@ -240,7 +240,7 @@ IMPL_LINK_TYPED(WrapPropertyPanel, SpacingLBHdl, ListBox&, rBox, void) SfxCallMode::RECORD, { &aULItem }); } -IMPL_LINK_NOARG_TYPED(WrapPropertyPanel, WrapTypeHdl, Button*, void) +IMPL_LINK_NOARG(WrapPropertyPanel, WrapTypeHdl, Button*, void) { sal_uInt16 nSlot = 0; if ( mpRBWrapLeft->IsChecked() ) diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx index 8421ec858b03..55d0026a3742 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx @@ -96,10 +96,10 @@ namespace sw { namespace sidebar { void UpdateEditContour(); void UpdateSpacingLB(); - DECL_LINK_TYPED(WrapTypeHdl, Button*, void); - DECL_LINK_TYPED(EnableContourHdl, Button*, void); - DECL_LINK_TYPED(EditContourHdl, Button*, void); - DECL_LINK_TYPED(SpacingLBHdl, ListBox&, void); + DECL_LINK(WrapTypeHdl, Button*, void); + DECL_LINK(EnableContourHdl, Button*, void); + DECL_LINK(EditContourHdl, Button*, void); + DECL_LINK(SpacingLBHdl, ListBox&, void); }; } } // end of namespace ::sw::sidebar diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index 07da38c4d243..63a270762516 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -70,11 +70,11 @@ class SwFormatTablePage : public SfxTabPage void Init(); void ModifyHdl(const Edit* pEdit); - DECL_LINK_TYPED( AutoClickHdl, Button*, void ); - DECL_LINK_TYPED( RelWidthClickHdl, Button*, void ); + DECL_LINK( AutoClickHdl, Button*, void ); + DECL_LINK( RelWidthClickHdl, Button*, void ); void RightModify(); - DECL_LINK_TYPED( UpDownHdl, SpinField&, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); + DECL_LINK( UpDownHdl, SpinField&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); using TabPage::ActivatePage; using TabPage::DeactivatePage; @@ -117,12 +117,12 @@ class SwTableColumnPage : public SfxTabPage bool bPercentMode:1; void Init(bool bWeb); - DECL_LINK_TYPED( AutoClickHdl, Button *, void ); + DECL_LINK( AutoClickHdl, Button *, void ); void ModifyHdl( MetricField* pEdit ); - DECL_LINK_TYPED( UpHdl, SpinField&, void ); - DECL_LINK_TYPED( DownHdl, SpinField&, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( ModeHdl, Button *, void ); + DECL_LINK( UpHdl, SpinField&, void ); + DECL_LINK( DownHdl, SpinField&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); + DECL_LINK( ModeHdl, Button *, void ); void UpdateCols( sal_uInt16 nAktPos ); SwTwips GetVisibleWidth(sal_uInt16 nPos); void SetVisibleWidth(sal_uInt16 nPos, SwTwips nNewWidth); @@ -172,13 +172,13 @@ class SwTextFlowPage : public SfxTabPage bool bPageBreak; bool bHtmlMode; - DECL_LINK_TYPED(PageBreakHdl_Impl, Button*, void); - DECL_LINK_TYPED(ApplyCollClickHdl_Impl, Button*, void); - DECL_LINK_TYPED( PageBreakPosHdl_Impl, Button*, void ); - DECL_LINK_TYPED( PageBreakTypeHdl_Impl, Button*, void ); - DECL_LINK_TYPED( SplitHdl_Impl, Button*, void ); - DECL_STATIC_LINK_TYPED( SwTextFlowPage, SplitRowHdl_Impl, Button*, void ); - DECL_LINK_TYPED( HeadLineCBClickHdl, Button* = nullptr, void ); + DECL_LINK(PageBreakHdl_Impl, Button*, void); + DECL_LINK(ApplyCollClickHdl_Impl, Button*, void); + DECL_LINK( PageBreakPosHdl_Impl, Button*, void ); + DECL_LINK( PageBreakTypeHdl_Impl, Button*, void ); + DECL_LINK( SplitHdl_Impl, Button*, void ); + DECL_STATIC_LINK( SwTextFlowPage, SplitRowHdl_Impl, Button*, void ); + DECL_LINK( HeadLineCBClickHdl, Button* = nullptr, void ); public: SwTextFlowPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index c9c74980507f..167049dc18d1 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -1420,7 +1420,7 @@ void SwPagePreview::SetVisArea( const Rectangle &rRect ) m_pViewWin->Invalidate(); } -IMPL_LINK_TYPED( SwPagePreview, ScrollHdl, ScrollBar *, p, void ) +IMPL_LINK( SwPagePreview, ScrollHdl, ScrollBar *, p, void ) { SwScrollbar* pScrollbar = static_cast<SwScrollbar*>(p); if(!GetViewShell()) @@ -1453,7 +1453,7 @@ IMPL_LINK_TYPED( SwPagePreview, ScrollHdl, ScrollBar *, p, void ) EndScrollHdl( pScrollbar ); } -IMPL_LINK_TYPED( SwPagePreview, EndScrollHdl, ScrollBar *, p, void ) +IMPL_LINK( SwPagePreview, EndScrollHdl, ScrollBar *, p, void ) { SwScrollbar* pScrollbar = static_cast<SwScrollbar*>(p); if(!GetViewShell()) diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 8052a712534d..b5a0d53b7b42 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -203,7 +203,7 @@ void SwView::GotFocus() const // called by the FormShell when a form control is focused. This is // a request to put the form shell on the top of the dispatcher stack -IMPL_LINK_NOARG_TYPED(SwView, FormControlActivated, LinkParamNone*, void) +IMPL_LINK_NOARG(SwView, FormControlActivated, LinkParamNone*, void) { // if a form control has been activated, and the form shell is not on the top // of the dispatcher stack, then we need to activate it @@ -466,7 +466,7 @@ extern "C" } } -IMPL_LINK_NOARG_TYPED(SwView, AttrChangedNotify, SwCursorShell*, void) +IMPL_LINK_NOARG(SwView, AttrChangedNotify, SwCursorShell*, void) { if ( GetEditWin().IsChainMode() ) GetEditWin().SetChainMode( false ); @@ -512,7 +512,7 @@ IMPL_LINK_NOARG_TYPED(SwView, AttrChangedNotify, SwCursorShell*, void) } } -IMPL_LINK_NOARG_TYPED(SwView, TimeoutHdl, Timer *, void) +IMPL_LINK_NOARG(SwView, TimeoutHdl, Timer *, void) { if( m_pWrtShell->BasicActionPend() || g_bNoInterrupt ) { diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 5d200aef812b..477d52610f2a 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -2452,7 +2452,7 @@ void SwView::GenerateFormLetter(bool bUseCurrentDocument) #endif } -IMPL_LINK_TYPED( SwView, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) +IMPL_LINK( SwView, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) { if ( ERRCODE_NONE != _pFileDlg->GetError() ) return; diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index c45467254110..07887a7f9b91 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -714,7 +714,7 @@ bool SwView::HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const } //#i87414# mod -IMPL_LINK_TYPED(SwView, OnlineSpellCallback, SpellCallbackInfo&, rInfo, void) +IMPL_LINK(SwView, OnlineSpellCallback, SpellCallbackInfo&, rInfo, void) { if (rInfo.nCommand == SpellCallbackCommand::STARTSPELLDLG) GetViewFrame()->GetDispatcher()->Execute( FN_SPELL_GRAMMAR_DIALOG, SfxCallMode::ASYNCHRON); diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index a983002218fa..866087e60590 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -605,10 +605,10 @@ struct ExecuteInfo class AsyncExecute { public: - DECL_STATIC_LINK_TYPED( AsyncExecute, ExecuteHdl_Impl, void*, void ); + DECL_STATIC_LINK( AsyncExecute, ExecuteHdl_Impl, void*, void ); }; -IMPL_STATIC_LINK_TYPED( AsyncExecute, ExecuteHdl_Impl, void*, p, void ) +IMPL_STATIC_LINK( AsyncExecute, ExecuteHdl_Impl, void*, p, void ) { ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p); SolarMutexReleaser aReleaser; @@ -834,7 +834,7 @@ private: VclPtr<ListBox> aListBox; IFieldmark *pFieldmark; - DECL_LINK_TYPED( MyListBoxHandler, ListBox&, void ); + DECL_LINK( MyListBoxHandler, ListBox&, void ); public: SwFieldDialog( SwEditWin* parent, IFieldmark *fieldBM ); @@ -897,7 +897,7 @@ void SwFieldDialog::dispose() FloatingWindow::dispose(); } -IMPL_LINK_TYPED( SwFieldDialog, MyListBoxHandler, ListBox&, rBox, void ) +IMPL_LINK( SwFieldDialog, MyListBoxHandler, ListBox&, rBox, void ) { if ( !rBox.IsTravelSelect() ) { @@ -915,7 +915,7 @@ IMPL_LINK_TYPED( SwFieldDialog, MyListBoxHandler, ListBox&, rBox, void ) } } -IMPL_LINK_NOARG_TYPED(SwView, FieldPopupModeEndHdl, FloatingWindow*, void) +IMPL_LINK_NOARG(SwView, FieldPopupModeEndHdl, FloatingWindow*, void) { m_pFieldPopup.disposeAndClear(); } diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx index a2d19dfccbe4..8c7ccf7e1693 100644 --- a/sw/source/uibase/uiview/viewmdi.cxx +++ b/sw/source/uibase/uiview/viewmdi.cxx @@ -258,7 +258,7 @@ void SwView::SetViewLayout( sal_uInt16 nColumns, bool bBookMode, bool bViewOnly // Scrollbar - Handler -IMPL_LINK_TYPED( SwView, WindowChildEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( SwView, WindowChildEventListener, VclWindowEvent&, rEvent, void ) { OSL_ENSURE( rEvent.GetWindow(), "Window???" ); vcl::Window* pChildWin = static_cast< vcl::Window* >( rEvent.GetData() ); @@ -304,7 +304,7 @@ void SwView::CreateScrollbar( bool bHori ) ppScrollbar->ExtendedShow(); } -IMPL_LINK_TYPED( SwView, MoveNavigationHdl, void*, p, void ) +IMPL_LINK( SwView, MoveNavigationHdl, void*, p, void ) { bool* pbNext = static_cast<bool*>(p); if ( !pbNext ) @@ -518,7 +518,7 @@ int SwView::KillVRuler() return 1; } -IMPL_LINK_TYPED( SwView, ExecRulerClick, Ruler *, pRuler, void ) +IMPL_LINK( SwView, ExecRulerClick, Ruler *, pRuler, void ) { OUString sDefPage; switch( pRuler->GetClickType() ) diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx index 89b3e1478e04..fab131719b7a 100644 --- a/sw/source/uibase/uiview/viewport.cxx +++ b/sw/source/uibase/uiview/viewport.cxx @@ -680,7 +680,7 @@ bool SwView::PageDownCursor(bool bSelect) // Handler of the scrollbars -IMPL_LINK_TYPED( SwView, ScrollHdl, ScrollBar *, p, void ) +IMPL_LINK( SwView, ScrollHdl, ScrollBar *, p, void ) { SwScrollbar* pScrollbar = static_cast<SwScrollbar*>(p); if ( GetWrtShell().ActionPend() ) @@ -752,7 +752,7 @@ IMPL_LINK_TYPED( SwView, ScrollHdl, ScrollBar *, p, void ) // Handler of the scrollbars -IMPL_LINK_TYPED( SwView, EndScrollHdl, ScrollBar *, p, void ) +IMPL_LINK( SwView, EndScrollHdl, ScrollBar *, p, void ) { SwScrollbar* pScrollbar = static_cast<SwScrollbar*>(p); if ( !GetWrtShell().ActionPend() ) diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx index acdd0e487de2..aa667ef23aad 100644 --- a/sw/source/uibase/uno/unomailmerge.cxx +++ b/sw/source/uibase/uno/unomailmerge.cxx @@ -211,7 +211,7 @@ namespace private: void implTakeOwnership( ); - DECL_LINK_TYPED( OnTryDeleteFile, Timer*, void ); + DECL_LINK( OnTryDeleteFile, Timer*, void ); }; DelayedFileDeletion::DelayedFileDeletion( const Reference< XModel >& _rxModel, const OUString& _rTemporaryFile ) @@ -240,7 +240,7 @@ namespace osl_atomic_decrement( &m_refCount ); } - IMPL_LINK_NOARG_TYPED(DelayedFileDeletion, OnTryDeleteFile, Timer *, void) + IMPL_LINK_NOARG(DelayedFileDeletion, OnTryDeleteFile, Timer *, void) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index f6a4cc1a30b2..48a21a981099 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -1483,7 +1483,7 @@ bool SwContentTree::Collapse( SvTreeListEntry* pParent ) // Also on double click will be initially opened only. -IMPL_LINK_NOARG_TYPED(SwContentTree, ContentDoubleClickHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(SwContentTree, ContentDoubleClickHdl, SvTreeListBox*, bool) { SvTreeListEntry* pEntry = GetCurEntry(); // Is it a content type? @@ -2387,7 +2387,7 @@ void SwContentTree::HideTree() } /** No idle with focus or while dragging */ -IMPL_LINK_NOARG_TYPED(SwContentTree, TimerUpdate, Timer *, void) +IMPL_LINK_NOARG(SwContentTree, TimerUpdate, Timer *, void) { if (IsDisposed()) return; diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 46902cc28a3d..e47dabbdde6b 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -767,7 +767,7 @@ void SwGlobalTree::EditContent(const SwGlblDocContent* pCont ) } } -IMPL_LINK_TYPED( SwGlobalTree, PopupHdl, Menu* , pMenu, bool) +IMPL_LINK( SwGlobalTree, PopupHdl, Menu* , pMenu, bool) { ExecuteContextMenuAction( pMenu->GetCurItemId()); return true; @@ -1005,7 +1005,7 @@ void SwGlobalTree::ExecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) delete pContCopy; } -IMPL_LINK_NOARG_TYPED(SwGlobalTree, Timeout, Timer *, void) +IMPL_LINK_NOARG(SwGlobalTree, Timeout, Timer *, void) { if(!IsDisposed() && !HasFocus() && Update( false )) Display(); @@ -1193,7 +1193,7 @@ void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont) } } -IMPL_LINK_NOARG_TYPED( SwGlobalTree, DoubleClickHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG( SwGlobalTree, DoubleClickHdl, SvTreeListBox*, bool) { SvTreeListEntry* pEntry = GetCurEntry(); SwGlblDocContent* pCont = static_cast<SwGlblDocContent*>(pEntry->GetUserData()); @@ -1212,7 +1212,7 @@ SwNavigationPI* SwGlobalTree::GetParentWindow() return static_cast<SwNavigationPI*>(Window::GetParent()); } -IMPL_STATIC_LINK_NOARG_TYPED(SwGlobalTree, ShowFrameHdl, void*, void) +IMPL_STATIC_LINK_NOARG(SwGlobalTree, ShowFrameHdl, void*, void) { const SfxObjectShell* pShell = SwGlobalTree::GetShowShell(); SfxViewFrame* pFirst = pShell ? SfxViewFrame::GetFirst(pShell) : nullptr; @@ -1354,7 +1354,7 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* _pContent, const Sequen } } -IMPL_LINK_TYPED( SwGlobalTree, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) +IMPL_LINK( SwGlobalTree, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) { if ( ERRCODE_NONE != _pFileDlg->GetError() ) return; diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx index 48280c4f9cad..6f4f39f5c5b7 100644 --- a/sw/source/uibase/utlui/gloslst.cxx +++ b/sw/source/uibase/utlui/gloslst.cxx @@ -54,8 +54,8 @@ class SwGlossDecideDlg : public ModalDialog VclPtr<OKButton> m_pOk; VclPtr<ListBox> m_pListLB; - DECL_LINK_TYPED(DoubleClickHdl, ListBox&, void); - DECL_LINK_TYPED(SelectHdl, ListBox&, void); + DECL_LINK(DoubleClickHdl, ListBox&, void); + DECL_LINK(SelectHdl, ListBox&, void); public: explicit SwGlossDecideDlg(vcl::Window* pParent); @@ -88,12 +88,12 @@ void SwGlossDecideDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwGlossDecideDlg, DoubleClickHdl, ListBox&, void) +IMPL_LINK_NOARG(SwGlossDecideDlg, DoubleClickHdl, ListBox&, void) { EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(SwGlossDecideDlg, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SwGlossDecideDlg, SelectHdl, ListBox&, void) { m_pOk->Enable(LISTBOX_ENTRY_NOTFOUND != m_pListLB->GetSelectEntryPos()); } diff --git a/sw/source/uibase/utlui/gotodlg.cxx b/sw/source/uibase/utlui/gotodlg.cxx index df76db6a2362..1098923f40f4 100644 --- a/sw/source/uibase/utlui/gotodlg.cxx +++ b/sw/source/uibase/utlui/gotodlg.cxx @@ -63,7 +63,7 @@ void SwGotoPageDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwGotoPageDlg, PageModifiedHdl, Edit&, void) +IMPL_LINK_NOARG(SwGotoPageDlg, PageModifiedHdl, Edit&, void) { if(!(mpMtrPageCtrl->GetText()).isEmpty() ) { diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index cb68eb601121..ff1df896201f 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -140,7 +140,7 @@ static void lcl_UnSelectFrame(SwWrtShell *pSh) // Select the document view -IMPL_LINK_TYPED( SwNavigationPI, DocListBoxSelectHdl, ListBox&, rBox, void ) +IMPL_LINK( SwNavigationPI, DocListBoxSelectHdl, ListBox&, rBox, void ) { int nEntryIdx = rBox.GetSelectEntryPos(); SwView *pView ; @@ -209,7 +209,7 @@ void SwNavigationPI::UsePage() // Select handler of the toolboxes -IMPL_LINK_TYPED( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox, void ) +IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox, void ) { const sal_uInt16 nCurrItemId = pBox->GetCurItemId(); SwView *pView = GetCreateView(); @@ -347,7 +347,7 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox, void ) // Click handler of the toolboxes -IMPL_LINK_TYPED( SwNavigationPI, ToolBoxClickHdl, ToolBox *, pBox, void ) +IMPL_LINK( SwNavigationPI, ToolBoxClickHdl, ToolBox *, pBox, void ) { const sal_uInt16 nCurrItemId = pBox->GetCurItemId(); switch (nCurrItemId) @@ -361,7 +361,7 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxClickHdl, ToolBox *, pBox, void ) } } -IMPL_LINK_TYPED( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox, void ) +IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox, void ) { const sal_uInt16 nCurrItemId = pBox->GetCurItemId(); switch (nCurrItemId) @@ -467,7 +467,7 @@ void SwNavHelpToolBox::RequestHelp( const HelpEvent& rHEvt ) // Action-Handler Edit: // Switches to the page if the structure view is not turned on. -IMPL_LINK_TYPED( SwNavigationPI, EditAction, NumEditAction&, rEdit, void ) +IMPL_LINK( SwNavigationPI, EditAction, NumEditAction&, rEdit, void ) { SwView *pView = GetCreateView(); if (pView) @@ -482,7 +482,7 @@ IMPL_LINK_TYPED( SwNavigationPI, EditAction, NumEditAction&, rEdit, void ) // If the page can be set here, the maximum is set. -IMPL_LINK_TYPED( SwNavigationPI, EditGetFocus, Control&, rControl, void ) +IMPL_LINK( SwNavigationPI, EditGetFocus, Control&, rControl, void ) { NumEditAction* pEdit = static_cast<NumEditAction*>(&rControl); SwView *pView = GetCreateView(); @@ -894,7 +894,7 @@ void SwNavigationPI::SetPopupWindow( SfxPopupWindow* pWindow ) m_pPopupWindow->SetDeleteLink_Impl( LINK( this, SwNavigationPI, ClosePopupWindow )); } -IMPL_LINK_NOARG_TYPED(SwNavigationPI, PopupModeEndHdl, FloatingWindow*, void) +IMPL_LINK_NOARG(SwNavigationPI, PopupModeEndHdl, FloatingWindow*, void) { if ( m_pPopupWindow->IsVisible() ) { @@ -912,7 +912,7 @@ IMPL_LINK_NOARG_TYPED(SwNavigationPI, PopupModeEndHdl, FloatingWindow*, void) } } -IMPL_LINK_TYPED( SwNavigationPI, ClosePopupWindow, SfxPopupWindow *, pWindow, void ) +IMPL_LINK( SwNavigationPI, ClosePopupWindow, SfxPopupWindow *, pWindow, void ) { if ( pWindow == m_pFloatingWindow ) m_pFloatingWindow = nullptr; @@ -998,7 +998,7 @@ void SwNavigationPI::Notify( SfxBroadcaster& rBrdc, const SfxHint& rHint ) } } -IMPL_LINK_TYPED( SwNavigationPI, MenuSelectHdl, Menu *, pMenu, bool ) +IMPL_LINK( SwNavigationPI, MenuSelectHdl, Menu *, pMenu, bool ) { sal_uInt16 nMenuId = pMenu->GetCurItemId(); if(nMenuId != USHRT_MAX) @@ -1079,7 +1079,7 @@ void SwNavigationPI::UpdateListBox() m_aDocListBox->SetUpdateMode(true); } -IMPL_LINK_TYPED(SwNavigationPI, DoneLink, SfxPoolItem *, pItem, void) +IMPL_LINK(SwNavigationPI, DoneLink, SfxPoolItem *, pItem, void) { const SfxViewFrameItem* pFrameItem = dynamic_cast<SfxViewFrameItem*>( pItem ); if( pFrameItem ) @@ -1251,7 +1251,7 @@ bool SwNavigationPI::IsGlobalDoc() const return bRet; } -IMPL_LINK_NOARG_TYPED(SwNavigationPI, ChangePageHdl, Idle *, void) +IMPL_LINK_NOARG(SwNavigationPI, ChangePageHdl, Idle *, void) { if (!IsDisposed()) { @@ -1260,7 +1260,7 @@ IMPL_LINK_NOARG_TYPED(SwNavigationPI, ChangePageHdl, Idle *, void) } } -IMPL_LINK_NOARG_TYPED(SwNavigationPI, PageEditModifyHdl, SpinField&, void) +IMPL_LINK_NOARG(SwNavigationPI, PageEditModifyHdl, SpinField&, void) { if(m_aPageChgIdle.IsActive()) m_aPageChgIdle.Stop(); diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx index 39fd6b37081a..cd69de7721bf 100644 --- a/sw/source/uibase/utlui/numfmtlb.cxx +++ b/sw/source/uibase/utlui/numfmtlb.cxx @@ -358,7 +358,7 @@ sal_uLong NumFormatListBox::GetFormat() const return reinterpret_cast<sal_uLong>(GetEntryData(nPos)); } -IMPL_LINK_TYPED( NumFormatListBox, SelectHdl, ListBox&, rBox, void ) +IMPL_LINK( NumFormatListBox, SelectHdl, ListBox&, rBox, void ) { const sal_Int32 nPos = rBox.GetSelectEntryPos(); OUString sDefine(SW_RES( STR_DEFINE_NUMBERFORMAT )); diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index 8ecc523e7b95..040c44861512 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -194,7 +194,7 @@ static void disableScrollBars(uno::Reference< beans::XPropertySet > const & xVie } } -IMPL_LINK_TYPED( SwOneExampleFrame, TimeoutHdl, Idle*, pTimer, void ) +IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Idle*, pTimer, void ) { if(!_xControl.is()) return; @@ -484,7 +484,7 @@ void SwOneExampleFrame::CreatePopup(const Point& rPt) aPop->Execute( aTopWindow.get(), rPt ); } -IMPL_LINK_TYPED(SwOneExampleFrame, PopupHdl, Menu*, pMenu, bool ) +IMPL_LINK(SwOneExampleFrame, PopupHdl, Menu*, pMenu, bool ) { sal_uInt16 nId = pMenu->GetCurItemId(); if ((nId > ITEM_ZOOM) && diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx index 8fb183c55c40..0874d2af4f73 100644 --- a/sw/source/uibase/wrtsh/select.cxx +++ b/sw/source/uibase/wrtsh/select.cxx @@ -702,7 +702,7 @@ void SwWrtShell::LeaveSelFrameMode() // Description: execute framebound macro -IMPL_LINK_TYPED( SwWrtShell, ExecFlyMac, const SwFlyFrameFormat*, pFlyFormat, void ) +IMPL_LINK( SwWrtShell, ExecFlyMac, const SwFlyFrameFormat*, pFlyFormat, void ) { const SwFrameFormat *pFormat = pFlyFormat ? static_cast<const SwFrameFormat*>(pFlyFormat) : GetFlyFrameFormat(); OSL_ENSURE(pFormat, "no frame format"); |