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 | |
| 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')
266 files changed, 1285 insertions, 1285 deletions
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index e6f5460591e6..e6fb35d5c0ca 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -182,7 +182,7 @@ class SwPostItMgr: public SfxListener sal_Int32 GetScrollSize() const; sal_Int32 GetSpaceBetween() const; void SetReadOnlyState(); - DECL_LINK_TYPED( CalcHdl, void*, void); + DECL_LINK( CalcHdl, void*, void); sw::sidebarwindows::SwSidebarWin* GetSidebarWin(const SfxBroadcaster* pBroadcaster) const; diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index e2c76821f935..579a97432022 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -168,7 +168,7 @@ class SwSidebarWin : public vcl::Window return mbReadonly; } - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); inline bool IsMouseOverSidebarWin() const { return mbMouseOver; } void SetLanguage(const SvxLanguageItem& rNewItem); @@ -196,9 +196,9 @@ class SwSidebarWin : public vcl::Window void SetSizePixel( const Size& rNewSize ) override; SfxItemSet DefaultItem(); - DECL_LINK_TYPED(ModifyHdl, LinkParamNone*, void); - DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void); - DECL_LINK_TYPED(DeleteHdl, void*, void); + DECL_LINK(ModifyHdl, LinkParamNone*, void); + DECL_LINK(ScrollHdl, ScrollBar*, void); + DECL_LINK(DeleteHdl, void*, void); inline SwView& DocView() { return mrView;} inline SwPostItMgr& Mgr() { return mrMgr; } diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx index 2657cd3b2755..13684ac833c4 100644 --- a/sw/inc/colwd.hxx +++ b/sw/inc/colwd.hxx @@ -34,7 +34,7 @@ class SwTableWidthDlg : public SvxStandardDialog protected: virtual void Apply() override; - DECL_LINK_TYPED(LoseFocusHdl, Edit&, void); + DECL_LINK(LoseFocusHdl, Edit&, void); public: SwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc ); diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index d14b176ba7ee..6078b2782d21 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -246,7 +246,7 @@ friend class SwConnectionDisposedListener_Impl; SAL_DLLPRIVATE SwDSParam* FindDSData(const SwDBData& rData, bool bCreate); SAL_DLLPRIVATE SwDSParam* FindDSConnection(const OUString& rSource, bool bCreate); - DECL_DLLPRIVATE_LINK_TYPED( PrtCancelHdl, Button *, void ); + DECL_DLLPRIVATE_LINK( PrtCancelHdl, Button *, void ); /// Insert data record as text into document. SAL_DLLPRIVATE void ImportFromConnection( SwWrtShell* pSh); diff --git a/sw/inc/dobjfac.hxx b/sw/inc/dobjfac.hxx index 5bcc3108c842..6778caa77435 100644 --- a/sw/inc/dobjfac.hxx +++ b/sw/inc/dobjfac.hxx @@ -26,7 +26,7 @@ class SdrObjFactory; class SwObjectFactory { public: - DECL_STATIC_LINK_TYPED( SwObjectFactory, MakeObject, SdrObjCreatorParams, SdrObject* ); + DECL_STATIC_LINK( SwObjectFactory, MakeObject, SdrObjCreatorParams, SdrObject* ); }; extern SwObjectFactory aSwObjectFactory; diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index b36fb70e4c0c..bc53c5e05c14 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -422,7 +422,7 @@ private: // CharTimer calls this method. void DoUpdateAllCharts(); - DECL_LINK_TYPED( DoUpdateModifiedOLE, Idle *, void ); + DECL_LINK( DoUpdateModifiedOLE, Idle *, void ); public: SwFormat *MakeCharFormat_(const OUString &, SwFormat *, bool, bool ); @@ -533,7 +533,7 @@ public: IDocumentState & getIDocumentState(); // IDocumentDrawModelAccess - DECL_LINK_TYPED( AddDrawUndo, SdrUndoAction *, void ); + DECL_LINK( AddDrawUndo, SdrUndoAction *, void ); IDocumentDrawModelAccess const & getIDocumentDrawModelAccess() const; IDocumentDrawModelAccess & getIDocumentDrawModelAccess(); @@ -578,7 +578,7 @@ public: const OUString& getDocAccTitle() const { return msDocAccTitle; } // INextInterface here - DECL_LINK_TYPED(CalcFieldValueHdl, EditFieldInfo*, void); + DECL_LINK(CalcFieldValueHdl, EditFieldInfo*, void); // OLE ??? bool IsOLEPrtNotifyPending() const { return mbOLEPrtNotifyPending; } diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index a0228c8e4027..879c367631b5 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -171,7 +171,7 @@ public: virtual ~SwDocShell() override; /// OLE 2.0-notification. - DECL_LINK_TYPED( Ole2ModifiedHdl, bool, void ); + DECL_LINK( Ole2ModifiedHdl, bool, void ); /// OLE-stuff. virtual void SetVisArea( const Rectangle &rRect ) override; diff --git a/sw/inc/gotodlg.hxx b/sw/inc/gotodlg.hxx index 734e9cde3287..314ab3b74e5c 100644 --- a/sw/inc/gotodlg.hxx +++ b/sw/inc/gotodlg.hxx @@ -40,7 +40,7 @@ private: SwView* GetCreateView() const; sal_uInt16 GetPageInfo(); - DECL_LINK_TYPED( PageModifiedHdl, Edit&, void ); + DECL_LINK( PageModifiedHdl, Edit&, void ); VclPtr<Edit> mpMtrPageCtrl; VclPtr<FixedText> mpPageNumberLbl; diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx index fef9e18dff85..12ca36e911cd 100644 --- a/sw/inc/htmltbl.hxx +++ b/sw/inc/htmltbl.hxx @@ -246,7 +246,7 @@ class SwHTMLTableLayout void Resize_( sal_uInt16 nAbsAvail, bool bRecalc ); - DECL_LINK_TYPED( DelayedResize_Impl, Timer*, void ); + DECL_LINK( DelayedResize_Impl, Timer*, void ); static sal_uInt16 GetBrowseWidthByVisArea( const SwDoc& rDoc ); public: diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 162ac0cfeffd..307e8acfb715 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -70,7 +70,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode void InsertLink( const OUString& rGrfName, const OUString& rFltName ); bool ImportGraphic( SvStream& rStrm ); - DECL_LINK_TYPED( SwapGraphic, const GraphicObject*, SvStream* ); + DECL_LINK( SwapGraphic, const GraphicObject*, SvStream* ); /** helper method to determine stream for the embedded graphic. diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index 3309501069d1..2d419708ab44 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -73,7 +73,7 @@ class SwChartLockController_Helper { SwDoc *pDoc; - DECL_LINK_TYPED( DoUnlockAllCharts, Timer *, void ); + DECL_LINK( DoUnlockAllCharts, Timer *, void ); Timer aUnlockTimer; // timer to unlock chart controllers bool bIsLocked; diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index 46ade150256a..0ef086c0c3d4 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -266,9 +266,9 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SAL_DLLPRIVATE bool IsTextTool() const; - DECL_DLLPRIVATE_LINK_TYPED( TimeoutHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( TimeoutHdl, Timer*, void ); - DECL_DLLPRIVATE_LINK_TYPED( FieldPopupModeEndHdl, FloatingWindow*, void ); + DECL_DLLPRIVATE_LINK( FieldPopupModeEndHdl, FloatingWindow*, void ); inline long GetXScroll() const; inline long GetYScroll() const; @@ -289,10 +289,10 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SAL_DLLPRIVATE long PhyPageDown(); 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 UpdateScrollbars(); - DECL_DLLPRIVATE_LINK_TYPED( WindowChildEventListener, VclWindowEvent&, void ); + DECL_DLLPRIVATE_LINK( WindowChildEventListener, VclWindowEvent&, void ); SAL_DLLPRIVATE void CalcVisArea( const Size &rPixelSz ); // linguistics functions @@ -429,7 +429,7 @@ public: void ExecFieldPopup( const Point& rPt, sw::mark::IFieldmark *fieldBM ); void ExecSmartTagPopup( const Point& rPt ); - DECL_LINK_TYPED( OnlineSpellCallback, SpellCallbackInfo&, void ); + DECL_LINK( OnlineSpellCallback, SpellCallbackInfo&, void ); bool ExecDrwTextSpellPopup(const Point& rPt); void SetTabColFromDocPos( const Point &rPt ) { m_aTabColFromDocPos = rPt; } @@ -452,7 +452,7 @@ public: static sal_uInt16 GetMoveType(); static void SetMoveType(sal_uInt16 nSet); - DECL_LINK_TYPED( MoveNavigationHdl, void*, void ); + DECL_LINK( MoveNavigationHdl, void*, void ); static void SetActMark(sal_Int32 nSet); bool HandleWheelCommands( const CommandEvent& ); @@ -499,7 +499,7 @@ public: void ExecDraw(SfxRequest&); void ExecTabWin(SfxRequest&); void ExecuteStatusLine(SfxRequest&); - DECL_LINK_TYPED( ExecRulerClick, Ruler *, void ); + DECL_LINK( ExecRulerClick, Ruler *, void ); void ExecSearch(SfxRequest&); void ExecViewOptions(SfxRequest &); @@ -538,10 +538,10 @@ public: void StateTabWin(SfxItemSet&); // attributes have changed - DECL_LINK_TYPED( AttrChangedNotify, SwCursorShell*, void ); + DECL_LINK( AttrChangedNotify, SwCursorShell*, void ); // form control has been activated - DECL_LINK_TYPED( FormControlActivated, LinkParamNone*, void ); + DECL_LINK( FormControlActivated, LinkParamNone*, void ); // edit links void EditLinkDlg(); @@ -586,7 +586,7 @@ public: void ExecuteInsertDoc( SfxRequest& rRequest, const SfxPoolItem* pItem ); long InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVersion ); - DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper *, void ); + DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper *, void ); // status methods for clipboard. // Status changes now notified from the clipboard. diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 6792919e0591..855f6a8c352e 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -3222,7 +3222,7 @@ class IdleTask public: bool GetFlag(); IdleTask(); - DECL_LINK_TYPED( FlipFlag, Idle *, void ); + DECL_LINK( FlipFlag, Idle *, void ); ~IdleTask() {} private: bool flag; @@ -3248,7 +3248,7 @@ bool IdleTask::GetFlag() } //Callback function of IdleTask Class -IMPL_LINK_TYPED(IdleTask, FlipFlag, Idle*, , void) +IMPL_LINK(IdleTask, FlipFlag, Idle*, , void) { //setting the flag to make sure that low priority idle task has been dispatched this->flag = true; diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index 0c59541d70c1..06b9c5b7f0e2 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -385,7 +385,7 @@ void SwAccessibleDocument::Dispose(bool bRecursive, bool bCanSkipInvisible) SwAccessibleContext::Dispose(bRecursive, bCanSkipInvisible); } -IMPL_LINK_TYPED( SwAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( SwAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEvent, void ) { OSL_ENSURE( rEvent.GetWindow(), "Window???" ); switch ( rEvent.GetId() ) diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx index 9160075c5823..8bd71968cadf 100644 --- a/sw/source/core/access/accdoc.hxx +++ b/sw/source/core/access/accdoc.hxx @@ -122,7 +122,7 @@ protected: public: SwAccessibleDocument( SwAccessibleMap* pInitMap ); - DECL_LINK_TYPED( WindowChildEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowChildEventListener, VclWindowEvent&, void ); // XServiceInfo diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx b/sw/source/core/doc/DocumentStatisticsManager.cxx index 51d398e9ceb9..86c055c15a9c 100644 --- a/sw/source/core/doc/DocumentStatisticsManager.cxx +++ b/sw/source/core/doc/DocumentStatisticsManager.cxx @@ -231,7 +231,7 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF return nChars < 0; } -IMPL_LINK_TYPED( DocumentStatisticsManager, DoIdleStatsUpdate, Timer *, pTimer, void ) +IMPL_LINK( DocumentStatisticsManager, DoIdleStatsUpdate, Timer *, pTimer, void ) { (void)pTimer; if (IncrementalDocStatCalculate(32000)) diff --git a/sw/source/core/doc/DocumentTimerManager.cxx b/sw/source/core/doc/DocumentTimerManager.cxx index 0a38024bd440..f53eab71f2d3 100644 --- a/sw/source/core/doc/DocumentTimerManager.cxx +++ b/sw/source/core/doc/DocumentTimerManager.cxx @@ -79,7 +79,7 @@ void DocumentTimerManager::StartBackgroundJobs() maIdle.Start(); } -IMPL_LINK_TYPED( DocumentTimerManager, DoIdleJobs, Idle*, pIdle, void ) +IMPL_LINK( DocumentTimerManager, DoIdleJobs, Idle*, pIdle, void ) { #ifdef TIMELOG static ::rtl::Logfile* pModLogFile = 0; diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index e04649ba95b1..aebf76989a6f 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -774,7 +774,7 @@ void SwDoc::PrtOLENotify( bool bAll ) } } -IMPL_LINK_NOARG_TYPED( SwDoc, DoUpdateModifiedOLE, Idle *, void ) +IMPL_LINK_NOARG( SwDoc, DoUpdateModifiedOLE, Idle *, void ) { SwFEShell* pSh = static_cast<SwFEShell*>(GetEditShell()); if( pSh ) diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx index 620996fd702c..7669a6d7d4bd 100644 --- a/sw/source/core/doc/docdraw.cxx +++ b/sw/source/core/doc/docdraw.cxx @@ -521,7 +521,7 @@ void SwDoc::SetCalcFieldValueHdl(Outliner* pOutliner) } /// Recognise fields/URLs in the Outliner and set how they are displayed. -IMPL_LINK_TYPED(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) +IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) { if (!pInfo) return; diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index 3fce21e7d42d..c43d7f46f380 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -1741,7 +1741,7 @@ void SwHTMLTableLayout::Resize_( sal_uInt16 nAbsAvail, bool bRecalc ) pRoot->EndAllAction( true ); //True per VirDev (browsing is calmer) } -IMPL_LINK_NOARG_TYPED( SwHTMLTableLayout, DelayedResize_Impl, Timer*, void ) +IMPL_LINK_NOARG( SwHTMLTableLayout, DelayedResize_Impl, Timer*, void ) { m_aResizeTimer.Stop(); Resize_( m_nDelayedResizeAbsAvail, m_bDelayedResizeRecalc ); diff --git a/sw/source/core/docnode/retrievedinputstreamdata.cxx b/sw/source/core/docnode/retrievedinputstreamdata.cxx index 9a46dc993539..b41125698981 100644 --- a/sw/source/core/docnode/retrievedinputstreamdata.cxx +++ b/sw/source/core/docnode/retrievedinputstreamdata.cxx @@ -122,7 +122,7 @@ bool SwRetrievedInputStreamDataManager::PopData( const tDataKey nDataKey, #i73788# Note: This method has to be run in the main thread. */ -IMPL_LINK_TYPED( SwRetrievedInputStreamDataManager, +IMPL_LINK( SwRetrievedInputStreamDataManager, LinkedInputStreamReady, void*, p, void ) { diff --git a/sw/source/core/docnode/threadmanager.cxx b/sw/source/core/docnode/threadmanager.cxx index 750ff2090888..d82d84fdc7c7 100644 --- a/sw/source/core/docnode/threadmanager.cxx +++ b/sw/source/core/docnode/threadmanager.cxx @@ -202,7 +202,7 @@ bool ThreadManager::StartThread( const tThreadData& rThreadData ) return bThreadStarted; } -IMPL_LINK_NOARG_TYPED(ThreadManager, TryToStartNewThread, Idle *, void) +IMPL_LINK_NOARG(ThreadManager, TryToStartNewThread, Idle *, void) { osl::MutexGuard aGuard(maMutex); diff --git a/sw/source/core/draw/dobjfac.cxx b/sw/source/core/draw/dobjfac.cxx index 845c08617195..e092f6d26917 100644 --- a/sw/source/core/draw/dobjfac.cxx +++ b/sw/source/core/draw/dobjfac.cxx @@ -23,7 +23,7 @@ SwObjectFactory aSwObjectFactory; -IMPL_STATIC_LINK_TYPED( +IMPL_STATIC_LINK( SwObjectFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* ) { if ( aParams.nInventor == SWGInventor ) diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 9614e039fbf0..a5575c2172a4 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -955,7 +955,7 @@ SwContentNode* SwGrfNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const return pGrfNd; } -IMPL_LINK_TYPED( SwGrfNode, SwapGraphic, const GraphicObject*, pGrfObj, SvStream* ) +IMPL_LINK( SwGrfNode, SwapGraphic, const GraphicObject*, pGrfObj, SvStream* ) { SvStream* pRet; diff --git a/sw/source/core/inc/DocumentStatisticsManager.hxx b/sw/source/core/inc/DocumentStatisticsManager.hxx index 0291afc032f5..b21e8ec9ef99 100644 --- a/sw/source/core/inc/DocumentStatisticsManager.hxx +++ b/sw/source/core/inc/DocumentStatisticsManager.hxx @@ -59,7 +59,7 @@ private: bool IncrementalDocStatCalculate(long nChars, bool bFields = true); // Our own 'StatsUpdateTimer' calls the following method - DECL_LINK_TYPED( DoIdleStatsUpdate, Timer *, void ); + DECL_LINK( DoIdleStatsUpdate, Timer *, void ); SwDocStat *mpDocStat; //< Statistics information. diff --git a/sw/source/core/inc/DocumentTimerManager.hxx b/sw/source/core/inc/DocumentTimerManager.hxx index cf6b580a2e69..b8575192eba3 100644 --- a/sw/source/core/inc/DocumentTimerManager.hxx +++ b/sw/source/core/inc/DocumentTimerManager.hxx @@ -48,7 +48,7 @@ public: void StartBackgroundJobs() override; // Our own 'IdleTimer' calls the following method - DECL_LINK_TYPED( DoIdleJobs, Idle *, void ); + DECL_LINK( DoIdleJobs, Idle *, void ); virtual ~DocumentTimerManager() override; diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx index 00b624a1b408..61c45fda8044 100644 --- a/sw/source/core/inc/blink.hxx +++ b/sw/source/core/inc/blink.hxx @@ -75,7 +75,7 @@ public: SwBlink(); ~SwBlink(); - DECL_LINK_TYPED( Blinker, Timer *, void ); + DECL_LINK( Blinker, Timer *, void ); void Insert( const Point& rPoint, const SwLinePortion* pPor, const SwTextFrame *pTextFrame, sal_uInt16 nDir ); diff --git a/sw/source/core/inc/retrievedinputstreamdata.hxx b/sw/source/core/inc/retrievedinputstreamdata.hxx index a8f2a0244e8c..cb8666c060fc 100644 --- a/sw/source/core/inc/retrievedinputstreamdata.hxx +++ b/sw/source/core/inc/retrievedinputstreamdata.hxx @@ -74,7 +74,7 @@ class SwRetrievedInputStreamDataManager bool PopData( const tDataKey nDataKey, tData& rData ); - DECL_LINK_TYPED( LinkedInputStreamReady, void*, void ); + DECL_LINK( LinkedInputStreamReady, void*, void ); private: diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx index 4a888277bb0b..126973bb58be 100644 --- a/sw/source/core/inc/threadmanager.hxx +++ b/sw/source/core/inc/threadmanager.hxx @@ -69,7 +69,7 @@ class ThreadManager void RemoveThread( const oslInterlockedCount nThreadID, const bool bThreadFinished = false ); - DECL_LINK_TYPED( TryToStartNewThread, Idle*, void ); + DECL_LINK( TryToStartNewThread, Idle*, void ); /** suspend the starting of threads diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx index 4fd56d2a1c5a..97d868d762f2 100644 --- a/sw/source/core/text/blink.cxx +++ b/sw/source/core/text/blink.cxx @@ -55,7 +55,7 @@ SwBlink::~SwBlink( ) * Toggle visibility flag * Determine the repaint rectangle and invalidate them in their OleShells. */ -IMPL_LINK_NOARG_TYPED(SwBlink, Blinker, Timer *, void) +IMPL_LINK_NOARG(SwBlink, Blinker, Timer *, void) { bVisible = !bVisible; if( bVisible ) diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx b/sw/source/core/txtnode/SwGrammarContact.cxx index e7ea21fc1b65..cbf89b966b95 100644 --- a/sw/source/core/txtnode/SwGrammarContact.cxx +++ b/sw/source/core/txtnode/SwGrammarContact.cxx @@ -44,7 +44,7 @@ class SwGrammarContact : public IGrammarContact, public SwClient SwGrammarMarkUp *mpProxyList; bool mbFinished; SwTextNode* getMyTextNode() { return static_cast<SwTextNode*>(GetRegisteredIn()); } - DECL_LINK_TYPED( TimerRepaint, Timer *, void ); + DECL_LINK( TimerRepaint, Timer *, void ); public: SwGrammarContact(); @@ -65,7 +65,7 @@ SwGrammarContact::SwGrammarContact() : mpProxyList(nullptr), mbFinished( false ) aTimer.SetTimeoutHdl( LINK(this, SwGrammarContact, TimerRepaint) ); } -IMPL_LINK_TYPED( SwGrammarContact, TimerRepaint, Timer *, pTimer, void ) +IMPL_LINK( SwGrammarContact, TimerRepaint, Timer *, pTimer, void ) { if( pTimer ) { diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx index 718e07dff949..1fdb2534d039 100644 --- a/sw/source/core/undo/undraw.cxx +++ b/sw/source/core/undo/undraw.cxx @@ -55,7 +55,7 @@ struct SwUndoGroupObjImpl // Draw-Objecte -IMPL_LINK_TYPED( SwDoc, AddDrawUndo, SdrUndoAction *, pUndo, void ) +IMPL_LINK( SwDoc, AddDrawUndo, SdrUndoAction *, pUndo, void ) { #if OSL_DEBUG_LEVEL > 1 SAL_INFO("sw.core", "Id: " << pUndo->GetId() << "Comment: " << pUndo->GetComment()); diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 13baf57da8cd..7d71e852fb85 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -160,7 +160,7 @@ void SwChartLockController_Helper::LockUnlockAllCharts( bool bLock ) bIsLocked = bLock; } -IMPL_LINK_NOARG_TYPED( SwChartLockController_Helper, DoUnlockAllCharts, Timer *, void ) +IMPL_LINK_NOARG( SwChartLockController_Helper, DoUnlockAllCharts, Timer *, void ) { UnlockAllCharts(); } diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 4375df835e30..adf16e459d6a 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -484,7 +484,7 @@ SwHTMLParser::~SwHTMLParser() } } -IMPL_LINK_NOARG_TYPED( SwHTMLParser, AsyncCallback, void*, void ) +IMPL_LINK_NOARG( SwHTMLParser, AsyncCallback, void*, void ) { m_nEventId=nullptr; diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 6ec45ba17670..386f11fb6988 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -491,7 +491,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient SwViewShell *CallEndAction( bool bChkAction = false, bool bChkPtr = true ); SwViewShell *CheckActionViewShell(); - DECL_LINK_TYPED( AsyncCallback, void*, void ); + DECL_LINK( AsyncCallback, void*, void ); // Attribute am Dok setzen void SetAttr_( bool bChkEnd, bool bBeforeTable, HTMLAttrs *pPostIts ); diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index c621ce918dc0..5eb010c3d202 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -59,18 +59,18 @@ void SwBreakDlg::Apply() } } -IMPL_LINK_NOARG_TYPED(SwBreakDlg, ClickHdl, Button*, void) +IMPL_LINK_NOARG(SwBreakDlg, ClickHdl, Button*, void) { CheckEnable(); } -IMPL_LINK_NOARG_TYPED(SwBreakDlg, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SwBreakDlg, SelectHdl, ListBox&, void) { CheckEnable(); } // Handler for Change Page Number -IMPL_LINK_TYPED( SwBreakDlg, PageNumHdl, Button*, pBox, void ) +IMPL_LINK( SwBreakDlg, PageNumHdl, Button*, pBox, void ) { if(static_cast<CheckBox*>(pBox)->IsChecked()) m_pPageNumEdit->SetValue(1); @@ -79,7 +79,7 @@ IMPL_LINK_TYPED( SwBreakDlg, PageNumHdl, Button*, pBox, void ) } // By changing the Page number the checkbox is checked. -IMPL_LINK_NOARG_TYPED(SwBreakDlg, PageNumModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwBreakDlg, PageNumModifyHdl, Edit&, void) { m_pPageNumBox->Check(); } @@ -89,7 +89,7 @@ IMPL_LINK_NOARG_TYPED(SwBreakDlg, PageNumModifyHdl, Edit&, void) * checks whether pagenumber nPage is a legal pagenumber (left pages with even * numbers etc. for a page template with alternating pages) */ -IMPL_LINK_NOARG_TYPED(SwBreakDlg, OkHdl, Button*, void) +IMPL_LINK_NOARG(SwBreakDlg, OkHdl, Button*, void) { if(m_pPageNumBox->IsChecked()) { // In case of differing page descriptions, test validity diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 28798155aad8..d3da603cf675 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -300,7 +300,7 @@ VclPtr<SfxTabPage> SwCharURLPage::Create( vcl::Window* pParent, return VclPtr<SwCharURLPage>::Create( pParent, *rAttrSet ); } -IMPL_LINK_NOARG_TYPED(SwCharURLPage, InsertFileHdl, Button*, void) +IMPL_LINK_NOARG(SwCharURLPage, InsertFileHdl, Button*, void) { FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE ); if( aDlgHelper.Execute() == ERRCODE_NONE ) @@ -310,7 +310,7 @@ IMPL_LINK_NOARG_TYPED(SwCharURLPage, InsertFileHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SwCharURLPage, EventHdl, Button*, void) +IMPL_LINK_NOARG(SwCharURLPage, EventHdl, Button*, void) { bModified |= SwMacroAssignDlg::INetFormatDlg( this, ::GetActiveView()->GetWrtShell(), pINetItem ); diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index f960d6529a7e..77ba0cd65bdb 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -679,7 +679,7 @@ void SwDropCapsPage::Reset(const SfxItemSet *rSet) bModified = false; } -IMPL_LINK_NOARG_TYPED(SwDropCapsPage, ClickHdl, Button*, void) +IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl, Button*, void) { bool bChecked = m_pDropCapsBox->IsChecked(); @@ -707,7 +707,7 @@ IMPL_LINK_NOARG_TYPED(SwDropCapsPage, ClickHdl, Button*, void) bModified = true; } -IMPL_LINK_NOARG_TYPED(SwDropCapsPage, WholeWordHdl, Button*, void) +IMPL_LINK_NOARG(SwDropCapsPage, WholeWordHdl, Button*, void) { m_pDropCapsField->Enable( !m_pWholeWordCB->IsChecked() ); m_pSwitchText->Enable(!m_pWholeWordCB->IsChecked()); @@ -717,7 +717,7 @@ IMPL_LINK_NOARG_TYPED(SwDropCapsPage, WholeWordHdl, Button*, void) bModified = true; } -IMPL_LINK_TYPED( SwDropCapsPage, ModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit&, rEdit, void ) { OUString sPreview; @@ -766,7 +766,7 @@ IMPL_LINK_TYPED( SwDropCapsPage, ModifyHdl, Edit&, rEdit, void ) bModified = true; } -IMPL_LINK_NOARG_TYPED(SwDropCapsPage, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SwDropCapsPage, SelectHdl, ListBox&, void) { m_pPict->UpdatePaintSettings(); bModified = true; diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 41ccbb854b4f..487441cf9fb4 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -310,7 +310,7 @@ void SwParagraphNumTabPage::EnableNewStart() m_pNewStartBX->Show(); } -IMPL_LINK_NOARG_TYPED(SwParagraphNumTabPage, NewStartHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwParagraphNumTabPage, NewStartHdl_Impl, Button*, void) { bool bEnable = m_pNewStartCB->IsChecked(); m_pNewStartNumberCB->Enable(bEnable); @@ -318,7 +318,7 @@ IMPL_LINK_NOARG_TYPED(SwParagraphNumTabPage, NewStartHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SwParagraphNumTabPage, LineCountHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwParagraphNumTabPage, LineCountHdl_Impl, Button*, void) { m_pRestartParaCountCB->Enable(m_pCountParaCB->IsChecked()); @@ -327,7 +327,7 @@ IMPL_LINK_NOARG_TYPED(SwParagraphNumTabPage, LineCountHdl_Impl, Button*, void) m_pRestartBX->Enable(bEnableRestartValue); } -IMPL_LINK_NOARG_TYPED( SwParagraphNumTabPage, EditNumStyleSelectHdl_Impl, ListBox&, void ) +IMPL_LINK_NOARG( SwParagraphNumTabPage, EditNumStyleSelectHdl_Impl, ListBox&, void ) { sal_Int32 numSelectPos = m_pNumberStyleLB->GetSelectEntryPos(); if ( numSelectPos == 0 ) @@ -336,7 +336,7 @@ IMPL_LINK_NOARG_TYPED( SwParagraphNumTabPage, EditNumStyleSelectHdl_Impl, ListBo m_pEditNumStyleBtn->Enable(); } -IMPL_LINK_NOARG_TYPED(SwParagraphNumTabPage, EditNumStyleHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwParagraphNumTabPage, EditNumStyleHdl_Impl, Button*, void) { OUString aTemplName(m_pNumberStyleLB->GetSelectEntry()); ExecuteEditNumStyle_Impl( SID_STYLE_EDIT, aTemplName, OUString(), SfxStyleFamily::Pseudo ); @@ -377,7 +377,7 @@ bool SwParagraphNumTabPage::ExecuteEditNumStyle_Impl( } -IMPL_LINK_TYPED( SwParagraphNumTabPage, StyleHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SwParagraphNumTabPage, StyleHdl_Impl, ListBox&, rBox, void ) { bool bEnable = bCurNumrule || rBox.GetSelectEntryPos() > 0; m_pNewStartCB->Enable(bEnable); diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 30449f073e7c..e102554aa435 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -213,7 +213,7 @@ void SwCondCollPage::Reset(const SfxItemSet *) } -IMPL_LINK_TYPED( SwCondCollPage, OnOffHdl, Button*, pBox, void ) +IMPL_LINK( SwCondCollPage, OnOffHdl, Button*, pBox, void ) { const bool bEnable = static_cast<CheckBox*>(pBox)->IsChecked(); m_pContextFT->Enable( bEnable ); @@ -228,16 +228,16 @@ IMPL_LINK_TYPED( SwCondCollPage, OnOffHdl, Button*, pBox, void ) SelectHdl(nullptr); } -IMPL_LINK_TYPED( SwCondCollPage, AssignRemoveClickHdl, Button*, pBtn, void) +IMPL_LINK( SwCondCollPage, AssignRemoveClickHdl, Button*, pBtn, void) { AssignRemove(pBtn); } -IMPL_LINK_TYPED( SwCondCollPage, AssignRemoveTreeListBoxHdl, SvTreeListBox*, pBtn, bool) +IMPL_LINK( SwCondCollPage, AssignRemoveTreeListBoxHdl, SvTreeListBox*, pBtn, bool) { AssignRemove(pBtn); return false; } -IMPL_LINK_TYPED( SwCondCollPage, AssignRemoveHdl, ListBox&, rBox, void) +IMPL_LINK( SwCondCollPage, AssignRemoveHdl, ListBox&, rBox, void) { AssignRemove(&rBox); } @@ -268,11 +268,11 @@ void SwCondCollPage::AssignRemove(void* pBtn) m_pTbLinks->SetUpdateMode(true); } -IMPL_LINK_TYPED( SwCondCollPage, SelectTreeListBoxHdl, SvTreeListBox*, pBox, void) +IMPL_LINK( SwCondCollPage, SelectTreeListBoxHdl, SvTreeListBox*, pBox, void) { SelectHdl(pBox); } -IMPL_LINK_TYPED( SwCondCollPage, SelectListBoxHdl, ListBox&, rBox, void) +IMPL_LINK( SwCondCollPage, SelectListBoxHdl, ListBox&, rBox, void) { SelectHdl(&rBox); } diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 25fd3feedfb5..b6d0cd2e7397 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -67,8 +67,8 @@ class SwTestAccountSettingsDialog : public SfxModalDialog bool m_bStop; void Test(); - DECL_LINK_TYPED(StopHdl, Button*, void); - DECL_LINK_TYPED(TestHdl, void*, void); + DECL_LINK(StopHdl, Button*, void); + DECL_LINK(TestHdl, void*, void); public: explicit SwTestAccountSettingsDialog(SwMailConfigPage* pParent); virtual ~SwTestAccountSettingsDialog() override; @@ -105,9 +105,9 @@ class SwAuthenticationSettingsDialog : public SfxModalDialog SwMailMergeConfigItem& rConfigItem; - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); - DECL_LINK_TYPED( CheckBoxHdl_Impl, Button*, void); - DECL_LINK_TYPED(RadioButtonHdl_Impl, Button*, void); + DECL_LINK(OKHdl_Impl, Button*, void); + DECL_LINK( CheckBoxHdl_Impl, Button*, void); + DECL_LINK(RadioButtonHdl_Impl, Button*, void); public: SwAuthenticationSettingsDialog(SwMailConfigPage* pParent, SwMailMergeConfigItem& rItem); @@ -207,20 +207,20 @@ void SwMailConfigPage::Reset( const SfxItemSet* /*rSet*/ ) m_pSecureCB ->SaveValue(); } -IMPL_LINK_TYPED(SwMailConfigPage, ReplyToHdl, Button*, pBox, void) +IMPL_LINK(SwMailConfigPage, ReplyToHdl, Button*, pBox, void) { bool bEnable = static_cast<CheckBox*>(pBox)->IsChecked(); m_pReplyToFT->Enable(bEnable); m_pReplyToED->Enable(bEnable); } -IMPL_LINK_NOARG_TYPED(SwMailConfigPage, AuthenticationHdl, Button*, void) +IMPL_LINK_NOARG(SwMailConfigPage, AuthenticationHdl, Button*, void) { ScopedVclPtrInstance< SwAuthenticationSettingsDialog > aDlg(this, *m_pConfigItem); aDlg->Execute(); } -IMPL_LINK_NOARG_TYPED(SwMailConfigPage, TestHdl, Button*, void) +IMPL_LINK_NOARG(SwMailConfigPage, TestHdl, Button*, void) { ScopedVclPtrInstance<SwTestAccountSettingsDialog>(this)->Execute(); } @@ -273,12 +273,12 @@ void SwTestAccountSettingsDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwTestAccountSettingsDialog, StopHdl, Button*, void) +IMPL_LINK_NOARG(SwTestAccountSettingsDialog, StopHdl, Button*, void) { m_bStop = true; } -IMPL_LINK_NOARG_TYPED(SwTestAccountSettingsDialog, TestHdl, void*, void) +IMPL_LINK_NOARG(SwTestAccountSettingsDialog, TestHdl, void*, void) { EnterWait(); Test(); @@ -476,7 +476,7 @@ void SwAuthenticationSettingsDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwAuthenticationSettingsDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, OKHdl_Impl, Button*, void) { rConfigItem.SetAuthentication( m_pAuthenticationCB->IsChecked() ); rConfigItem.SetSMTPAfterPOP(m_pSMTPAfterPOPRB->IsChecked()); @@ -491,7 +491,7 @@ IMPL_LINK_NOARG_TYPED(SwAuthenticationSettingsDialog, OKHdl_Impl, Button*, void) EndDialog(RET_OK); } -IMPL_LINK_TYPED( SwAuthenticationSettingsDialog, CheckBoxHdl_Impl, Button*, pBox, void) +IMPL_LINK( SwAuthenticationSettingsDialog, CheckBoxHdl_Impl, Button*, pBox, void) { bool bChecked = static_cast<CheckBox*>(pBox)->IsChecked(); m_pSeparateAuthenticationRB->Enable(bChecked); @@ -499,7 +499,7 @@ IMPL_LINK_TYPED( SwAuthenticationSettingsDialog, CheckBoxHdl_Impl, Button*, pBox RadioButtonHdl_Impl( nullptr ); } -IMPL_LINK_NOARG_TYPED(SwAuthenticationSettingsDialog, RadioButtonHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, RadioButtonHdl_Impl, Button*, void) { bool bSeparate = m_pSeparateAuthenticationRB->IsChecked(); bool bIsEnabled = m_pSeparateAuthenticationRB->IsEnabled(); diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index c54be94b0835..d028903d2cd6 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -314,14 +314,14 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet ) m_pFormattingLB->SetDropDownLineCount( m_pFormattingLB->GetEntryCount() ); } -IMPL_LINK_NOARG_TYPED(SwCompatibilityOptPage, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SwCompatibilityOptPage, SelectHdl, ListBox&, void) { const sal_Int32 nPos = m_pFormattingLB->GetSelectEntryPos(); sal_uLong nOptions = reinterpret_cast<sal_uLong>(m_pFormattingLB->GetEntryData( nPos )); SetCurrentOptions( nOptions ); } -IMPL_LINK_NOARG_TYPED(SwCompatibilityOptPage, UseAsDefaultHdl, Button*, void) +IMPL_LINK_NOARG(SwCompatibilityOptPage, UseAsDefaultHdl, Button*, void) { ScopedVclPtrInstance<MessageDialog> aQuery(this, "QueryDefaultCompatDialog", "modules/swriter/ui/querydefaultcompatdialog.ui"); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 214a961b848d..57310326943f 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -155,7 +155,7 @@ VclPtr<SfxTabPage> SwLoadOptPage::Create( vcl::Window* pParent, return VclPtr<SwLoadOptPage>::Create(pParent, *rAttrSet ); } -IMPL_LINK_NOARG_TYPED(SwLoadOptPage, StandardizedPageCountCheckHdl, Button*, void) +IMPL_LINK_NOARG(SwLoadOptPage, StandardizedPageCountCheckHdl, Button*, void) { m_pStandardizedPageSizeNF->Enable(m_pShowStandardizedPageCount->IsChecked()); } @@ -356,7 +356,7 @@ void SwLoadOptPage::Reset( const SfxItemSet* rSet) m_pStandardizedPageSizeNF->Enable(m_pShowStandardizedPageCount->IsChecked()); } -IMPL_LINK_NOARG_TYPED(SwLoadOptPage, MetricHdl, ListBox&, void) +IMPL_LINK_NOARG(SwLoadOptPage, MetricHdl, ListBox&, void) { const sal_Int32 nMPos = m_pMetricLB->GetSelectEntryPos(); if(nMPos != LISTBOX_ENTRY_NOTFOUND) @@ -682,7 +682,7 @@ void SwCaptionOptPage::DelUserData() } } -IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, ShowEntryHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl, SvTreeListBox*, void) { SvTreeListEntry* pSelEntry = m_pCheckLB->FirstSelected(); @@ -789,7 +789,7 @@ IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, ShowEntryHdl, SvTreeListBox*, void) ModifyHdl(*m_pCategoryBox); } -IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, SaveEntryHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SwCaptionOptPage, SaveEntryHdl, SvTreeListBox*, void) { SvTreeListEntry* pEntry = m_pCheckLB->GetHdlEntry(); @@ -825,7 +825,7 @@ void SwCaptionOptPage::SaveEntry(SvTreeListEntry* pEntry) } } -IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwCaptionOptPage, ModifyHdl, Edit&, void) { const OUString sFieldTypeName = m_pCategoryBox->GetText(); @@ -843,17 +843,17 @@ IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, ModifyHdl, Edit&, void) InvalidatePreview(); } -IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, SelectHdl, ComboBox&, void) +IMPL_LINK_NOARG(SwCaptionOptPage, SelectHdl, ComboBox&, void) { InvalidatePreview(); } -IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, SelectListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(SwCaptionOptPage, SelectListBoxHdl, ListBox&, void) { InvalidatePreview(); } -IMPL_LINK_TYPED( SwCaptionOptPage, OrderHdl, ListBox&, rBox, void ) +IMPL_LINK( SwCaptionOptPage, OrderHdl, ListBox&, rBox, void ) { InvalidatePreview(); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index dde2cb6360cd..05335159f7ec 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -287,7 +287,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet* rSet) return bRet; } -IMPL_LINK_TYPED(SwContentOptPage, VertRulerHdl, Button*, pBox, void) +IMPL_LINK(SwContentOptPage, VertRulerHdl, Button*, pBox, void) { m_pVRulerRightCBox->Enable(pBox->IsEnabled() && static_cast<CheckBox*>(pBox)->IsChecked()); } @@ -485,7 +485,7 @@ void SwAddPrinterTabPage::Reset( const SfxItemSet* ) m_pProspectCB_RTL->Enable( false ); } -IMPL_LINK_NOARG_TYPED(SwAddPrinterTabPage, AutoClickHdl, Button*, void) +IMPL_LINK_NOARG(SwAddPrinterTabPage, AutoClickHdl, Button*, void) { bAttrModified = true; bool bIsProspect = m_pProspectCB->IsChecked(); @@ -509,7 +509,7 @@ void SwAddPrinterTabPage::SetFax( const std::vector<OUString>& rFaxLst ) m_pFaxLB->SelectEntryPos(0); } -IMPL_LINK_NOARG_TYPED(SwAddPrinterTabPage, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SwAddPrinterTabPage, SelectHdl, ListBox&, void) { bAttrModified=true; } @@ -968,7 +968,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet) m_pIndexHeightLB->SaveValue(); } -IMPL_LINK_NOARG_TYPED(SwStdFontTabPage, StandardHdl, Button*, void) +IMPL_LINK_NOARG(SwStdFontTabPage, StandardHdl, Button*, void) { sal_uInt8 nFontOffset = m_nFontGroup * FONT_PER_GROUP; m_pStandardBox->SetText(SwStdFontConfig::GetDefaultFor(FONT_STANDARD + nFontOffset, m_eLanguage)); @@ -1000,7 +1000,7 @@ IMPL_LINK_NOARG_TYPED(SwStdFontTabPage, StandardHdl, Button*, void) MAP_TWIP, 10 )); } -IMPL_LINK_TYPED( SwStdFontTabPage, ModifyHdl, Edit&, rBox, void ) +IMPL_LINK( SwStdFontTabPage, ModifyHdl, Edit&, rBox, void ) { if(&rBox == m_pStandardBox) { @@ -1026,7 +1026,7 @@ IMPL_LINK_TYPED( SwStdFontTabPage, ModifyHdl, Edit&, rBox, void ) } } -IMPL_LINK_TYPED( SwStdFontTabPage, ModifyHeightHdl, Edit&, rBox, void ) +IMPL_LINK( SwStdFontTabPage, ModifyHeightHdl, Edit&, rBox, void ) { if(&rBox == m_pStandardHeightLB) { @@ -1052,7 +1052,7 @@ IMPL_LINK_TYPED( SwStdFontTabPage, ModifyHeightHdl, Edit&, rBox, void ) } } -IMPL_LINK_TYPED( SwStdFontTabPage, LoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( SwStdFontTabPage, LoseFocusHdl, Control&, rControl, void ) { ComboBox* pBox = static_cast<ComboBox*>(&rControl); FontSizeBox* pHeightLB = nullptr; @@ -1291,7 +1291,7 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet* rSet) CheckBoxHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(SwTableOptionsTabPage, CheckBoxHdl, Button*, void) +IMPL_LINK_NOARG(SwTableOptionsTabPage, CheckBoxHdl, Button*, void) { m_pNumFormatFormattingCB->Enable(m_pNumFormattingCB->IsChecked()); m_pNumAlignmentCB->Enable(m_pNumFormattingCB->IsChecked()); @@ -2061,7 +2061,7 @@ void SwRedlineOptionsTabPage::Reset( const SfxItemSet* ) ChangedMaskPrevHdl(*pMarkPosLB); } -IMPL_LINK_TYPED( SwRedlineOptionsTabPage, AttribHdl, ListBox&, rLB, void ) +IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox&, rLB, void ) { SvxFontPrevWindow *pPrev = nullptr; ColorListBox *pColorLB; @@ -2166,7 +2166,7 @@ IMPL_LINK_TYPED( SwRedlineOptionsTabPage, AttribHdl, ListBox&, rLB, void ) pPrev->Invalidate(); } -IMPL_LINK_TYPED( SwRedlineOptionsTabPage, ColorHdl, ListBox&, rListBox, void ) +IMPL_LINK( SwRedlineOptionsTabPage, ColorHdl, ListBox&, rListBox, void ) { ColorListBox* pColorLB = static_cast<ColorListBox*>(&rListBox); SvxFontPrevWindow *pPrev = nullptr; @@ -2231,7 +2231,7 @@ IMPL_LINK_TYPED( SwRedlineOptionsTabPage, ColorHdl, ListBox&, rListBox, void ) pPrev->Invalidate(); } -IMPL_LINK_NOARG_TYPED(SwRedlineOptionsTabPage, ChangedMaskPrevHdl, ListBox&, void) +IMPL_LINK_NOARG(SwRedlineOptionsTabPage, ChangedMaskPrevHdl, ListBox&, void) { pMarkPreviewWN->SetMarkPos(pMarkPosLB->GetSelectEntryPos()); pMarkPreviewWN->SetColor(pMarkColorLB->GetSelectEntryColor().GetColor()); @@ -2417,7 +2417,7 @@ void SwCompareOptionsTabPage::Reset( const SfxItemSet* ) m_pStoreRsidCB->SaveValue(); } -IMPL_LINK_NOARG_TYPED(SwCompareOptionsTabPage, ComparisonHdl, Button*, void) +IMPL_LINK_NOARG(SwCompareOptionsTabPage, ComparisonHdl, Button*, void) { bool bChecked = !m_pAutoRB->IsChecked(); m_pRsidCB->Enable( bChecked ); @@ -2425,7 +2425,7 @@ IMPL_LINK_NOARG_TYPED(SwCompareOptionsTabPage, ComparisonHdl, Button*, void) m_pLenNF->Enable( bChecked && m_pIgnoreCB->IsChecked() ); } -IMPL_LINK_NOARG_TYPED(SwCompareOptionsTabPage, IgnoreHdl, Button*, void) +IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl, Button*, void) { m_pLenNF->Enable( m_pIgnoreCB->IsChecked() ); } @@ -2535,7 +2535,7 @@ void SwTestTabPage::Init() m_pTest10CBox->SetClickHdl( aLk ); } -IMPL_LINK_NOARG_TYPED(SwTestTabPage, AutoClickHdl, Button*, void) +IMPL_LINK_NOARG(SwTestTabPage, AutoClickHdl, Button*, void) { bAttrModified = true; } diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index ccb8673accd6..d001831e308e 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -288,7 +288,7 @@ void SwAddressListDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwAddressListDialog, FilterHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl, Button*, void) { SvTreeListEntry* pSelect = m_pListLB->FirstSelected(); uno::Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); @@ -341,7 +341,7 @@ IMPL_LINK_NOARG_TYPED(SwAddressListDialog, FilterHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SwAddressListDialog, LoadHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwAddressListDialog, LoadHdl_Impl, Button*, void) { SwView* pView = m_pAddressPage->GetWizard()->GetSwView(); @@ -354,7 +354,7 @@ IMPL_LINK_NOARG_TYPED(SwAddressListDialog, LoadHdl_Impl, Button*, void) } } -IMPL_LINK_TYPED(SwAddressListDialog, CreateHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, Button*, pButton, void) { OUString sInputURL; VclPtr<SwCreateAddressListDialog> pDlg( @@ -432,7 +432,7 @@ IMPL_LINK_TYPED(SwAddressListDialog, CreateHdl_Impl, Button*, pButton, void) } } -IMPL_LINK_TYPED(SwAddressListDialog, EditHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwAddressListDialog, EditHdl_Impl, Button*, pButton, void) { SvTreeListEntry* pEntry = m_pListLB->FirstSelected(); AddressUserData_Impl* pUserData = pEntry ? static_cast<AddressUserData_Impl*>(pEntry->GetUserData()) : nullptr; @@ -463,14 +463,14 @@ IMPL_LINK_TYPED(SwAddressListDialog, EditHdl_Impl, Button*, pButton, void) } }; -IMPL_LINK_NOARG_TYPED(SwAddressListDialog, ListBoxSelectHdl_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SwAddressListDialog, ListBoxSelectHdl_Impl, SvTreeListBox*, void) { SvTreeListEntry* pSelect = m_pListLB->FirstSelected(); Application::PostUserEvent( LINK( this, SwAddressListDialog, StaticListBoxSelectHdl_Impl ), pSelect, true ); } -IMPL_LINK_TYPED(SwAddressListDialog, StaticListBoxSelectHdl_Impl, void*, p, void) +IMPL_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, void*, p, void) { SvTreeListEntry* pSelect = static_cast<SvTreeListEntry*>(p); //prevent nested calls of the select handler @@ -623,7 +623,7 @@ void SwAddressListDialog::DetectTablesAndQueries( } } -IMPL_LINK_TYPED(SwAddressListDialog, TableSelectHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwAddressListDialog, TableSelectHdl_Impl, Button*, pButton, void) { EnterWait(); SvTreeListEntry* pSelect = m_pListLB->FirstSelected(); @@ -642,7 +642,7 @@ IMPL_LINK_TYPED(SwAddressListDialog, TableSelectHdl_Impl, Button*, pButton, void LeaveWait(); } -IMPL_LINK_NOARG_TYPED(SwAddressListDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwAddressListDialog, OKHdl_Impl, Button*, void) { EndDialog(RET_OK); } diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx index 40f0fad410eb..818a754228dd 100644 --- a/sw/source/ui/dbui/addresslistdialog.hxx +++ b/sw/source/ui/dbui/addresslistdialog.hxx @@ -74,15 +74,15 @@ class SwAddressListDialog : public SfxModalDialog void DetectTablesAndQueries(SvTreeListEntry* pSelect, bool bWidthDialog); - DECL_LINK_TYPED(FilterHdl_Impl, Button*, void); - DECL_LINK_TYPED(LoadHdl_Impl, Button*, void); - DECL_LINK_TYPED(CreateHdl_Impl, Button*, void); - DECL_LINK_TYPED(ListBoxSelectHdl_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED(EditHdl_Impl, Button*, void); - DECL_LINK_TYPED(TableSelectHdl_Impl, Button*, void); - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); - - DECL_LINK_TYPED(StaticListBoxSelectHdl_Impl, void*, void); + DECL_LINK(FilterHdl_Impl, Button*, void); + DECL_LINK(LoadHdl_Impl, Button*, void); + DECL_LINK(CreateHdl_Impl, Button*, void); + DECL_LINK(ListBoxSelectHdl_Impl, SvTreeListBox*, void); + DECL_LINK(EditHdl_Impl, Button*, void); + DECL_LINK(TableSelectHdl_Impl, Button*, void); + DECL_LINK(OKHdl_Impl, Button*, void); + + DECL_LINK(StaticListBoxSelectHdl_Impl, void*, void); public: SwAddressListDialog(SwMailMergeAddressBlockPage* pParent); diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index e5a3354af2b3..ebb3e0eb1b6a 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -60,9 +60,9 @@ class SwAddressControl_Impl : public Control bool m_bNoDataSet; - DECL_LINK_TYPED(ScrollHdl_Impl, ScrollBar*, void); - DECL_LINK_TYPED(GotFocusHdl_Impl, Control&, void); - DECL_LINK_TYPED(EditModifyHdl_Impl, Edit&, void); + DECL_LINK(ScrollHdl_Impl, ScrollBar*, void); + DECL_LINK(GotFocusHdl_Impl, Control&, void); + DECL_LINK(EditModifyHdl_Impl, Edit&, void); void MakeVisible(const Rectangle& aRect); @@ -260,13 +260,13 @@ void SwAddressControl_Impl::SetCurrentDataSet(sal_uInt32 nSet) } } -IMPL_LINK_TYPED(SwAddressControl_Impl, ScrollHdl_Impl, ScrollBar*, pScroll, void) +IMPL_LINK(SwAddressControl_Impl, ScrollHdl_Impl, ScrollBar*, pScroll, void) { long nThumb = pScroll->GetThumbPos(); m_pWindow->SetPosPixel(Point(0, - (m_nLineHeight * nThumb))); } -IMPL_LINK_TYPED(SwAddressControl_Impl, GotFocusHdl_Impl, Control&, rControl, void) +IMPL_LINK(SwAddressControl_Impl, GotFocusHdl_Impl, Control&, rControl, void) { Edit* pEdit = static_cast<Edit*>(&rControl); if(GetFocusFlags::Tab & pEdit->GetGetFocusFlags()) @@ -298,7 +298,7 @@ void SwAddressControl_Impl::MakeVisible(const Rectangle & rRect) } // copy data changes into database -IMPL_LINK_TYPED(SwAddressControl_Impl, EditModifyHdl_Impl, Edit&, rEdit, void) +IMPL_LINK(SwAddressControl_Impl, EditModifyHdl_Impl, Edit&, rEdit, void) { //get the data element number of the current set sal_Int32 nIndex = m_aEditLines[&rEdit]; @@ -515,7 +515,7 @@ void SwCreateAddressListDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, NewHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwCreateAddressListDialog, NewHdl_Impl, Button*, void) { sal_uInt32 nCurrent = m_pAddressControl->GetCurrentDataSet(); std::vector<OUString> aNewData; @@ -530,7 +530,7 @@ IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, NewHdl_Impl, Button*, void) UpdateButtons(); } -IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, DeleteHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwCreateAddressListDialog, DeleteHdl_Impl, Button*, void) { sal_uInt32 nCurrent = m_pAddressControl->GetCurrentDataSet(); if(m_pCSVData->aDBData.size() > 1) @@ -551,7 +551,7 @@ IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, DeleteHdl_Impl, Button*, void) UpdateButtons(); } -IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, FindHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwCreateAddressListDialog, FindHdl_Impl, Button*, void) { if(!m_pFindDlg) { @@ -569,7 +569,7 @@ IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, FindHdl_Impl, Button*, void) m_pFindDlg->Show(!m_pFindDlg->IsVisible()); } -IMPL_LINK_TYPED(SwCreateAddressListDialog, CustomizeHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwCreateAddressListDialog, CustomizeHdl_Impl, Button*, pButton, void) { VclPtrInstance< SwCustomizeAddressListDialog > pDlg(pButton, *m_pCSVData); if(RET_OK == pDlg->Execute()) @@ -618,7 +618,7 @@ void lcl_WriteValues(const std::vector<OUString> *pFields, SvStream* pStream) } -IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, OkHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwCreateAddressListDialog, OkHdl_Impl, Button*, void) { if(m_sURL.isEmpty()) { @@ -658,7 +658,7 @@ IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, OkHdl_Impl, Button*, void) } } -IMPL_LINK_TYPED(SwCreateAddressListDialog, DBCursorHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwCreateAddressListDialog, DBCursorHdl_Impl, Button*, pButton, void) { sal_uInt32 nValue = static_cast< sal_uInt32 >(m_pSetNoNF->GetValue()); @@ -683,7 +683,7 @@ IMPL_LINK_TYPED(SwCreateAddressListDialog, DBCursorHdl_Impl, Button*, pButton, v } } -IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, DBNumCursorHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SwCreateAddressListDialog, DBNumCursorHdl_Impl, Edit&, void) { m_pAddressControl->SetCurrentDataSet( static_cast< sal_uInt32 >(m_pSetNoNF->GetValue() - 1) ); UpdateButtons(); @@ -776,7 +776,7 @@ void SwFindEntryDialog::dispose() } -IMPL_LINK_NOARG_TYPED(SwFindEntryDialog, FindHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwFindEntryDialog, FindHdl_Impl, Button*, void) { sal_Int32 nColumn = -1; if(m_pFindOnlyCB->IsChecked()) @@ -785,12 +785,12 @@ IMPL_LINK_NOARG_TYPED(SwFindEntryDialog, FindHdl_Impl, Button*, void) m_pParent->Find(m_pFindED->GetText(), nColumn); } -IMPL_LINK_NOARG_TYPED(SwFindEntryDialog, FindEnableHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SwFindEntryDialog, FindEnableHdl_Impl, Edit&, void) { m_pFindPB->Enable(!m_pFindED->GetText().isEmpty()); } -IMPL_LINK_NOARG_TYPED(SwFindEntryDialog, CloseHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwFindEntryDialog, CloseHdl_Impl, Button*, void) { Show(false); } diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx index cd03f78f7194..3bd61463008e 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.hxx +++ b/sw/source/ui/dbui/createaddresslistdialog.hxx @@ -62,13 +62,13 @@ class SwCreateAddressListDialog : public SfxModalDialog SwCSVData* m_pCSVData; VclPtr<SwFindEntryDialog> m_pFindDlg; - DECL_LINK_TYPED(NewHdl_Impl, Button*, void); - DECL_LINK_TYPED(DeleteHdl_Impl, Button*, void); - DECL_LINK_TYPED(FindHdl_Impl, Button*, void); - DECL_LINK_TYPED(CustomizeHdl_Impl, Button*, void); - DECL_LINK_TYPED(OkHdl_Impl, Button*, void); - DECL_LINK_TYPED(DBCursorHdl_Impl, Button*, void); - DECL_LINK_TYPED(DBNumCursorHdl_Impl, Edit&, void); + DECL_LINK(NewHdl_Impl, Button*, void); + DECL_LINK(DeleteHdl_Impl, Button*, void); + DECL_LINK(FindHdl_Impl, Button*, void); + DECL_LINK(CustomizeHdl_Impl, Button*, void); + DECL_LINK(OkHdl_Impl, Button*, void); + DECL_LINK(DBCursorHdl_Impl, Button*, void); + DECL_LINK(DBNumCursorHdl_Impl, Edit&, void); void UpdateButtons(); @@ -93,9 +93,9 @@ class SwFindEntryDialog : public ModelessDialog VclPtr<SwCreateAddressListDialog> m_pParent; - DECL_LINK_TYPED(FindHdl_Impl, Button*, void); - DECL_LINK_TYPED(FindEnableHdl_Impl, Edit&, void); - DECL_LINK_TYPED(CloseHdl_Impl, Button*, void); + DECL_LINK(FindHdl_Impl, Button*, void); + DECL_LINK(FindEnableHdl_Impl, Edit&, void); + DECL_LINK(CloseHdl_Impl, Button*, void); public: SwFindEntryDialog(SwCreateAddressListDialog* pParent); diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx index 7eb46bd9a09e..aafaffff4b75 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx @@ -75,12 +75,12 @@ void SwCustomizeAddressListDialog::dispose() } -IMPL_LINK_NOARG_TYPED(SwCustomizeAddressListDialog, ListBoxSelectHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SwCustomizeAddressListDialog, ListBoxSelectHdl_Impl, ListBox&, void) { UpdateButtons(); } -IMPL_LINK_TYPED(SwCustomizeAddressListDialog, AddRenameHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwCustomizeAddressListDialog, AddRenameHdl_Impl, Button*, pButton, void) { bool bRename = pButton == m_pRenamePB; sal_Int32 nPos = m_pFieldsLB->GetSelectEntryPos(); @@ -125,7 +125,7 @@ IMPL_LINK_TYPED(SwCustomizeAddressListDialog, AddRenameHdl_Impl, Button*, pButto UpdateButtons(); } -IMPL_LINK_NOARG_TYPED(SwCustomizeAddressListDialog, DeleteHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwCustomizeAddressListDialog, DeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pFieldsLB->GetSelectEntryPos(); m_pFieldsLB->RemoveEntry(m_pFieldsLB->GetSelectEntryPos()); @@ -141,7 +141,7 @@ IMPL_LINK_NOARG_TYPED(SwCustomizeAddressListDialog, DeleteHdl_Impl, Button*, voi UpdateButtons(); } -IMPL_LINK_TYPED(SwCustomizeAddressListDialog, UpDownHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwCustomizeAddressListDialog, UpDownHdl_Impl, Button*, pButton, void) { sal_Int32 nPos; sal_Int32 nOldPos = nPos = m_pFieldsLB->GetSelectEntryPos(); @@ -203,7 +203,7 @@ void SwAddRenameEntryDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_TYPED(SwAddRenameEntryDialog, ModifyHdl_Impl, Edit&, rEdit, void) +IMPL_LINK(SwAddRenameEntryDialog, ModifyHdl_Impl, Edit&, rEdit, void) { OUString sEntry = rEdit.GetText(); bool bFound = sEntry.isEmpty(); diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx index ab27eb4db9d9..9ce17611ad20 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx @@ -40,10 +40,10 @@ class SwCustomizeAddressListDialog : public SfxModalDialog SwCSVData* m_pNewData; - DECL_LINK_TYPED(AddRenameHdl_Impl, Button*, void); - DECL_LINK_TYPED(DeleteHdl_Impl, Button*, void); - DECL_LINK_TYPED(UpDownHdl_Impl, Button*, void); - DECL_LINK_TYPED(ListBoxSelectHdl_Impl, ListBox&, void); + DECL_LINK(AddRenameHdl_Impl, Button*, void); + DECL_LINK(DeleteHdl_Impl, Button*, void); + DECL_LINK(UpDownHdl_Impl, Button*, void); + DECL_LINK(ListBoxSelectHdl_Impl, ListBox&, void); void UpdateButtons(); public: @@ -60,7 +60,7 @@ class SwAddRenameEntryDialog : public SfxModalDialog VclPtr<OKButton> m_pOK; const std::vector< OUString >& m_rCSVHeader; - DECL_LINK_TYPED(ModifyHdl_Impl, Edit&, void); + DECL_LINK(ModifyHdl_Impl, Edit&, void); protected: SwAddRenameEntryDialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const std::vector< OUString >& rCSVHeader); diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 048802c86741..acf15d512482 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -454,7 +454,7 @@ void SwInsertDBColAutoPilot::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_TYPED( SwInsertDBColAutoPilot, PageHdl, Button*, pButton, void ) +IMPL_LINK( SwInsertDBColAutoPilot, PageHdl, Button*, pButton, void ) { bool bShowTable = pButton == m_pRbAsTable; @@ -485,7 +485,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, PageHdl, Button*, pButton, void ) SelectHdl( bShowTable ? *m_pLbTableDbColumn : *m_pLbTextDbColumn ); } -IMPL_LINK_TYPED( SwInsertDBColAutoPilot, DBFormatHdl, Button*, pButton, void ) +IMPL_LINK( SwInsertDBColAutoPilot, DBFormatHdl, Button*, pButton, void ) { ListBox& rBox = m_pRbAsTable->IsChecked() ? ( nullptr == m_pLbTableCol->GetEntryData( 0 ) @@ -501,7 +501,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, DBFormatHdl, Button*, pButton, void ) m_pLbDbFormatFromUsr->Enable( !bFromDB ); } -IMPL_LINK_TYPED( SwInsertDBColAutoPilot, TableToFromHdl, Button*, pButton, void ) +IMPL_LINK( SwInsertDBColAutoPilot, TableToFromHdl, Button*, pButton, void ) { bool bChgEnable = true, bEnableTo = true, bEnableFrom = true; m_pLbTableDbColumn->SetUpdateMode( false ); @@ -644,7 +644,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, TableToFromHdl, Button*, pButton, void m_pLbTableCol->SetUpdateMode( true ); } -IMPL_LINK_TYPED( SwInsertDBColAutoPilot, DblClickHdl, ListBox&, rBox, void ) +IMPL_LINK( SwInsertDBColAutoPilot, DblClickHdl, ListBox&, rBox, void ) { Button* pButton = nullptr; if( &rBox == m_pLbTextDbColumn ) @@ -658,7 +658,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, DblClickHdl, ListBox&, rBox, void ) TableToFromHdl( pButton ); } -IMPL_LINK_TYPED( SwInsertDBColAutoPilot, TableFormatHdl, Button*, pButton, void ) +IMPL_LINK( SwInsertDBColAutoPilot, TableFormatHdl, Button*, pButton, void ) { SwWrtShell& rSh = pView->GetWrtShell(); bool bNewSet = false; @@ -780,7 +780,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, TableFormatHdl, Button*, pButton, void } } -IMPL_LINK_TYPED( SwInsertDBColAutoPilot, AutoFormatHdl, Button*, pButton, void ) +IMPL_LINK( SwInsertDBColAutoPilot, AutoFormatHdl, Button*, pButton, void ) { SwAbstractDialogFactory* pFact = swui::GetFactory(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); @@ -791,7 +791,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, AutoFormatHdl, Button*, pButton, void ) pDlg->FillAutoFormatOfIndex( pTAutoFormat ); } -IMPL_LINK_TYPED( SwInsertDBColAutoPilot, SelectHdl, ListBox&, rBox, void ) +IMPL_LINK( SwInsertDBColAutoPilot, SelectHdl, ListBox&, rBox, void ) { ListBox* pGetBox = &rBox == m_pLbDbFormatFromUsr ? ( m_pRbAsTable->IsChecked() @@ -851,7 +851,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, SelectHdl, ListBox&, rBox, void ) } } -IMPL_LINK_TYPED( SwInsertDBColAutoPilot, HeaderHdl, Button*, pButton, void ) +IMPL_LINK( SwInsertDBColAutoPilot, HeaderHdl, Button*, pButton, void ) { if( pButton == m_pCbTableHeadon ) { diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 4637a3cff083..5d92cec760b0 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -159,7 +159,7 @@ bool SwMailMergeAddressBlockPage::commitPage( ::svt::WizardTypes::CommitPageReas return true; } -IMPL_LINK_NOARG_TYPED(SwMailMergeAddressBlockPage, AddressListHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressListHdl_Impl, Button*, void) { try { @@ -186,7 +186,7 @@ IMPL_LINK_NOARG_TYPED(SwMailMergeAddressBlockPage, AddressListHdl_Impl, Button*, } } -IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, SettingsHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMailMergeAddressBlockPage, SettingsHdl_Impl, Button*, pButton, void) { ScopedVclPtr<SwSelectAddressBlockDialog> pDlg( VclPtr<SwSelectAddressBlockDialog>::Create(pButton, m_pWizard->GetConfigItem())); @@ -212,7 +212,7 @@ IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, SettingsHdl_Impl, Button*, pButton, GetWizard()->enableButtons(WizardButtonFlags::NEXT, GetWizard()->isStateEnabled(MM_GREETINGSPAGE)); } -IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, AssignHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMailMergeAddressBlockPage, AssignHdl_Impl, Button*, pButton, void) { SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); const sal_uInt16 nSel = m_pSettingsWIN->GetSelectedAddress(); @@ -240,7 +240,7 @@ void SwMailMergeAddressBlockPage::EnableAddressBlock(bool bAll, bool bSelective) m_pStep4->Enable(bSelective); } -IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, Button*, pBox, void) +IMPL_LINK(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, Button*, pBox, void) { EnableAddressBlock(pBox->IsEnabled(), static_cast<CheckBox*>(pBox)->IsChecked()); SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); @@ -248,7 +248,7 @@ IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, Button*, pBox m_pWizard->UpdateRoadmap(); } -IMPL_LINK_NOARG_TYPED(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl, LinkParamNone*, void) +IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl, LinkParamNone*, void) { const sal_uInt16 nSel = m_pSettingsWIN->GetSelectedAddress(); const uno::Sequence< OUString> aBlocks = @@ -260,13 +260,13 @@ IMPL_LINK_NOARG_TYPED(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl, L GetWizard()->enableButtons(WizardButtonFlags::NEXT, GetWizard()->isStateEnabled(MM_GREETINGSPAGE)); } -IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, HideParagraphsHdl_Impl, Button*, pBox, void) +IMPL_LINK(SwMailMergeAddressBlockPage, HideParagraphsHdl_Impl, Button*, pBox, void) { SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); rConfigItem.SetHideEmptyParagraphs( static_cast<CheckBox*>(pBox)->IsChecked() ); } -IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, Button*, pButton, void) { //if no pButton is given, the first set has to be pre-set SwMailMergeConfigItem& rConfig = m_pWizard->GetConfigItem(); @@ -419,7 +419,7 @@ OUString SwSelectAddressBlockDialog::GetCountry() const return OUString(); } -IMPL_LINK_TYPED(SwSelectAddressBlockDialog, DeleteHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwSelectAddressBlockDialog, DeleteHdl_Impl, Button*, pButton, void) { if(m_aAddressBlocks.getLength()) { @@ -439,7 +439,7 @@ IMPL_LINK_TYPED(SwSelectAddressBlockDialog, DeleteHdl_Impl, Button*, pButton, vo } } -IMPL_LINK_TYPED(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, Button*, pButton, void) { bool bCustomize = pButton == m_pCustomizePB; SwCustomizeAddressBlockDialog::DialogType nType = bCustomize ? @@ -471,7 +471,7 @@ IMPL_LINK_TYPED(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, Button*, pButt } } -IMPL_LINK_TYPED(SwSelectAddressBlockDialog, IncludeHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwSelectAddressBlockDialog, IncludeHdl_Impl, Button*, pButton, void) { m_pCountryED->Enable(m_pDependentRB == pButton); } @@ -585,25 +585,25 @@ void SwCustomizeAddressBlockDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwCustomizeAddressBlockDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, OKHdl_Impl, Button*, void) { EndDialog(RET_OK); } -IMPL_LINK_TYPED(SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl, SvTreeListBox*, pBox, void) +IMPL_LINK(SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl, SvTreeListBox*, pBox, void) { sal_Int32 nUserData = (sal_Int32)reinterpret_cast<sal_IntPtr>(pBox->FirstSelected()->GetUserData()); // Check if the selected entry is already in the address and then forbid inserting m_pInsertFieldIB->Enable(nUserData >= 0 || !HasItem_Impl(nUserData)); } -IMPL_LINK_NOARG_TYPED(SwCustomizeAddressBlockDialog, EditModifyHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, EditModifyHdl_Impl, Edit&, void) { m_pPreviewWIN->SetAddress(SwAddressPreview::FillData(GetAddress(), m_rConfigItem)); UpdateImageButtons_Impl(); } -IMPL_LINK_TYPED(SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl, Button*, pButton, void) { if (m_pInsertFieldIB == pButton) { @@ -666,7 +666,7 @@ bool SwCustomizeAddressBlockDialog::HasItem_Impl(sal_Int32 nUserData) return m_pDragED->GetText().indexOf("<" + sEntry + ">") >= 0; } -IMPL_LINK_TYPED(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl, AddressMultiLineEdit&, rEdit, void) +IMPL_LINK(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl, AddressMultiLineEdit&, rEdit, void) { // called in case the selection of the edit field changes. // determine selection - if it's one of the editable fields then @@ -718,11 +718,11 @@ IMPL_LINK_TYPED(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl, Address bOnEntry = false; } -IMPL_LINK_NOARG_TYPED(SwCustomizeAddressBlockDialog, FieldChangeComboBoxHdl_Impl, ComboBox&, void) +IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, FieldChangeComboBoxHdl_Impl, ComboBox&, void) { FieldChangeHdl_Impl(*m_pFieldCB); } -IMPL_LINK_NOARG_TYPED(SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl, Edit&, void) { //changing the field content changes the related members, too sal_Int32 nSelected = GetSelectedItem_Impl(); @@ -810,9 +810,9 @@ class SwAssignFieldsControl : public Control long m_nYOffset; long m_nFirstYPos; - DECL_LINK_TYPED(ScrollHdl_Impl, ScrollBar*, void); - DECL_LINK_TYPED(MatchHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(GotFocusHdl_Impl, Control&, void); + DECL_LINK(ScrollHdl_Impl, ScrollBar*, void); + DECL_LINK(MatchHdl_Impl, ListBox&, void); + DECL_LINK(GotFocusHdl_Impl, Control&, void); virtual bool PreNotify( NotifyEvent& rNEvt ) override; virtual void Command( const CommandEvent& rCEvt ) override; @@ -1080,7 +1080,7 @@ void SwAssignFieldsControl::MakeVisible( sal_Int32 nIndex ) ScrollHdl_Impl( m_aVScroll.get() ); } -IMPL_LINK_TYPED(SwAssignFieldsControl, ScrollHdl_Impl, ScrollBar*, pScroll, void) +IMPL_LINK(SwAssignFieldsControl, ScrollHdl_Impl, ScrollBar*, pScroll, void) { long nThumb = pScroll->GetThumbPos(); // the scrollbar moves on a per line basis @@ -1099,7 +1099,7 @@ IMPL_LINK_TYPED(SwAssignFieldsControl, ScrollHdl_Impl, ScrollBar*, pScroll, void SetUpdateMode(true); } -IMPL_LINK_TYPED(SwAssignFieldsControl, MatchHdl_Impl, ListBox&, rBox, void) +IMPL_LINK(SwAssignFieldsControl, MatchHdl_Impl, ListBox&, rBox, void) { const OUString sColumn = rBox.GetSelectEntry(); uno::Reference< XColumnsSupplier > xColsSupp( m_rConfigItem->GetResultSet(), uno::UNO_QUERY); @@ -1133,7 +1133,7 @@ IMPL_LINK_TYPED(SwAssignFieldsControl, MatchHdl_Impl, ListBox&, rBox, void) m_aModifyHdl.Call(nullptr); } -IMPL_LINK_TYPED(SwAssignFieldsControl, GotFocusHdl_Impl, Control&, rControl, void) +IMPL_LINK(SwAssignFieldsControl, GotFocusHdl_Impl, Control&, rControl, void) { ListBox* pBox = static_cast<ListBox*>(&rControl); if(GetFocusFlags::Tab & pBox->GetGetFocusFlags()) @@ -1226,7 +1226,7 @@ uno::Sequence< OUString > SwAssignFieldsDialog::CreateAssignments() return aAssignments; } -IMPL_LINK_NOARG_TYPED(SwAssignFieldsDialog, OkHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwAssignFieldsDialog, OkHdl_Impl, Button*, void) { m_rConfigItem.SetColumnAssignment( m_rConfigItem.GetCurrentDBData(), @@ -1234,7 +1234,7 @@ IMPL_LINK_NOARG_TYPED(SwAssignFieldsDialog, OkHdl_Impl, Button*, void) EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(SwAssignFieldsDialog, AssignmentModifyHdl_Impl, LinkParamNone*, void) +IMPL_LINK_NOARG(SwAssignFieldsDialog, AssignmentModifyHdl_Impl, LinkParamNone*, void) { uno::Sequence< OUString > aAssignments = CreateAssignments(); const OUString sPreview = SwAddressPreview::FillData( diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index 4c1632bf0d2f..e69390f9918b 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -65,13 +65,13 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage VclPtr<SwMailMergeWizard> m_pWizard; - DECL_LINK_TYPED(AddressListHdl_Impl, Button *, void); - DECL_LINK_TYPED(SettingsHdl_Impl, Button*, void); - DECL_LINK_TYPED(AssignHdl_Impl, Button*, void); - DECL_LINK_TYPED(AddressBlockHdl_Impl, Button*, void); - DECL_LINK_TYPED(InsertDataHdl_Impl, Button*, void); - DECL_LINK_TYPED(AddressBlockSelectHdl_Impl, LinkParamNone*, void); - DECL_LINK_TYPED(HideParagraphsHdl_Impl, Button*, void); + DECL_LINK(AddressListHdl_Impl, Button *, void); + DECL_LINK(SettingsHdl_Impl, Button*, void); + DECL_LINK(AssignHdl_Impl, Button*, void); + DECL_LINK(AddressBlockHdl_Impl, Button*, void); + DECL_LINK(InsertDataHdl_Impl, Button*, void); + DECL_LINK(AddressBlockSelectHdl_Impl, LinkParamNone*, void); + DECL_LINK(HideParagraphsHdl_Impl, Button*, void); void EnableAddressBlock(bool bAll, bool bSelective); @@ -101,9 +101,9 @@ class SwSelectAddressBlockDialog : public SfxModalDialog css::uno::Sequence< OUString> m_aAddressBlocks; SwMailMergeConfigItem& m_rConfig; - DECL_LINK_TYPED(NewCustomizeHdl_Impl, Button*, void); - DECL_LINK_TYPED(DeleteHdl_Impl, Button*, void); - DECL_LINK_TYPED(IncludeHdl_Impl, Button*, void); + DECL_LINK(NewCustomizeHdl_Impl, Button*, void); + DECL_LINK(DeleteHdl_Impl, Button*, void); + DECL_LINK(IncludeHdl_Impl, Button*, void); using Window::SetSettings; @@ -228,13 +228,13 @@ private: SwMailMergeConfigItem& m_rConfigItem; DialogType m_eType; - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); - DECL_LINK_TYPED(ListBoxSelectHdl_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED(EditModifyHdl_Impl, Edit&, void); - DECL_LINK_TYPED(ImageButtonHdl_Impl, Button*, void); - DECL_LINK_TYPED(SelectionChangedHdl_Impl, AddressMultiLineEdit&, void); - DECL_LINK_TYPED(FieldChangeHdl_Impl, Edit&, void); - DECL_LINK_TYPED(FieldChangeComboBoxHdl_Impl, ComboBox&, void); + DECL_LINK(OKHdl_Impl, Button*, void); + DECL_LINK(ListBoxSelectHdl_Impl, SvTreeListBox*, void); + DECL_LINK(EditModifyHdl_Impl, Edit&, void); + DECL_LINK(ImageButtonHdl_Impl, Button*, void); + DECL_LINK(SelectionChangedHdl_Impl, AddressMultiLineEdit&, void); + DECL_LINK(FieldChangeHdl_Impl, Edit&, void); + DECL_LINK(FieldChangeComboBoxHdl_Impl, ComboBox&, void); bool HasItem_Impl(sal_Int32 nUserData); sal_Int32 GetSelectedItem_Impl(); @@ -266,8 +266,8 @@ class SwAssignFieldsDialog : public SfxModalDialog SwMailMergeConfigItem& m_rConfigItem; css::uno::Sequence< OUString > CreateAssignments(); - DECL_LINK_TYPED(OkHdl_Impl, Button*, void); - DECL_LINK_TYPED(AssignmentModifyHdl_Impl, LinkParamNone*, void); + DECL_LINK(OkHdl_Impl, Button*, void); + DECL_LINK(AssignmentModifyHdl_Impl, LinkParamNone*, void); public: SwAssignFieldsDialog(vcl::Window* pParent, diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index 22bc4545791c..c77e2f77ec24 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -108,7 +108,7 @@ void SwMailMergeDocSelectPage::dispose() svt::OWizardPage::dispose(); } -IMPL_LINK_TYPED(SwMailMergeDocSelectPage, DocSelectHdl, Button*, pButton, void) +IMPL_LINK(SwMailMergeDocSelectPage, DocSelectHdl, Button*, pButton, void) { m_pRecentDocLB->Enable(m_pRecentDocRB == pButton); @@ -116,7 +116,7 @@ IMPL_LINK_TYPED(SwMailMergeDocSelectPage, DocSelectHdl, Button*, pButton, void) m_pWizard->enableButtons(WizardButtonFlags::NEXT, m_pWizard->isStateEnabled(MM_OUTPUTTYPETPAGE)); } -IMPL_LINK_TYPED(SwMailMergeDocSelectPage, FileSelectHdl, Button*, pButton, void) +IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, Button*, pButton, void) { bool bTemplate = m_pBrowseTemplatePB == pButton; diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx index 8015506755a2..b5322c3e127d 100644 --- a/sw/source/ui/dbui/mmdocselectpage.hxx +++ b/sw/source/ui/dbui/mmdocselectpage.hxx @@ -44,8 +44,8 @@ class SwMailMergeDocSelectPage : public svt::OWizardPage VclPtr<SwMailMergeWizard> m_pWizard; - DECL_LINK_TYPED(DocSelectHdl, Button*, void); - DECL_LINK_TYPED(FileSelectHdl, Button*, void); + DECL_LINK(DocSelectHdl, Button*, void); + DECL_LINK(FileSelectHdl, Button*, void); virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override; diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 3a5a8185872b..c27e9c35bc68 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -79,7 +79,7 @@ static void lcl_StoreGreetingsBox(ComboBox& rBox, rConfig.SetCurrentGreeting(eType, rBox.GetSelectEntryPos()); } -IMPL_LINK_NOARG_TYPED(SwGreetingsHandler, IndividualHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwGreetingsHandler, IndividualHdl_Impl, Button*, void) { bool bIndividual = m_pPersonalizedCB->IsEnabled() && m_pPersonalizedCB->IsChecked(); m_pFemaleFT->Enable(bIndividual); @@ -103,7 +103,7 @@ IMPL_LINK_NOARG_TYPED(SwGreetingsHandler, IndividualHdl_Impl, Button*, void) UpdatePreview(); } -IMPL_LINK_TYPED(SwGreetingsHandler, GreetingHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwGreetingsHandler, GreetingHdl_Impl, Button*, pButton, void) { ScopedVclPtr<SwCustomizeAddressBlockDialog> pDlg( VclPtr<SwCustomizeAddressBlockDialog>::Create(pButton, m_rConfigItem, @@ -128,7 +128,7 @@ void SwGreetingsHandler::UpdatePreview() //the base class does nothing } -IMPL_LINK_TYPED(SwMailMergeGreetingsPage, AssignHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMailMergeGreetingsPage, AssignHdl_Impl, Button*, pButton, void) { const OUString sPreview(m_pFemaleLB->GetSelectEntry() + "\n" + m_pMaleLB->GetSelectEntry()); ScopedVclPtr<SwAssignFieldsDialog> pDlg( @@ -141,15 +141,15 @@ IMPL_LINK_TYPED(SwMailMergeGreetingsPage, AssignHdl_Impl, Button*, pButton, void } } -IMPL_LINK_NOARG_TYPED(SwMailMergeGreetingsPage, GreetingSelectHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SwMailMergeGreetingsPage, GreetingSelectHdl_Impl, Edit&, void) { UpdatePreview(); } -IMPL_LINK_NOARG_TYPED(SwMailMergeGreetingsPage, GreetingSelectListBoxHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SwMailMergeGreetingsPage, GreetingSelectListBoxHdl_Impl, ListBox&, void) { UpdatePreview(); } -IMPL_LINK_NOARG_TYPED(SwMailMergeGreetingsPage, GreetingSelectComboBoxHdl_Impl, ComboBox&, void) +IMPL_LINK_NOARG(SwMailMergeGreetingsPage, GreetingSelectComboBoxHdl_Impl, ComboBox&, void) { UpdatePreview(); } @@ -363,7 +363,7 @@ bool SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPageReason return true; } -IMPL_LINK_TYPED(SwMailMergeGreetingsPage, ContainsHdl_Impl, Button*, pBox, void) +IMPL_LINK(SwMailMergeGreetingsPage, ContainsHdl_Impl, Button*, pBox, void) { bool bContainsGreeting = static_cast<CheckBox*>(pBox)->IsChecked(); SwGreetingsHandler::Contains(bContainsGreeting); @@ -377,7 +377,7 @@ IMPL_LINK_TYPED(SwMailMergeGreetingsPage, ContainsHdl_Impl, Button*, pBox, void) m_pWizard->UpdateRoadmap(); } -IMPL_LINK_TYPED(SwMailMergeGreetingsPage, InsertDataHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMailMergeGreetingsPage, InsertDataHdl_Impl, Button*, pButton, void) { //if no pButton is given, the first set has to be pre-set if(!pButton) @@ -490,14 +490,14 @@ void SwMailBodyDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_TYPED(SwMailBodyDialog, ContainsHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMailBodyDialog, ContainsHdl_Impl, Button*, pButton, void) { CheckBox* pBox = static_cast<CheckBox*>(pButton); SwGreetingsHandler::Contains(pBox->IsChecked()); m_rConfigItem.SetGreetingLine(pBox->IsChecked(), true); } -IMPL_LINK_NOARG_TYPED(SwMailBodyDialog, OKHdl, Button*, void) +IMPL_LINK_NOARG(SwMailBodyDialog, OKHdl, Button*, void) { m_rConfigItem.SetGreetingLine( m_pGreetingLineCB->IsChecked(), false); diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx index a1fc1909b375..44c7ac8e4960 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hxx +++ b/sw/source/ui/dbui/mmgreetingspage.hxx @@ -68,8 +68,8 @@ protected: ~SwGreetingsHandler() {} - DECL_LINK_TYPED(IndividualHdl_Impl, Button*, void); - DECL_LINK_TYPED(GreetingHdl_Impl, Button*, void); + DECL_LINK(IndividualHdl_Impl, Button*, void); + DECL_LINK(GreetingHdl_Impl, Button*, void); void Contains(bool bContainsGreeting); virtual void UpdatePreview(); @@ -87,12 +87,12 @@ class SwMailMergeGreetingsPage : public svt::OWizardPage, OUString m_sDocument; - DECL_LINK_TYPED(ContainsHdl_Impl, Button*, void); - DECL_LINK_TYPED(InsertDataHdl_Impl, Button*, void); - DECL_LINK_TYPED(GreetingSelectHdl_Impl, Edit&, void); - DECL_LINK_TYPED(GreetingSelectComboBoxHdl_Impl, ComboBox&, void); - DECL_LINK_TYPED(GreetingSelectListBoxHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(AssignHdl_Impl, Button*, void); + DECL_LINK(ContainsHdl_Impl, Button*, void); + DECL_LINK(InsertDataHdl_Impl, Button*, void); + DECL_LINK(GreetingSelectHdl_Impl, Edit&, void); + DECL_LINK(GreetingSelectComboBoxHdl_Impl, ComboBox&, void); + DECL_LINK(GreetingSelectListBoxHdl_Impl, ListBox&, void); + DECL_LINK(AssignHdl_Impl, Button*, void); virtual void UpdatePreview() override; virtual void ActivatePage() override; @@ -111,8 +111,8 @@ class SwMailBodyDialog : public SfxModalDialog, public SwGreetingsHandler VclPtr<OKButton> m_pOK; - DECL_LINK_TYPED(ContainsHdl_Impl, Button*, void); - DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK(ContainsHdl_Impl, Button*, void); + DECL_LINK(OKHdl, Button*, void); public: SwMailBodyDialog(vcl::Window* pParent); virtual ~SwMailBodyDialog() override; diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 5ff97ed8ce34..15838bbf25de 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -620,7 +620,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig OSL_ENSURE(nullptr == rShell.GetTableFormat(), "What to do with a table here?"); } -IMPL_LINK_NOARG_TYPED(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl, SwOneExampleFrame&, void) +IMPL_LINK_NOARG(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl, SwOneExampleFrame&, void) { m_pExampleContainerWIN->Show(); @@ -660,7 +660,7 @@ IMPL_LINK_NOARG_TYPED(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl, SwOneExample m_pTopMF->SetMax(rPageSize.GetHeight() - DEFAULT_TOP_DISTANCE); } -IMPL_LINK_TYPED(SwMailMergeLayoutPage, ZoomHdl_Impl, ListBox&, rBox, void) +IMPL_LINK(SwMailMergeLayoutPage, ZoomHdl_Impl, ListBox&, rBox, void) { if(m_pExampleWrtShell) { @@ -682,11 +682,11 @@ IMPL_LINK_TYPED(SwMailMergeLayoutPage, ZoomHdl_Impl, ListBox&, rBox, void) } } -IMPL_LINK_NOARG_TYPED(SwMailMergeLayoutPage, ChangeAddressLoseFocusHdl_Impl, Control&, void) +IMPL_LINK_NOARG(SwMailMergeLayoutPage, ChangeAddressLoseFocusHdl_Impl, Control&, void) { ChangeAddressHdl_Impl(*m_pLeftMF); } -IMPL_LINK_NOARG_TYPED(SwMailMergeLayoutPage, ChangeAddressHdl_Impl, SpinField&, void) +IMPL_LINK_NOARG(SwMailMergeLayoutPage, ChangeAddressHdl_Impl, SpinField&, void) { if(m_pExampleWrtShell && m_pAddressBlockFormat) { @@ -706,7 +706,7 @@ IMPL_LINK_NOARG_TYPED(SwMailMergeLayoutPage, ChangeAddressHdl_Impl, SpinField&, } } -IMPL_LINK_TYPED(SwMailMergeLayoutPage, GreetingsHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMailMergeLayoutPage, GreetingsHdl_Impl, Button*, pButton, void) { bool bDown = pButton == m_pDownPB; bool bMoved = m_pExampleWrtShell->MoveParagraph( bDown ? 1 : -1 ); @@ -719,7 +719,7 @@ IMPL_LINK_TYPED(SwMailMergeLayoutPage, GreetingsHdl_Impl, Button*, pButton, void } } -IMPL_LINK_TYPED(SwMailMergeLayoutPage, AlignToTextHdl_Impl, Button*, pBox, void) +IMPL_LINK(SwMailMergeLayoutPage, AlignToTextHdl_Impl, Button*, pBox, void) { bool bCheck = static_cast<CheckBox*>(pBox)->IsChecked() && pBox->IsEnabled(); m_pLeftFT->Enable(!bCheck); diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index e1c32613e3db..41b04063b6bc 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hxx +++ b/sw/source/ui/dbui/mmlayoutpage.hxx @@ -65,12 +65,12 @@ class SwMailMergeLayoutPage : public svt::OWizardPage css::uno::Reference< css::beans::XPropertySet > m_xViewProperties; - DECL_LINK_TYPED(PreviewLoadedHdl_Impl, SwOneExampleFrame&, void); - DECL_LINK_TYPED(ZoomHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(ChangeAddressHdl_Impl, SpinField&, void); - DECL_LINK_TYPED(ChangeAddressLoseFocusHdl_Impl, Control&, void); - DECL_LINK_TYPED(GreetingsHdl_Impl, Button*, void); - DECL_LINK_TYPED(AlignToTextHdl_Impl, Button*, void); + DECL_LINK(PreviewLoadedHdl_Impl, SwOneExampleFrame&, void); + DECL_LINK(ZoomHdl_Impl, ListBox&, void); + DECL_LINK(ChangeAddressHdl_Impl, SpinField&, void); + DECL_LINK(ChangeAddressLoseFocusHdl_Impl, Control&, void); + DECL_LINK(GreetingsHdl_Impl, Button*, void); + DECL_LINK(AlignToTextHdl_Impl, Button*, void); static SwFrameFormat* InsertAddressFrame( SwWrtShell& rShell, diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index a8bd05335850..73413e40dc56 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -77,7 +77,7 @@ void SwMailMergeOutputTypePage::dispose() } -IMPL_LINK_NOARG_TYPED(SwMailMergeOutputTypePage, TypeHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwMailMergeOutputTypePage, TypeHdl_Impl, Button*, void) { bool bLetter = m_pLetterRB->IsChecked(); m_pLetterHint->Show(bLetter); @@ -363,7 +363,7 @@ void SwSendMailDialog::SetDocumentCount( sal_Int32 nAllDocuments ) UpdateTransferStatus(); } -IMPL_LINK_TYPED( SwSendMailDialog, StopHdl_Impl, Button*, pButton, void ) +IMPL_LINK( SwSendMailDialog, StopHdl_Impl, Button*, pButton, void ) { m_bCancel = true; if(m_pImpl->xMailDispatcher.is()) @@ -383,17 +383,17 @@ IMPL_LINK_TYPED( SwSendMailDialog, StopHdl_Impl, Button*, pButton, void ) } } -IMPL_LINK_NOARG_TYPED(SwSendMailDialog, CloseHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwSendMailDialog, CloseHdl_Impl, Button*, void) { ModelessDialog::Show( false ); } -IMPL_STATIC_LINK_TYPED( SwSendMailDialog, StartSendMails, void*, pDialog, void ) +IMPL_STATIC_LINK( SwSendMailDialog, StartSendMails, void*, pDialog, void ) { static_cast<SwSendMailDialog*>(pDialog)->SendMails(); } -IMPL_LINK_TYPED( SwSendMailDialog, RemoveThis, Idle*, pTimer, void ) +IMPL_LINK( SwSendMailDialog, RemoveThis, Idle*, pTimer, void ) { if( m_pImpl->xMailDispatcher.is() ) { @@ -415,7 +415,7 @@ IMPL_LINK_TYPED( SwSendMailDialog, RemoveThis, Idle*, pTimer, void ) } } -IMPL_STATIC_LINK_TYPED( SwSendMailDialog, StopSendMails, void*, p, void ) +IMPL_STATIC_LINK( SwSendMailDialog, StopSendMails, void*, p, void ) { SwSendMailDialog* pDialog = static_cast<SwSendMailDialog*>(p); if(pDialog->m_pImpl->xMailDispatcher.is() && diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx index 4eb248b0a127..961153a3c530 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.hxx +++ b/sw/source/ui/dbui/mmoutputtypepage.hxx @@ -35,7 +35,7 @@ class SwMailMergeOutputTypePage : public svt::OWizardPage VclPtr<SwMailMergeWizard> m_pWizard; - DECL_LINK_TYPED(TypeHdl_Impl, Button*, void); + DECL_LINK(TypeHdl_Impl, Button*, void); public: SwMailMergeOutputTypePage( SwMailMergeWizard* _pParent); diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index 492944a3f42c..ec0b71b06a36 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -120,7 +120,7 @@ static OUString lcl_GetColumnValueOf(const OUString& rColumn, Reference < contai class SwSaveWarningBox_Impl : public SwMessageAndEditDialog { - DECL_LINK_TYPED( ModifyHdl, Edit&, void); + DECL_LINK( ModifyHdl, Edit&, void); public: SwSaveWarningBox_Impl(vcl::Window* pParent, const OUString& rFileName); @@ -133,7 +133,7 @@ public: class SwSendQueryBox_Impl : public SwMessageAndEditDialog { bool bIsEmptyAllowed; - DECL_LINK_TYPED( ModifyHdl, Edit&, void); + DECL_LINK( ModifyHdl, Edit&, void); public: SwSendQueryBox_Impl(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription); @@ -170,7 +170,7 @@ SwSaveWarningBox_Impl::SwSaveWarningBox_Impl(vcl::Window* pParent, const OUStrin ModifyHdl(*m_pEdit); } -IMPL_LINK_TYPED( SwSaveWarningBox_Impl, ModifyHdl, Edit&, rEdit, void) +IMPL_LINK( SwSaveWarningBox_Impl, ModifyHdl, Edit&, rEdit, void) { m_pOKPB->Enable(!rEdit.GetText().isEmpty()); } @@ -185,7 +185,7 @@ SwSendQueryBox_Impl::SwSendQueryBox_Impl(vcl::Window* pParent, const OUString& r ModifyHdl(*m_pEdit); } -IMPL_LINK_TYPED( SwSendQueryBox_Impl, ModifyHdl, Edit&, rEdit, void) +IMPL_LINK( SwSendQueryBox_Impl, ModifyHdl, Edit&, rEdit, void) { m_pOKPB->Enable(bIsEmptyAllowed || !rEdit.GetText().isEmpty()); } @@ -472,7 +472,7 @@ void SwMMResultEmailDialog::FillInEmailSettings() } } -IMPL_LINK_TYPED(SwMMResultSaveDialog, DocumentSelectionHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMMResultSaveDialog, DocumentSelectionHdl_Impl, Button*, pButton, void) { bool bEnableFromTo = pButton == m_pFromRB; m_pFromNF->Enable(bEnableFromTo); @@ -480,7 +480,7 @@ IMPL_LINK_TYPED(SwMMResultSaveDialog, DocumentSelectionHdl_Impl, Button*, pButto m_pToNF->Enable(bEnableFromTo); } -IMPL_LINK_TYPED(SwMMResultPrintDialog, DocumentSelectionHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMMResultPrintDialog, DocumentSelectionHdl_Impl, Button*, pButton, void) { bool bEnableFromTo = pButton == m_pFromRB; m_pFromNF->Enable(bEnableFromTo); @@ -488,7 +488,7 @@ IMPL_LINK_TYPED(SwMMResultPrintDialog, DocumentSelectionHdl_Impl, Button*, pButt m_pToNF->Enable(bEnableFromTo); } -IMPL_LINK_TYPED(SwMMResultEmailDialog, DocumentSelectionHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMMResultEmailDialog, DocumentSelectionHdl_Impl, Button*, pButton, void) { bool bEnableFromTo = pButton == m_pFromRB; m_pFromNF->Enable(bEnableFromTo); @@ -496,7 +496,7 @@ IMPL_LINK_TYPED(SwMMResultEmailDialog, DocumentSelectionHdl_Impl, Button*, pButt m_pToNF->Enable(bEnableFromTo); } -IMPL_LINK_TYPED(SwMMResultEmailDialog, CopyToHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMMResultEmailDialog, CopyToHdl_Impl, Button*, pButton, void) { ScopedVclPtrInstance< SwCopyToDialog > pDlg(pButton); pDlg->SetCC(m_sCC ); @@ -508,7 +508,7 @@ IMPL_LINK_TYPED(SwMMResultEmailDialog, CopyToHdl_Impl, Button*, pButton, void) } } -IMPL_LINK_NOARG_TYPED(SwMMResultSaveDialog, SaveCancelHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwMMResultSaveDialog, SaveCancelHdl_Impl, Button*, void) { m_bCancelSaving = true; } @@ -568,7 +568,7 @@ void endDialog(Button* pButton) } // anonymous namespace -IMPL_LINK_TYPED(SwMMResultSaveDialog, SaveOutputHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMMResultSaveDialog, SaveOutputHdl_Impl, Button*, pButton, void) { SwView* pView = ::GetActiveView(); std::shared_ptr<SwMailMergeConfigItem> xConfigItem = pView->GetMailMergeConfigItem(); @@ -760,7 +760,7 @@ IMPL_LINK_TYPED(SwMMResultSaveDialog, SaveOutputHdl_Impl, Button*, pButton, void endDialog(pButton); } -IMPL_LINK_TYPED(SwMMResultPrintDialog, PrinterChangeHdl_Impl, ListBox&, rBox, void) +IMPL_LINK(SwMMResultPrintDialog, PrinterChangeHdl_Impl, ListBox&, rBox, void) { SwView* pView = ::GetActiveView(); std::shared_ptr<SwMailMergeConfigItem> xConfigItem = pView->GetMailMergeConfigItem(); @@ -796,7 +796,7 @@ IMPL_LINK_TYPED(SwMMResultPrintDialog, PrinterChangeHdl_Impl, ListBox&, rBox, vo xConfigItem->SetSelectedPrinter(rBox.GetSelectEntry()); } -IMPL_LINK_TYPED(SwMMResultPrintDialog, PrintHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMMResultPrintDialog, PrintHdl_Impl, Button*, pButton, void) { SwView* pView = ::GetActiveView(); std::shared_ptr<SwMailMergeConfigItem> xConfigItem = pView->GetMailMergeConfigItem(); @@ -855,7 +855,7 @@ IMPL_LINK_TYPED(SwMMResultPrintDialog, PrintHdl_Impl, Button*, pButton, void) endDialog(pButton); } -IMPL_LINK_TYPED(SwMMResultPrintDialog, PrinterSetupHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMMResultPrintDialog, PrinterSetupHdl_Impl, Button*, pButton, void) { if( !m_pTempPrinter ) PrinterChangeHdl_Impl(*m_pPrinterLB); @@ -863,7 +863,7 @@ IMPL_LINK_TYPED(SwMMResultPrintDialog, PrinterSetupHdl_Impl, Button*, pButton, v m_pTempPrinter->Setup(pButton); } -IMPL_LINK_TYPED(SwMMResultEmailDialog, SendTypeHdl_Impl, ListBox&, rBox, void) +IMPL_LINK(SwMMResultEmailDialog, SendTypeHdl_Impl, ListBox&, rBox, void) { sal_uLong nDocType = reinterpret_cast<sal_uLong>(rBox.GetSelectEntryData()); bool bEnable = MM_DOCTYPE_HTML != nDocType && MM_DOCTYPE_TEXT != nDocType; @@ -888,7 +888,7 @@ IMPL_LINK_TYPED(SwMMResultEmailDialog, SendTypeHdl_Impl, ListBox&, rBox, void) } } -IMPL_LINK_TYPED(SwMMResultEmailDialog, SendAsHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMMResultEmailDialog, SendAsHdl_Impl, Button*, pButton, void) { VclPtr<SwMailBodyDialog> pDlg = VclPtr<SwMailBodyDialog>::Create(pButton); pDlg->SetBody(m_sBody); @@ -899,7 +899,7 @@ IMPL_LINK_TYPED(SwMMResultEmailDialog, SendAsHdl_Impl, Button*, pButton, void) } // Send documents as e-mail -IMPL_LINK_TYPED(SwMMResultEmailDialog, SendDocumentsHdl_Impl, Button*, pButton, void) +IMPL_LINK(SwMMResultEmailDialog, SendDocumentsHdl_Impl, Button*, pButton, void) { SwView* pView = ::GetActiveView(); std::shared_ptr<SwMailMergeConfigItem> xConfigItem = pView->GetMailMergeConfigItem(); diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index db2a10f1cf07..230e191e724e 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -156,7 +156,7 @@ void SwSelectDBTableDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_TYPED(SwSelectDBTableDialog, PreviewHdl, Button*, pButton, void) +IMPL_LINK(SwSelectDBTableDialog, PreviewHdl, Button*, pButton, void) { SvTreeListEntry* pEntry = m_pTable->FirstSelected(); if(pEntry) diff --git a/sw/source/ui/dbui/selectdbtabledialog.hxx b/sw/source/ui/dbui/selectdbtabledialog.hxx index 97a2b993f15c..276afbbd2577 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.hxx +++ b/sw/source/ui/dbui/selectdbtabledialog.hxx @@ -45,7 +45,7 @@ class SwSelectDBTableDialog : public SfxModalDialog css::uno::Reference<css::sdbc::XConnection> m_xConnection; - DECL_LINK_TYPED(PreviewHdl, Button*, void); + DECL_LINK(PreviewHdl, Button*, void); public: SwSelectDBTableDialog(vcl::Window* pParent, const css::uno::Reference<css::sdbc::XConnection>& xConnection); diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 12b9f8c6da5f..b1afb05cbd6c 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -318,7 +318,7 @@ LineEnd SwAsciiFilterDlg::GetCRLF() const return eEnd; } -IMPL_LINK_TYPED( SwAsciiFilterDlg, CharSetSelHdl, ListBox&, rListBox, void ) +IMPL_LINK( SwAsciiFilterDlg, CharSetSelHdl, ListBox&, rListBox, void ) { SvxTextEncodingBox* pBox = static_cast<SvxTextEncodingBox*>(&rListBox); LineEnd eOldEnd = GetCRLF(), eEnd = (LineEnd)-1; @@ -393,7 +393,7 @@ IMPL_LINK_TYPED( SwAsciiFilterDlg, CharSetSelHdl, ListBox&, rListBox, void ) m_pLanguageLB->SelectLanguage( nLng ); } -IMPL_LINK_TYPED( SwAsciiFilterDlg, LineEndHdl, RadioButton&, rBtn, void ) +IMPL_LINK( SwAsciiFilterDlg, LineEndHdl, RadioButton&, rBtn, void ) { if( m_bSaveLineStatus ) rBtn.SaveValue(); diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 565d6e7e7d11..9fd9f360557f 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -140,7 +140,7 @@ void SwDocStatPage::Update() SetData(aDocStat); } -IMPL_LINK_NOARG_TYPED(SwDocStatPage, UpdateHdl, Button*, void) +IMPL_LINK_NOARG(SwDocStatPage, UpdateHdl, Button*, void) { Update(); SwDocShell* pDocShell = static_cast<SwDocShell*>( SfxObjectShell::Current()); diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index ddc6e0edd2ec..5efee1fc9985 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -162,7 +162,7 @@ OUString AbstractTabDialog_Impl::GetText() const return pDlg->GetText(); } -IMPL_LINK_NOARG_TYPED(AbstractApplyTabDialog_Impl, ApplyHdl, Button*, void) +IMPL_LINK_NOARG(AbstractApplyTabDialog_Impl, ApplyHdl, Button*, void) { if (pDlg->Apply()) m_aHandler.Call(nullptr); @@ -605,7 +605,7 @@ long AbstractMailMergeWizard_Impl::GetResult() return pDlg->GetResult(); } -IMPL_LINK_TYPED( AbstractMailMergeWizard_Impl, EndDialogHdl, Dialog&, rDialog, void ) +IMPL_LINK( AbstractMailMergeWizard_Impl, EndDialogHdl, Dialog&, rDialog, void ) { OSL_ENSURE( &rDialog == pDlg, "wrong dialog passed to EndDialogHdl!" ); (void) rDialog; // unused in non-debug diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index e6d935912af1..e3cc72cf7e24 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -131,7 +131,7 @@ public: : AbstractTabDialog_Impl(p) { } - DECL_LINK_TYPED(ApplyHdl, Button*, void); + DECL_LINK(ApplyHdl, Button*, void); private: Link<LinkParamNone*,void> m_aHandler; virtual void SetApplyHdl( const Link<LinkParamNone*,void>& rLink ) override; @@ -347,7 +347,7 @@ class AbstractMailMergeWizard_Impl : public AbstractMailMergeWizard VclPtr<SwMailMergeWizard> pDlg; Link<Dialog&,void> aEndDlgHdl; - DECL_LINK_TYPED( EndDialogHdl, Dialog&, void ); + DECL_LINK( EndDialogHdl, Dialog&, void ); public: explicit AbstractMailMergeWizard_Impl( SwMailMergeWizard* p ) : pDlg(p) diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index c15dd03c815b..51f1c74608b4 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -567,7 +567,7 @@ void SwEditRegionDlg::SelectSection(const OUString& rSectionName) // selected entry in TreeListBox is showed in Edit window in case of // multiselection some controls are disabled -IMPL_LINK_TYPED( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox, void ) +IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox, void ) { bDontCheckPasswd = true; SvTreeListEntry* pEntry=pBox->FirstSelected(); @@ -727,7 +727,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox, void bDontCheckPasswd = false; } -IMPL_LINK_TYPED( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox, void ) +IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox, void ) { if( !pBox->GetSelectionCount() ) { @@ -750,7 +750,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox, void ) } // in OkHdl the modified settings are being applied and reversed regions are deleted -IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, OkHdl, Button*, void) +IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl, Button*, void) { // temp. Array because during changing of a region the position // inside of the "Core-Arrays" can be shifted: @@ -827,7 +827,7 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, OkHdl, Button*, void) } // Toggle protect -IMPL_LINK_TYPED( SwEditRegionDlg, ChangeProtectHdl, Button *, pButton, void ) +IMPL_LINK( SwEditRegionDlg, ChangeProtectHdl, Button *, pButton, void ) { TriStateBox* pBox = static_cast<TriStateBox*>(pButton); if(!CheckPasswd(pBox)) @@ -851,7 +851,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, ChangeProtectHdl, Button *, pButton, void ) } // Toggle hide -IMPL_LINK_TYPED( SwEditRegionDlg, ChangeHideHdl, Button *, pButton, void ) +IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, Button *, pButton, void ) { TriStateBox* pBox = static_cast<TriStateBox*>(pButton); if(!CheckPasswd(pBox)) @@ -878,7 +878,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, ChangeHideHdl, Button *, pButton, void ) } // Toggle edit in readonly -IMPL_LINK_TYPED( SwEditRegionDlg, ChangeEditInReadonlyHdl, Button *, pButton, void ) +IMPL_LINK( SwEditRegionDlg, ChangeEditInReadonlyHdl, Button *, pButton, void ) { TriStateBox* pBox = static_cast<TriStateBox*>(pButton); if(!CheckPasswd(pBox)) @@ -896,7 +896,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, ChangeEditInReadonlyHdl, Button *, pButton, vo } // clear selected region -IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, ChangeDismissHdl, Button*, void) +IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl, Button*, void) { if(!CheckPasswd()) return; @@ -961,7 +961,7 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, ChangeDismissHdl, Button*, void) } // link CheckBox to file? -IMPL_LINK_TYPED( SwEditRegionDlg, UseFileHdl, Button *, pButton, void ) +IMPL_LINK( SwEditRegionDlg, UseFileHdl, Button *, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); if(!CheckPasswd(pBox)) @@ -1018,7 +1018,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, UseFileHdl, Button *, pButton, void ) } // call dialog paste file -IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, FileSearchHdl, Button*, void) +IMPL_LINK_NOARG(SwEditRegionDlg, FileSearchHdl, Button*, void) { if(!CheckPasswd()) return; @@ -1028,7 +1028,7 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, FileSearchHdl, Button*, void) m_pDocInserter->StartExecuteModal( LINK( this, SwEditRegionDlg, DlgClosedHdl ) ); } -IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, OptionsHdl, Button*, void) +IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl, Button*, void) { if(!CheckPasswd()) return; @@ -1127,7 +1127,7 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, OptionsHdl, Button*, void) } // Applying of the filename or the linked region -IMPL_LINK_TYPED( SwEditRegionDlg, FileNameHdl, Edit&, rEdit, void ) +IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit&, rEdit, void ) { Selection aSelect = rEdit.GetSelection(); if(!CheckPasswd()) @@ -1175,7 +1175,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, FileNameHdl, Edit&, rEdit, void ) } } -IMPL_LINK_TYPED( SwEditRegionDlg, DDEHdl, Button*, pButton, void ) +IMPL_LINK( SwEditRegionDlg, DDEHdl, Button*, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); if(!CheckPasswd(pBox)) @@ -1224,7 +1224,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, DDEHdl, Button*, pButton, void ) } } -IMPL_LINK_TYPED( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox, void ) +IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox, void ) { bool bChange = pBox == m_pPasswdPB; if(!CheckPasswd()) @@ -1278,7 +1278,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox, void ) // the current region name is being added to the TreeListBox immediately during // editing, with empty string no Ok() -IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, NameEditHdl, Edit&, void) +IMPL_LINK_NOARG(SwEditRegionDlg, NameEditHdl, Edit&, void) { if(!CheckPasswd()) return; @@ -1295,7 +1295,7 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, NameEditHdl, Edit&, void) } } -IMPL_LINK_TYPED( SwEditRegionDlg, ConditionEditHdl, Edit&, rEdit, void ) +IMPL_LINK( SwEditRegionDlg, ConditionEditHdl, Edit&, rEdit, void ) { Selection aSelect = rEdit.GetSelection(); if(!CheckPasswd()) @@ -1311,7 +1311,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, ConditionEditHdl, Edit&, rEdit, void ) } } -IMPL_LINK_TYPED( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg, void ) +IMPL_LINK( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg, void ) { OUString sFileName, sFilterName, sPassword; if ( _pFileDlg->GetError() == ERRCODE_NONE ) @@ -1340,7 +1340,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFile } } -IMPL_LINK_TYPED( SwEditRegionDlg, SubRegionEventHdl, VclWindowEvent&, rEvent, void ) +IMPL_LINK( SwEditRegionDlg, SubRegionEventHdl, VclWindowEvent&, rEvent, void ) { if( !m_bSubRegionsFilled && rEvent.GetId() == VCLEVENT_DROPDOWN_PRE_OPEN ) { @@ -1664,21 +1664,21 @@ VclPtr<SfxTabPage> SwInsertSectionTabPage::Create( vcl::Window* pParent, return VclPtr<SwInsertSectionTabPage>::Create(pParent, *rAttrSet); } -IMPL_LINK_TYPED( SwInsertSectionTabPage, ChangeHideHdl, Button *, pBox, void ) +IMPL_LINK( SwInsertSectionTabPage, ChangeHideHdl, Button *, pBox, void ) { bool bHide = static_cast<CheckBox*>(pBox)->IsChecked(); m_pConditionED->Enable(bHide); m_pConditionFT->Enable(bHide); } -IMPL_LINK_TYPED( SwInsertSectionTabPage, ChangeProtectHdl, Button *, pBox, void ) +IMPL_LINK( SwInsertSectionTabPage, ChangeProtectHdl, Button *, pBox, void ) { bool bCheck = static_cast<CheckBox*>(pBox)->IsChecked(); m_pPasswdCB->Enable(bCheck); m_pPasswdPB->Enable(bCheck); } -IMPL_LINK_TYPED( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton, void ) +IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton, void ) { bool bChange = pButton == m_pPasswdPB; bool bSet = bChange ? bChange : m_pPasswdCB->IsChecked(); @@ -1708,14 +1708,14 @@ IMPL_LINK_TYPED( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton, voi m_aNewPasswd.realloc(0); } -IMPL_LINK_NOARG_TYPED(SwInsertSectionTabPage, NameEditHdl, Edit&, void) +IMPL_LINK_NOARG(SwInsertSectionTabPage, NameEditHdl, Edit&, void) { const OUString aName = m_pCurName->GetText(); GetTabDialog()->GetOKButton().Enable(!aName.isEmpty() && m_pCurName->GetEntryPos( aName ) == LISTBOX_ENTRY_NOTFOUND); } -IMPL_LINK_TYPED( SwInsertSectionTabPage, UseFileHdl, Button *, pButton, void ) +IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, Button *, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); if( pBox->IsChecked() ) @@ -1745,14 +1745,14 @@ IMPL_LINK_TYPED( SwInsertSectionTabPage, UseFileHdl, Button *, pButton, void ) } } -IMPL_LINK_NOARG_TYPED(SwInsertSectionTabPage, FileSearchHdl, Button*, void) +IMPL_LINK_NOARG(SwInsertSectionTabPage, FileSearchHdl, Button*, void) { delete m_pDocInserter; m_pDocInserter = new ::sfx2::DocumentInserter( "swriter" ); m_pDocInserter->StartExecuteModal( LINK( this, SwInsertSectionTabPage, DlgClosedHdl ) ); } -IMPL_LINK_TYPED( SwInsertSectionTabPage, DDEHdl, Button*, pButton, void ) +IMPL_LINK( SwInsertSectionTabPage, DDEHdl, Button*, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); bool bDDE = pBox->IsChecked(); @@ -1779,7 +1779,7 @@ IMPL_LINK_TYPED( SwInsertSectionTabPage, DDEHdl, Button*, pButton, void ) } } -IMPL_LINK_TYPED( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg, void ) +IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg, void ) { if ( _pFileDlg->GetError() == ERRCODE_NONE ) { @@ -2014,7 +2014,7 @@ VclPtr<SfxTabPage> SwSectionFootnoteEndTabPage::Create( vcl::Window* pParent, return VclPtr<SwSectionFootnoteEndTabPage>::Create(pParent, *rAttrSet); } -IMPL_LINK_TYPED( SwSectionFootnoteEndTabPage, FootEndHdl, Button *, pBox, void ) +IMPL_LINK( SwSectionFootnoteEndTabPage, FootEndHdl, Button *, pBox, void ) { bool bFoot = m_pFootnoteNtAtTextEndCB == pBox || m_pFootnoteNtNumCB == pBox || m_pFootnoteNtNumFormatCB == pBox ; @@ -2192,7 +2192,7 @@ void SwSectionIndentTabPage::SetWrtShell(SwWrtShell& rSh) m_pPreviewWin->SetSize(aPageSize); } -IMPL_LINK_NOARG_TYPED(SwSectionIndentTabPage, IndentModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwSectionIndentTabPage, IndentModifyHdl, Edit&, void) { m_pPreviewWin->SetLeftMargin( static_cast< long >(m_pBeforeMF->Denormalize(m_pBeforeMF->GetValue(FUNIT_TWIP))) ); m_pPreviewWin->SetRightMargin( static_cast< long >(m_pAfterMF->Denormalize(m_pAfterMF->GetValue(FUNIT_TWIP))) ); diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index befd3a534aa3..6de40a834664 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -34,7 +34,7 @@ #include <vcl/msgbox.hxx> #include <vcl/settings.hxx> -IMPL_STATIC_LINK_NOARG_TYPED(SwWordCountFloatDlg, CloseHdl, Button*, void) +IMPL_STATIC_LINK_NOARG(SwWordCountFloatDlg, CloseHdl, Button*, void) { SfxViewFrame* pVFrame = ::GetActiveView()->GetViewFrame(); if (pVFrame != nullptr) diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx index b016c35d8323..2332d2a7e2aa 100644 --- a/sw/source/ui/dochdl/selglos.cxx +++ b/sw/source/ui/dochdl/selglos.cxx @@ -46,7 +46,7 @@ void SwSelGlossaryDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwSelGlossaryDlg, DoubleClickHdl, ListBox&, void) +IMPL_LINK_NOARG(SwSelGlossaryDlg, DoubleClickHdl, ListBox&, void) { EndDialog(RET_OK); } diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 0162a20bbd41..a15de6dcc864 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -218,11 +218,11 @@ void SwEnvFormatPage::dispose() } -IMPL_LINK_TYPED( SwEnvFormatPage, LoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( SwEnvFormatPage, LoseFocusHdl, Control&, rControl, void ) { ModifyHdl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( SwEnvFormatPage, ModifyHdl, SpinField&, rEdit, void ) +IMPL_LINK( SwEnvFormatPage, ModifyHdl, SpinField&, rEdit, void ) { long lWVal = static_cast< long >(GetFieldVal(*m_pSizeWidthField )); long lHVal = static_cast< long >(GetFieldVal(*m_pSizeHeightField)); @@ -257,7 +257,7 @@ IMPL_LINK_TYPED( SwEnvFormatPage, ModifyHdl, SpinField&, rEdit, void ) } } -IMPL_LINK_TYPED( SwEnvFormatPage, EditHdl, MenuButton *, pButton, void ) +IMPL_LINK( SwEnvFormatPage, EditHdl, MenuButton *, pButton, void ) { SwWrtShell* pSh = GetParentSwEnvDlg()->pSh; OSL_ENSURE(pSh, "Shell missing"); @@ -383,7 +383,7 @@ SfxItemSet *SwEnvFormatPage::GetCollItemSet(SwTextFormatColl* pColl, bool bSende return pAddrSet; } -IMPL_LINK_NOARG_TYPED(SwEnvFormatPage, FormatHdl, ListBox&, void) +IMPL_LINK_NOARG(SwEnvFormatPage, FormatHdl, ListBox&, void) { long lWidth; long lHeight; diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index 6de321c054c0..09eab399cf70 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -43,10 +43,10 @@ class SwEnvFormatPage : public SfxTabPage std::vector<sal_uInt16> aIDs; - DECL_LINK_TYPED( ModifyHdl, SpinField&, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( EditHdl, MenuButton *, void ); - DECL_LINK_TYPED(FormatHdl, ListBox&, void); + DECL_LINK( ModifyHdl, SpinField&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); + DECL_LINK( EditHdl, MenuButton *, void ); + DECL_LINK(FormatHdl, ListBox&, void); void SetMinMax(); diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 0188619ef4a4..d027f0270f2a 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -248,7 +248,7 @@ void SwEnvPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK_TYPED( SwEnvPage, DatabaseHdl, ListBox&, rListBox, void ) +IMPL_LINK( SwEnvPage, DatabaseHdl, ListBox&, rListBox, void ) { SwWait aWait( *pSh->GetView().GetDocShell(), true ); @@ -266,7 +266,7 @@ IMPL_LINK_TYPED( SwEnvPage, DatabaseHdl, ListBox&, rListBox, void ) m_pTableLB->GetSelectEntry()); } -IMPL_LINK_NOARG_TYPED(SwEnvPage, FieldHdl, Button*, void) +IMPL_LINK_NOARG(SwEnvPage, FieldHdl, Button*, void) { OUString aStr("<" + m_pDatabaseLB->GetSelectEntry() + "." + m_pTableLB->GetSelectEntry() + "." + @@ -278,7 +278,7 @@ IMPL_LINK_NOARG_TYPED(SwEnvPage, FieldHdl, Button*, void) m_pAddrEdit->SetSelection(aSel); } -IMPL_LINK_NOARG_TYPED(SwEnvPage, SenderHdl, Button*, void) +IMPL_LINK_NOARG(SwEnvPage, SenderHdl, Button*, void) { const bool bEnable = m_pSenderBox->IsChecked(); GetParentSwEnvDlg()->aEnvItem.bSend = bEnable; diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index d57ba17eb9ce..4ed48bdf1af9 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -84,7 +84,7 @@ void SwEnvPrtPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK_NOARG_TYPED(SwEnvPrtPage, ClickHdl, Button*, void) +IMPL_LINK_NOARG(SwEnvPrtPage, ClickHdl, Button*, void) { if (m_pBottomButton->IsChecked()) { @@ -108,7 +108,7 @@ IMPL_LINK_NOARG_TYPED(SwEnvPrtPage, ClickHdl, Button*, void) } } -IMPL_LINK_TYPED( SwEnvPrtPage, ButtonHdl, Button *, pBtn, void ) +IMPL_LINK( SwEnvPrtPage, ButtonHdl, Button *, pBtn, void ) { if (pBtn == m_pPrtSetup) { @@ -125,7 +125,7 @@ IMPL_LINK_TYPED( SwEnvPrtPage, ButtonHdl, Button *, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(SwEnvPrtPage, AlignHdl, ToolBox *, void) +IMPL_LINK_NOARG(SwEnvPrtPage, AlignHdl, ToolBox *, void) { if (m_pAlignBox->GetCurItemId()) { diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 8dc800de6efb..0a71355316ab 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -47,9 +47,9 @@ class SwEnvPrtPage : public SfxTabPage VclPtr<Printer> pPrt; - DECL_LINK_TYPED(ClickHdl, Button*, void); - DECL_LINK_TYPED(AlignHdl, ToolBox *, void); - DECL_LINK_TYPED(ButtonHdl, Button *, void ); + DECL_LINK(ClickHdl, Button*, void); + DECL_LINK(AlignHdl, ToolBox *, void); + DECL_LINK(ButtonHdl, Button *, void ); SwEnvDlg* GetParentSwEnvDlg() {return static_cast<SwEnvDlg*>( GetParentDialog());} diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 70ac152f280f..e2d3fc066889 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -323,7 +323,7 @@ void SwLabPage::SetToBusinessCard() m_pAddressFrame->Hide(); }; -IMPL_LINK_NOARG_TYPED(SwLabPage, AddrHdl, Button*, void) +IMPL_LINK_NOARG(SwLabPage, AddrHdl, Button*, void) { OUString aWriting; @@ -334,7 +334,7 @@ IMPL_LINK_NOARG_TYPED(SwLabPage, AddrHdl, Button*, void) m_pWritingEdit->GrabFocus(); } -IMPL_LINK_TYPED( SwLabPage, DatabaseHdl, ListBox&, rListBox, void ) +IMPL_LINK( SwLabPage, DatabaseHdl, ListBox&, rListBox, void ) { sActDBName = m_pDatabaseLB->GetSelectEntry(); @@ -346,7 +346,7 @@ IMPL_LINK_TYPED( SwLabPage, DatabaseHdl, ListBox&, rListBox, void ) GetDBManager()->GetColumnNames(m_pDBFieldLB, sActDBName, m_pTableLB->GetSelectEntry()); } -IMPL_LINK_NOARG_TYPED(SwLabPage, FieldHdl, Button*, void) +IMPL_LINK_NOARG(SwLabPage, FieldHdl, Button*, void) { OUString aStr("<" + m_pDatabaseLB->GetSelectEntry() + "." + m_pTableLB->GetSelectEntry() + "." + @@ -358,12 +358,12 @@ IMPL_LINK_NOARG_TYPED(SwLabPage, FieldHdl, Button*, void) m_pWritingEdit->SetSelection(aSel); } -IMPL_LINK_NOARG_TYPED(SwLabPage, PageHdl, Button*, void) +IMPL_LINK_NOARG(SwLabPage, PageHdl, Button*, void) { m_pMakeBox->GetSelectHdl().Call(*m_pMakeBox); } -IMPL_LINK_NOARG_TYPED(SwLabPage, MakeHdl, ListBox&, void) +IMPL_LINK_NOARG(SwLabPage, MakeHdl, ListBox&, void) { WaitObject aWait( GetParentSwLabDlg() ); @@ -416,7 +416,7 @@ IMPL_LINK_NOARG_TYPED(SwLabPage, MakeHdl, ListBox&, void) m_pTypeBox->GetSelectHdl().Call(*m_pTypeBox); } -IMPL_LINK_NOARG_TYPED(SwLabPage, TypeHdl, ListBox&, void) +IMPL_LINK_NOARG(SwLabPage, TypeHdl, ListBox&, void) { DisplayFormat(); aItem.m_aType = m_pTypeBox->GetSelectEntry(); diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index 903cba9f332d..2f473617b20b 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -101,7 +101,7 @@ void SwVisitingCardPage::InitFrameControl() } } -IMPL_LINK_NOARG_TYPED(SwVisitingCardPage, FrameControlInitializedHdl, SwOneExampleFrame&, void) +IMPL_LINK_NOARG(SwVisitingCardPage, FrameControlInitializedHdl, SwOneExampleFrame&, void) { SvTreeListEntry* pSel = m_pAutoTextLB->FirstSelected(); OUString sEntry; @@ -132,12 +132,12 @@ IMPL_LINK_NOARG_TYPED(SwVisitingCardPage, FrameControlInitializedHdl, SwOneExamp } } -IMPL_LINK_NOARG_TYPED( SwVisitingCardPage, AutoTextSelectTreeListBoxHdl, SvTreeListBox*, void ) +IMPL_LINK_NOARG( SwVisitingCardPage, AutoTextSelectTreeListBoxHdl, SvTreeListBox*, void ) { if(m_xAutoText.is() && pExampleFrame->IsInitialized()) pExampleFrame->ClearDocument(); } -IMPL_LINK_TYPED( SwVisitingCardPage, AutoTextSelectHdl, ListBox&, rBox, void ) +IMPL_LINK( SwVisitingCardPage, AutoTextSelectHdl, ListBox&, rBox, void ) { if(m_xAutoText.is()) { diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index c1c39dd85b8d..cc9b92391201 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -383,14 +383,14 @@ void SwLabFormatPage::dispose() // Modify-handler of MetricFields. start preview timer -IMPL_LINK_NOARG_TYPED(SwLabFormatPage, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwLabFormatPage, ModifyHdl, Edit&, void) { bModified = true; aPreviewIdle.Start(); } // Invalidate preview -IMPL_LINK_NOARG_TYPED(SwLabFormatPage, PreviewHdl, Idle *, void) +IMPL_LINK_NOARG(SwLabFormatPage, PreviewHdl, Idle *, void) { aPreviewIdle.Stop(); ChangeMinMax(); @@ -399,7 +399,7 @@ IMPL_LINK_NOARG_TYPED(SwLabFormatPage, PreviewHdl, Idle *, void) } // LoseFocus-Handler: Update on change -IMPL_LINK_TYPED( SwLabFormatPage, LoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( SwLabFormatPage, LoseFocusHdl, Control&, rControl, void ) { if (static_cast<Edit*>( &rControl)->IsModified()) PreviewHdl(nullptr); @@ -564,7 +564,7 @@ void SwLabFormatPage::Reset(const SfxItemSet* ) PreviewHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(SwLabFormatPage, SaveHdl, Button*, void) +IMPL_LINK_NOARG(SwLabFormatPage, SaveHdl, Button*, void) { SwLabRec aRec; aRec.lHDist = static_cast< long >(GETFLDVAL(*m_pHDistField)); @@ -633,7 +633,7 @@ void SwSaveLabelDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwSaveLabelDlg, OkHdl, Button*, void) +IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl, Button*, void) { SwLabelConfig& rCfg = pLabPage->GetParentSwLabDlg()->GetLabelsConfig(); OUString sMake(m_pMakeCB->GetText()); @@ -664,7 +664,7 @@ IMPL_LINK_NOARG_TYPED(SwSaveLabelDlg, OkHdl, Button*, void) EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(SwSaveLabelDlg, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwSaveLabelDlg, ModifyHdl, Edit&, void) { m_pOKPB->Enable(!m_pMakeCB->GetText().isEmpty() && !m_pTypeED->GetText().isEmpty()); } diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 44268dce46e5..24e6d3460569 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -87,10 +87,10 @@ class SwLabFormatPage : public SfxTabPage SwLabItem aItem; - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( PreviewHdl, Idle *, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( SaveHdl, Button*, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( PreviewHdl, Idle *, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); + DECL_LINK( SaveHdl, Button*, void ); void ChangeMinMax(); @@ -123,8 +123,8 @@ class SwSaveLabelDlg : public ModalDialog VclPtr<SwLabFormatPage> pLabPage; SwLabRec& rLabRec; - DECL_LINK_TYPED(OkHdl, Button*, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(OkHdl, Button*, void); + DECL_LINK(ModifyHdl, Edit&, void); public: SwSaveLabelDlg(SwLabFormatPage* pParent, SwLabRec& rRec); diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index 64b75d0d9a41..3fa3742d2894 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -79,7 +79,7 @@ void SwLabPrtPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK_TYPED( SwLabPrtPage, CountHdl, Button *, pButton, void ) +IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton, void ) { if (pButton == m_pPrtSetup) { diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 2827f7bf92d5..8d494e8b3795 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -44,7 +44,7 @@ class SwLabPrtPage : public SfxTabPage VclPtr<FixedText> m_pPrinterInfo; VclPtr<PushButton> m_pPrtSetup; - DECL_LINK_TYPED( CountHdl, Button *, void ); + DECL_LINK( CountHdl, Button *, void ); SwLabDlg* GetParentSwLabDlg() {return static_cast<SwLabDlg*>(GetParentDialog());} diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 68f11b1e9347..5ee023d9b18a 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -419,7 +419,7 @@ void SwMailMergeDlg::Apply() { } -IMPL_LINK_TYPED( SwMailMergeDlg, ButtonHdl, Button *, pBtn, void ) +IMPL_LINK( SwMailMergeDlg, ButtonHdl, Button *, pBtn, void ) { if (pBtn == m_pOkBTN) { if( ExecQryShell() ) @@ -427,7 +427,7 @@ IMPL_LINK_TYPED( SwMailMergeDlg, ButtonHdl, Button *, pBtn, void ) } } -IMPL_LINK_TYPED( SwMailMergeDlg, OutputTypeHdl, Button *, pBtn, void ) +IMPL_LINK( SwMailMergeDlg, OutputTypeHdl, Button *, pBtn, void ) { bool bPrint = pBtn == m_pPrinterRB; m_pSingleJobsCB->Enable(bPrint); @@ -450,7 +450,7 @@ IMPL_LINK_TYPED( SwMailMergeDlg, OutputTypeHdl, Button *, pBtn, void ) } } -IMPL_LINK_TYPED( SwMailMergeDlg, SaveTypeHdl, Button*, pBtn, void ) +IMPL_LINK( SwMailMergeDlg, SaveTypeHdl, Button*, pBtn, void ) { bool bIndividual = pBtn == m_pSaveIndividualRB; @@ -468,7 +468,7 @@ IMPL_LINK_TYPED( SwMailMergeDlg, SaveTypeHdl, Button*, pBtn, void ) } } -IMPL_LINK_TYPED( SwMailMergeDlg, FilenameHdl, Button*, pBox, void ) +IMPL_LINK( SwMailMergeDlg, FilenameHdl, Button*, pBox, void ) { bool bEnable = static_cast<CheckBox*>(pBox)->IsChecked(); m_pColumnFT->Enable( bEnable ); @@ -480,7 +480,7 @@ IMPL_LINK_TYPED( SwMailMergeDlg, FilenameHdl, Button*, pBox, void ) m_pFilterLB->Enable( bEnable ); } -IMPL_LINK_NOARG_TYPED(SwMailMergeDlg, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwMailMergeDlg, ModifyHdl, Edit&, void) { m_pFromRB->Check(); } @@ -598,7 +598,7 @@ OUString SwMailMergeDlg::GetTargetURL() const return sPath; } -IMPL_LINK_NOARG_TYPED(SwMailMergeDlg, InsertPathHdl, Button*, void) +IMPL_LINK_NOARG(SwMailMergeDlg, InsertPathHdl, Button*, void) { uno::Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); uno::Reference < XFolderPicker2 > xFP = FolderPicker::create(xContext); diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index b042169fdf60..153524ae9445 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -45,12 +45,12 @@ class SwLabPage : public SfxTabPage VclPtr<ListBox> m_pHiddenSortTypeBox; VclPtr<FixedText> m_pFormatInfo; - DECL_LINK_TYPED(AddrHdl, Button*, void); - DECL_LINK_TYPED(DatabaseHdl, ListBox&, void ); - DECL_LINK_TYPED(FieldHdl, Button *, void); - DECL_LINK_TYPED(PageHdl, Button *, void); - DECL_LINK_TYPED(MakeHdl, ListBox&, void); - DECL_LINK_TYPED(TypeHdl, ListBox&, void); + DECL_LINK(AddrHdl, Button*, void); + DECL_LINK(DatabaseHdl, ListBox&, void ); + DECL_LINK(FieldHdl, Button *, void); + DECL_LINK(PageHdl, Button *, void); + DECL_LINK(MakeHdl, ListBox&, void); + DECL_LINK(TypeHdl, ListBox&, void); void DisplayFormat (); SwLabRec* GetSelectedEntryPos(); @@ -93,9 +93,9 @@ class SwVisitingCardPage : public SfxTabPage SwOneExampleFrame* pExampleFrame; css::uno::Reference< css::text::XAutoTextContainer2 > m_xAutoText; - DECL_LINK_TYPED( AutoTextSelectTreeListBoxHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( AutoTextSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( FrameControlInitializedHdl, SwOneExampleFrame&, void ); + DECL_LINK( AutoTextSelectTreeListBoxHdl, SvTreeListBox*, void ); + DECL_LINK( AutoTextSelectHdl, ListBox&, void ); + DECL_LINK( FrameControlInitializedHdl, SwOneExampleFrame&, void ); void InitFrameControl(); void UpdateFields(); diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index 7423d169f2b1..c1d4855f4d02 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -108,12 +108,12 @@ void sw::DropDownFieldDialog::Apply() } } -IMPL_LINK_TYPED(sw::DropDownFieldDialog, ButtonHdl, Button*, pButton, void) +IMPL_LINK(sw::DropDownFieldDialog, ButtonHdl, Button*, pButton, void) { EndDialog(m_pNextPB == pButton ? RET_OK : RET_YES ); } -IMPL_LINK_NOARG_TYPED(sw::DropDownFieldDialog, DoubleClickHdl, ListBox&, void) +IMPL_LINK_NOARG(sw::DropDownFieldDialog, DoubleClickHdl, ListBox&, void) { EndDialog(RET_OK); } diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index bdcbad03dc0b..26b3dc063f3a 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -215,7 +215,7 @@ void SwChangeDBDlg::UpdateFields() pSh->EndAllAction(); } -IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, ButtonHdl, Button*, void) +IMPL_LINK_NOARG(SwChangeDBDlg, ButtonHdl, Button*, void) { OUString sTableName; OUString sColumnName; @@ -229,7 +229,7 @@ IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, ButtonHdl, Button*, void) EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, TreeSelectHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SwChangeDBDlg, TreeSelectHdl, SvTreeListBox*, void) { SvTreeListEntry* pEntry = m_pAvailDBTLB->GetCurEntry(); @@ -256,7 +256,7 @@ void SwChangeDBDlg::ShowDBName(const SwDBData& rDBData) } } -IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, AddDBHdl, Button*, void) +IMPL_LINK_NOARG(SwChangeDBDlg, AddDBHdl, Button*, void) { const OUString sNewDB = SwDBManager::LoadAndRegisterDataSource(); if (!sNewDB.isEmpty()) diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index a64ec9a60cec..ed26ffbe74fc 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -275,7 +275,7 @@ sal_uInt16 SwFieldDBPage::GetGroup() return GRP_DB; } -IMPL_LINK_TYPED( SwFieldDBPage, TypeListBoxHdl, ListBox&, rBox, void ) +IMPL_LINK( SwFieldDBPage, TypeListBoxHdl, ListBox&, rBox, void ) { TypeHdl(&rBox); } @@ -400,7 +400,7 @@ void SwFieldDBPage::TypeHdl( ListBox* pBox ) } } -IMPL_LINK_TYPED( SwFieldDBPage, NumSelectHdl, ListBox&, rLB, void ) +IMPL_LINK( SwFieldDBPage, NumSelectHdl, ListBox&, rLB, void ) { m_pNewFormatRB->Check(); m_aOldNumSelectHdl.Call(rLB); @@ -435,7 +435,7 @@ void SwFieldDBPage::CheckInsert() EnableInsert(bInsert); } -IMPL_LINK_TYPED( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox, void ) +IMPL_LINK( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox, void ) { SvTreeListEntry* pEntry = pBox->GetCurEntry(); if (pEntry) @@ -475,7 +475,7 @@ IMPL_LINK_TYPED( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox, void ) } } -IMPL_LINK_NOARG_TYPED(SwFieldDBPage, AddDBHdl, Button*, void) +IMPL_LINK_NOARG(SwFieldDBPage, AddDBHdl, Button*, void) { OUString sNewDB = SwDBManager::LoadAndRegisterDataSource(); if(!sNewDB.isEmpty()) @@ -485,7 +485,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldDBPage, AddDBHdl, Button*, void) } // Modify -IMPL_LINK_NOARG_TYPED(SwFieldDBPage, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwFieldDBPage, ModifyHdl, Edit&, void) { CheckInsert(); } diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index 8e58090b485f..788de1f064a6 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -54,11 +54,11 @@ class SwFieldDBPage : public SwFieldPage sal_uInt16 m_nOldSubType; Link<ListBox&,void> m_aOldNumSelectHdl; - DECL_LINK_TYPED( TypeListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( NumSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( TreeSelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( AddDBHdl, Button*, void ); + DECL_LINK( TypeListBoxHdl, ListBox&, void ); + DECL_LINK( NumSelectHdl, ListBox&, void ); + DECL_LINK( TreeSelectHdl, SvTreeListBox*, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( AddDBHdl, Button*, void ); void TypeHdl(ListBox*); void CheckInsert(); diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index b09d6d7a8426..7f92d992b82a 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -221,7 +221,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* ) } } -IMPL_LINK_NOARG_TYPED(SwFieldDokInfPage, TypeHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SwFieldDokInfPage, TypeHdl, SvTreeListBox*, void) { // save old ListBoxPos SvTreeListEntry* pOldEntry = pSelEntry; @@ -240,7 +240,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldDokInfPage, TypeHdl, SvTreeListBox*, void) SubTypeHdl(*m_pSelectionLB); } -IMPL_LINK_NOARG_TYPED(SwFieldDokInfPage, SubTypeHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl, ListBox&, void) { sal_uInt16 nSubType = (sal_uInt16)reinterpret_cast<sal_uLong>(pSelEntry->GetUserData()); sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos(); diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index e01057460c16..01ac1d5c0df2 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -50,8 +50,8 @@ class SwFieldDokInfPage : public SwFieldPage sal_uLong nOldFormat; OUString m_sOldCustomFieldName; - DECL_LINK_TYPED(TypeHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(SubTypeHdl, ListBox&, void); + DECL_LINK(TypeHdl, SvTreeListBox*, void); + DECL_LINK(SubTypeHdl, ListBox&, void); sal_Int32 FillSelectionLB(sal_uInt16 nSubTypeId); diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index b63c6b21f096..1d4dce0d107c 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -205,7 +205,7 @@ void SwFieldDokPage::Reset(const SfxItemSet* ) } } -IMPL_LINK_NOARG_TYPED(SwFieldDokPage, TypeHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, ListBox&, void) { // save old ListBoxPos const sal_Int32 nOld = GetTypeSel(); @@ -458,7 +458,7 @@ void SwFieldDokPage::AddSubType(sal_uInt16 nTypeId) m_pSelectionLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId)); } -IMPL_LINK_NOARG_TYPED(SwFieldDokPage, SubTypeHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl, ListBox&, void) { sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos(); if(nPos == LISTBOX_ENTRY_NOTFOUND) @@ -525,7 +525,7 @@ sal_Int32 SwFieldDokPage::FillFormatLB(sal_uInt16 nTypeId) return nSize; } -IMPL_LINK_NOARG_TYPED(SwFieldDokPage, FormatHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldDokPage, FormatHdl, ListBox&, void) { sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index cd20b27cc8cb..ab5cde0c4de8 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -50,9 +50,9 @@ class SwFieldDokPage : public SwFieldPage sal_Int32 nOldSel; sal_uLong nOldFormat; - DECL_LINK_TYPED(TypeHdl, ListBox&, void); - DECL_LINK_TYPED(FormatHdl, ListBox&, void); - DECL_LINK_TYPED(SubTypeHdl, ListBox&, void); + DECL_LINK(TypeHdl, ListBox&, void); + DECL_LINK(FormatHdl, ListBox&, void); + DECL_LINK(SubTypeHdl, ListBox&, void); void AddSubType(sal_uInt16 nTypeId); sal_Int32 FillFormatLB(sal_uInt16 nTypeId); diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index e11971426d03..4396c1ead502 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -239,7 +239,7 @@ void SwFieldEditDlg::InsertHdl() } // kick off changing of the field -IMPL_LINK_NOARG_TYPED(SwFieldEditDlg, OKHdl, Button*, void) +IMPL_LINK_NOARG(SwFieldEditDlg, OKHdl, Button*, void) { if (GetOKButton()->IsEnabled()) { @@ -257,7 +257,7 @@ short SwFieldEditDlg::Execute() } // Traveling between fields of the same type -IMPL_LINK_TYPED( SwFieldEditDlg, NextPrevHdl, Button *, pButton, void ) +IMPL_LINK( SwFieldEditDlg, NextPrevHdl, Button *, pButton, void ) { bool bNext = pButton == m_pNextBT; @@ -291,7 +291,7 @@ IMPL_LINK_TYPED( SwFieldEditDlg, NextPrevHdl, Button *, pButton, void ) Init(); } -IMPL_LINK_NOARG_TYPED(SwFieldEditDlg, AddressHdl, Button*, void) +IMPL_LINK_NOARG(SwFieldEditDlg, AddressHdl, Button*, void) { SwFieldPage* pTabPage = static_cast<SwFieldPage*>(GetTabPage()); SwFieldMgr& rMgr = pTabPage->GetFieldMgr(); diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index b5c79b24ea21..60a17d53eb4f 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -210,7 +210,7 @@ void SwFieldFuncPage::Reset(const SfxItemSet* ) } } -IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, TypeHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void) { // save old ListBoxPos const sal_Int32 nOld = GetTypeSel(); @@ -403,7 +403,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, TypeHdl, ListBox&, void) } } -IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldFuncPage, SelectHdl, ListBox&, void) { const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); @@ -411,17 +411,17 @@ IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, SelectHdl, ListBox&, void) m_pNameED->SetText( m_pSelectionLB->GetSelectEntry() ); } -IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, InsertMacroHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldFuncPage, InsertMacroHdl, ListBox&, void) { SelectHdl(*m_pSelectionLB); InsertHdl(nullptr); } -IMPL_LINK_TYPED( SwFieldFuncPage, ListModifyButtonHdl, Button*, pControl, void) +IMPL_LINK( SwFieldFuncPage, ListModifyButtonHdl, Button*, pControl, void) { ListModifyHdl(pControl); } -IMPL_LINK_TYPED( SwFieldFuncPage, ListModifyReturnActionHdl, ReturnActionEdit&, rControl, void) +IMPL_LINK( SwFieldFuncPage, ListModifyReturnActionHdl, ReturnActionEdit&, rControl, void) { ListModifyHdl(&rControl); } @@ -471,11 +471,11 @@ void SwFieldFuncPage::ListModifyHdl(Control* pControl) ListEnableHdl(*m_pListItemED); } -IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, ListEnableListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldFuncPage, ListEnableListBoxHdl, ListBox&, void) { ListEnableHdl(*m_pListItemED); } -IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, ListEnableHdl, Edit&, void) +IMPL_LINK_NOARG(SwFieldFuncPage, ListEnableHdl, Edit&, void) { //enable "Add" button when text is in the Edit that's not already member of the box m_pListAddPB->Enable(!m_pListItemED->GetText().isEmpty() && @@ -531,7 +531,7 @@ void SwFieldFuncPage::UpdateSubType() } // call MacroBrowser, fill Listbox with Macros -IMPL_LINK_NOARG_TYPED( SwFieldFuncPage, MacroHdl, Button *, void) +IMPL_LINK_NOARG( SwFieldFuncPage, MacroHdl, Button *, void) { const OUString sMacro(TurnMacroString(m_pNameED->GetText()).replaceAll(".", ";")); if (GetFieldMgr().ChooseMacro(sMacro)) @@ -646,7 +646,7 @@ void SwFieldFuncPage::FillUserData() SetUserData(USER_DATA_VERSION ";" + OUString::number( nTypeSel )); } -IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwFieldFuncPage, ModifyHdl, Edit&, void) { const sal_Int32 nLen = m_pNameED->GetText().getLength(); diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index b8034a495beb..2f969b2af15d 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -66,18 +66,18 @@ class SwFieldFuncPage : public SwFieldPage sal_uLong nOldFormat; bool bDropDownLBChanged; - DECL_LINK_TYPED( TypeHdl, ListBox&, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( InsertMacroHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( ListModifyReturnActionHdl, ReturnActionEdit&, void ); - DECL_LINK_TYPED( ListModifyButtonHdl, Button*, void ); - DECL_LINK_TYPED( ListEnableHdl, Edit&, void ); - DECL_LINK_TYPED( ListEnableListBoxHdl, ListBox&, void ); + DECL_LINK( TypeHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( InsertMacroHdl, ListBox&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( ListModifyReturnActionHdl, ReturnActionEdit&, void ); + DECL_LINK( ListModifyButtonHdl, Button*, void ); + DECL_LINK( ListEnableHdl, Edit&, void ); + DECL_LINK( ListEnableListBoxHdl, ListBox&, void ); void ListModifyHdl(Control*); // select Macro - DECL_LINK_TYPED( MacroHdl, Button *, void ); + DECL_LINK( MacroHdl, Button *, void ); void UpdateSubType(); static OUString TurnMacroString(const OUString &rMacro); diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index d4084939d64a..d94a6829df32 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -299,13 +299,13 @@ void SwFieldPage::RestorePos(ListBox* pLst1) } // Insert new fields -IMPL_LINK_TYPED( SwFieldPage, TreeListBoxInsertHdl, SvTreeListBox*, pBtn, bool ) +IMPL_LINK( SwFieldPage, TreeListBoxInsertHdl, SvTreeListBox*, pBtn, bool ) { InsertHdl(pBtn); return false; } -IMPL_LINK_TYPED( SwFieldPage, ListBoxInsertHdl, ListBox&, rBox, void ) +IMPL_LINK( SwFieldPage, ListBoxInsertHdl, ListBox&, rBox, void ) { InsertHdl(&rBox); } @@ -345,7 +345,7 @@ void SwFieldPage::EnableInsert(bool bEnable) m_bInsert = bEnable; } -IMPL_LINK_NOARG_TYPED(SwFieldPage, NumFormatHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldPage, NumFormatHdl, ListBox&, void) { InsertHdl(nullptr); } diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx index b7c5090b9b13..a7e665b428b1 100644 --- a/sw/source/ui/fldui/fldpage.hxx +++ b/sw/source/ui/fldui/fldpage.hxx @@ -54,9 +54,9 @@ protected: SwField* GetCurField() { return m_pCurField;} SwWrtShell* GetWrtShell() { return m_pWrtShell;} - DECL_LINK_TYPED( ListBoxInsertHdl, ListBox&, void ); - DECL_LINK_TYPED( TreeListBoxInsertHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( NumFormatHdl, ListBox&, void ); + DECL_LINK( ListBoxInsertHdl, ListBox&, void ); + DECL_LINK( TreeListBoxInsertHdl, SvTreeListBox*, bool ); + DECL_LINK( NumFormatHdl, ListBox&, void ); void InsertHdl(void *); void Init(); diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 301cfb5d385b..ab7ce0e6e2cf 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -129,7 +129,7 @@ void SwFieldRefPage::dispose() SwFieldPage::dispose(); } -IMPL_LINK_NOARG_TYPED(SwFieldRefPage, ModifyHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SwFieldRefPage, ModifyHdl_Impl, Edit&, void) { OUString sFilter = comphelper::string::strip(m_pFilterED->GetText(), ' '); UpdateSubType(sFilter); @@ -299,7 +299,7 @@ void SwFieldRefPage::Reset(const SfxItemSet* ) } } -IMPL_LINK_NOARG_TYPED(SwFieldRefPage, TypeHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, ListBox&, void) { // save old ListBoxPos const sal_Int32 nOld = GetTypeSel(); @@ -438,11 +438,11 @@ IMPL_LINK_NOARG_TYPED(SwFieldRefPage, TypeHdl, ListBox&, void) } } -IMPL_LINK_NOARG_TYPED(SwFieldRefPage, SubTypeTreeListBoxHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SwFieldRefPage, SubTypeTreeListBoxHdl, SvTreeListBox*, void) { SubTypeHdl(); } -IMPL_LINK_NOARG_TYPED(SwFieldRefPage, SubTypeListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldRefPage, SubTypeListBoxHdl, ListBox&, void) { SubTypeHdl(); } @@ -827,7 +827,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId) } // Modify -IMPL_LINK_NOARG_TYPED(SwFieldRefPage, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwFieldRefPage, ModifyHdl, Edit&, void) { OUString aName(m_pNameED->GetText()); const bool bEmptyName = aName.isEmpty(); diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index 30f13754e246..bcc122e8c17f 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -61,11 +61,11 @@ class SwFieldRefPage : public SwFieldPage // fallback, if previously selected text node doesn't exist anymore size_t mnSavedSelectedPos; - DECL_LINK_TYPED(TypeHdl, ListBox&, void); - DECL_LINK_TYPED(SubTypeListBoxHdl, ListBox&, void); - DECL_LINK_TYPED(SubTypeTreeListBoxHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); - DECL_LINK_TYPED(ModifyHdl_Impl, Edit&, void); + DECL_LINK(TypeHdl, ListBox&, void); + DECL_LINK(SubTypeListBoxHdl, ListBox&, void); + DECL_LINK(SubTypeTreeListBoxHdl, SvTreeListBox*, void); + DECL_LINK(ModifyHdl, Edit&, void); + DECL_LINK(ModifyHdl_Impl, Edit&, void); void SubTypeHdl(); diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 72cfc891e05b..cfc424d0bfa2 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -179,7 +179,7 @@ SfxItemSet* SwFieldDlg::CreateInputItemSet( sal_uInt16 nID ) } // kick off inserting of new fields -IMPL_LINK_NOARG_TYPED(SwFieldDlg, OKHdl, Button*, void) +IMPL_LINK_NOARG(SwFieldDlg, OKHdl, Button*, void) { if (GetOKButton().IsEnabled()) { @@ -190,7 +190,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldDlg, OKHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SwFieldDlg, CancelHdl, Button*, void) +IMPL_LINK_NOARG(SwFieldDlg, CancelHdl, Button*, void) { Close(); } diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 98e073e045b4..95a367e968ab 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -207,7 +207,7 @@ void SwFieldVarPage::Reset(const SfxItemSet* ) } } -IMPL_LINK_NOARG_TYPED(SwFieldVarPage, TypeHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldVarPage, TypeHdl, ListBox&, void) { // save old ListBoxPos const sal_Int32 nOld = GetTypeSel(); @@ -237,7 +237,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldVarPage, TypeHdl, ListBox&, void) bInit = false; } -IMPL_LINK_TYPED( SwFieldVarPage, SubTypeListBoxHdl, ListBox&, rBox, void ) +IMPL_LINK( SwFieldVarPage, SubTypeListBoxHdl, ListBox&, rBox, void ) { SubTypeHdl(&rBox); } @@ -829,7 +829,7 @@ void SwFieldVarPage::FillFormatLB(sal_uInt16 nTypeId) } // Modify -IMPL_LINK_NOARG_TYPED(SwFieldVarPage, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwFieldVarPage, ModifyHdl, Edit&, void) { OUString sValue(m_pValueED->GetText()); bool bHasValue = !sValue.isEmpty(); @@ -952,7 +952,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldVarPage, ModifyHdl, Edit&, void) EnableInsert(bInsert); } -IMPL_LINK_TYPED( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void ) +IMPL_LINK( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void ) { const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); @@ -1096,7 +1096,7 @@ IMPL_LINK_TYPED( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void ) } } -IMPL_LINK_NOARG_TYPED(SwFieldVarPage, ChapterHdl, ListBox&, void) +IMPL_LINK_NOARG(SwFieldVarPage, ChapterHdl, ListBox&, void) { bool bEnable = m_pChapterLevelLB->GetSelectEntryPos() != 0; @@ -1105,7 +1105,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldVarPage, ChapterHdl, ListBox&, void) SeparatorHdl(*m_pSeparatorED); } -IMPL_LINK_NOARG_TYPED(SwFieldVarPage, SeparatorHdl, Edit&, void) +IMPL_LINK_NOARG(SwFieldVarPage, SeparatorHdl, Edit&, void) { bool bEnable = !m_pSeparatorED->GetText().isEmpty() || m_pChapterLevelLB->GetSelectEntryPos() == 0; diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index 9294da46b626..66421cea84e2 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -76,12 +76,12 @@ class SwFieldVarPage : public SwFieldPage sal_uLong nOldFormat; bool bInit; - DECL_LINK_TYPED( TypeHdl, ListBox&, void ); - DECL_LINK_TYPED( SubTypeListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( TBClickHdl, ToolBox *, void ); - DECL_LINK_TYPED( ChapterHdl, ListBox&, void ); - DECL_LINK_TYPED( SeparatorHdl, Edit&, void ); + DECL_LINK( TypeHdl, ListBox&, void ); + DECL_LINK( SubTypeListBoxHdl, ListBox&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( TBClickHdl, ToolBox *, void ); + DECL_LINK( ChapterHdl, ListBox&, void ); + DECL_LINK( SeparatorHdl, Edit&, void ); void SubTypeHdl(ListBox*); void UpdateSubType(); diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index 8cc3cba5b31d..553e472ea344 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -164,7 +164,7 @@ void SwFieldInputDlg::Apply() rSh.EndAllAction(); } -IMPL_LINK_NOARG_TYPED(SwFieldInputDlg, NextHdl, Button*, void) +IMPL_LINK_NOARG(SwFieldInputDlg, NextHdl, Button*, void) { EndDialog(RET_OK); } diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index d448a193f533..4c8d82e3c90b 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -107,7 +107,7 @@ void SwJavaEditDialog::dispose() SvxStandardDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, PrevHdl, Button*, void) +IMPL_LINK_NOARG(SwJavaEditDialog, PrevHdl, Button*, void) { pSh->EnterStdMode(); @@ -118,7 +118,7 @@ IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, PrevHdl, Button*, void) RadioButtonHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, NextHdl, Button*, void) +IMPL_LINK_NOARG(SwJavaEditDialog, NextHdl, Button*, void) { pSh->EnterStdMode(); @@ -129,7 +129,7 @@ IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, NextHdl, Button*, void) RadioButtonHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, OKHdl, Button*, void) +IMPL_LINK_NOARG(SwJavaEditDialog, OKHdl, Button*, void) { SetField(); EndDialog( RET_OK ); @@ -229,7 +229,7 @@ bool SwJavaEditDialog::IsUpdate() const return pField && ( sal_uInt32(bIsUrl ? 1 : 0) != pField->GetFormat() || pField->GetPar2() != aType || pField->GetPar1() != aText ); } -IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, RadioButtonHdl, Button*, void) +IMPL_LINK_NOARG(SwJavaEditDialog, RadioButtonHdl, Button*, void) { bool bEnable = m_pUrlRB->IsChecked(); m_pUrlPB->Enable(bEnable); @@ -248,7 +248,7 @@ IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, RadioButtonHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED( SwJavaEditDialog, InsertFileHdl, Button *, void ) +IMPL_LINK_NOARG( SwJavaEditDialog, InsertFileHdl, Button *, void ) { if ( !pFileDlg ) { @@ -260,7 +260,7 @@ IMPL_LINK_NOARG_TYPED( SwJavaEditDialog, InsertFileHdl, Button *, void ) pFileDlg->StartExecuteModal( LINK( this, SwJavaEditDialog, DlgClosedHdl ) ); } -IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, DlgClosedHdl, sfx2::FileDialogHelper *, void) +IMPL_LINK_NOARG(SwJavaEditDialog, DlgClosedHdl, sfx2::FileDialogHelper *, void) { if ( pFileDlg->GetError() == ERRCODE_NONE ) { diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 7ec636d63c1a..f56babc26998 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -230,7 +230,7 @@ void SwColumnDlg::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_TYPED(SwColumnDlg, ObjectListBoxHdl, ListBox&, rBox, void) +IMPL_LINK(SwColumnDlg, ObjectListBoxHdl, ListBox&, rBox, void) { ObjectHdl(&rBox); } @@ -296,7 +296,7 @@ void SwColumnDlg::ObjectHdl(ListBox* pBox) pTabPage->Reset(pSet); } -IMPL_LINK_NOARG_TYPED(SwColumnDlg, OkHdl, Button*, void) +IMPL_LINK_NOARG(SwColumnDlg, OkHdl, Button*, void) { // evaluate current selection SfxItemSet* pSet = nullptr; @@ -697,11 +697,11 @@ bool SwColumnPage::FillItemSet(SfxItemSet *rSet) } // update ColumnManager -IMPL_LINK_NOARG_TYPED( SwColumnPage, UpdateColMgrListBox, ListBox&, void ) +IMPL_LINK_NOARG( SwColumnPage, UpdateColMgrListBox, ListBox&, void ) { UpdateColMgr(*m_pLineWidthEdit); } -IMPL_LINK_NOARG_TYPED( SwColumnPage, UpdateColMgr, Edit&, void ) +IMPL_LINK_NOARG( SwColumnPage, UpdateColMgr, Edit&, void ) { long nGutterWidth = m_pColMgr->GetGutterWidth(); if(m_nCols > 1) @@ -970,7 +970,7 @@ void SwColumnPage::SetLabels( sal_uInt16 nVis ) * the column number overwrites potential user's width settings; all columns * are equally wide. */ -IMPL_LINK_TYPED( SwColumnPage, ColModify, Edit&, rEdit, void ) +IMPL_LINK( SwColumnPage, ColModify, Edit&, rEdit, void ) { ColModify(static_cast<NumericField*>(&rEdit)); } @@ -1005,7 +1005,7 @@ void SwColumnPage::ColModify(NumericField* pNF) * width the automatic calculation of the column width is overruled; only an * alteration of the column number leads back to that default. */ -IMPL_LINK_TYPED( SwColumnPage, GapModify, Edit&, rEdit, void ) +IMPL_LINK( SwColumnPage, GapModify, Edit&, rEdit, void ) { if (m_nCols < 2) return; @@ -1072,7 +1072,7 @@ IMPL_LINK_TYPED( SwColumnPage, GapModify, Edit&, rEdit, void ) Update(pMetricField); } -IMPL_LINK_TYPED( SwColumnPage, EdModify, Edit&, rEdit, void ) +IMPL_LINK( SwColumnPage, EdModify, Edit&, rEdit, void ) { MetricField * pMetricField = static_cast<MetricField*>(&rEdit); PercentField *pField = m_aPercentFieldsMap[pMetricField]; @@ -1083,7 +1083,7 @@ IMPL_LINK_TYPED( SwColumnPage, EdModify, Edit&, rEdit, void ) // Handler behind the Checkbox for automatic width. When the box is checked // no explicit values for the column width can be entered. -IMPL_LINK_TYPED( SwColumnPage, AutoWidthHdl, Button*, pButton, void ) +IMPL_LINK( SwColumnPage, AutoWidthHdl, Button*, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); long nDist = static_cast< long >(m_aDistEd1.DenormalizePercent(m_aDistEd1.GetValue(FUNIT_TWIP))); @@ -1101,7 +1101,7 @@ IMPL_LINK_TYPED( SwColumnPage, AutoWidthHdl, Button*, pButton, void ) } // scroll up the contents of the edits -IMPL_LINK_NOARG_TYPED(SwColumnPage, Up, Button*, void) +IMPL_LINK_NOARG(SwColumnPage, Up, Button*, void) { if( m_nFirstVis ) { @@ -1112,7 +1112,7 @@ IMPL_LINK_NOARG_TYPED(SwColumnPage, Up, Button*, void) } // scroll down the contents of the edits. -IMPL_LINK_NOARG_TYPED(SwColumnPage, Down, Button*, void) +IMPL_LINK_NOARG(SwColumnPage, Down, Button*, void) { if( m_nFirstVis + nVisCols < m_nCols ) { @@ -1335,7 +1335,7 @@ DeactivateRC SwColumnPage::DeactivatePage(SfxItemSet *_pSet) return DeactivateRC::LeavePage; } -IMPL_LINK_TYPED( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS, void ) +IMPL_LINK( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS, void ) { const sal_uInt16 nItem = pVS->GetSelectItemId(); if( nItem < 4 ) diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 974cd3d0a91e..4d0bac6b27ef 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -279,7 +279,7 @@ void SwCaptionDialog::Apply() our_aSepTextSave = m_pSepEdit->GetText(); } -IMPL_LINK_TYPED( SwCaptionDialog, OptionHdl, Button*, pButton, void ) +IMPL_LINK( SwCaptionDialog, OptionHdl, Button*, pButton, void ) { OUString sFieldTypeName = m_pCategoryBox->GetText(); if(sFieldTypeName == m_sNone) @@ -301,16 +301,16 @@ IMPL_LINK_TYPED( SwCaptionDialog, OptionHdl, Button*, pButton, void ) DrawSample(); } -IMPL_LINK_NOARG_TYPED(SwCaptionDialog, SelectListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(SwCaptionDialog, SelectListBoxHdl, ListBox&, void) { DrawSample(); } -IMPL_LINK_NOARG_TYPED(SwCaptionDialog, SelectHdl, ComboBox&, void) +IMPL_LINK_NOARG(SwCaptionDialog, SelectHdl, ComboBox&, void) { DrawSample(); } -IMPL_LINK_NOARG_TYPED(SwCaptionDialog, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwCaptionDialog, ModifyHdl, Edit&, void) { SwWrtShell &rSh = rView.GetWrtShell(); OUString sFieldTypeName = m_pCategoryBox->GetText(); @@ -332,7 +332,7 @@ IMPL_LINK_NOARG_TYPED(SwCaptionDialog, ModifyHdl, Edit&, void) DrawSample(); } -IMPL_LINK_NOARG_TYPED(SwCaptionDialog, CaptionHdl, Button*, void) +IMPL_LINK_NOARG(SwCaptionDialog, CaptionHdl, Button*, void) { SfxItemSet aSet( rView.GetDocShell()->GetDoc()->GetAttrPool() ); ScopedVclPtrInstance< SwCaptionOptDlg > aDlg( this, aSet ); diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index e400ce7125fb..7b16081b027a 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -1762,13 +1762,13 @@ DeactivateRC SwFramePage::DeactivatePage(SfxItemSet * _pSet) } // swap left/right with inside/outside -IMPL_LINK_NOARG_TYPED(SwFramePage, MirrorHdl, Button*, void) +IMPL_LINK_NOARG(SwFramePage, MirrorHdl, Button*, void) { RndStdIds eId = GetAnchor(); InitPos( eId, -1, 0, -1, 0, LONG_MAX, LONG_MAX); } -IMPL_LINK_TYPED( SwFramePage, RelSizeClickHdl, Button *, p, void ) +IMPL_LINK( SwFramePage, RelSizeClickHdl, Button *, p, void ) { CheckBox* pBtn = static_cast<CheckBox*>(p); if (pBtn == m_pRelWidthCB) @@ -1795,11 +1795,11 @@ IMPL_LINK_TYPED( SwFramePage, RelSizeClickHdl, Button *, p, void ) } // range check -IMPL_LINK_NOARG_TYPED(SwFramePage, RangeModifyClickHdl, Button*, void) +IMPL_LINK_NOARG(SwFramePage, RangeModifyClickHdl, Button*, void) { RangeModifyHdl(); } -IMPL_LINK_NOARG_TYPED(SwFramePage, RangeModifyLoseFocusHdl, Control&, void) +IMPL_LINK_NOARG(SwFramePage, RangeModifyLoseFocusHdl, Control&, void) { RangeModifyHdl(); } @@ -1922,7 +1922,7 @@ void SwFramePage::RangeModifyHdl() m_pAtVertPosED->SetValue(m_pAtVertPosED->Normalize(aVal.nVPos), FUNIT_TWIP); } -IMPL_LINK_NOARG_TYPED(SwFramePage, AnchorTypeHdl, Button*, void) +IMPL_LINK_NOARG(SwFramePage, AnchorTypeHdl, Button*, void) { m_pMirrorPagesCB->Enable(!m_pAnchorAsCharRB->IsChecked()); @@ -1949,7 +1949,7 @@ IMPL_LINK_NOARG_TYPED(SwFramePage, AnchorTypeHdl, Button*, void) && FLY_AS_CHAR == eId) ); } -IMPL_LINK_TYPED( SwFramePage, PosHdl, ListBox&, rLB, void ) +IMPL_LINK( SwFramePage, PosHdl, ListBox&, rLB, void ) { bool bHori = &rLB == m_pHorizontalDLB; ListBox *pRelLB = bHori ? m_pHoriRelationLB : m_pVertRelationLB; @@ -2051,7 +2051,7 @@ IMPL_LINK_TYPED( SwFramePage, PosHdl, ListBox&, rLB, void ) } // horizontal Pos -IMPL_LINK_TYPED( SwFramePage, RelHdl, ListBox&, rLB, void ) +IMPL_LINK( SwFramePage, RelHdl, ListBox&, rLB, void ) { bool bHori = &rLB == m_pHoriRelationLB; @@ -2080,7 +2080,7 @@ IMPL_LINK_TYPED( SwFramePage, RelHdl, ListBox&, rLB, void ) RangeModifyHdl(); } -IMPL_LINK_NOARG_TYPED(SwFramePage, RealSizeHdl, Button*, void) +IMPL_LINK_NOARG(SwFramePage, RealSizeHdl, Button*, void) { m_aWidthED.SetUserValue( m_aWidthED. NormalizePercent(m_aGrfSize.Width() ), FUNIT_TWIP); m_aHeightED.SetUserValue(m_aHeightED.NormalizePercent(m_aGrfSize.Height()), FUNIT_TWIP); @@ -2088,19 +2088,19 @@ IMPL_LINK_NOARG_TYPED(SwFramePage, RealSizeHdl, Button*, void) UpdateExample(); } -IMPL_LINK_NOARG_TYPED(SwFramePage, AutoWidthClickHdl, Button*, void) +IMPL_LINK_NOARG(SwFramePage, AutoWidthClickHdl, Button*, void) { if( !IsInGraficMode() ) HandleAutoCB( m_pAutoWidthCB->IsChecked(), *m_pWidthFT, *m_pWidthAutoFT, *m_aWidthED.get() ); } -IMPL_LINK_NOARG_TYPED(SwFramePage, AutoHeightClickHdl, Button*, void) +IMPL_LINK_NOARG(SwFramePage, AutoHeightClickHdl, Button*, void) { if( !IsInGraficMode() ) HandleAutoCB( m_pAutoHeightCB->IsChecked(), *m_pHeightFT, *m_pHeightAutoFT, *m_aWidthED.get() ); } -IMPL_LINK_TYPED( SwFramePage, ModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( SwFramePage, ModifyHdl, Edit&, rEdit, void ) { SwTwips nWidth = static_cast< SwTwips >(m_aWidthED.DenormalizePercent(m_aWidthED.GetValue(FUNIT_TWIP))); SwTwips nHeight = static_cast< SwTwips >(m_aHeightED.DenormalizePercent(m_aHeightED.GetValue(FUNIT_TWIP))); @@ -2568,7 +2568,7 @@ DeactivateRC SwGrfExtPage::DeactivatePage(SfxItemSet *_pSet) return DeactivateRC::LeavePage; } -IMPL_LINK_NOARG_TYPED(SwGrfExtPage, BrowseHdl, Button*, void) +IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl, Button*, void) { if(!pGrfDlg) { @@ -2613,7 +2613,7 @@ IMPL_LINK_NOARG_TYPED(SwGrfExtPage, BrowseHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SwGrfExtPage, MirrorHdl, Button*, void) +IMPL_LINK_NOARG(SwGrfExtPage, MirrorHdl, Button*, void) { bool bEnable = m_pMirrorHorzBox->IsChecked(); @@ -2838,7 +2838,7 @@ VclPtr<SfxTabPage> SwFrameURLPage::Create(vcl::Window *pParent, const SfxItemSet return VclPtr<SwFrameURLPage>::Create( pParent, *rSet ); } -IMPL_LINK_NOARG_TYPED(SwFrameURLPage, InsertFileHdl, Button*, void) +IMPL_LINK_NOARG(SwFrameURLPage, InsertFileHdl, Button*, void) { FileDialogHelper aDlgHelper( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE ); uno::Reference < ui::dialogs::XFilePicker2 > xFP = aDlgHelper.GetFilePicker(); @@ -3188,7 +3188,7 @@ bool SwFrameAddPage::FillItemSet(SfxItemSet *rSet) return bRet; } -IMPL_LINK_NOARG_TYPED(SwFrameAddPage, EditModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwFrameAddPage, EditModifyHdl, Edit&, void) { bool bEnable = !m_pNameED->GetText().isEmpty(); m_pAltNameED->Enable(bEnable); @@ -3204,7 +3204,7 @@ void SwFrameAddPage::SetFormatUsed(bool bFormatUsed) } } -IMPL_LINK_TYPED(SwFrameAddPage, ChainModifyHdl, ListBox&, rBox, void) +IMPL_LINK(SwFrameAddPage, ChainModifyHdl, ListBox&, rBox, void) { OUString sCurrentPrevChain, sCurrentNextChain; if(m_pPrevLB->GetSelectEntryPos()) diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 7d0fe614f921..68266e2e817c 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -587,11 +587,11 @@ DeactivateRC SwWrapTabPage::DeactivatePage(SfxItemSet* _pSet) } // range check -IMPL_LINK_TYPED( SwWrapTabPage, RangeLoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( SwWrapTabPage, RangeLoseFocusHdl, Control&, rControl, void ) { RangeModifyHdl( static_cast<SpinField&>(rControl) ); } -IMPL_LINK_TYPED( SwWrapTabPage, RangeModifyHdl, SpinField&, rSpin, void ) +IMPL_LINK( SwWrapTabPage, RangeModifyHdl, SpinField&, rSpin, void ) { MetricField& rEdit = static_cast<MetricField&>(rSpin); sal_Int64 nValue = rEdit.GetValue(); @@ -616,7 +616,7 @@ IMPL_LINK_TYPED( SwWrapTabPage, RangeModifyHdl, SpinField&, rSpin, void ) } } -IMPL_LINK_TYPED( SwWrapTabPage, WrapTypeHdl, Button *, pBtn, void ) +IMPL_LINK( SwWrapTabPage, WrapTypeHdl, Button *, pBtn, void ) { bool bWrapThrough = (pBtn == m_pWrapThroughRB); m_pWrapTransparentCB->Enable( bWrapThrough && !m_bHtmlMode ); @@ -630,7 +630,7 @@ IMPL_LINK_TYPED( SwWrapTabPage, WrapTypeHdl, Button *, pBtn, void ) ContourHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(SwWrapTabPage, ContourHdl, Button*, void) +IMPL_LINK_NOARG(SwWrapTabPage, ContourHdl, Button*, void) { bool bEnable = !(m_pWrapOutlineCB->IsChecked() && m_pWrapOutlineCB->IsEnabled()); diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx index 1c69dddd7cbf..8d6e55b4e35a 100644 --- a/sw/source/ui/inc/mmresultdialogs.hxx +++ b/sw/source/ui/inc/mmresultdialogs.hxx @@ -57,9 +57,9 @@ class SwMMResultSaveDialog : public SfxModalDialog bool m_bCancelSaving; - DECL_LINK_TYPED(SaveOutputHdl_Impl, Button* , void); - DECL_LINK_TYPED(SaveCancelHdl_Impl, Button*, void); - DECL_LINK_TYPED(DocumentSelectionHdl_Impl, Button*, void); + DECL_LINK(SaveOutputHdl_Impl, Button* , void); + DECL_LINK(SaveCancelHdl_Impl, Button*, void); + DECL_LINK(DocumentSelectionHdl_Impl, Button*, void); public: SwMMResultSaveDialog(); @@ -86,10 +86,10 @@ class SwMMResultPrintDialog : public SfxModalDialog VclPtr<Printer> m_pTempPrinter; - DECL_LINK_TYPED(PrinterChangeHdl_Impl, ListBox&,void ); - DECL_LINK_TYPED(PrintHdl_Impl, Button*, void); - DECL_LINK_TYPED(PrinterSetupHdl_Impl, Button*, void ); - DECL_LINK_TYPED(DocumentSelectionHdl_Impl, Button*, void); + DECL_LINK(PrinterChangeHdl_Impl, ListBox&,void ); + DECL_LINK(PrintHdl_Impl, Button*, void); + DECL_LINK(PrinterSetupHdl_Impl, Button*, void ); + DECL_LINK(DocumentSelectionHdl_Impl, Button*, void); void FillInPrinterSettings(); @@ -135,11 +135,11 @@ class SwMMResultEmailDialog : public SfxModalDialog OUString m_sBody; - DECL_LINK_TYPED(CopyToHdl_Impl, Button*, void); - DECL_LINK_TYPED(SendTypeHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(SendAsHdl_Impl, Button*, void); - DECL_LINK_TYPED(SendDocumentsHdl_Impl, Button*, void); - DECL_LINK_TYPED(DocumentSelectionHdl_Impl, Button*, void); + DECL_LINK(CopyToHdl_Impl, Button*, void); + DECL_LINK(SendTypeHdl_Impl, ListBox&, void); + DECL_LINK(SendAsHdl_Impl, Button*, void); + DECL_LINK(SendDocumentsHdl_Impl, Button*, void); + DECL_LINK(DocumentSelectionHdl_Impl, Button*, void); void FillInEmailSettings(); @@ -198,11 +198,11 @@ class SwSendMailDialog : public ModelessDialog //SfxModalDialog sal_Int32 m_nSendCount; sal_Int32 m_nErrorCount; - DECL_LINK_TYPED( StopHdl_Impl, Button*, void ); - DECL_LINK_TYPED( CloseHdl_Impl, Button* , void); - DECL_STATIC_LINK_TYPED( SwSendMailDialog, StartSendMails, void*, void ); - DECL_STATIC_LINK_TYPED( SwSendMailDialog, StopSendMails, void*, void ); - DECL_LINK_TYPED( RemoveThis, Idle*, void ); + DECL_LINK( StopHdl_Impl, Button*, void ); + DECL_LINK( CloseHdl_Impl, Button* , void); + DECL_STATIC_LINK( SwSendMailDialog, StartSendMails, void*, void ); + DECL_STATIC_LINK( SwSendMailDialog, StopSendMails, void*, void ); + DECL_LINK( RemoveThis, Idle*, void ); void IterateMails(); void SendMails(); diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 30fd38a1ea62..8ad638ee0210 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -96,7 +96,7 @@ static void lcl_SetBOOLProp( } } -IMPL_LINK_NOARG_TYPED(SwMultiTOXTabDialog, CreateExample_Hdl, SwOneExampleFrame&, void) +IMPL_LINK_NOARG(SwMultiTOXTabDialog, CreateExample_Hdl, SwOneExampleFrame&, void) { try { diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index ecea420917b5..744d2952119c 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -200,7 +200,7 @@ class SwAutoMarkDlg_Impl : public ModalDialog bool bCreateMode; - DECL_LINK_TYPED(OkHdl, Button*, void); + DECL_LINK(OkHdl, Button*, void); public: SwAutoMarkDlg_Impl(vcl::Window* pParent, const OUString& rAutoMarkURL, bool bCreate); @@ -476,7 +476,7 @@ SwTOXDescription* SwMultiTOXTabDialog::CreateTOXDescFromTOXBase( return pDesc; } -IMPL_LINK_NOARG_TYPED( SwMultiTOXTabDialog, ShowPreviewHdl, Button*, void ) +IMPL_LINK_NOARG( SwMultiTOXTabDialog, ShowPreviewHdl, Button*, void ) { if(m_pShowExampleCB->IsChecked()) { @@ -637,9 +637,9 @@ class SwAddStylesDlg_Impl : public SfxModalDialog OUString* pStyleArr; - DECL_LINK_TYPED(OkHdl, Button*, void); - DECL_LINK_TYPED(LeftRightHdl, Button*, void); - DECL_LINK_TYPED(HeaderDragHdl, HeaderBar*, void); + DECL_LINK(OkHdl, Button*, void); + DECL_LINK(LeftRightHdl, Button*, void); + DECL_LINK(HeaderDragHdl, HeaderBar*, void); public: SwAddStylesDlg_Impl(vcl::Window* pParent, SwWrtShell& rWrtSh, OUString rStringArr[]); @@ -731,7 +731,7 @@ void SwAddStylesDlg_Impl::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwAddStylesDlg_Impl, OkHdl, Button*, void) +IMPL_LINK_NOARG(SwAddStylesDlg_Impl, OkHdl, Button*, void) { for(sal_uInt16 i = 0; i < MAXLEVEL; i++) pStyleArr[i].clear(); @@ -753,12 +753,12 @@ IMPL_LINK_NOARG_TYPED(SwAddStylesDlg_Impl, OkHdl, Button*, void) EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(SwAddStylesDlg_Impl, HeaderDragHdl, HeaderBar*, void) +IMPL_LINK_NOARG(SwAddStylesDlg_Impl, HeaderDragHdl, HeaderBar*, void) { m_pHeaderTree->Invalidate(); } -IMPL_LINK_TYPED(SwAddStylesDlg_Impl, LeftRightHdl, Button*, pBtn, void) +IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, Button*, pBtn, void) { bool bLeft = pBtn == m_pLeftPB; SvTreeListEntry* pEntry = m_pHeaderTree->FirstSelected(); @@ -1315,7 +1315,7 @@ VclPtr<SfxTabPage> SwTOXSelectTabPage::Create( vcl::Window* pParent, const SfxIt return VclPtr<SwTOXSelectTabPage>::Create(pParent, *rAttrSet); } -IMPL_LINK_TYPED(SwTOXSelectTabPage, TOXTypeHdl, ListBox&, rBox, void) +IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox&, rBox, void) { SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog()); const sal_uInt16 nType = sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >( @@ -1381,11 +1381,11 @@ IMPL_LINK_TYPED(SwTOXSelectTabPage, TOXTypeHdl, ListBox&, rBox, void) ModifyHdl(*m_pTitleED); } -IMPL_LINK_NOARG_TYPED(SwTOXSelectTabPage, ModifyListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(SwTOXSelectTabPage, ModifyListBoxHdl, ListBox&, void) { ModifyHdl(*m_pTitleED); } -IMPL_LINK_NOARG_TYPED(SwTOXSelectTabPage, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwTOXSelectTabPage, ModifyHdl, Edit&, void) { if(!m_bWaitingInitialSettings) { @@ -1395,7 +1395,7 @@ IMPL_LINK_NOARG_TYPED(SwTOXSelectTabPage, ModifyHdl, Edit&, void) } } -IMPL_LINK_TYPED(SwTOXSelectTabPage, CheckBoxHdl, Button*, pButton, void ) +IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, Button*, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog()); @@ -1424,7 +1424,7 @@ IMPL_LINK_TYPED(SwTOXSelectTabPage, CheckBoxHdl, Button*, pButton, void ) ModifyHdl(*m_pTitleED); }; -IMPL_LINK_NOARG_TYPED(SwTOXSelectTabPage, RadioButtonHdl, Button*, void) +IMPL_LINK_NOARG(SwTOXSelectTabPage, RadioButtonHdl, Button*, void) { bool bEnable = m_pFromCaptionsRB->IsChecked(); m_pCaptionSequenceFT->Enable(bEnable); @@ -1434,7 +1434,7 @@ IMPL_LINK_NOARG_TYPED(SwTOXSelectTabPage, RadioButtonHdl, Button*, void) ModifyHdl(*m_pTitleED); } -IMPL_LINK_TYPED(SwTOXSelectTabPage, LanguageListBoxHdl, ListBox&, rBox, void) +IMPL_LINK(SwTOXSelectTabPage, LanguageListBoxHdl, ListBox&, rBox, void) { LanguageHdl(&rBox); } @@ -1477,7 +1477,7 @@ void SwTOXSelectTabPage::LanguageHdl( ListBox* pBox ) ModifyHdl(*m_pTitleED); }; -IMPL_LINK_TYPED(SwTOXSelectTabPage, AddStylesHdl, Button*, pButton, void) +IMPL_LINK(SwTOXSelectTabPage, AddStylesHdl, Button*, pButton, void) { ScopedVclPtrInstance<SwAddStylesDlg_Impl> pDlg( pButton, static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell(), @@ -1487,13 +1487,13 @@ IMPL_LINK_TYPED(SwTOXSelectTabPage, AddStylesHdl, Button*, pButton, void) ModifyHdl(*m_pTitleED); } -IMPL_LINK_TYPED(SwTOXSelectTabPage, MenuEnableHdl, Menu*, pMenu, bool) +IMPL_LINK(SwTOXSelectTabPage, MenuEnableHdl, Menu*, pMenu, bool) { pMenu->EnableItem("edit", !sAutoMarkURL.isEmpty()); return false; } -IMPL_LINK_TYPED(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu, bool) +IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu, bool) { const OUString sSaveAutoMarkURL = sAutoMarkURL; OString sIdent(pMenu->GetCurItemIdent()); @@ -2017,11 +2017,11 @@ void SwTOXEntryTabPage::dispose() // pVoid is used as signal to change all levels of the example -IMPL_LINK_TYPED(SwTOXEntryTabPage, ModifyClickHdl, Button*, pVoid, void) +IMPL_LINK(SwTOXEntryTabPage, ModifyClickHdl, Button*, pVoid, void) { OnModify(pVoid); } -IMPL_LINK_NOARG_TYPED(SwTOXEntryTabPage, ModifyHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(SwTOXEntryTabPage, ModifyHdl, LinkParamNone*, void) { OnModify(nullptr); } @@ -2225,7 +2225,7 @@ VclPtr<SfxTabPage> SwTOXEntryTabPage::Create( vcl::Window* pParent, const Sf return VclPtr<SwTOXEntryTabPage>::Create(pParent, *rAttrSet); } -IMPL_LINK_NOARG_TYPED(SwTOXEntryTabPage, EditStyleHdl, Button*, void) +IMPL_LINK_NOARG(SwTOXEntryTabPage, EditStyleHdl, Button*, void) { if( LISTBOX_ENTRY_NOTFOUND != m_pCharStyleLB->GetSelectEntryPos()) { @@ -2238,7 +2238,7 @@ IMPL_LINK_NOARG_TYPED(SwTOXEntryTabPage, EditStyleHdl, Button*, void) } } -IMPL_LINK_TYPED(SwTOXEntryTabPage, RemoveInsertAuthHdl, Button*, pButton, void) +IMPL_LINK(SwTOXEntryTabPage, RemoveInsertAuthHdl, Button*, pButton, void) { bool bInsert = pButton == m_pAuthInsertPB; if(bInsert) @@ -2300,7 +2300,7 @@ bool SwTOXEntryTabPage::Notify( NotifyEvent& rNEvt ) // This function initializes the default value in the Token // put here the UI dependent initializations -IMPL_LINK_TYPED(SwTOXEntryTabPage, InsertTokenHdl, Button*, pBtn, void) +IMPL_LINK(SwTOXEntryTabPage, InsertTokenHdl, Button*, pBtn, void) { OUString sText; FormTokenType eTokenType = TOKEN_ENTRY_NO; @@ -2354,7 +2354,7 @@ IMPL_LINK_TYPED(SwTOXEntryTabPage, InsertTokenHdl, Button*, pBtn, void) ModifyHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(SwTOXEntryTabPage, AllLevelsHdl, Button*, void) +IMPL_LINK_NOARG(SwTOXEntryTabPage, AllLevelsHdl, Button*, void) { //get current level //write it into all levels @@ -2379,7 +2379,7 @@ void SwTOXEntryTabPage::WriteBackLevel() } } -IMPL_LINK_TYPED(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox, void) +IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox, void) { if(bInLevelHdl) return; @@ -2422,13 +2422,13 @@ IMPL_LINK_TYPED(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox, void) pBox->GrabFocus(); } -IMPL_LINK_TYPED(SwTOXEntryTabPage, SortKeyHdl, Button*, pButton, void) +IMPL_LINK(SwTOXEntryTabPage, SortKeyHdl, Button*, pButton, void) { bool bEnable = m_pSortContentRB == pButton; m_pSortKeyFrame->Enable(bEnable); } -IMPL_LINK_TYPED(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken&, rToken, void) +IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken&, rToken, void) { if (!rToken.sCharStyleName.isEmpty()) m_pCharStyleLB->SelectEntry(rToken.sCharStyleName); @@ -2541,7 +2541,7 @@ IMPL_LINK_TYPED(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken&, rToken, void) } } -IMPL_LINK_TYPED(SwTOXEntryTabPage, StyleSelectHdl, ListBox&, rBox, void) +IMPL_LINK(SwTOXEntryTabPage, StyleSelectHdl, ListBox&, rBox, void) { OUString sEntry = rBox.GetSelectEntry(); const sal_uInt16 nId = (sal_uInt16)reinterpret_cast<sal_IntPtr>(rBox.GetSelectEntryData()); @@ -2562,7 +2562,7 @@ IMPL_LINK_TYPED(SwTOXEntryTabPage, StyleSelectHdl, ListBox&, rBox, void) ModifyHdl(nullptr); } -IMPL_LINK_TYPED(SwTOXEntryTabPage, ChapterInfoHdl, ListBox&, rBox, void) +IMPL_LINK(SwTOXEntryTabPage, ChapterInfoHdl, ListBox&, rBox, void) { sal_Int32 nPos = rBox.GetSelectEntryPos(); if(LISTBOX_ENTRY_NOTFOUND != nPos) @@ -2576,7 +2576,7 @@ IMPL_LINK_TYPED(SwTOXEntryTabPage, ChapterInfoHdl, ListBox&, rBox, void) } } -IMPL_LINK_TYPED(SwTOXEntryTabPage, ChapterInfoOutlineHdl, Edit&, rEdit, void) +IMPL_LINK(SwTOXEntryTabPage, ChapterInfoOutlineHdl, Edit&, rEdit, void) { const sal_uInt16 nLevel = static_cast<sal_uInt8>(static_cast<NumericField&>(rEdit).GetValue()); @@ -2588,7 +2588,7 @@ IMPL_LINK_TYPED(SwTOXEntryTabPage, ChapterInfoOutlineHdl, Edit&, rEdit, void) ModifyHdl(nullptr); } -IMPL_LINK_TYPED(SwTOXEntryTabPage, NumberFormatHdl, ListBox&, rBox, void) +IMPL_LINK(SwTOXEntryTabPage, NumberFormatHdl, ListBox&, rBox, void) { const sal_Int32 nPos = rBox.GetSelectEntryPos(); @@ -2604,7 +2604,7 @@ IMPL_LINK_TYPED(SwTOXEntryTabPage, NumberFormatHdl, ListBox&, rBox, void) } } -IMPL_LINK_TYPED(SwTOXEntryTabPage, TabPosHdl, Edit&, rEdit, void) +IMPL_LINK(SwTOXEntryTabPage, TabPosHdl, Edit&, rEdit, void) { MetricField* pField = static_cast<MetricField*>(&rEdit); Control* pCtrl = m_pTokenWIN->GetActiveControl(); @@ -2619,7 +2619,7 @@ IMPL_LINK_TYPED(SwTOXEntryTabPage, TabPosHdl, Edit&, rEdit, void) ModifyHdl(nullptr); } -IMPL_LINK_TYPED(SwTOXEntryTabPage, FillCharHdl, Edit&, rBox, void) +IMPL_LINK(SwTOXEntryTabPage, FillCharHdl, Edit&, rBox, void) { Control* pCtrl = m_pTokenWIN->GetActiveControl(); OSL_ENSURE(pCtrl && WINDOW_EDIT != pCtrl->GetType() && @@ -2637,7 +2637,7 @@ IMPL_LINK_TYPED(SwTOXEntryTabPage, FillCharHdl, Edit&, rBox, void) ModifyHdl(nullptr); } -IMPL_LINK_TYPED(SwTOXEntryTabPage, AutoRightHdl, Button*, pBox, void) +IMPL_LINK(SwTOXEntryTabPage, AutoRightHdl, Button*, pBox, void) { //the most right style::TabStop is usually right aligned Control* pCurCtrl = m_pTokenWIN->GetActiveControl(); @@ -3280,7 +3280,7 @@ void SwTokenWindow::AdjustScrolling() } } -IMPL_LINK_TYPED(SwTokenWindow, ScrollHdl, Button*, pBtn, void ) +IMPL_LINK(SwTokenWindow, ScrollHdl, Button*, pBtn, void ) { if(aControlList.empty()) return; @@ -3458,14 +3458,14 @@ bool SwTokenWindow::CreateQuickHelp(Control* pCtrl, return bRet; } -IMPL_LINK_TYPED(SwTokenWindow, EditResize, Edit&, rEdit, void) +IMPL_LINK(SwTokenWindow, EditResize, Edit&, rEdit, void) { static_cast<SwTOXEdit*>(&rEdit)->AdjustSize(); AdjustPositions(); aModifyHdl.Call(nullptr); } -IMPL_LINK_TYPED(SwTokenWindow, NextItemHdl, SwTOXEdit&, rEdit, void) +IMPL_LINK(SwTokenWindow, NextItemHdl, SwTOXEdit&, rEdit, void) { ctrl_iterator it = std::find(aControlList.begin(),aControlList.end(),&rEdit); @@ -3489,7 +3489,7 @@ IMPL_LINK_TYPED(SwTokenWindow, NextItemHdl, SwTOXEdit&, rEdit, void) } } -IMPL_LINK_TYPED(SwTokenWindow, TbxFocusHdl, Control&, rControl, void) +IMPL_LINK(SwTokenWindow, TbxFocusHdl, Control&, rControl, void) { SwTOXEdit* pEdit = static_cast<SwTOXEdit*>(&rControl); for (ctrl_iterator it = aControlList.begin(); it != aControlList.end(); ++it) @@ -3503,7 +3503,7 @@ IMPL_LINK_TYPED(SwTokenWindow, TbxFocusHdl, Control&, rControl, void) SetActiveControl(pEdit); } -IMPL_LINK_TYPED(SwTokenWindow, NextItemBtnHdl, SwTOXButton&, rBtn, void ) +IMPL_LINK(SwTokenWindow, NextItemBtnHdl, SwTOXButton&, rBtn, void ) { ctrl_iterator it = std::find(aControlList.begin(),aControlList.end(),&rBtn); @@ -3540,7 +3540,7 @@ IMPL_LINK_TYPED(SwTokenWindow, NextItemBtnHdl, SwTOXButton&, rBtn, void ) } } -IMPL_LINK_TYPED(SwTokenWindow, TbxFocusBtnHdl, Control&, rControl, void ) +IMPL_LINK(SwTokenWindow, TbxFocusBtnHdl, Control&, rControl, void ) { SwTOXButton* pBtn = static_cast<SwTOXButton*>(&rControl); for (ctrl_iterator it = aControlList.begin(); it != aControlList.end(); ++it) @@ -3735,7 +3735,7 @@ VclPtr<SfxTabPage> SwTOXStylesTabPage::Create( vcl::Window* pParent, return VclPtr<SwTOXStylesTabPage>::Create(pParent, *rAttrSet); } -IMPL_LINK_NOARG_TYPED(SwTOXStylesTabPage, EditStyleHdl, Button *, void) +IMPL_LINK_NOARG(SwTOXStylesTabPage, EditStyleHdl, Button *, void) { if( LISTBOX_ENTRY_NOTFOUND != m_pParaLayLB->GetSelectEntryPos()) { @@ -3749,7 +3749,7 @@ IMPL_LINK_NOARG_TYPED(SwTOXStylesTabPage, EditStyleHdl, Button *, void) } // allocate templates -IMPL_LINK_NOARG_TYPED(SwTOXStylesTabPage, AssignHdl, Button*, void) +IMPL_LINK_NOARG(SwTOXStylesTabPage, AssignHdl, Button*, void) { sal_Int32 nLevPos = m_pLevelLB->GetSelectEntryPos(); sal_Int32 nTemplPos = m_pParaLayLB->GetSelectEntryPos(); @@ -3770,7 +3770,7 @@ IMPL_LINK_NOARG_TYPED(SwTOXStylesTabPage, AssignHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SwTOXStylesTabPage, StdHdl, Button*, void) +IMPL_LINK_NOARG(SwTOXStylesTabPage, StdHdl, Button*, void) { const sal_Int32 nPos = m_pLevelLB->GetSelectEntryPos(); if(nPos != LISTBOX_ENTRY_NOTFOUND) @@ -3784,7 +3784,7 @@ IMPL_LINK_NOARG_TYPED(SwTOXStylesTabPage, StdHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SwTOXStylesTabPage, DoubleClickHdl, ListBox&, void) +IMPL_LINK_NOARG(SwTOXStylesTabPage, DoubleClickHdl, ListBox&, void) { const OUString aTmpName( m_pParaLayLB->GetSelectEntry() ); SwWrtShell& rSh = static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell(); @@ -3795,7 +3795,7 @@ IMPL_LINK_NOARG_TYPED(SwTOXStylesTabPage, DoubleClickHdl, ListBox&, void) } // enable only when selected -IMPL_LINK_NOARG_TYPED(SwTOXStylesTabPage, EnableSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SwTOXStylesTabPage, EnableSelectHdl, ListBox&, void) { m_pStdBT->Enable(m_pLevelLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND); @@ -4193,7 +4193,7 @@ void SwAutoMarkDlg_Impl::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwAutoMarkDlg_Impl, OkHdl, Button*, void) +IMPL_LINK_NOARG(SwAutoMarkDlg_Impl, OkHdl, Button*, void) { bool bError = false; if(m_pEntriesBB->IsModified() || bCreateMode) diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx index 8925b60e0eac..41c99bf7f95e 100644 --- a/sw/source/ui/index/multmrk.cxx +++ b/sw/source/ui/index/multmrk.cxx @@ -45,7 +45,7 @@ SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr& rTOXMgr) m_pTextFT->SetText(rMgr.GetTOXMark(0)->GetTOXType()->GetTypeName()); } -IMPL_LINK_TYPED( SwMultiTOXMarkDlg, SelectHdl, ListBox&, rBox, void ) +IMPL_LINK( SwMultiTOXMarkDlg, SelectHdl, ListBox&, rBox, void ) { if(rBox.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND) { SwTOXMark* pMark = rMgr.GetTOXMark(rBox.GetSelectEntryPos()); diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 00e07b6ff78d..e8d4ef2b492c 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -371,7 +371,7 @@ void SwIndexMarkPane::Activate() } } -IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, SyncSelectionHdl, Button*, void) +IMPL_LINK_NOARG(SwIndexMarkPane, SyncSelectionHdl, Button*, void) { bSelected = !pSh->HasSelection(); aOrgStr = pSh->GetView().GetSelectionTextParam(true, false); @@ -575,7 +575,7 @@ class SwNewUserIdxDlg : public ModalDialog SwIndexMarkPane* m_pDlg; - DECL_LINK_TYPED( ModifyHdl, Edit&, void); + DECL_LINK( ModifyHdl, Edit&, void); public: explicit SwNewUserIdxDlg(SwIndexMarkPane* pPane) @@ -600,12 +600,12 @@ class SwNewUserIdxDlg : public ModalDialog OUString GetName(){return m_pNameED->GetText();} }; -IMPL_LINK_TYPED( SwNewUserIdxDlg, ModifyHdl, Edit&, rEdit, void) +IMPL_LINK( SwNewUserIdxDlg, ModifyHdl, Edit&, rEdit, void) { m_pOKPB->Enable(!rEdit.GetText().isEmpty() && !m_pDlg->IsTOXType(rEdit.GetText())); } -IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, NewUserIdxHdl, Button*, void) +IMPL_LINK_NOARG(SwIndexMarkPane, NewUserIdxHdl, Button*, void) { ScopedVclPtrInstance< SwNewUserIdxDlg > pDlg(this); if(RET_OK == pDlg->Execute()) @@ -616,14 +616,14 @@ IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, NewUserIdxHdl, Button*, void) } } -IMPL_LINK_TYPED( SwIndexMarkPane, SearchTypeHdl, Button*, pBox, void) +IMPL_LINK( SwIndexMarkPane, SearchTypeHdl, Button*, pBox, void) { bool bEnable = static_cast<CheckBox*>(pBox)->IsChecked() && pBox->IsEnabled(); m_pSearchCaseWordOnlyCB->Enable(bEnable); m_pSearchCaseSensitiveCB->Enable(bEnable); } -IMPL_LINK_TYPED( SwIndexMarkPane, InsertHdl, Button *, pButton, void ) +IMPL_LINK( SwIndexMarkPane, InsertHdl, Button *, pButton, void ) { Apply(); //close the dialog if only one entry is available @@ -631,7 +631,7 @@ IMPL_LINK_TYPED( SwIndexMarkPane, InsertHdl, Button *, pButton, void ) CloseHdl(pButton); } -IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, CloseHdl, Button*, void) +IMPL_LINK_NOARG(SwIndexMarkPane, CloseHdl, Button*, void) { if(bNewMark) { @@ -646,12 +646,12 @@ IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, CloseHdl, Button*, void) } // select index type only when inserting -IMPL_LINK_TYPED( SwIndexMarkPane, ModifyListBoxHdl, ListBox&, rBox, void ) +IMPL_LINK( SwIndexMarkPane, ModifyListBoxHdl, ListBox&, rBox, void ) { ModifyHdl(&rBox); } -IMPL_LINK_TYPED( SwIndexMarkPane, ModifyEditHdl, Edit&, rEdit, void ) +IMPL_LINK( SwIndexMarkPane, ModifyEditHdl, Edit&, rEdit, void ) { ModifyHdl(&rEdit); } @@ -730,35 +730,35 @@ void SwIndexMarkPane::ModifyHdl(Control* pBox) (!m_pEntryED->GetText().isEmpty() || pSh->GetCursorCnt(false))); } -IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, NextHdl, Button*, void) +IMPL_LINK_NOARG(SwIndexMarkPane, NextHdl, Button*, void) { InsertUpdate(); pTOXMgr->NextTOXMark(); UpdateDialog(); } -IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, NextSameHdl, Button*, void) +IMPL_LINK_NOARG(SwIndexMarkPane, NextSameHdl, Button*, void) { InsertUpdate(); pTOXMgr->NextTOXMark(true); UpdateDialog(); } -IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, PrevHdl, Button*, void) +IMPL_LINK_NOARG(SwIndexMarkPane, PrevHdl, Button*, void) { InsertUpdate(); pTOXMgr->PrevTOXMark(); UpdateDialog(); } -IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, PrevSameHdl, Button*, void) +IMPL_LINK_NOARG(SwIndexMarkPane, PrevSameHdl, Button*, void) { InsertUpdate(); pTOXMgr->PrevTOXMark(true); UpdateDialog(); } -IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, DelHdl, Button*, void) +IMPL_LINK_NOARG(SwIndexMarkPane, DelHdl, Button*, void) { bDel = true; InsertUpdate(); @@ -876,7 +876,7 @@ void SwIndexMarkPane::UpdateDialog() } // Remind whether the edit boxes for Phonetic reading are changed manually -IMPL_LINK_TYPED( SwIndexMarkPane, PhoneticEDModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( SwIndexMarkPane, PhoneticEDModifyHdl, Edit&, rEdit, void ) { if (m_pPhoneticED0 == &rEdit) { @@ -893,7 +893,7 @@ IMPL_LINK_TYPED( SwIndexMarkPane, PhoneticEDModifyHdl, Edit&, rEdit, void ) } // Enable Disable of the 2nd key -IMPL_LINK_TYPED( SwIndexMarkPane, KeyDCBModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( SwIndexMarkPane, KeyDCBModifyHdl, Edit&, rEdit, void ) { ComboBox* pBox = static_cast<ComboBox*>(&rEdit); if (m_pKey1DCB == pBox) @@ -1024,9 +1024,9 @@ class SwCreateAuthEntryDlg_Impl : public ModalDialog bool m_bNewEntryMode; bool m_bNameAllowed; - DECL_LINK_TYPED(IdentifierHdl, ComboBox&, void); - DECL_LINK_TYPED(ShortNameHdl, Edit&, void); - DECL_LINK_TYPED(EnableHdl, ListBox&, void); + DECL_LINK(IdentifierHdl, ComboBox&, void); + DECL_LINK(ShortNameHdl, Edit&, void); + DECL_LINK(EnableHdl, ListBox&, void); public: SwCreateAuthEntryDlg_Impl(vcl::Window* pParent, @@ -1135,7 +1135,7 @@ void SwAuthorMarkPane::ReInitDlg(SwWrtShell& rWrtShell) InitControls(); } -IMPL_LINK_NOARG_TYPED(SwAuthorMarkPane, CloseHdl, Button*, void) +IMPL_LINK_NOARG(SwAuthorMarkPane, CloseHdl, Button*, void) { if(bNewEntry) { @@ -1163,7 +1163,7 @@ static OUString lcl_FindColumnEntry(const beans::PropertyValue* pFields, sal_Int return OUString(); } -IMPL_LINK_TYPED( SwAuthorMarkPane, CompEntryHdl, ListBox&, rBox, void) +IMPL_LINK( SwAuthorMarkPane, CompEntryHdl, ListBox&, rBox, void) { const OUString sEntry(rBox.GetSelectEntry()); if(bIsFromComponent) @@ -1207,7 +1207,7 @@ IMPL_LINK_TYPED( SwAuthorMarkPane, CompEntryHdl, ListBox&, rBox, void) m_pTitleFI->SetText(m_sFields[AUTH_FIELD_TITLE]); } -IMPL_LINK_NOARG_TYPED(SwAuthorMarkPane, InsertHdl, Button*, void) +IMPL_LINK_NOARG(SwAuthorMarkPane, InsertHdl, Button*, void) { //insert or update the SwAuthorityField... if(pSh) @@ -1260,7 +1260,7 @@ IMPL_LINK_NOARG_TYPED(SwAuthorMarkPane, InsertHdl, Button*, void) CloseHdl(nullptr); } -IMPL_LINK_TYPED(SwAuthorMarkPane, CreateEntryHdl, Button*, pButton, void) +IMPL_LINK(SwAuthorMarkPane, CreateEntryHdl, Button*, pButton, void) { bool bCreate = pButton == m_pCreateEntryPB; OUString sOldId = m_sCreatedEntry[0]; @@ -1304,7 +1304,7 @@ IMPL_LINK_TYPED(SwAuthorMarkPane, CreateEntryHdl, Button*, pButton, void) } } -IMPL_LINK_TYPED(SwAuthorMarkPane, ChangeSourceHdl, Button*, pButton, void) +IMPL_LINK(SwAuthorMarkPane, ChangeSourceHdl, Button*, pButton, void) { bool bFromComp = (pButton == m_pFromComponentRB); bIsFromComponent = bFromComp; @@ -1365,7 +1365,7 @@ IMPL_LINK_TYPED(SwAuthorMarkPane, ChangeSourceHdl, Button*, pButton, void) CompEntryHdl(*m_pEntryLB); } -IMPL_LINK_TYPED(SwAuthorMarkPane, EditModifyHdl, Edit&, rEdit, void) +IMPL_LINK(SwAuthorMarkPane, EditModifyHdl, Edit&, rEdit, void) { Link<Edit*,bool> aAllowed = LINK(this, SwAuthorMarkPane, IsEntryAllowedHdl); bool bResult = aAllowed.Call(&rEdit); @@ -1378,7 +1378,7 @@ IMPL_LINK_TYPED(SwAuthorMarkPane, EditModifyHdl, Edit&, rEdit, void) } }; -IMPL_LINK_TYPED(SwAuthorMarkPane, IsEntryAllowedHdl, Edit*, pEdit, bool) +IMPL_LINK(SwAuthorMarkPane, IsEntryAllowedHdl, Edit*, pEdit, bool) { OUString sEntry = pEdit->GetText(); bool bAllowed = false; @@ -1584,7 +1584,7 @@ OUString SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField) cons return OUString(); } -IMPL_LINK_TYPED(SwCreateAuthEntryDlg_Impl, IdentifierHdl, ComboBox&, rBox, void) +IMPL_LINK(SwCreateAuthEntryDlg_Impl, IdentifierHdl, ComboBox&, rBox, void) { const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>( rWrtSh.GetFieldType(RES_AUTHORITY, OUString())); @@ -1610,7 +1610,7 @@ IMPL_LINK_TYPED(SwCreateAuthEntryDlg_Impl, IdentifierHdl, ComboBox&, rBox, void) } } -IMPL_LINK_TYPED(SwCreateAuthEntryDlg_Impl, ShortNameHdl, Edit&, rEdit, void) +IMPL_LINK(SwCreateAuthEntryDlg_Impl, ShortNameHdl, Edit&, rEdit, void) { if(aShortNameCheckLink.IsSet()) { @@ -1620,7 +1620,7 @@ IMPL_LINK_TYPED(SwCreateAuthEntryDlg_Impl, ShortNameHdl, Edit&, rEdit, void) } } -IMPL_LINK_TYPED(SwCreateAuthEntryDlg_Impl, EnableHdl, ListBox&, rBox, void) +IMPL_LINK(SwCreateAuthEntryDlg_Impl, EnableHdl, ListBox&, rBox, void) { m_pOKBT->Enable(m_bNameAllowed && rBox.GetSelectEntryCount()); }; diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 6197c4f64ef3..329fef44ad73 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -43,7 +43,7 @@ const char BookmarkTable::cSeparator(';'); const OUString BookmarkTable::sDefaultBookmarkName("Bookmark"); // callback to modify EditBox -IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwInsertBookmarkDlg, ModifyHdl, Edit&, void) { ValidateBookmarks(); m_pBookmarksBox->SelectAll(false); @@ -90,7 +90,7 @@ IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, ModifyHdl, Edit&, void) } // callback to delete a text mark -IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, DeleteHdl, Button*, void) +IMPL_LINK_NOARG(SwInsertBookmarkDlg, DeleteHdl, Button*, void) { if (!ValidateBookmarks()) return; @@ -124,18 +124,18 @@ IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, DeleteHdl, Button*, void) } // callback to a goto button -IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, GotoHdl, Button*, void) +IMPL_LINK_NOARG(SwInsertBookmarkDlg, GotoHdl, Button*, void) { GotoSelectedBookmark(); } -IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, DoubleClickHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(SwInsertBookmarkDlg, DoubleClickHdl, SvTreeListBox*, bool) { GotoSelectedBookmark(); return true; } -IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, SelectionChangedHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SwInsertBookmarkDlg, SelectionChangedHdl, SvTreeListBox*, void) { if (!ValidateBookmarks()) return; @@ -171,7 +171,7 @@ IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, SelectionChangedHdl, SvTreeListBox*, } } -IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, RenameHdl, Button*, void) +IMPL_LINK_NOARG(SwInsertBookmarkDlg, RenameHdl, Button*, void) { if (!ValidateBookmarks()) return; @@ -205,7 +205,7 @@ IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, RenameHdl, Button*, void) } // callback to a insert button. Inserts a new text mark to the current position. -IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, InsertHdl, Button*, void) +IMPL_LINK_NOARG(SwInsertBookmarkDlg, InsertHdl, Button*, void) { OUString sBookmark = m_pEditBox->GetText(); rSh.SetBookmark(vcl::KeyCode(), sBookmark, OUString()); diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index f457b986b490..30f053bf4a57 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -56,7 +56,7 @@ void SwFootNoteOptionDlg::PageCreated( sal_uInt16 /*nId*/, SfxTabPage &rPage ) static_cast<SwEndNoteOptionPage&>(rPage).SetShell( rSh ); } -IMPL_LINK_TYPED( SwFootNoteOptionDlg, OkHdl, Button *, pBtn, void ) +IMPL_LINK( SwFootNoteOptionDlg, OkHdl, Button *, pBtn, void ) { SfxItemSet aDummySet(rSh.GetAttrPool(), 1, 1 ); SfxTabPage *pPage = GetTabPage( m_nFootNoteId ); @@ -294,7 +294,7 @@ void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell ) // Handler behind the button to collect the footnote at the page. In this case // all kinds of numbering can be used. -IMPL_LINK_NOARG_TYPED(SwEndNoteOptionPage, PosPageHdl, Button*, void) +IMPL_LINK_NOARG(SwEndNoteOptionPage, PosPageHdl, Button*, void) { const SwFootnoteNum eNum = (const SwFootnoteNum)GetNumbering(); bPosDoc = false; @@ -308,7 +308,7 @@ IMPL_LINK_NOARG_TYPED(SwEndNoteOptionPage, PosPageHdl, Button*, void) m_pPageTemplBox->Enable(false); } -IMPL_LINK_NOARG_TYPED(SwEndNoteOptionPage, NumCountHdl, ListBox&, void) +IMPL_LINK_NOARG(SwEndNoteOptionPage, NumCountHdl, ListBox&, void) { bool bEnable = true; if( m_pNumCountBox->GetEntryCount() - 1 != m_pNumCountBox->GetSelectEntryPos() ) @@ -322,7 +322,7 @@ IMPL_LINK_NOARG_TYPED(SwEndNoteOptionPage, NumCountHdl, ListBox&, void) // Handler behind the button to collect the footnote at the chapter or end of // the document. In this case no pagewise numbering can be used. -IMPL_LINK_NOARG_TYPED(SwEndNoteOptionPage, PosChapterHdl, Button*, void) +IMPL_LINK_NOARG(SwEndNoteOptionPage, PosChapterHdl, Button*, void) { if ( !bPosDoc ) SelectNumbering(FTNNUM_DOC); diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 9f7942147a9a..5a7f52cb3c31 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -184,7 +184,7 @@ void SwGlossaryGroupDlg::Apply() } } -IMPL_LINK_NOARG_TYPED( SwGlossaryGroupDlg, SelectHdl, SvTreeListBox*, void ) +IMPL_LINK_NOARG( SwGlossaryGroupDlg, SelectHdl, SvTreeListBox*, void ) { m_pNewPB->Enable(false); SvTreeListEntry* pFirstEntry = m_pGroupTLB->FirstSelected(); @@ -207,7 +207,7 @@ IMPL_LINK_NOARG_TYPED( SwGlossaryGroupDlg, SelectHdl, SvTreeListBox*, void ) } } -IMPL_LINK_NOARG_TYPED(SwGlossaryGroupDlg, NewHdl, Button*, void) +IMPL_LINK_NOARG(SwGlossaryGroupDlg, NewHdl, Button*, void) { OUString sGroup = m_pNameED->GetText() + OUStringLiteral1(GLOS_DELIM) @@ -226,7 +226,7 @@ IMPL_LINK_NOARG_TYPED(SwGlossaryGroupDlg, NewHdl, Button*, void) m_pGroupTLB->GetModel()->Resort(); } -IMPL_LINK_TYPED( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton, void ) +IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton, void ) { SvTreeListEntry* pEntry = m_pGroupTLB->FirstSelected(); if(!pEntry) @@ -275,7 +275,7 @@ IMPL_LINK_TYPED( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton, void ) m_pNameED->SetText(aEmptyOUStr); } -IMPL_LINK_NOARG_TYPED(SwGlossaryGroupDlg, RenameHdl, Button*, void) +IMPL_LINK_NOARG(SwGlossaryGroupDlg, RenameHdl, Button*, void) { SvTreeListEntry* pEntry = m_pGroupTLB->FirstSelected(); GlosBibUserData* pUserData = static_cast<GlosBibUserData*>(pEntry->GetUserData()); @@ -320,11 +320,11 @@ IMPL_LINK_NOARG_TYPED(SwGlossaryGroupDlg, RenameHdl, Button*, void) m_pGroupTLB->GetModel()->Resort(); } -IMPL_LINK_NOARG_TYPED(SwGlossaryGroupDlg, ModifyListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyListBoxHdl, ListBox&, void) { ModifyHdl(*m_pNameED); } -IMPL_LINK_NOARG_TYPED(SwGlossaryGroupDlg, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyHdl, Edit&, void) { OUString sEntry(m_pNameED->GetText()); bool bEnableNew = true; diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index e3e7cbd6c6ef..c906e674623b 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -125,8 +125,8 @@ class SwNewGlosNameDlg : public ModalDialog VclPtr<Edit> m_pOldShort; protected: - DECL_LINK_TYPED( Modify, Edit&, void ); - DECL_LINK_TYPED(Rename, Button*, void); + DECL_LINK( Modify, Edit&, void ); + DECL_LINK(Rename, Button*, void); public: SwNewGlosNameDlg( vcl::Window* pParent, @@ -274,7 +274,7 @@ void SwGlossaryDlg::dispose() } // select new group -IMPL_LINK_TYPED( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox, void ) +IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox, void ) { SvTreeListEntry* pEntry = pBox->FirstSelected(); if(!pEntry) @@ -372,7 +372,7 @@ SvTreeListEntry* SwGlossaryDlg::DoesBlockExist(const OUString& rBlock, return nullptr; } -IMPL_LINK_TYPED( SwGlossaryDlg, NameModify, Edit&, rEdit, void ) +IMPL_LINK( SwGlossaryDlg, NameModify, Edit&, rEdit, void ) { const OUString aName(m_pNameED->GetText()); bool bNameED = &rEdit == m_pNameED; @@ -411,7 +411,7 @@ IMPL_LINK_TYPED( SwGlossaryDlg, NameModify, Edit&, rEdit, void ) } } -IMPL_LINK_TYPED( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox, bool ) +IMPL_LINK( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox, bool ) { SvTreeListEntry* pEntry = pBox->FirstSelected(); if(pBox->GetParent(pEntry) && !bIsDocReadOnly) @@ -419,7 +419,7 @@ IMPL_LINK_TYPED( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox, bool ) return false; } -IMPL_LINK_TYPED( SwGlossaryDlg, EnableHdl, Menu *, pMn, bool ) +IMPL_LINK( SwGlossaryDlg, EnableHdl, Menu *, pMn, bool ) { SvTreeListEntry* pEntry = m_pCategoryBox->FirstSelected(); @@ -441,7 +441,7 @@ IMPL_LINK_TYPED( SwGlossaryDlg, EnableHdl, Menu *, pMn, bool ) return true; } -IMPL_LINK_TYPED( SwGlossaryDlg, MenuHdl, Menu *, pMn, bool ) +IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn, bool ) { OString sItemIdent(pMn->GetCurItemIdent()); @@ -613,7 +613,7 @@ IMPL_LINK_TYPED( SwGlossaryDlg, MenuHdl, Menu *, pMn, bool ) } // dialog manage regions -IMPL_LINK_NOARG_TYPED(SwGlossaryDlg, BibHdl, Button*, void) +IMPL_LINK_NOARG(SwGlossaryDlg, BibHdl, Button*, void) { SwGlossaries* pGloss = ::GetGlossaries(); if( pGloss->IsGlosPathErr() ) @@ -782,7 +782,7 @@ void SwGlossaryDlg::Init() m_pInsertTipCB->SetClickHdl(LINK(this, SwGlossaryDlg, CheckBoxHdl)); } -IMPL_LINK_NOARG_TYPED(SwGlossaryDlg, EditHdl, MenuButton *, void) +IMPL_LINK_NOARG(SwGlossaryDlg, EditHdl, MenuButton *, void) { // EndDialog must not be called in MenuHdl if (m_pEditBtn->GetCurItemIdent() == "edit") @@ -794,7 +794,7 @@ IMPL_LINK_NOARG_TYPED(SwGlossaryDlg, EditHdl, MenuButton *, void) } // KeyInput for ShortName - Edits without Spaces -IMPL_LINK_TYPED( SwNewGlosNameDlg, Modify, Edit&, rBox, void ) +IMPL_LINK( SwNewGlosNameDlg, Modify, Edit&, rBox, void ) { OUString aName(m_pNewName->GetText()); SwGlossaryDlg* pDlg = static_cast<SwGlossaryDlg*>(GetParent()); @@ -807,7 +807,7 @@ IMPL_LINK_TYPED( SwNewGlosNameDlg, Modify, Edit&, rBox, void ) m_pOk->Enable(bEnable); } -IMPL_LINK_NOARG_TYPED(SwNewGlosNameDlg, Rename, Button*, void) +IMPL_LINK_NOARG(SwNewGlosNameDlg, Rename, Button*, void) { SwGlossaryDlg* pDlg = static_cast<SwGlossaryDlg*>(GetParent()); OUString sNew = GetAppCharClass().uppercase(m_pNewShort->GetText()); @@ -821,7 +821,7 @@ IMPL_LINK_NOARG_TYPED(SwNewGlosNameDlg, Rename, Button*, void) EndDialog(RET_OK); } -IMPL_LINK_TYPED( SwGlossaryDlg, CheckBoxHdl, Button *, pBox, void ) +IMPL_LINK( SwGlossaryDlg, CheckBoxHdl, Button *, pBox, void ) { SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get(); bool bCheck = static_cast<CheckBox*>(pBox)->IsChecked(); @@ -1035,7 +1035,7 @@ OUString SwGlossaryDlg::GetCurrGrpName() const return OUString(); } -IMPL_LINK_TYPED( SwGlossaryDlg, PathHdl, Button *, pBtn, void ) +IMPL_LINK( SwGlossaryDlg, PathHdl, Button *, pBtn, void ) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) @@ -1058,7 +1058,7 @@ IMPL_LINK_TYPED( SwGlossaryDlg, PathHdl, Button *, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(SwGlossaryDlg, InsertHdl, Button*, void) +IMPL_LINK_NOARG(SwGlossaryDlg, InsertHdl, Button*, void) { EndDialog(RET_OK); } @@ -1076,7 +1076,7 @@ void SwGlossaryDlg::ShowPreview() ShowAutoText(::GetCurrGlosGroup(), m_pShortNameEdit->GetText()); }; -IMPL_LINK_NOARG_TYPED(SwGlossaryDlg, PreviewLoadedHdl, SwOneExampleFrame&, void) +IMPL_LINK_NOARG(SwGlossaryDlg, PreviewLoadedHdl, SwOneExampleFrame&, void) { ResumeShowAutoText(); } diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index f4c0a2c11a67..ac812c2802a4 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -62,9 +62,9 @@ class SwEndNoteOptionPage : public SfxTabPage inline void SelectNumbering(int eNum); int GetNumbering() const; - DECL_LINK_TYPED(PosPageHdl, Button*, void); - DECL_LINK_TYPED(PosChapterHdl, Button*, void); - DECL_LINK_TYPED(NumCountHdl, ListBox&, void); + DECL_LINK(PosPageHdl, Button*, void); + DECL_LINK(PosChapterHdl, Button*, void); + DECL_LINK(NumCountHdl, ListBox&, void); public: SwEndNoteOptionPage( vcl::Window *pParent, bool bEndNote, diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index 407c366bb63f..791333282791 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -81,24 +81,24 @@ void SwInsFootNoteDlg::Apply() bFootnote = m_pFootnoteBtn->IsChecked(); } -IMPL_LINK_NOARG_TYPED(SwInsFootNoteDlg, NumberCharHdl, Button*, void) +IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberCharHdl, Button*, void) { m_pNumberCharEdit->GrabFocus(); m_pOkBtn->Enable( !m_pNumberCharEdit->GetText().isEmpty() || bExtCharAvailable ); } -IMPL_LINK_NOARG_TYPED(SwInsFootNoteDlg, NumberEditHdl, Edit&, void) +IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberEditHdl, Edit&, void) { m_pNumberCharBtn->Check(); m_pOkBtn->Enable( !m_pNumberCharEdit->GetText().isEmpty() ); } -IMPL_LINK_NOARG_TYPED(SwInsFootNoteDlg, NumberAutoBtnHdl, Button*, void) +IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberAutoBtnHdl, Button*, void) { m_pOkBtn->Enable(); } -IMPL_LINK_NOARG_TYPED(SwInsFootNoteDlg, NumberExtCharHdl, Button*, void) +IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberExtCharHdl, Button*, void) { m_pNumberCharBtn->Check(); @@ -137,7 +137,7 @@ IMPL_LINK_NOARG_TYPED(SwInsFootNoteDlg, NumberExtCharHdl, Button*, void) } } -IMPL_LINK_TYPED( SwInsFootNoteDlg, NextPrevHdl, Button *, pBtn, void ) +IMPL_LINK( SwInsFootNoteDlg, NextPrevHdl, Button *, pBtn, void ) { Apply(); diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 641804d4325f..c96b5d5c5747 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -193,7 +193,7 @@ void SwLineNumberingDlg::dispose() } -IMPL_LINK_NOARG_TYPED(SwLineNumberingDlg, OKHdl, Button*, void) +IMPL_LINK_NOARG(SwLineNumberingDlg, OKHdl, Button*, void) { SwLineNumberInfo aInf(pSh->GetLineNumberInfo()); @@ -255,7 +255,7 @@ IMPL_LINK_NOARG_TYPED(SwLineNumberingDlg, OKHdl, Button*, void) } // modify -IMPL_LINK_NOARG_TYPED(SwLineNumberingDlg, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SwLineNumberingDlg, ModifyHdl, Edit&, void) { bool bEnable = m_pNumberingOnCB->IsChecked() && !m_pDivisorED->GetText().isEmpty(); @@ -265,7 +265,7 @@ IMPL_LINK_NOARG_TYPED(SwLineNumberingDlg, ModifyHdl, Edit&, void) } // On/Off -IMPL_LINK_NOARG_TYPED(SwLineNumberingDlg, LineOnOffHdl, Button*, void) +IMPL_LINK_NOARG(SwLineNumberingDlg, LineOnOffHdl, Button*, void) { bool bEnable = m_pNumberingOnCB->IsChecked(); m_pBodyContent->Enable(bEnable); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index e44175fd4798..ac2b5ad1728b 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -589,7 +589,7 @@ void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh) m_pIndentAtMF->SetUnit( eMetric ); } -IMPL_LINK_NOARG_TYPED(SwNumPositionTabPage, EditModifyHdl, ListBox&, void) +IMPL_LINK_NOARG(SwNumPositionTabPage, EditModifyHdl, ListBox&, void) { sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < MAXLEVEL; i++) @@ -614,7 +614,7 @@ IMPL_LINK_NOARG_TYPED(SwNumPositionTabPage, EditModifyHdl, ListBox&, void) SetModified(); } -IMPL_LINK_TYPED( SwNumPositionTabPage, LevelHdl, ListBox&, rBox, void ) +IMPL_LINK( SwNumPositionTabPage, LevelHdl, ListBox&, rBox, void ) { sal_uInt16 nSaveNumLvl = nActNumLvl; nActNumLvl = 0; @@ -659,11 +659,11 @@ IMPL_LINK_TYPED( SwNumPositionTabPage, LevelHdl, ListBox&, rBox, void ) InitControls(); } -IMPL_LINK_TYPED( SwNumPositionTabPage, DistanceLoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( SwNumPositionTabPage, DistanceLoseFocusHdl, Control&, rControl, void ) { DistanceHdl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( SwNumPositionTabPage, DistanceHdl, SpinField&, rSpin, void ) +IMPL_LINK( SwNumPositionTabPage, DistanceHdl, SpinField&, rSpin, void ) { if(bInInintControl) return; @@ -722,7 +722,7 @@ IMPL_LINK_TYPED( SwNumPositionTabPage, DistanceHdl, SpinField&, rSpin, void ) m_pDistBorderMF->SetText(aEmptyOUStr); } -IMPL_LINK_TYPED( SwNumPositionTabPage, RelativeHdl, Button *, pBox, void ) +IMPL_LINK( SwNumPositionTabPage, RelativeHdl, Button *, pBox, void ) { bool bOn = static_cast<CheckBox*>(pBox)->IsChecked(); bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 && USHRT_MAX != nActNumLvl; @@ -760,7 +760,7 @@ IMPL_LINK_TYPED( SwNumPositionTabPage, RelativeHdl, Button *, pBox, void ) bLastRelative = bOn; } -IMPL_LINK_NOARG_TYPED(SwNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SwNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox&, void) { // determine value to be set at the chosen list levels SvxNumberFormat::LabelFollowedBy eLabelFollowedBy = SvxNumberFormat::LISTTAB; @@ -819,11 +819,11 @@ IMPL_LINK_NOARG_TYPED(SwNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox&, v SetModified(); } -IMPL_LINK_TYPED( SwNumPositionTabPage, ListtabPosFocusHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SwNumPositionTabPage, ListtabPosFocusHdl_Impl, Control&, rControl, void ) { ListtabPosHdl_Impl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( SwNumPositionTabPage, ListtabPosHdl_Impl, SpinField&, rSpin, void ) +IMPL_LINK( SwNumPositionTabPage, ListtabPosHdl_Impl, SpinField&, rSpin, void ) { MetricField& rField = static_cast<MetricField&>(rSpin); // determine value to be set at the chosen list levels @@ -845,11 +845,11 @@ IMPL_LINK_TYPED( SwNumPositionTabPage, ListtabPosHdl_Impl, SpinField&, rSpin, vo SetModified(); } -IMPL_LINK_TYPED( SwNumPositionTabPage, AlignAtFocusHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SwNumPositionTabPage, AlignAtFocusHdl_Impl, Control&, rControl, void ) { AlignAtHdl_Impl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( SwNumPositionTabPage, AlignAtHdl_Impl, SpinField&, rSpin, void ) +IMPL_LINK( SwNumPositionTabPage, AlignAtHdl_Impl, SpinField&, rSpin, void ) { MetricField& rField = static_cast<MetricField&>(rSpin); // determine value to be set at the chosen list levels @@ -872,11 +872,11 @@ IMPL_LINK_TYPED( SwNumPositionTabPage, AlignAtHdl_Impl, SpinField&, rSpin, void SetModified(); } -IMPL_LINK_TYPED( SwNumPositionTabPage, IndentAtFocusHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SwNumPositionTabPage, IndentAtFocusHdl_Impl, Control&, rControl, void ) { IndentAtHdl_Impl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( SwNumPositionTabPage, IndentAtHdl_Impl, SpinField&, rSpin, void ) +IMPL_LINK( SwNumPositionTabPage, IndentAtHdl_Impl, SpinField&, rSpin, void ) { MetricField& rField = static_cast<MetricField&>(rSpin); // determine value to be set at the chosen list levels @@ -902,7 +902,7 @@ IMPL_LINK_TYPED( SwNumPositionTabPage, IndentAtHdl_Impl, SpinField&, rSpin, void SetModified(); } -IMPL_LINK_NOARG_TYPED(SwNumPositionTabPage, StandardHdl, Button*, void) +IMPL_LINK_NOARG(SwNumPositionTabPage, StandardHdl, Button*, void) { sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < MAXLEVEL; i++) @@ -1027,7 +1027,7 @@ short SwSvxNumBulletTabDialog::Ok() return nRet; } -IMPL_LINK_NOARG_TYPED(SwSvxNumBulletTabDialog, RemoveNumberingHdl, Button*, void) +IMPL_LINK_NOARG(SwSvxNumBulletTabDialog, RemoveNumberingHdl, Button*, void) { EndDialog(RET_USER); } diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 25d450d2665f..1e61f437691f 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -63,9 +63,9 @@ class SwNumNamesDlg : public ModalDialog VclPtr<ListBox> m_pFormBox; VclPtr<OKButton> m_pOKBtn; - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( DoubleClickHdl, ListBox&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( DoubleClickHdl, ListBox&, void ); public: explicit SwNumNamesDlg(vcl::Window *pParent); @@ -91,7 +91,7 @@ void SwNumNamesDlg::dispose() // remember selected entry -IMPL_LINK_TYPED( SwNumNamesDlg, SelectHdl, ListBox&, rBox, void ) +IMPL_LINK( SwNumNamesDlg, SelectHdl, ListBox&, rBox, void ) { m_pFormEdit->SetText(rBox.GetSelectEntry()); m_pFormEdit->SetSelection(Selection(0, SELECTION_MAX)); @@ -119,13 +119,13 @@ void SwNumNamesDlg::SetUserNames(const OUString *pList[]) } // unlock OK-Button when text is in Edit -IMPL_LINK_TYPED( SwNumNamesDlg, ModifyHdl, Edit&, rBox, void ) +IMPL_LINK( SwNumNamesDlg, ModifyHdl, Edit&, rBox, void ) { m_pOKBtn->Enable(!rBox.GetText().isEmpty()); } // DoubleClickHdl -IMPL_LINK_NOARG_TYPED(SwNumNamesDlg, DoubleClickHdl, ListBox&, void) +IMPL_LINK_NOARG(SwNumNamesDlg, DoubleClickHdl, ListBox&, void) { EndDialog(RET_OK); } @@ -225,14 +225,14 @@ void SwOutlineTabDialog::PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) } } -IMPL_LINK_NOARG_TYPED(SwOutlineTabDialog, CancelHdl, Button*, void) +IMPL_LINK_NOARG(SwOutlineTabDialog, CancelHdl, Button*, void) { if (!bModified) rWrtSh.ResetModified(); EndDialog(); } -IMPL_LINK_TYPED( SwOutlineTabDialog, FormHdl, Button *, pBtn, void ) +IMPL_LINK( SwOutlineTabDialog, FormHdl, Button *, pBtn, void ) { PopupMenu *pFormMenu = get_menu("form"); // fill PopupMenu @@ -254,7 +254,7 @@ IMPL_LINK_TYPED( SwOutlineTabDialog, FormHdl, Button *, pBtn, void ) pFormMenu->Execute(pBtn, Rectangle(Point(0,0), pBtn->GetSizePixel()), PopupMenuFlags::ExecuteDown); } -IMPL_LINK_TYPED( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu, bool ) +IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu, bool ) { sal_uInt8 nLevelNo = 0; OString sIdent = pMenu->GetCurItemIdent(); @@ -562,7 +562,7 @@ void SwOutlineSettingsTabPage::Update() SetModified(); } -IMPL_LINK_TYPED( SwOutlineSettingsTabPage, LevelHdl, ListBox&, rBox, void ) +IMPL_LINK( SwOutlineSettingsTabPage, LevelHdl, ListBox&, rBox, void ) { nActLevel = 0; if(rBox.IsEntryPosSelected( MAXLEVEL )) @@ -582,7 +582,7 @@ IMPL_LINK_TYPED( SwOutlineSettingsTabPage, LevelHdl, ListBox&, rBox, void ) Update(); } -IMPL_LINK_TYPED( SwOutlineSettingsTabPage, ToggleComplete, Edit&, rEdit, void ) +IMPL_LINK( SwOutlineSettingsTabPage, ToggleComplete, Edit&, rEdit, void ) { sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < MAXLEVEL; i++) @@ -599,7 +599,7 @@ IMPL_LINK_TYPED( SwOutlineSettingsTabPage, ToggleComplete, Edit&, rEdit, void ) SetModified(); } -IMPL_LINK_TYPED( SwOutlineSettingsTabPage, CollSelect, ListBox&, rBox, void ) +IMPL_LINK( SwOutlineSettingsTabPage, CollSelect, ListBox&, rBox, void ) { sal_uInt8 i; @@ -641,13 +641,13 @@ IMPL_LINK_TYPED( SwOutlineSettingsTabPage, CollSelect, ListBox&, rBox, void ) SetModified(); } -IMPL_LINK_NOARG_TYPED(SwOutlineSettingsTabPage, CollSelectGetFocus, Control&, void) +IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CollSelectGetFocus, Control&, void) { for( sal_uInt8 i = 0; i < MAXLEVEL; ++i) aSaveCollNames[i] = pCollNames[i]; } -IMPL_LINK_TYPED( SwOutlineSettingsTabPage, NumberSelect, ListBox&, rBox, void ) +IMPL_LINK( SwOutlineSettingsTabPage, NumberSelect, ListBox&, rBox, void ) { sal_uInt16 nMask = 1; sal_Int16 nNumberType = static_cast<SwNumberingTypeListBox&>(rBox).GetSelectedNumberingType(); @@ -665,7 +665,7 @@ IMPL_LINK_TYPED( SwOutlineSettingsTabPage, NumberSelect, ListBox&, rBox, void ) SetModified(); } -IMPL_LINK_NOARG_TYPED(SwOutlineSettingsTabPage, DelimModify, Edit&, void) +IMPL_LINK_NOARG(SwOutlineSettingsTabPage, DelimModify, Edit&, void) { sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < MAXLEVEL; i++) @@ -682,7 +682,7 @@ IMPL_LINK_NOARG_TYPED(SwOutlineSettingsTabPage, DelimModify, Edit&, void) SetModified(); } -IMPL_LINK_TYPED( SwOutlineSettingsTabPage, StartModified, Edit&, rEdit, void ) +IMPL_LINK( SwOutlineSettingsTabPage, StartModified, Edit&, rEdit, void ) { sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < MAXLEVEL; i++) @@ -698,7 +698,7 @@ IMPL_LINK_TYPED( SwOutlineSettingsTabPage, StartModified, Edit&, rEdit, void ) SetModified(); } -IMPL_LINK_NOARG_TYPED(SwOutlineSettingsTabPage, CharFormatHdl, ListBox&, void) +IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CharFormatHdl, ListBox&, void) { OUString sEntry = m_pCharFormatLB->GetSelectEntry(); sal_uInt16 nMask = 1; diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index efa2aaf63b60..cc55e81cd023 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -52,19 +52,19 @@ const sal_uInt16 SwFootNotePage::aPageRg[] = { // handler to switch between the different possibilities how the footnote // region's height can be set. -IMPL_LINK_NOARG_TYPED(SwFootNotePage, HeightPage, Button*, void) +IMPL_LINK_NOARG(SwFootNotePage, HeightPage, Button*, void) { m_pMaxHeightEdit->Enable(false); } -IMPL_LINK_NOARG_TYPED(SwFootNotePage, HeightMetric, Button*, void) +IMPL_LINK_NOARG(SwFootNotePage, HeightMetric, Button*, void) { m_pMaxHeightEdit->Enable(); m_pMaxHeightEdit->GrabFocus(); } // handler limit values -IMPL_LINK_NOARG_TYPED(SwFootNotePage, HeightModify, Control&, void) +IMPL_LINK_NOARG(SwFootNotePage, HeightModify, Control&, void) { m_pMaxHeightEdit->SetMax(m_pMaxHeightEdit->Normalize(lMaxHeight - (m_pDistEdit->Denormalize(m_pDistEdit->GetValue(FUNIT_TWIP)) + @@ -84,7 +84,7 @@ IMPL_LINK_NOARG_TYPED(SwFootNotePage, HeightModify, Control&, void) FUNIT_TWIP); } -IMPL_LINK_NOARG_TYPED(SwFootNotePage, LineWidthChanged_Impl, Edit&, void) +IMPL_LINK_NOARG(SwFootNotePage, LineWidthChanged_Impl, Edit&, void) { sal_Int64 nVal = static_cast<sal_Int64>(MetricField::ConvertDoubleValue( m_pLineWidthEdit->GetValue( ), @@ -93,7 +93,7 @@ IMPL_LINK_NOARG_TYPED(SwFootNotePage, LineWidthChanged_Impl, Edit&, void) m_pLineTypeBox->SetWidth( nVal ); } -IMPL_LINK_NOARG_TYPED(SwFootNotePage, LineColorSelected_Impl, ListBox&, void) +IMPL_LINK_NOARG(SwFootNotePage, LineColorSelected_Impl, ListBox&, void) { m_pLineTypeBox->SetColor( m_pLineColorBox->GetSelectEntryColor() ); } diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 3854fa0400f0..583e2c2332dc 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -387,11 +387,11 @@ const sal_uInt16* SwTextGridPage::GetRanges() return aPageRg; } -IMPL_LINK_TYPED(SwTextGridPage, CharorLineLoseFocusdHdl, Control&, rControl, void) +IMPL_LINK(SwTextGridPage, CharorLineLoseFocusdHdl, Control&, rControl, void) { CharorLineChangedHdl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED(SwTextGridPage, CharorLineChangedHdl, SpinField&, rField, void) +IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, SpinField&, rField, void) { //if in squared mode if ( m_bSquaredMode ) @@ -437,11 +437,11 @@ IMPL_LINK_TYPED(SwTextGridPage, CharorLineChangedHdl, SpinField&, rField, void) GridModifyHdl(*m_pColorLB); } -IMPL_LINK_TYPED(SwTextGridPage, TextSizeLoseFocusHdl, Control&, rControl, void) +IMPL_LINK(SwTextGridPage, TextSizeLoseFocusHdl, Control&, rControl, void) { TextSizeChangedHdl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED(SwTextGridPage, TextSizeChangedHdl, SpinField&, rField, void) +IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, SpinField&, rField, void) { //if in squared mode if( m_bSquaredMode ) @@ -492,7 +492,7 @@ IMPL_LINK_TYPED(SwTextGridPage, TextSizeChangedHdl, SpinField&, rField, void) GridModifyHdl(*m_pColorLB); } -IMPL_LINK_TYPED(SwTextGridPage, GridTypeHdl, Button*, pButton, void) +IMPL_LINK(SwTextGridPage, GridTypeHdl, Button*, pButton, void) { bool bEnable = m_pNoGridRB.get() != pButton; m_pLayoutFL->Enable(bEnable); @@ -518,18 +518,18 @@ IMPL_LINK_TYPED(SwTextGridPage, GridTypeHdl, Button*, pButton, void) GridModifyHdl(*m_pColorLB); } -IMPL_LINK_NOARG_TYPED(SwTextGridPage, DisplayGridHdl, Button*, void) +IMPL_LINK_NOARG(SwTextGridPage, DisplayGridHdl, Button*, void) { bool bChecked = m_pDisplayCB->IsChecked(); m_pPrintCB->Enable(bChecked); m_pPrintCB->Check(bChecked); } -IMPL_LINK_NOARG_TYPED(SwTextGridPage, GridModifyClickHdl, Button*, void) +IMPL_LINK_NOARG(SwTextGridPage, GridModifyClickHdl, Button*, void) { GridModifyHdl(*m_pColorLB); } -IMPL_LINK_NOARG_TYPED(SwTextGridPage, GridModifyHdl, ListBox&, void) +IMPL_LINK_NOARG(SwTextGridPage, GridModifyHdl, ListBox&, void) { const SfxItemSet& rOldSet = GetItemSet(); SfxItemSet aSet(rOldSet); diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 99e42c031a69..23c37459bb7d 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -367,14 +367,14 @@ void SwSortDlg::Apply() ScopedVclPtrInstance<MessageDialog>(this->GetParent(), SW_RES(STR_SRTERR), VclMessageType::Info)->Execute(); } -IMPL_LINK_TYPED( SwSortDlg, DelimHdl, Button*, pButton, void ) +IMPL_LINK( SwSortDlg, DelimHdl, Button*, pButton, void ) { bool bEnable = pButton == m_pDelimFreeRB && m_pDelimFreeRB->IsEnabled(); m_pDelimEdt->Enable( bEnable ); m_pDelimPB->Enable( bEnable ); } -IMPL_LINK_NOARG_TYPED(SwSortDlg, DelimCharHdl, Button*, void) +IMPL_LINK_NOARG(SwSortDlg, DelimCharHdl, Button*, void) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) @@ -392,7 +392,7 @@ IMPL_LINK_NOARG_TYPED(SwSortDlg, DelimCharHdl, Button*, void) } } -IMPL_LINK_TYPED( SwSortDlg, CheckHdl, Button*, pControl, void ) +IMPL_LINK( SwSortDlg, CheckHdl, Button*, pControl, void ) { if( pControl == m_pRowRB.get()) { @@ -422,7 +422,7 @@ IMPL_LINK_TYPED( SwSortDlg, CheckHdl, Button*, pControl, void ) static_cast<CheckBox *>(pControl)->Check(); } -IMPL_LINK_TYPED( SwSortDlg, LanguageListBoxHdl, ListBox&, rLBox, void ) +IMPL_LINK( SwSortDlg, LanguageListBoxHdl, ListBox&, rLBox, void ) { LanguageHdl(&rLBox); } diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index 08e3e30c0f0a..a150e32df126 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -236,29 +236,29 @@ SwTitlePageDlg::SwTitlePageDlg( vcl::Window *pParent ) : m_pPagePropertiesPB->SetClickHdl(LINK(this, SwTitlePageDlg, EditHdl)); } -IMPL_LINK_NOARG_TYPED(SwTitlePageDlg, UpHdl, SpinField&, void) +IMPL_LINK_NOARG(SwTitlePageDlg, UpHdl, SpinField&, void) { if (m_pPageCountNF->GetValue() == 2) FillList(); } -IMPL_LINK_NOARG_TYPED(SwTitlePageDlg, DownHdl, SpinField&, void) +IMPL_LINK_NOARG(SwTitlePageDlg, DownHdl, SpinField&, void) { if (m_pPageCountNF->GetValue() == 1) FillList(); } -IMPL_LINK_NOARG_TYPED(SwTitlePageDlg, RestartNumberingHdl, Button*, void) +IMPL_LINK_NOARG(SwTitlePageDlg, RestartNumberingHdl, Button*, void) { m_pRestartNumberingNF->Enable(m_pRestartNumberingCB->IsChecked()); } -IMPL_LINK_NOARG_TYPED(SwTitlePageDlg, SetPageNumberHdl, Button*, void) +IMPL_LINK_NOARG(SwTitlePageDlg, SetPageNumberHdl, Button*, void) { m_pSetPageNumberNF->Enable(m_pSetPageNumberCB->IsChecked()); } -IMPL_LINK_NOARG_TYPED(SwTitlePageDlg, StartPageHdl, Button*, void) +IMPL_LINK_NOARG(SwTitlePageDlg, StartPageHdl, Button*, void) { m_pPageStartNF->Enable(m_pPageStartRB->IsChecked()); } @@ -286,14 +286,14 @@ void SwTitlePageDlg::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwTitlePageDlg, EditHdl, Button*, void) +IMPL_LINK_NOARG(SwTitlePageDlg, EditHdl, Button*, void) { SwView& rView = mpSh->GetView(); rView.GetDocShell()->FormatPage(m_pPagePropertiesLB->GetSelectEntry(), "page", *mpSh); rView.InvalidateRulerPos(); } -IMPL_LINK_NOARG_TYPED(SwTitlePageDlg, OKHdl, Button*, void) +IMPL_LINK_NOARG(SwTitlePageDlg, OKHdl, Button*, void) { lcl_PushCursor(mpSh); diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx index 36286e35af1a..4e2795ea3cf3 100644 --- a/sw/source/ui/table/colwd.cxx +++ b/sw/source/ui/table/colwd.cxx @@ -31,7 +31,7 @@ #include <cmdid.h> #include <table.hrc> -IMPL_LINK_NOARG_TYPED(SwTableWidthDlg, LoseFocusHdl, Edit&, void) +IMPL_LINK_NOARG(SwTableWidthDlg, LoseFocusHdl, Edit&, void) { sal_uInt16 nId = (sal_uInt16)m_pColNF->GetValue()-1; const SwTwips lWidth = rFnc.GetColWidth(nId); diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index d245ca3bfdbd..8ddfb70eda79 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -197,7 +197,7 @@ void SwConvertTableDlg::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_TYPED( SwConvertTableDlg, AutoFormatHdl, Button*, pButton, void ) +IMPL_LINK( SwConvertTableDlg, AutoFormatHdl, Button*, pButton, void ) { SwAbstractDialogFactory* pFact = swui::GetFactory(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); @@ -208,7 +208,7 @@ IMPL_LINK_TYPED( SwConvertTableDlg, AutoFormatHdl, Button*, pButton, void ) pDlg->FillAutoFormatOfIndex( pTAutoFormat ); } -IMPL_LINK_TYPED( SwConvertTableDlg, BtnHdl, Button*, pButton, void ) +IMPL_LINK( SwConvertTableDlg, BtnHdl, Button*, pButton, void ) { if( pButton == mpTabBtn ) mpKeepColumn->SetState( mpKeepColumn->GetSavedValue() ); @@ -222,13 +222,13 @@ IMPL_LINK_TYPED( SwConvertTableDlg, BtnHdl, Button*, pButton, void ) mpOtherEd->Enable( mpOtherBtn->IsChecked() ); } -IMPL_LINK_NOARG_TYPED(SwConvertTableDlg, CheckBoxHdl, Button*, void) +IMPL_LINK_NOARG(SwConvertTableDlg, CheckBoxHdl, Button*, void) { mpRepeatHeaderCB->Enable(mpHeaderCB->IsChecked()); ReapeatHeaderCheckBoxHdl(); } -IMPL_LINK_NOARG_TYPED(SwConvertTableDlg, ReapeatHeaderCheckBoxHdl, Button*, void) +IMPL_LINK_NOARG(SwConvertTableDlg, ReapeatHeaderCheckBoxHdl, Button*, void) { bool bEnable = mpHeaderCB->IsChecked() && mpRepeatHeaderCB->IsChecked(); mpRepeatRows->Enable(bEnable); diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx index 81cbe188b460..deabff20630f 100644 --- a/sw/source/ui/table/instable.cxx +++ b/sw/source/ui/table/instable.cxx @@ -129,7 +129,7 @@ SwInsTableDlg::SwInsTableDlg( SwView& rView ) m_pRepeatHeaderNF->SetMax( nMax ); } -IMPL_LINK_NOARG_TYPED(SwInsTableDlg, OKHdl, Button*, void) +IMPL_LINK_NOARG(SwInsTableDlg, OKHdl, Button*, void) { EndDialog(RET_OK); } @@ -156,7 +156,7 @@ void SwInsTableDlg::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_TYPED( SwInsTableDlg, ModifyName, Edit&, rEdit, void ) +IMPL_LINK( SwInsTableDlg, ModifyName, Edit&, rEdit, void ) { OUString sTableName = rEdit.GetText(); if (sTableName.indexOf(' ') != -1) @@ -168,7 +168,7 @@ IMPL_LINK_TYPED( SwInsTableDlg, ModifyName, Edit&, rEdit, void ) m_pInsertBtn->Enable(pShell->GetTableStyle( sTableName ) == nullptr); } -IMPL_LINK_TYPED( SwInsTableDlg, ModifyRowCol, Edit&, rEdit, void ) +IMPL_LINK( SwInsTableDlg, ModifyRowCol, Edit&, rEdit, void ) { if(&rEdit == m_pColNF) { @@ -196,7 +196,7 @@ IMPL_LINK_TYPED( SwInsTableDlg, ModifyRowCol, Edit&, rEdit, void ) m_pRepeatHeaderNF->SetValue( ( nEnteredValRepeatHeaderNF < nMax )? nEnteredValRepeatHeaderNF : nMax ); } } -IMPL_LINK_TYPED( SwInsTableDlg, AutoFormatHdl, Button*, pButton, void ) +IMPL_LINK( SwInsTableDlg, AutoFormatHdl, Button*, pButton, void ) { SwAbstractDialogFactory* pFact = swui::GetFactory(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); @@ -207,18 +207,18 @@ IMPL_LINK_TYPED( SwInsTableDlg, AutoFormatHdl, Button*, pButton, void ) pDlg->FillAutoFormatOfIndex( pTAutoFormat ); } -IMPL_LINK_NOARG_TYPED(SwInsTableDlg, CheckBoxHdl, Button*, void) +IMPL_LINK_NOARG(SwInsTableDlg, CheckBoxHdl, Button*, void) { m_pRepeatHeaderCB->Enable(m_pHeaderCB->IsChecked()); ReapeatHeaderCheckBoxHdl(); } -IMPL_LINK_NOARG_TYPED(SwInsTableDlg, ReapeatHeaderCheckBoxHdl, Button*, void) +IMPL_LINK_NOARG(SwInsTableDlg, ReapeatHeaderCheckBoxHdl, Button*, void) { m_pRepeatGroup->Enable(m_pHeaderCB->IsChecked() && m_pRepeatHeaderCB->IsChecked()); } -IMPL_LINK_NOARG_TYPED(SwInsTableDlg, ModifyRepeatHeaderNF_Hdl, Edit&, void) +IMPL_LINK_NOARG(SwInsTableDlg, ModifyRepeatHeaderNF_Hdl, Edit&, void) { nEnteredValRepeatHeaderNF = m_pRepeatHeaderNF->GetValue(); } diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 10acafe08c84..e96e195c7980 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -167,7 +167,7 @@ void SwFormatTablePage::Init() m_pRelWidthCB->SetClickHdl(LINK( this, SwFormatTablePage, RelWidthClickHdl )); } -IMPL_LINK_TYPED( SwFormatTablePage, RelWidthClickHdl, Button*, p, void ) +IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, Button*, p, void ) { CheckBox* pBtn = static_cast<CheckBox*>(p); OSL_ENSURE(pTableData, "table data not available?"); @@ -202,7 +202,7 @@ IMPL_LINK_TYPED( SwFormatTablePage, RelWidthClickHdl, Button*, p, void ) bModified = true; } -IMPL_LINK_TYPED( SwFormatTablePage, AutoClickHdl, Button*, pControl, void ) +IMPL_LINK( SwFormatTablePage, AutoClickHdl, Button*, pControl, void ) { bool bRestore = true, bLeftEnable = false, @@ -283,11 +283,11 @@ void SwFormatTablePage::RightModify() } } -IMPL_LINK_TYPED( SwFormatTablePage, LoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( SwFormatTablePage, LoseFocusHdl, Control&, rControl, void ) { UpDownHdl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( SwFormatTablePage, UpDownHdl, SpinField&, rEdit, void ) +IMPL_LINK( SwFormatTablePage, UpDownHdl, SpinField&, rEdit, void ) { if( m_aRightMF.get() == &rEdit) RightModify(); @@ -867,7 +867,7 @@ void SwTableColumnPage::Init(bool bWeb) m_pProportionalCB->SetClickHdl( aLk ); } -IMPL_LINK_TYPED( SwTableColumnPage, AutoClickHdl, Button*, pControl, void ) +IMPL_LINK( SwTableColumnPage, AutoClickHdl, Button*, pControl, void ) { //move display window if(pControl == m_pDownBtn.get()) @@ -899,19 +899,19 @@ IMPL_LINK_TYPED( SwTableColumnPage, AutoClickHdl, Button*, pControl, void ) UpdateCols(0); } -IMPL_LINK_TYPED( SwTableColumnPage, UpHdl, SpinField&, rEdit, void ) +IMPL_LINK( SwTableColumnPage, UpHdl, SpinField&, rEdit, void ) { bModified = true; ModifyHdl( static_cast<MetricField*>(&rEdit) ); } -IMPL_LINK_TYPED( SwTableColumnPage, DownHdl, SpinField&, rEdit, void ) +IMPL_LINK( SwTableColumnPage, DownHdl, SpinField&, rEdit, void ) { bModified = true; ModifyHdl( static_cast<MetricField*>(&rEdit) ); } -IMPL_LINK_TYPED( SwTableColumnPage, LoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( SwTableColumnPage, LoseFocusHdl, Control&, rControl, void ) { MetricField* pEdit = static_cast<MetricField*>(&rControl); if (pEdit->IsModified()) @@ -921,7 +921,7 @@ IMPL_LINK_TYPED( SwTableColumnPage, LoseFocusHdl, Control&, rControl, void ) } } -IMPL_LINK_TYPED( SwTableColumnPage, ModeHdl, Button*, pBox, void ) +IMPL_LINK( SwTableColumnPage, ModeHdl, Button*, pBox, void ) { bool bCheck = static_cast<CheckBox*>(pBox)->IsChecked(); if (pBox == m_pProportionalCB) @@ -1677,7 +1677,7 @@ void SwTextFlowPage::SetShell(SwWrtShell* pSh) } } -IMPL_LINK_NOARG_TYPED(SwTextFlowPage, PageBreakHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwTextFlowPage, PageBreakHdl_Impl, Button*, void) { if( m_pPgBrkCB->IsChecked() ) { @@ -1714,7 +1714,7 @@ IMPL_LINK_NOARG_TYPED(SwTextFlowPage, PageBreakHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SwTextFlowPage, ApplyCollClickHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SwTextFlowPage, ApplyCollClickHdl_Impl, Button*, void) { bool bEnable = false; if ( m_pPageCollCB->IsChecked() && @@ -1735,7 +1735,7 @@ IMPL_LINK_NOARG_TYPED(SwTextFlowPage, ApplyCollClickHdl_Impl, Button*, void) } } -IMPL_LINK_TYPED( SwTextFlowPage, PageBreakPosHdl_Impl, Button*, pBtn, void ) +IMPL_LINK( SwTextFlowPage, PageBreakPosHdl_Impl, Button*, pBtn, void ) { if ( m_pPgBrkCB->IsChecked() ) { @@ -1764,7 +1764,7 @@ IMPL_LINK_TYPED( SwTextFlowPage, PageBreakPosHdl_Impl, Button*, pBtn, void ) } } -IMPL_LINK_TYPED( SwTextFlowPage, PageBreakTypeHdl_Impl, Button*, pBtn, void ) +IMPL_LINK( SwTextFlowPage, PageBreakTypeHdl_Impl, Button*, pBtn, void ) { if ( pBtn == m_pColBrkRB || m_pPgBrkAfterRB->IsChecked() ) { @@ -1778,18 +1778,18 @@ IMPL_LINK_TYPED( SwTextFlowPage, PageBreakTypeHdl_Impl, Button*, pBtn, void ) PageBreakPosHdl_Impl(m_pPgBrkBeforeRB); } -IMPL_LINK_TYPED( SwTextFlowPage, SplitHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SwTextFlowPage, SplitHdl_Impl, Button*, pBox, void ) { m_pSplitRowCB->Enable(static_cast<CheckBox*>(pBox)->IsChecked()); } -IMPL_STATIC_LINK_TYPED( +IMPL_STATIC_LINK( SwTextFlowPage, SplitRowHdl_Impl, Button*, pBox, void ) { static_cast<TriStateBox*>(pBox)->EnableTriState(false); } -IMPL_LINK_NOARG_TYPED(SwTextFlowPage, HeadLineCBClickHdl, Button*, void) +IMPL_LINK_NOARG(SwTextFlowPage, HeadLineCBClickHdl, Button*, void) { m_pRepeatHeaderCombo->Enable(m_pHeadLineCB->IsChecked()); } diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 9d9a2a1ab36a..e240aeaf17f6 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -279,7 +279,7 @@ void SwAutoFormatDlg::FillAutoFormatOfIndex( SwTableAutoFormat*& rToFill ) const // Handler: -IMPL_LINK_TYPED( SwAutoFormatDlg, CheckHdl, Button *, pBtn, void ) +IMPL_LINK( SwAutoFormatDlg, CheckHdl, Button *, pBtn, void ) { SwTableAutoFormat* pData = &(*pTableTable)[nIndex]; bool bCheck = static_cast<CheckBox*>(pBtn)->IsChecked(), bDataChgd = true; @@ -309,7 +309,7 @@ IMPL_LINK_TYPED( SwAutoFormatDlg, CheckHdl, Button *, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, AddHdl, Button*, void) +IMPL_LINK_NOARG(SwAutoFormatDlg, AddHdl, Button*, void) { bool bOk = false, bFormatInserted = false; while( !bOk ) @@ -367,7 +367,7 @@ IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, AddHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, RemoveHdl, Button*, void) +IMPL_LINK_NOARG(SwAutoFormatDlg, RemoveHdl, Button*, void) { OUString aMessage = aStrDelMsg; aMessage += "\n\n"; @@ -402,7 +402,7 @@ IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, RemoveHdl, Button*, void) SelFormatHdl( *m_pLbFormat ); } -IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, RenameHdl, Button*, void) +IMPL_LINK_NOARG(SwAutoFormatDlg, RenameHdl, Button*, void) { bool bOk = false; while( !bOk ) @@ -465,7 +465,7 @@ IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, RenameHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, SelFormatHdl, ListBox&, void) +IMPL_LINK_NOARG(SwAutoFormatDlg, SelFormatHdl, ListBox&, void) { bool bBtnEnable = false; sal_uInt8 nSelPos = (sal_uInt8) m_pLbFormat->GetSelectEntryPos(), nOldIdx = nIndex; @@ -497,7 +497,7 @@ IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, SelFormatHdl, ListBox&, void) m_pBtnRename->Enable( bBtnEnable ); } -IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, OkHdl, Button*, void) +IMPL_LINK_NOARG(SwAutoFormatDlg, OkHdl, Button*, void) { if( bSetAutoFormat ) pShell->SetTableStyle((*pTableTable)[nIndex]); diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index 9c05b4ffcad9..5db8f4dd8d85 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -86,7 +86,7 @@ void SwRenameXNamedDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SwRenameXNamedDlg, OkHdl, Button*, void) +IMPL_LINK_NOARG(SwRenameXNamedDlg, OkHdl, Button*, void) { try { @@ -99,7 +99,7 @@ IMPL_LINK_NOARG_TYPED(SwRenameXNamedDlg, OkHdl, Button*, void) EndDialog(RET_OK); } -IMPL_LINK_TYPED(SwRenameXNamedDlg, ModifyHdl, Edit&, rEdit, void) +IMPL_LINK(SwRenameXNamedDlg, ModifyHdl, Edit&, rEdit, void) { OUString sTmp(rEdit.GetText()); 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"); |