New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problem

...see ebe26f72e90337da2d14f3029de148904e3e30b6 "WaE: 'unused' attribute ignored when parsing type"
for the problem.

21 files changed, 59 insertions, 59 deletions

diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index d1c7cad7f1e2..ecc6400fdbbe 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.hxx
@@ -114,8 +114,8 @@ private:
     TabEntry*       FindEntry( sal_Int32 nIndex ) const;
     bool            RemoveEntry( sal_Int32 nIndex );
 
-    DECL_DLLPRIVATE_LINK( ActivatePageHdl, TabControl * );
-    DECL_DLLPRIVATE_LINK( DeactivatePageHdl, TabControl * );
+    DECL_DLLPRIVATE_LINK(ActivatePageHdl, void *);
+    DECL_DLLPRIVATE_LINK(DeactivatePageHdl, void *);
 
 public:
     FwkTabWindow( Window* pParent );
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index 3920890e02c7..3ac4588879b4 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -106,7 +106,7 @@ class MenuManager : public ThreadHelpBase           ,
         );
 
     protected:
-        DECL_LINK( Highlight, Menu * );
+        DECL_LINK(Highlight, void *);
         DECL_LINK( Activate, Menu * );
         DECL_LINK( Deactivate, Menu * );
 
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index 84931a3ed952..e9eea8d85455 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -205,7 +205,7 @@ namespace framework
             virtual void SAL_CALL addLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL removeLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (::com::sun::star::uno::RuntimeException);
 
-            DECL_LINK( MenuBarClose, MenuBar * );
+            DECL_LINK(MenuBarClose, void *);
             DECL_LINK( WindowEventListener, VclSimpleEvent* );
 
             //---------------------------------------------------------------------------------------------------------
@@ -214,7 +214,7 @@ namespace framework
             virtual void requestLayout( Hint eHint );
 
         protected:
-            DECL_LINK( AsyncLayoutHdl, Timer * );
+            DECL_LINK(AsyncLayoutHdl, void *);
 
         private:
             //---------------------------------------------------------------------------------------------------------
diff --git a/framework/inc/services/licensedlg.hxx b/framework/inc/services/licensedlg.hxx
index 9e6018ad1f86..a3bba4518337 100644
--- a/framework/inc/services/licensedlg.hxx
+++ b/framework/inc/services/licensedlg.hxx
@@ -90,11 +90,11 @@ class LicenseDialog : public ModalDialog
 
     void                EnableControls();
 
-    DECL_LINK(          PageDownHdl, PushButton * );
-    DECL_LINK(          EndReachedHdl, LicenseView * );
-    DECL_LINK(          ScrolledHdl, LicenseView * );
-    DECL_LINK(          AcceptBtnHdl, PushButton * );
-    DECL_LINK(          DeclineBtnHdl, PushButton * );
+    DECL_LINK(PageDownHdl, void *);
+    DECL_LINK(EndReachedHdl, void *);
+    DECL_LINK(ScrolledHdl, void *);
+    DECL_LINK(AcceptBtnHdl, void *);
+    DECL_LINK(DeclineBtnHdl, void *);
 
     public:
         LicenseDialog(const rtl::OUString& aLicense, ResMgr *pResMgr);
diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx
index 009c4210ce32..d0fe52b762e8 100644
--- a/framework/inc/services/substitutepathvars.hxx
+++ b/framework/inc/services/substitutepathvars.hxx
@@ -256,7 +256,7 @@ class SubstitutePathVariables : private ThreadHelpBase, // Struct for right init
             throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
 
         protected:
-            DECL_LINK( implts_ConfigurationNotify, SubstitutePathNotify* );
+            DECL_LINK(implts_ConfigurationNotify, void *);
 
             void            SetPredefinedPathVariables( PredefinedPathVariables& );
             rtl::OUString   ConvertOSLtoUCBURL( const rtl::OUString& aOSLCompliantURL ) const;
diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx
index 883e0d7c936e..662b6ab7a2ed 100644
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -81,12 +81,12 @@ class AddonsToolBarManager : public ToolBarManager
         void FillToolbar( const com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& rAddonToolbar );
 
     protected:
-        DECL_LINK( Click, ToolBox * );
-        DECL_LINK( DoubleClick, ToolBox * );
-        DECL_LINK( Command, CommandEvent * );
-        DECL_LINK( Select, ToolBox * );
-        DECL_LINK( Activate, ToolBox * );
-        DECL_LINK( Deactivate, ToolBox * );
+        DECL_LINK(Click, void *);
+        DECL_LINK(DoubleClick, void *);
+        DECL_LINK(Command, void *);
+        DECL_LINK(Select, void *);
+        DECL_LINK(Activate, void *);
+        DECL_LINK(Deactivate, void *);
         DECL_LINK( StateChanged, StateChangedType* );
         DECL_LINK( DataChanged, DataChangedEvent* );
 
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index 34b8ae093f07..683670782718 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -180,7 +180,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
         void GetPopupController( PopupControllerCache& rPopupController );
 
     protected:
-        DECL_LINK( Highlight, Menu * );
+        DECL_LINK(Highlight, void *);
         DECL_LINK( Activate, Menu * );
         DECL_LINK( Deactivate, Menu * );
         DECL_LINK( AsyncSettingsHdl, Timer * );
diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx
index bcd952f1b690..247a42ec00f0 100644
--- a/framework/inc/uielement/statusbarmanager.hxx
+++ b/framework/inc/uielement/statusbarmanager.hxx
@@ -111,8 +111,8 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener
         void MouseMove( const MouseEvent& rMEvt );
         void MouseButtonDown( const MouseEvent& rMEvt );
         void MouseButtonUp( const MouseEvent& rMEvt );
-        DECL_LINK( Click, StatusBar* );
-        DECL_LINK( DoubleClick, StatusBar* );
+        DECL_LINK(Click, void *);
+        DECL_LINK(DoubleClick, void *);
 
         void RemoveControllers();
         rtl::OUString RetrieveLabelFromCommand( const rtl::OUString& aCmdURL );
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 2f8ad0564f3b..98430b97b286 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -165,19 +165,19 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
         DECL_LINK( Command, CommandEvent * );
         PopupMenu * GetToolBarCustomMenu(ToolBox* pToolBar);
         //end
-        DECL_LINK( Click, ToolBox * );
-        DECL_LINK( DropdownClick, ToolBox * );
-        DECL_LINK( DoubleClick, ToolBox * );
-        DECL_LINK( Select, ToolBox * );
-        DECL_LINK( Activate, ToolBox * );
-        DECL_LINK( Deactivate, ToolBox * );
+        DECL_LINK(Click, void *);
+        DECL_LINK(DropdownClick, void *);
+        DECL_LINK(DoubleClick, void *);
+        DECL_LINK(Select, void *);
+        DECL_LINK(Activate, void *);
+        DECL_LINK(Deactivate, void *);
         DECL_LINK( StateChanged, StateChangedType* );
         DECL_LINK( DataChanged, DataChangedEvent* );
 
         DECL_LINK( MenuButton, ToolBox * );
         DECL_LINK( MenuSelect, Menu * );
         DECL_LINK( MenuDeactivate, Menu * );
-        DECL_LINK( AsyncUpdateControllersHdl, Timer * );
+        DECL_LINK(AsyncUpdateControllersHdl, void *);
         DECL_STATIC_LINK( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo* );
 
         virtual bool MenuItemAllowed( sal_uInt16 ) const;
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index 2f89d8ded3f8..e46fc441a4b7 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -286,7 +286,7 @@ TabEntry* FwkTabWindow::FindEntry( sal_Int32 nIndex ) const
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( FwkTabWindow, ActivatePageHdl, TabControl *, EMPTYARG )
+IMPL_LINK_NOARG(FwkTabWindow, ActivatePageHdl)
 {
     const sal_uInt16 nId = m_aTabCtrl.GetCurPageId();
     FwkTabPage* pTabPage = static_cast< FwkTabPage* >( m_aTabCtrl.GetTabPage( nId ) );
@@ -310,7 +310,7 @@ IMPL_LINK( FwkTabWindow, ActivatePageHdl, TabControl *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( FwkTabWindow, DeactivatePageHdl, TabControl *, EMPTYARG )
+IMPL_LINK_NOARG(FwkTabWindow, DeactivatePageHdl)
 {
     m_aTabCtrl.BroadcastEvent( VCLEVENT_TABPAGE_DEACTIVATE );
     return 1;
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index e2a08deb13db..8f015638737b 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -956,7 +956,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
 }
 
 
-IMPL_LINK( MenuManager, Highlight, Menu *, EMPTYARG )
+IMPL_LINK_NOARG(MenuManager, Highlight)
 {
     return 0;
 }
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 2a8d20b02abf..01523d2e4f06 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -266,7 +266,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
                 - decide then, if we must close this frame only, establish the backing mode
                   or shutdown the whole application.
 */
-IMPL_LINK( CloseDispatcher, impl_asyncCallback, void*, EMPTYARG )
+IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
 {
     try
     {
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index e25d74b7de18..3b4774ca2948 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -2666,7 +2666,7 @@ sal_Bool LayoutManager::implts_resetMenuBar()
     return sal_False;
 }
 
-IMPL_LINK( LayoutManager, MenuBarClose, MenuBar *, EMPTYARG )
+IMPL_LINK_NOARG(LayoutManager, MenuBarClose)
 {
     ReadGuard aReadLock( m_aLock );
     uno::Reference< frame::XDispatchProvider >   xProvider(m_xFrame, uno::UNO_QUERY);
@@ -2689,7 +2689,7 @@ IMPL_LINK( LayoutManager, MenuBarClose, MenuBar *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( LayoutManager, SettingsChanged, void*, EMPTYARG )
+IMPL_LINK_NOARG(LayoutManager, SettingsChanged)
 {
     return 1;
 }
@@ -2832,7 +2832,7 @@ void SAL_CALL LayoutManager::windowHidden( const lang::EventObject& aEvent ) thr
     }
 }
 
-IMPL_LINK( LayoutManager, AsyncLayoutHdl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(LayoutManager, AsyncLayoutHdl)
 {
     ReadGuard aReadLock( m_aLock );
     m_aAsyncLayoutTimer.Stop();
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 343671030c17..eb534842cf15 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1536,7 +1536,7 @@ void AutoRecovery::implts_stopTimer()
 }
 
 //-----------------------------------------------
-IMPL_LINK(AutoRecovery, implts_timerExpired, void*, EMPTYARG)
+IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired)
 {
     try
     {
@@ -1637,7 +1637,7 @@ IMPL_LINK(AutoRecovery, implts_timerExpired, void*, EMPTYARG)
 }
 
 //-----------------------------------------------
-IMPL_LINK(AutoRecovery, implts_asyncDispatch, void*, EMPTYARG)
+IMPL_LINK_NOARG(AutoRecovery, implts_asyncDispatch)
 {
     // SAFE ->
     WriteGuard aWriteLock(m_aLock);
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index 2db5879071bd..0b8976981840 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -893,7 +893,7 @@ void BackingWindow::Resize()
     maTemplateButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos + mnColumnWidth[0], nYPos ), Size( mnTextColumnWidth[1], maButtonImageSize.Height() ) );
 }
 
-IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(BackingWindow, ToolboxHdl)
 {
     const char* pNodePath = NULL;
     const char* pNode = NULL;
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index 3b2ef61eed7c..fdf60e270349 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -463,13 +463,13 @@ LicenseDialog::~LicenseDialog()
 {
 }
 
-IMPL_LINK( LicenseDialog, PageDownHdl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(LicenseDialog, PageDownHdl)
 {
     aLicenseML.ScrollDown( SCROLL_PAGEDOWN );
     return 0;
 }
 
-IMPL_LINK( LicenseDialog, EndReachedHdl, LicenseView *, EMPTYARG )
+IMPL_LINK_NOARG(LicenseDialog, EndReachedHdl)
 {
     bEndReached = sal_True;
 
@@ -478,19 +478,19 @@ IMPL_LINK( LicenseDialog, EndReachedHdl, LicenseView *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( LicenseDialog, ScrolledHdl, LicenseView *, EMPTYARG )
+IMPL_LINK_NOARG(LicenseDialog, ScrolledHdl)
 {
     EnableControls();
 
     return 0;
 }
 
-IMPL_LINK( LicenseDialog, DeclineBtnHdl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(LicenseDialog, DeclineBtnHdl)
 {
     EndDialog(0);
     return 0;
 }
-IMPL_LINK( LicenseDialog, AcceptBtnHdl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(LicenseDialog, AcceptBtnHdl)
 {
     EndDialog(1);
     return 0;
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 7ef9502114dc..b96bb715b87a 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -678,7 +678,7 @@ throw ( NoSuchElementException, RuntimeException )
 //      protected methods
 //_________________________________________________________________________________________________________________
 
-IMPL_LINK( SubstitutePathVariables, implts_ConfigurationNotify, SubstitutePathNotify*, EMPTYARG )
+IMPL_LINK_NOARG(SubstitutePathVariables, implts_ConfigurationNotify)
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     ResetableGuard aLock( m_aLock );
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 6ae3d09cbe5c..4f698299e820 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -421,7 +421,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
     AddFrameActionListener();
 }
 
-IMPL_LINK( AddonsToolBarManager, Click, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(AddonsToolBarManager, Click)
 {
     if ( m_bDisposed )
         return 1;
@@ -439,7 +439,7 @@ IMPL_LINK( AddonsToolBarManager, Click, ToolBox*, EMPTYARG )
     return 1;
 }
 
-IMPL_LINK( AddonsToolBarManager, DoubleClick, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(AddonsToolBarManager, DoubleClick)
 {
     if ( m_bDisposed )
         return 1;
@@ -457,7 +457,7 @@ IMPL_LINK( AddonsToolBarManager, DoubleClick, ToolBox*, EMPTYARG )
     return 1;
 }
 
-IMPL_LINK( AddonsToolBarManager, Command, CommandEvent*, EMPTYARG )
+IMPL_LINK_NOARG(AddonsToolBarManager, Command)
 {
     ResetableGuard aGuard( m_aLock );
 
@@ -467,7 +467,7 @@ IMPL_LINK( AddonsToolBarManager, Command, CommandEvent*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( AddonsToolBarManager, Select, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(AddonsToolBarManager, Select)
 {
     if ( m_bDisposed )
         return 1;
@@ -486,12 +486,12 @@ IMPL_LINK( AddonsToolBarManager, Select, ToolBox*, EMPTYARG )
     return 1;
 }
 
-IMPL_LINK( AddonsToolBarManager, Activate, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(AddonsToolBarManager, Activate)
 {
     return 1;
 }
 
-IMPL_LINK( AddonsToolBarManager, Deactivate, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(AddonsToolBarManager, Deactivate)
 {
     return 1;
 }
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 64e86f995595..0ff34d6d097b 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1125,7 +1125,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
 }
 
 
-IMPL_LINK( MenuBarManager, Highlight, Menu *, EMPTYARG )
+IMPL_LINK_NOARG(MenuBarManager, Highlight)
 {
     return 0;
 }
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 95ed4c1d57b1..3093ec77ad0e 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -664,7 +664,7 @@ void StatusBarManager::MouseButtonUp( const MouseEvent& rMEvt )
     MouseButton(rMEvt,&frame::XStatusbarController::mouseButtonUp);
 }
 
-IMPL_LINK( StatusBarManager, Click, StatusBar*, EMPTYARG )
+IMPL_LINK_NOARG(StatusBarManager, Click)
 {
     ResetableGuard aGuard( m_aLock );
 
@@ -683,7 +683,7 @@ IMPL_LINK( StatusBarManager, Click, StatusBar*, EMPTYARG )
     return 1;
 }
 
-IMPL_LINK( StatusBarManager, DoubleClick, StatusBar*, EMPTYARG )
+IMPL_LINK_NOARG(StatusBarManager, DoubleClick)
 {
     ResetableGuard aGuard( m_aLock );
 
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 0104b65fd531..067dbe4eacb1 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1613,12 +1613,12 @@ long ToolBarManager::HandleClick(void ( SAL_CALL XToolbarController::*_pClick )(
     return 1;
 }
 
-IMPL_LINK( ToolBarManager, Click, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(ToolBarManager, Click)
 {
     return HandleClick(&XToolbarController::click);
 }
 
-IMPL_LINK( ToolBarManager, DropdownClick, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(ToolBarManager, DropdownClick)
 {
     ResetableGuard aGuard( m_aLock );
 
@@ -1641,7 +1641,7 @@ IMPL_LINK( ToolBarManager, DropdownClick, ToolBox*, EMPTYARG )
     return 1;
 }
 
-IMPL_LINK( ToolBarManager, DoubleClick, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(ToolBarManager, DoubleClick)
 {
     return HandleClick(&XToolbarController::doubleClick);
 }
@@ -2056,7 +2056,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
     return 1;
 }
 
-IMPL_LINK( ToolBarManager, Select, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(ToolBarManager, Select)
 {
     if ( m_bDisposed )
         return 1;
@@ -2076,12 +2076,12 @@ IMPL_LINK( ToolBarManager, Select, ToolBox*, EMPTYARG )
     return 1;
 }
 
-IMPL_LINK( ToolBarManager, Activate, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(ToolBarManager, Activate)
 {
     return 1;
 }
 
-IMPL_LINK( ToolBarManager, Deactivate, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(ToolBarManager, Deactivate)
 {
     return 1;
 }
@@ -2139,7 +2139,7 @@ IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent  )
     return 1;
 }
 
-IMPL_LINK( ToolBarManager, AsyncUpdateControllersHdl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(ToolBarManager, AsyncUpdateControllersHdl)
 {
     // The guard must be in its own context as the we can get destroyed when our
     // own xInterface reference get destroyed!