New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problem

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

55 files changed, 178 insertions, 178 deletions

diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index 11e94947f1bb..a71227e753bd 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -129,9 +129,9 @@ class SdrItemBrowser: public _SdrItemBrowserWindow {
     bool bDirty;
 private:
     static Window* ImpGetViewWin(SdrView& rView);
-    DECL_LINK(IdleHdl,Timer*);
+    DECL_LINK(IdleHdl, void *);
     DECL_LINK(ChangedHdl,_SdrItemBrowserControl*);
-    DECL_LINK(SetDirtyHdl,_SdrItemBrowserControl*);
+    DECL_LINK(SetDirtyHdl, void *);
 public:
     SdrItemBrowser(SdrView& rView);
     void ForceParent();
diff --git a/svx/inc/svx/charmap.hxx b/svx/inc/svx/charmap.hxx
index 3168a2f22337..7e863915e52b 100644
--- a/svx/inc/svx/charmap.hxx
+++ b/svx/inc/svx/charmap.hxx
@@ -130,7 +130,7 @@ private:
     void            InitSettings( sal_Bool bForeground, sal_Bool bBackground);
     // abstraction layers are: Unicode<->MapIndex<->Pixel
     Point           MapIndexToPixel( int) const;
-    DECL_LINK( VscrollHdl, ScrollBar* );
+    DECL_LINK(VscrollHdl, void *);
 };
 
 #endif
diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx
index 895036f7f3eb..b3b84dace24e 100644
--- a/svx/inc/svx/fillctrl.hxx
+++ b/svx/inc/svx/fillctrl.hxx
@@ -92,7 +92,7 @@ private:
     Size            aLogicalAttrSize;
     Timer           aDelayTimer;
 
-    DECL_LINK( DelayHdl, Timer * );
+    DECL_LINK( DelayHdl, void * );
     DECL_LINK( SelectFillTypeHdl, ListBox * );
     DECL_LINK( SelectFillAttrHdl, ListBox * );
     virtual void    DataChanged( const DataChangedEvent& rDCEvt );
diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx
index a196ee7870b5..1dfb8ab8c7fc 100644
--- a/svx/inc/svx/hdft.hxx
+++ b/svx/inc/svx/hdft.hxx
@@ -95,13 +95,13 @@ protected:
 
     void            InitHandler();
     DECL_LINK( TurnOnHdl, CheckBox*);
-    DECL_LINK( DistModify, MetricField*);
-    DECL_LINK( HeightModify, MetricField*);
-    DECL_LINK( BorderModify, MetricField*);
-    DECL_LINK( BackgroundHdl, Button*);
+    DECL_LINK(DistModify, void *);
+    DECL_LINK(HeightModify, void *);
+    DECL_LINK(BorderModify, void *);
+    DECL_LINK(BackgroundHdl, void *);
 
     void            UpdateExample();
-    DECL_LINK( RangeHdl, Edit*);
+    DECL_LINK(RangeHdl, void *);
 
 private:
 #ifdef _SVX_HDFT_CXX
diff --git a/svx/inc/svx/imapdlg.hxx b/svx/inc/svx/imapdlg.hxx
index 3a6703aa6cdd..a1cf6126215b 100644
--- a/svx/inc/svx/imapdlg.hxx
+++ b/svx/inc/svx/imapdlg.hxx
@@ -145,7 +145,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
                         DECL_LINK( GraphSizeHdl, IMapWindow* );
                         DECL_LINK( URLModifyHdl, void* );
                         DECL_LINK( URLLoseFocusHdl, void* );
-                        DECL_LINK( UpdateHdl, Timer* );
+                        DECL_LINK(UpdateHdl, void *);
                         DECL_LINK( TbxUpdateHdl, Timer* );
                         DECL_LINK( StateHdl, IMapWindow* );
                         DECL_LINK( MiscHdl, void* );
diff --git a/svx/inc/svx/itemwin.hxx b/svx/inc/svx/itemwin.hxx
index acf00d18606f..10babf837f1f 100644
--- a/svx/inc/svx/itemwin.hxx
+++ b/svx/inc/svx/itemwin.hxx
@@ -51,7 +51,7 @@ class SvxLineBox : public LineLB
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
 
 #ifdef _SVX_ITEMWIN_CXX
-                    DECL_LINK( DelayHdl_Impl, Timer * );
+                    DECL_LINK(DelayHdl_Impl, void *);
 
     void            ReleaseFocus_Impl();
 #endif
diff --git a/svx/inc/svx/numvset.hxx b/svx/inc/svx/numvset.hxx
index 0bf764bf5847..cdc27326d4fd 100644
--- a/svx/inc/svx/numvset.hxx
+++ b/svx/inc/svx/numvset.hxx
@@ -106,7 +106,7 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
     sal_Bool        bGrfNotFound;
 
     protected:
-        DECL_LINK(FormatHdl_Impl, Timer*);
+        DECL_LINK(FormatHdl_Impl, void *);
 
     void            SetGrfNotFound(sal_Bool bSet) {bGrfNotFound = bSet;}
     sal_Bool            IsGrfNotFound()const {return bGrfNotFound;}
diff --git a/svx/inc/svx/passwd.hxx b/svx/inc/svx/passwd.hxx
index a412807c80cd..ab43e5009fa5 100644
--- a/svx/inc/svx/passwd.hxx
+++ b/svx/inc/svx/passwd.hxx
@@ -63,8 +63,8 @@ private:
 
     sal_Bool            bEmpty;
 
-    DECL_LINK( ButtonHdl, OKButton * );
-    DECL_LINK( EditModifyHdl, Edit * );
+    DECL_LINK(ButtonHdl, void *);
+    DECL_LINK(EditModifyHdl, void *);
 
 public:
                     SvxPasswordDialog( Window* pParent, sal_Bool bAllowEmptyPasswords = sal_False, sal_Bool bDisableOldPassword = sal_False );
diff --git a/svx/inc/svx/rubydialog.hxx b/svx/inc/svx/rubydialog.hxx
index 1c74ad3224a3..3b267b629887 100644
--- a/svx/inc/svx/rubydialog.hxx
+++ b/svx/inc/svx/rubydialog.hxx
@@ -131,14 +131,14 @@ class SvxRubyDialog : public SfxModelessDialog
     SfxBindings*    pBindings;
     SvxRubyData_Impl* pImpl;
 
-    DECL_LINK(ApplyHdl_Impl, PushButton*);
-    DECL_LINK(CloseHdl_Impl, PushButton*);
-    DECL_LINK(StylistHdl_Impl, PushButton*);
+    DECL_LINK(ApplyHdl_Impl, void *);
+    DECL_LINK(CloseHdl_Impl, void *);
+    DECL_LINK(StylistHdl_Impl, void *);
     DECL_LINK(AutomaticHdl_Impl, CheckBox*);
     DECL_LINK(ScrollHdl_Impl, ScrollBar*);
     DECL_LINK(PositionHdl_Impl, ListBox*);
     DECL_LINK(AdjustHdl_Impl, ListBox*);
-    DECL_LINK(CharStyleHdl_Impl, ListBox*);
+    DECL_LINK(CharStyleHdl_Impl, void *);
     DECL_LINK(EditModifyHdl_Impl, Edit*);
     DECL_LINK(EditScrollHdl_Impl, sal_Int32*);
     DECL_LINK(EditJumpHdl_Impl, sal_Int32*);
diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx
index 852c681fa27f..263494332dc9 100644
--- a/svx/inc/svx/srchdlg.hxx
+++ b/svx/inc/svx/srchdlg.hxx
@@ -235,12 +235,12 @@ private:
     DECL_LINK( ModifyHdl_Impl, ComboBox* pEdit );
     DECL_LINK( FlagHdl_Impl, Control* pCtrl );
     DECL_LINK( CommandHdl_Impl, Button* pBtn );
-    DECL_LINK( TemplateHdl_Impl, Button* );
+    DECL_LINK(TemplateHdl_Impl, void *);
     DECL_LINK( FocusHdl_Impl, Control* );
-    DECL_LINK( LoseFocusHdl_Impl, Control* );
-    DECL_LINK( FormatHdl_Impl, Button* );
-    DECL_LINK( NoFormatHdl_Impl, Button* );
-    DECL_LINK( AttributeHdl_Impl, Button* );
+    DECL_LINK(LoseFocusHdl_Impl, void *);
+    DECL_LINK(FormatHdl_Impl, void *);
+    DECL_LINK(NoFormatHdl_Impl, void *);
+    DECL_LINK(AttributeHdl_Impl, void *);
     DECL_LINK( TimeoutHdl_Impl, Timer* );
 
     void            Construct_Impl();
diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx
index c5773d101d77..19594c3a7a4a 100644
--- a/svx/inc/svx/svdpntv.hxx
+++ b/svx/inc/svx/svdpntv.hxx
@@ -249,7 +249,7 @@ public:
 
 private:
     SVX_DLLPRIVATE void ImpClearVars();
-    DECL_LINK(ImpComeBackHdl,Timer*);
+    DECL_LINK(ImpComeBackHdl,void*);
 
 protected:
     sal_uInt16 ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const;
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index f55a18174873..eb7fb6470dcd 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -191,7 +191,7 @@ public:
                 DECL_LINK( CbxHdl, CheckBox* pCbx );
                 DECL_LINK( CbxTransHdl, CheckBox* pCbx );
                 DECL_LINK( FocusLbHdl, ColorLB* pLb );
-                DECL_LINK( ExecHdl, PushButton* pBtn );
+                DECL_LINK(ExecHdl, void *);
 };
 
 //-------------------------------------------------------------------------
@@ -331,7 +331,7 @@ IMPL_LINK( MaskData, FocusLbHdl, ColorLB*, pLb )
 
 //-------------------------------------------------------------------------
 
-IMPL_LINK( MaskData, ExecHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(MaskData, ExecHdl)
 {
     SfxBoolItem aBItem( SID_BMPMASK_EXEC, sal_True );
     rBindings.GetDispatcher()->Execute( SID_BMPMASK_EXEC, OWN_CALLMODE, &aBItem, 0L );
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index c96bbf781eab..ddc11ed87e39 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -606,7 +606,7 @@ IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, ContourWindow*, pWnd )
     return 0L;
 }
 
-IMPL_LINK( SvxSuperContourDlg, UpdateHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(SvxSuperContourDlg, UpdateHdl)
 {
     aUpdateTimer.Stop();
 
@@ -632,7 +632,7 @@ IMPL_LINK( SvxSuperContourDlg, UpdateHdl, Timer*, EMPTYARG )
     return 0L;
 }
 
-IMPL_LINK( SvxSuperContourDlg, CreateHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(SvxSuperContourDlg, CreateHdl)
 {
     aCreateTimer.Stop();
 
@@ -800,7 +800,7 @@ void SvxSuperContourDlg::DataChanged( const DataChangedEvent& rDCEvt )
             ApplyImageList();
 }
 
-IMPL_LINK( SvxSuperContourDlg, MiscHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SvxSuperContourDlg, MiscHdl)
 {
        SvtMiscOptions aMiscOptions;
     aTbx1.SetOutStyle( aMiscOptions.GetToolboxStyle() );
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 5b164c02ce8a..e3a40b2c1b9e 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -623,7 +623,7 @@ void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, sal_Bool bFocus )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxShowCharSet, VscrollHdl, ScrollBar *, EMPTYARG )
+IMPL_LINK_NOARG(SvxShowCharSet, VscrollHdl)
 {
     if( nSelectedIndex < FirstInView() )
     {
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index 9a7c8de4b02b..acb7867c2c95 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -68,8 +68,8 @@ class SvxSuperContourDlg : public SvxContourDlg
                         DECL_LINK( Tbx1ClickHdl, ToolBox* );
                         DECL_LINK( MousePosHdl, ContourWindow* );
                         DECL_LINK( GraphSizeHdl, ContourWindow* );
-                        DECL_LINK( UpdateHdl, Timer* );
-                        DECL_LINK( CreateHdl, Timer* );
+                        DECL_LINK(UpdateHdl, void *);
+                        DECL_LINK(CreateHdl, void *);
                         DECL_LINK( StateHdl, ContourWindow* );
                         DECL_LINK( PipetteHdl, ContourWindow* );
                         DECL_LINK( PipetteClickHdl, ContourWindow* );
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index c5462aa7a2a3..6baa08bcb8f5 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -1224,7 +1224,7 @@ void SvxLightCtl3D::LoseFocus()
     maLightControl.HideFocus();
 }
 
-IMPL_LINK( SvxLightCtl3D, ScrollBarMove, void*, EMPTYARG)
+IMPL_LINK_NOARG(SvxLightCtl3D, ScrollBarMove)
 {
     const sal_Int32 nHor(maHorScroller.GetThumbPos());
     const sal_Int32 nVer(maVerScroller.GetThumbPos());
@@ -1241,7 +1241,7 @@ IMPL_LINK( SvxLightCtl3D, ScrollBarMove, void*, EMPTYARG)
     return 0;
 }
 
-IMPL_LINK( SvxLightCtl3D, ButtonPress, void*, EMPTYARG)
+IMPL_LINK_NOARG(SvxLightCtl3D, ButtonPress)
 {
     if(PREVIEW_OBJECTTYPE_SPHERE == GetSvx3DLightControl().GetObjectType())
     {
@@ -1255,7 +1255,7 @@ IMPL_LINK( SvxLightCtl3D, ButtonPress, void*, EMPTYARG)
     return 0;
 }
 
-IMPL_LINK( SvxLightCtl3D, InternalInteractiveChange, void*, EMPTYARG)
+IMPL_LINK_NOARG(SvxLightCtl3D, InternalInteractiveChange)
 {
     double fHor, fVer;
 
@@ -1271,7 +1271,7 @@ IMPL_LINK( SvxLightCtl3D, InternalInteractiveChange, void*, EMPTYARG)
     return 0;
 }
 
-IMPL_LINK( SvxLightCtl3D, InternalSelectionChange, void*, EMPTYARG)
+IMPL_LINK_NOARG(SvxLightCtl3D, InternalSelectionChange)
 {
     CheckSelection();
 
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index e311731a6d23..bb28df5d5f82 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -786,7 +786,7 @@ SaveDialog::~SaveDialog()
 }
 
 //===============================================
-IMPL_LINK( SaveDialog, OKButtonHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SaveDialog, OKButtonHdl)
 {
     m_nResult = DLG_RET_OK;
     return 0;
@@ -1386,7 +1386,7 @@ void RecoveryDialog::end()
 }
 
 //===============================================
-IMPL_LINK( RecoveryDialog, NextButtonHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(RecoveryDialog, NextButtonHdl)
 {
     m_bUserDecideNext = sal_True;
     m_bWaitForUser    = sal_False;
@@ -1394,7 +1394,7 @@ IMPL_LINK( RecoveryDialog, NextButtonHdl, void*, EMPTYARG )
 }
 
 //===============================================
-IMPL_LINK( RecoveryDialog, CancelButtonHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(RecoveryDialog, CancelButtonHdl)
 {
     if (m_eRecoveryState == RecoveryDialog::E_RECOVERY_PREPARED)
     {
@@ -1520,7 +1520,7 @@ sal_Bool BrokenRecoveryDialog::isExecutionNeeded()
 }
 
 //===============================================
-IMPL_LINK( BrokenRecoveryDialog, OkButtonHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(BrokenRecoveryDialog, OkButtonHdl)
 {
     String sPhysicalPath = m_aSaveDirED.GetText().EraseLeadingChars().EraseTrailingChars();
     rtl::OUString sURL;
@@ -1534,14 +1534,14 @@ IMPL_LINK( BrokenRecoveryDialog, OkButtonHdl, void*, EMPTYARG )
 }
 
 //===============================================
-IMPL_LINK( BrokenRecoveryDialog, CancelButtonHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(BrokenRecoveryDialog, CancelButtonHdl)
 {
     EndDialog(DLG_RET_CANCEL);
     return 0;
 }
 
 //===============================================
-IMPL_LINK( BrokenRecoveryDialog, SaveButtonHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(BrokenRecoveryDialog, SaveButtonHdl)
 {
     impl_askForSavePath();
     return 0;
@@ -1605,19 +1605,19 @@ void BrokenRecoveryDialog::impl_askForSavePath()
         {
         }
 
-        IMPL_LINK( ErrorRepWelcomeDialog, PrevBtnHdl, void*, EMPTYARG )
+        IMPL_LINK_NOARG(ErrorRepWelcomeDialog, PrevBtnHdl)
         {
             m_nResult = DLG_RET_BACK;
             return 0;
         }
 
-        IMPL_LINK( ErrorRepWelcomeDialog, NextBtnHdl, void*, EMPTYARG )
+        IMPL_LINK_NOARG(ErrorRepWelcomeDialog, NextBtnHdl)
         {
             m_nResult = DLG_RET_OK;
             return 0;
         }
 
-        IMPL_LINK( ErrorRepWelcomeDialog, CancelBtnHdl, void*, EMPTYARG )
+        IMPL_LINK_NOARG(ErrorRepWelcomeDialog, CancelBtnHdl)
         {
             m_nResult = DLG_RET_CANCEL;
             return 0;
@@ -1656,7 +1656,7 @@ void BrokenRecoveryDialog::impl_askForSavePath()
         {
         }
 
-        IMPL_LINK( ErrorDescriptionEdit, ModifyHdl, void*, EMPTYARG )
+        IMPL_LINK_NOARG(ErrorDescriptionEdit, ModifyHdl)
         {
             if ( !GetVScrollBar() )
                 return 0;
@@ -1743,19 +1743,19 @@ void BrokenRecoveryDialog::impl_askForSavePath()
             maDocTypeED.GrabFocus();
         }
 
-        IMPL_LINK( ErrorRepSendDialog, PrevBtnHdl, void*, EMPTYARG )
+        IMPL_LINK_NOARG(ErrorRepSendDialog, PrevBtnHdl)
         {
             m_nResult = DLG_RET_BACK;
             return 0;
         }
 
-        IMPL_LINK( ErrorRepSendDialog, CancelBtnHdl, void*, EMPTYARG )
+        IMPL_LINK_NOARG(ErrorRepSendDialog, CancelBtnHdl)
         {
             m_nResult = DLG_RET_CANCEL;
             return 0;
         }
 
-        IMPL_LINK( ErrorRepSendDialog, SendBtnHdl, void*, EMPTYARG )
+        IMPL_LINK_NOARG(ErrorRepSendDialog, SendBtnHdl)
         {
 
             SaveParams();
@@ -1765,21 +1765,21 @@ void BrokenRecoveryDialog::impl_askForSavePath()
             return 0;
         }
 
-        IMPL_LINK( ErrorRepSendDialog, ShowRepBtnHdl, void*, EMPTYARG )
+        IMPL_LINK_NOARG(ErrorRepSendDialog, ShowRepBtnHdl)
         {
             ErrorRepPreviewDialog aDlg( this );
             aDlg.Execute();
             return 0;
         }
 
-        IMPL_LINK( ErrorRepSendDialog, OptBtnHdl, void*, EMPTYARG )
+        IMPL_LINK_NOARG(ErrorRepSendDialog, OptBtnHdl)
         {
             ErrorRepOptionsDialog aDlg( this, maParams );
             aDlg.Execute();
             return 0;
         }
 
-        IMPL_LINK( ErrorRepSendDialog, ContactCBHdl, void*, EMPTYARG )
+        IMPL_LINK_NOARG(ErrorRepSendDialog, ContactCBHdl)
         {
             bool    bCheck = maContactCB.IsChecked();
             maEMailAddrFT.Enable( bCheck );
@@ -1929,7 +1929,7 @@ void BrokenRecoveryDialog::impl_askForSavePath()
         {
         }
 
-        IMPL_LINK( ErrorRepOptionsDialog, ManualBtnHdl, void*, EMPTYARG )
+        IMPL_LINK_NOARG(ErrorRepOptionsDialog, ManualBtnHdl)
         {
             bool    bCheck = maManualBtn.IsChecked();
             maProxyServerFT.Enable( bCheck );
@@ -1939,7 +1939,7 @@ void BrokenRecoveryDialog::impl_askForSavePath()
             return 0;
         }
 
-        IMPL_LINK( ErrorRepOptionsDialog, OKBtnHdl, void*, EMPTYARG )
+        IMPL_LINK_NOARG(ErrorRepOptionsDialog, OKBtnHdl)
         {
             if ( maManualBtn.IsChecked() )
                 mrParams.miHTTPConnectionType = 2;
@@ -1955,7 +1955,7 @@ void BrokenRecoveryDialog::impl_askForSavePath()
             return 0;
         }
 
-        IMPL_LINK( ErrorRepOptionsDialog, CancelBtnHdl, void*, EMPTYARG )
+        IMPL_LINK_NOARG(ErrorRepOptionsDialog, CancelBtnHdl)
         {
             EndDialog(DLG_RET_CANCEL);
             return 0;
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 9813ee0a8ee0..8767608b3206 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -663,7 +663,7 @@ void SvxFontWorkDialog::SetShadowYVal_Impl(const XFormTextShadowYValItem* pItem)
     }
 }
 
-IMPL_LINK( SvxFontWorkDialog, SelectStyleHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxFontWorkDialog, SelectStyleHdl_Impl)
 {
     sal_uInt16 nId = aTbxStyle.GetCurItemId();
 
@@ -691,7 +691,7 @@ IMPL_LINK( SvxFontWorkDialog, SelectStyleHdl_Impl, void *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( SvxFontWorkDialog, SelectAdjustHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxFontWorkDialog, SelectAdjustHdl_Impl)
 {
     sal_uInt16 nId = aTbxAdjust.GetCurItemId();
 
@@ -718,7 +718,7 @@ IMPL_LINK( SvxFontWorkDialog, SelectAdjustHdl_Impl, void *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( SvxFontWorkDialog, SelectShadowHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxFontWorkDialog, SelectShadowHdl_Impl)
 {
     sal_uInt16 nId = aTbxShadow.GetCurItemId();
 
@@ -758,14 +758,14 @@ IMPL_LINK( SvxFontWorkDialog, SelectShadowHdl_Impl, void *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK_INLINE_START( SvxFontWorkDialog, ModifyInputHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SvxFontWorkDialog, ModifyInputHdl_Impl)
 {
     aInputTimer.Start();
     return 0;
 }
-IMPL_LINK_INLINE_END( SvxFontWorkDialog, ModifyInputHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(SvxFontWorkDialog, ModifyInputHdl_Impl)
 
-IMPL_LINK( SvxFontWorkDialog, InputTimoutHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl)
 {
     // Possibly set the Metric system again. This should be done with a
     // listen, this is however not possible at the moment due to compabillity
@@ -819,7 +819,7 @@ IMPL_LINK( SvxFontWorkDialog, InputTimoutHdl_Impl, void *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( SvxFontWorkDialog, FormSelectHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxFontWorkDialog, FormSelectHdl_Impl)
 {
     XFormTextStdFormItem aItem;
 
@@ -832,7 +832,7 @@ IMPL_LINK( SvxFontWorkDialog, FormSelectHdl_Impl, void *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( SvxFontWorkDialog, ColorSelectHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxFontWorkDialog, ColorSelectHdl_Impl)
 {
     XFormTextShadowColorItem aItem( (const String &) String(),
                                     (const Color &) aShadowColorLB.GetSelectEntryColor() );
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 531f1d6f78e0..287a34ae06e0 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -510,29 +510,29 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox )
     return 0;
 }
 
-IMPL_LINK_INLINE_START( SvxHFPage, DistModify, MetricField *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SvxHFPage, DistModify)
 {
     UpdateExample();
     return 0;
 }
-IMPL_LINK_INLINE_END( SvxHFPage, DistModify, MetricField *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(SvxHFPage, DistModify)
 
-IMPL_LINK_INLINE_START( SvxHFPage, HeightModify, MetricField *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SvxHFPage, HeightModify)
 {
     UpdateExample();
 
     return 0;
 }
-IMPL_LINK_INLINE_END( SvxHFPage, HeightModify, MetricField *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(SvxHFPage, HeightModify)
 
-IMPL_LINK_INLINE_START( SvxHFPage, BorderModify, MetricField *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SvxHFPage, BorderModify)
 {
     UpdateExample();
     return 0;
 }
-IMPL_LINK_INLINE_END( SvxHFPage, BorderModify, MetricField *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(SvxHFPage, BorderModify)
 
-IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl)
 {
     if ( !pBBSet )
     {
@@ -859,7 +859,7 @@ int SvxHFPage::DeactivatePage( SfxItemSet* _pSet )
     return LEAVE_PAGE;
 }
 
-IMPL_LINK( SvxHFPage, RangeHdl, Edit *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHFPage, RangeHdl)
 {
     long nHHeight = aBspWin.GetHdHeight();
     long nHDist   = aBspWin.GetHdDist();
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index ac21958fe048..40b3c17a1b4a 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -704,7 +704,7 @@ IMPL_LINK( SvxIMapDlg, GraphSizeHdl, IMapWindow*, pWnd )
     return 0L;
 }
 
-IMPL_LINK( SvxIMapDlg, URLModifyHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SvxIMapDlg, URLModifyHdl)
 {
     NotifyInfo  aNewInfo;
 
@@ -717,7 +717,7 @@ IMPL_LINK( SvxIMapDlg, URLModifyHdl, void*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( SvxIMapDlg, URLLoseFocusHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SvxIMapDlg, URLLoseFocusHdl)
 {
     NotifyInfo      aNewInfo;
     const String    aURLText( maURLBox.GetText() );
@@ -745,7 +745,7 @@ IMPL_LINK( SvxIMapDlg, URLLoseFocusHdl, void*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( SvxIMapDlg, UpdateHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(SvxIMapDlg, UpdateHdl)
 {
     pOwnData->aTimer.Stop();
 
@@ -830,7 +830,7 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd )
     return 0L;
 }
 
-IMPL_LINK( SvxIMapDlg, MiscHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SvxIMapDlg, MiscHdl)
 {
        SvtMiscOptions aMiscOptions;
     aTbxIMapDlg1.SetOutStyle( aMiscOptions.GetToolboxStyle() );
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 9c0c451340c8..6a272705567e 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -358,7 +358,7 @@ IMPL_LINK( SvxGridTabPage, ChangeDrawHdl_Impl, MetricField *, pField )
 }
 //------------------------------------------------------------------------
 
-IMPL_LINK( SvxGridTabPage, ClickRotateHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxGridTabPage, ClickRotateHdl_Impl)
 {
     if( aCbxRotate.IsChecked() )
         aMtrFldAngle.Enable();
@@ -384,7 +384,7 @@ IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, NumericField *, pField )
 }
 //------------------------------------------------------------------------
 
-IMPL_LINK( SvxGridTabPage, ChangeGridsnapHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxGridTabPage, ChangeGridsnapHdl_Impl)
 {
     bAttrModified = sal_True;
     return 0;
diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx
index 622f2efe9055..2b2f8925e8eb 100644
--- a/svx/source/dialog/orienthelper.cxx
+++ b/svx/source/dialog/orienthelper.cxx
@@ -106,7 +106,7 @@ void OrientationHelper_Impl::ShowDependentWindows()
         aIt->first->Show( mbVisible );
 }
 
-IMPL_LINK( OrientationHelper_Impl, ClickHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(OrientationHelper_Impl, ClickHdl)
 {
     EnableDependentWindows();
     return 0L;
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index 787f18fe6d6d..f6dc875be342 100644
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -40,7 +40,7 @@
 
 // class SvxPasswordDialog -----------------------------------------------
 
-IMPL_LINK( SvxPasswordDialog, ButtonHdl, OKButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl)
 {
     sal_Bool bOK = sal_True;
     short nRet = RET_OK;
@@ -71,7 +71,7 @@ IMPL_LINK( SvxPasswordDialog, ButtonHdl, OKButton *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxPasswordDialog, EditModifyHdl, Edit *, EMPTYARG )
+IMPL_LINK_NOARG(SvxPasswordDialog, EditModifyHdl)
 {
     if ( !bEmpty )
     {
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 2959670cc771..abdce55c131e 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -544,7 +544,7 @@ IMPL_LINK(SvxRubyDialog, ScrollHdl_Impl, ScrollBar*, pScroll)
     return 0;
 }
 
-IMPL_LINK(SvxRubyDialog, ApplyHdl_Impl, PushButton*, EMPTYARG)
+IMPL_LINK_NOARG(SvxRubyDialog, ApplyHdl_Impl)
 {
     const Sequence<PropertyValues>&  aRubyValues = pImpl->GetRubyValues();
     if(!aRubyValues.getLength())
@@ -573,13 +573,13 @@ IMPL_LINK(SvxRubyDialog, ApplyHdl_Impl, PushButton*, EMPTYARG)
     return 0;
 }
 
-IMPL_LINK(SvxRubyDialog, CloseHdl_Impl, PushButton*, EMPTYARG)
+IMPL_LINK_NOARG(SvxRubyDialog, CloseHdl_Impl)
 {
     Close();
     return 0;
 }
 
-IMPL_LINK(SvxRubyDialog, StylistHdl_Impl, PushButton*, EMPTYARG)
+IMPL_LINK_NOARG(SvxRubyDialog, StylistHdl_Impl)
 {
     SfxPoolItem* pState = 0;
     SfxItemState    eState = pBindings->QueryState( SID_STYLE_DESIGNER, pState );
@@ -640,7 +640,7 @@ IMPL_LINK(SvxRubyDialog, PositionHdl_Impl, ListBox*, pBox)
     return 0;
 }
 
-IMPL_LINK(SvxRubyDialog, CharStyleHdl_Impl, ListBox*, EMPTYARG )
+IMPL_LINK_NOARG(SvxRubyDialog, CharStyleHdl_Impl)
 {
     AssertOneEntry();
     OUString sStyleName;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index d090ff67f001..3b1c131b4757 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -1611,7 +1611,7 @@ IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, ComboBox *, pEd )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxSearchDialog, TemplateHdl_Impl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxSearchDialog, TemplateHdl_Impl)
 {
     if ( pImpl->bSaveToModule )
         SaveToModule_Impl();
@@ -2054,7 +2054,7 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxSearchDialog, LoseFocusHdl_Impl, Control *, EMPTYARG )
+IMPL_LINK_NOARG(SvxSearchDialog, LoseFocusHdl_Impl)
 {
     SaveToModule_Impl();
     return 0;
@@ -2062,7 +2062,7 @@ IMPL_LINK( SvxSearchDialog, LoseFocusHdl_Impl, Control *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl)
 {
     SfxObjectShell* pSh = SfxObjectShell::Current();
 
@@ -2158,7 +2158,7 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxSearchDialog, NoFormatHdl_Impl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl)
 {
     aLayoutBtn.SetText( aStylesStr );
     bFormat = sal_False;
@@ -2189,7 +2189,7 @@ IMPL_LINK( SvxSearchDialog, NoFormatHdl_Impl, Button *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxSearchDialog, AttributeHdl_Impl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxSearchDialog, AttributeHdl_Impl)
 {
     if ( !pSearchList || !pImpl->pRanges )
         return 0;
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index a450f134ac14..f1b810c69692 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -526,7 +526,7 @@ void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
     }
 }
 
-IMPL_LINK(SvxBmpNumValueSet, FormatHdl_Impl, Timer*, EMPTYARG)
+IMPL_LINK_NOARG(SvxBmpNumValueSet, FormatHdl_Impl)
 {
     // only when a graphics was not there, it needs to be formatted
     if(bGrfNotFound)
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index ac730a35ec7b..0162c2e3c75f 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -2325,7 +2325,7 @@ void Svx3DWin::Resize()
 }
 
 // -----------------------------------------------------------------------
-IMPL_LINK( Svx3DWin, ClickUpdateHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(Svx3DWin, ClickUpdateHdl)
 {
     bUpdate = !aBtnUpdate.IsChecked();
     aBtnUpdate.Check( bUpdate );
@@ -2349,7 +2349,7 @@ IMPL_LINK( Svx3DWin, ClickUpdateHdl, void *, EMPTYARG )
 }
 
 // -----------------------------------------------------------------------
-IMPL_LINK( Svx3DWin, ClickAssignHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(Svx3DWin, ClickAssignHdl)
 {
     SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
     if (pDispatcher != NULL)
@@ -2983,7 +2983,7 @@ IMPL_LINK( Svx3DWin, ClickLightHdl, PushButton*, pBtn )
 
 
 // -----------------------------------------------------------------------
-IMPL_LINK( Svx3DWin, DoubleClickHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(Svx3DWin, DoubleClickHdl)
 {
     // and assign
     ClickAssignHdl( NULL );
@@ -2993,7 +2993,7 @@ IMPL_LINK( Svx3DWin, DoubleClickHdl, void*, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( Svx3DWin, ChangeLightCallbackHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(Svx3DWin, ChangeLightCallbackHdl)
 {
     return( 0L );
 }
@@ -3001,7 +3001,7 @@ IMPL_LINK( Svx3DWin, ChangeLightCallbackHdl, void*, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( Svx3DWin, ChangeSelectionCallbackHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(Svx3DWin, ChangeSelectionCallbackHdl)
 {
     const sal_uInt32 nLight(aCtlLightPreview.GetSvx3DLightControl().GetSelectedLight());
     PushButton* pBtn = 0;
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index fde623b8da47..66c51c313dd9 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -3194,7 +3194,7 @@ void DbFilterField::UpdateFromField(const Reference< XColumn >& /*_rxField*/, co
 }
 
 //------------------------------------------------------------------
-IMPL_LINK( DbFilterField, OnClick, void*, EMPTYARG )
+IMPL_LINK_NOARG(DbFilterField, OnClick)
 {
     TriState eState = ((CheckBoxControl*)m_pWindow)->GetBox().GetState();
     String aText;
@@ -4429,7 +4429,7 @@ void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _
 
 
 //------------------------------------------------------------------
-IMPL_LINK( FmXListBoxCell, OnDoubleClick, void*, EMPTYARG )
+IMPL_LINK_NOARG(FmXListBoxCell, OnDoubleClick)
 {
     if (m_pBox)
     {
@@ -4815,7 +4815,7 @@ void SAL_CALL FmXFilterCell::setMaxTextLen( sal_Int16 /*nLen*/ ) throw( RuntimeE
 }
 
 //------------------------------------------------------------------------------
-IMPL_LINK( FmXFilterCell, OnCommit, void*, EMPTYARG )
+IMPL_LINK_NOARG(FmXFilterCell, OnCommit)
 {
     ::cppu::OInterfaceIteratorHelper aIt( m_aTextListeners );
     ::com::sun::star::awt::TextEvent aEvt;
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index ebdaff328ef9..aab704a6cf09 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -360,13 +360,13 @@ namespace svxform
     {
     }
     //------------------------------------------------------------------------
-    IMPL_LINK( XFormsPage, TbxSelectHdl, ToolBox *, EMPTYARG )
+    IMPL_LINK_NOARG(XFormsPage, TbxSelectHdl)
     {
         DoToolBoxAction( m_aToolBox.GetCurItemId() );
         return 0;
     }
     //------------------------------------------------------------------------
-    IMPL_LINK( XFormsPage, ItemSelectHdl, DataTreeListBox *, EMPTYARG )
+    IMPL_LINK_NOARG(XFormsPage, ItemSelectHdl)
     {
         EnableMenuItems( NULL );
         return 0;
@@ -1985,7 +1985,7 @@ namespace svxform
         return 0;
     }
     // -----------------------------------------------------------------------
-    IMPL_LINK( DataNavigatorWindow, ActivatePageHdl, TabControl *, EMPTYARG )
+    IMPL_LINK_NOARG(DataNavigatorWindow, ActivatePageHdl)
     {
         sal_uInt16 nId = 0;
         XFormsPage* pPage = GetCurrentPage( nId );
@@ -1999,7 +1999,7 @@ namespace svxform
         return 0;
     }
     // -----------------------------------------------------------------------
-    IMPL_LINK( DataNavigatorWindow, UpdateHdl, Timer *, EMPTYARG )
+    IMPL_LINK_NOARG(DataNavigatorWindow, UpdateHdl)
     {
         ModelSelectHdl( NULL );
         return 0;
@@ -2681,7 +2681,7 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    IMPL_LINK( AddDataItemDialog, OKHdl, OKButton *, EMPTYARG )
+    IMPL_LINK_NOARG(AddDataItemDialog, OKHdl)
     {
         bool bIsHandleBinding = ( DITBinding == m_eItemType );
         bool bIsHandleText = ( DITText == m_eItemType );
@@ -3077,7 +3077,7 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    IMPL_LINK( AddConditionDialog, EditHdl, PushButton *, EMPTYARG )
+    IMPL_LINK_NOARG(AddConditionDialog, EditHdl)
     {
         Reference< XNameContainer > xNameContnr;
         try
@@ -3102,7 +3102,7 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    IMPL_LINK( AddConditionDialog, OKHdl, OKButton *, EMPTYARG )
+    IMPL_LINK_NOARG(AddConditionDialog, OKHdl)
     {
 /*!!!
         try
@@ -3120,14 +3120,14 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    IMPL_LINK( AddConditionDialog, ModifyHdl, MultiLineEdit *, EMPTYARG )
+    IMPL_LINK_NOARG(AddConditionDialog, ModifyHdl)
     {
         m_aResultTimer.Start();
         return 0;
     }
 
     //------------------------------------------------------------------------
-    IMPL_LINK( AddConditionDialog, ResultHdl, Timer *, EMPTYARG )
+    IMPL_LINK_NOARG(AddConditionDialog, ResultHdl)
     {
         String sCondition = m_aConditionED.GetText().EraseLeadingChars().EraseTrailingChars();
         String sResult;
@@ -3257,7 +3257,7 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    IMPL_LINK( NamespaceItemDialog, OKHdl, OKButton *, EMPTYARG )
+    IMPL_LINK_NOARG(NamespaceItemDialog, OKHdl)
     {
         try
         {
@@ -3355,7 +3355,7 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    IMPL_LINK( ManageNamespaceDialog, OKHdl, OKButton *, EMPTYARG )
+    IMPL_LINK_NOARG(ManageNamespaceDialog, OKHdl)
     {
         String sPrefix = m_aPrefixED.GetText();
 
@@ -3432,7 +3432,7 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    IMPL_LINK( AddSubmissionDialog, RefHdl, PushButton *, EMPTYARG )
+    IMPL_LINK_NOARG(AddSubmissionDialog, RefHdl)
     {
         AddConditionDialog aDlg( this, PN_BINDING_EXPR, m_xTempBinding );
         aDlg.SetCondition( m_aRefED.GetText() );
@@ -3443,7 +3443,7 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    IMPL_LINK( AddSubmissionDialog, OKHdl, OKButton *, EMPTYARG )
+    IMPL_LINK_NOARG(AddSubmissionDialog, OKHdl)
     {
         rtl::OUString sName(m_aNameED.GetText());
         if(sName.isEmpty()) {
@@ -3683,7 +3683,7 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    IMPL_LINK( AddInstanceDialog, FilePickerHdl, PushButton *, EMPTYARG )
+    IMPL_LINK_NOARG(AddInstanceDialog, FilePickerHdl)
     {
         ::sfx2::FileDialogHelper aDlg(
             css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index bc19a1c39cec..9734fac2e90c 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1281,7 +1281,7 @@ IMPL_LINK( FmFilterNavigator, OnRemove, SvLBoxEntry*, pEntry )
 }
 
 //------------------------------------------------------------------------
-IMPL_LINK( FmFilterNavigator, OnDropActionTimer, void*, EMPTYARG )
+IMPL_LINK_NOARG(FmFilterNavigator, OnDropActionTimer)
 {
     if (--m_aTimerCounter > 0)
         return 0L;
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 95d177a92fa2..2edf59dafb60 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1058,7 +1058,7 @@ void FmXFormShell::LockSlotInvalidation(sal_Bool bLock)
 }
 
 //------------------------------------------------------------------------------
-IMPL_LINK(FmXFormShell, OnInvalidateSlots, void*, EMPTYARG)
+IMPL_LINK_NOARG(FmXFormShell, OnInvalidateSlots)
 {
     if ( impl_checkDisposed() )
         return 0L;
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index c6471c95b722..956663c906fc 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -1495,7 +1495,7 @@ void FormController::toggleAutoFields(sal_Bool bAutoFields)
 }
 
 //------------------------------------------------------------------------------
-IMPL_LINK(FormController, OnToggleAutoFields, void*, EMPTYARG)
+IMPL_LINK_NOARG(FormController, OnToggleAutoFields)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
 
@@ -2678,7 +2678,7 @@ void FormController::updateAllDispatchers() const
 }
 
 //------------------------------------------------------------------------------
-IMPL_LINK(FormController, OnLoad, void*, EMPTYARG)
+IMPL_LINK_NOARG(FormController, OnLoad)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     m_bLocked = determineLockState();
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index df1c845e9c84..53947c390000 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1528,7 +1528,7 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    IMPL_LINK( NavigatorTree, OnEdit, void*, EMPTYARG )
+    IMPL_LINK_NOARG(NavigatorTree, OnEdit)
     {
         nEditEvent = 0;
         EditEntry( m_pEditEntry );
@@ -1538,7 +1538,7 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    IMPL_LINK( NavigatorTree, OnDropActionTimer, void*, EMPTYARG )
+    IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer)
     {
         if (--m_aTimerCounter > 0)
             return 0L;
@@ -1592,7 +1592,7 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    IMPL_LINK(NavigatorTree, OnSynchronizeTimer, void*, EMPTYARG)
+    IMPL_LINK_NOARG(NavigatorTree, OnSynchronizeTimer)
     {
         SynchronizeMarkList();
         return 0L;
@@ -1600,7 +1600,7 @@ namespace svxform
 
 
     //------------------------------------------------------------------------
-    IMPL_LINK( NavigatorTree, OnClipboardAction, void*, EMPTYARG )
+    IMPL_LINK_NOARG(NavigatorTree, OnClipboardAction)
     {
         if ( !m_aControlExchange.isClipboardOwner() )
         {
diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx
index e7e5770b066e..4c80b8af3d28 100644
--- a/svx/source/gallery2/galbrws.cxx
+++ b/svx/source/gallery2/galbrws.cxx
@@ -268,7 +268,7 @@ sal_Bool GalleryBrowser::IsLinkage() const
 
 // -----------------------------------------------------------------------------
 
-IMPL_LINK( GalleryBrowser, SplitHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(GalleryBrowser, SplitHdl)
 {
     mpSplitter->SetPosPixel( Point( mpSplitter->GetSplitPosPixel(), mpSplitter->GetPosPixel().Y() ) );
     Resize();
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index fc20022bcf93..d581973fe00f 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -645,7 +645,7 @@ sal_Bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
 
 // -----------------------------------------------------------------------------
 
-IMPL_LINK( GalleryBrowser1, ShowContextMenuHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(GalleryBrowser1, ShowContextMenuHdl)
 {
     ::std::vector< sal_uInt16 > aExecVector;
     ImplGetExecuteVector(aExecVector);
@@ -684,7 +684,7 @@ IMPL_LINK( GalleryBrowser1, PopupMenuHdl, Menu*, pMenu )
 
 // -----------------------------------------------------------------------------
 
-IMPL_LINK( GalleryBrowser1, SelectThemeHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(GalleryBrowser1, SelectThemeHdl)
 {
     ( (GalleryBrowser*) GetParent() )->ThemeSelectionHasChanged();
     return 0L;
@@ -692,7 +692,7 @@ IMPL_LINK( GalleryBrowser1, SelectThemeHdl, void*, EMPTYARG )
 
 // -----------------------------------------------------------------------------
 
-IMPL_LINK( GalleryBrowser1, ClickNewThemeHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(GalleryBrowser1, ClickNewThemeHdl)
 {
     String  aNewTheme( GAL_RESID( RID_SVXSTR_GALLERY_NEWTHEME ) );
     String  aName( aNewTheme );
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 46311b3ea560..b9953f9c814a 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -1212,7 +1212,7 @@ IMPL_LINK( GalleryBrowser2, MenuSelectHdl, Menu*, pMenu )
 
 // -----------------------------------------------------------------------------
 
-IMPL_LINK( GalleryBrowser2, SelectObjectHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(GalleryBrowser2, SelectObjectHdl)
 {
     ImplUpdateInfoBar();
     return 0L;
@@ -1232,7 +1232,7 @@ IMPL_LINK( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox )
 
 // -----------------------------------------------------------------------------
 
-IMPL_LINK( GalleryBrowser2, MiscHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(GalleryBrowser2, MiscHdl)
 {
     maViewBox.SetOutStyle( maMiscOptions.GetToolboxStyle() );
 
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 0d5acf0de782..e814bfc0d6eb 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -160,8 +160,8 @@ namespace svxform
         String                      m_sInstanceURL;
         bool                        m_bLinkOnce;
 
-        DECL_LINK(                  TbxSelectHdl, ToolBox * );
-        DECL_LINK(                  ItemSelectHdl, DataTreeListBox * );
+        DECL_LINK(TbxSelectHdl, void *);
+        DECL_LINK(ItemSelectHdl, void *);
 
         void                        AddChildren( SvLBoxEntry* _pParent,
                                                  const ImageList& _rImgLst,
@@ -246,8 +246,8 @@ namespace svxform
         DECL_LINK(                  ModelSelectHdl, ListBox * );
         DECL_LINK(                  MenuSelectHdl, MenuButton * );
         DECL_LINK(                  MenuActivateHdl, MenuButton * );
-        DECL_LINK(                  ActivatePageHdl, TabControl* );
-        DECL_LINK(                  UpdateHdl, Timer* );
+        DECL_LINK(ActivatePageHdl, void *);
+        DECL_LINK(UpdateHdl, void *);
 
         XFormsPage*                 GetCurrentPage( sal_uInt16& rCurId );
         void                        LoadModels();
@@ -355,7 +355,7 @@ namespace svxform
 
         DECL_LINK(          CheckHdl, CheckBox * );
         DECL_LINK(          ConditionHdl, PushButton * );
-        DECL_LINK(          OKHdl, OKButton * );
+        DECL_LINK(OKHdl, void *);
 
         void                InitDialog();
         void                InitFromNode();
@@ -389,10 +389,10 @@ namespace svxform
         XFormsUIHelper1_ref     m_xUIHelper;
         XPropertySet_ref        m_xBinding;
 
-        DECL_LINK(              ModifyHdl, MultiLineEdit * );
-        DECL_LINK(              ResultHdl, Timer * );
-        DECL_LINK(              EditHdl, PushButton * );
-        DECL_LINK(              OKHdl, OKButton * );
+        DECL_LINK(ModifyHdl, void *);
+        DECL_LINK(ResultHdl, void *);
+        DECL_LINK(EditHdl, void *);
+        DECL_LINK(OKHdl, void *);
 
     public:
         AddConditionDialog( Window* pParent,
@@ -434,7 +434,7 @@ namespace svxform
 
         DECL_LINK(          SelectHdl, SvxSimpleTable * );
         DECL_LINK(          ClickHdl, PushButton * );
-        DECL_LINK(          OKHdl, OKButton * );
+        DECL_LINK(OKHdl, void *);
 
         void                LoadNamespaces();
 
@@ -458,7 +458,7 @@ namespace svxform
 
         AddConditionDialog* m_pConditionDlg;
 
-        DECL_LINK(          OKHdl, OKButton * );
+        DECL_LINK(OKHdl, void *);
 
     public:
         ManageNamespaceDialog( Window* pParent, AddConditionDialog* _pCondDlg, bool _bIsEdit );
@@ -507,8 +507,8 @@ namespace svxform
         XPropertySet_ref    m_xTempBinding;
         XPropertySet_ref    m_xCreatedBinding;
 
-        DECL_LINK(          RefHdl, PushButton * );
-        DECL_LINK(          OKHdl, OKButton * );
+        DECL_LINK(RefHdl, void *);
+        DECL_LINK(OKHdl, void *);
 
         void                FillAllBoxes();
 
@@ -562,7 +562,7 @@ namespace svxform
 
         String                  m_sAllFilterName;
 
-        DECL_LINK(              FilePickerHdl, PushButton * );
+        DECL_LINK(FilePickerHdl, void *);
 
     public:
         AddInstanceDialog( Window* pParent, bool _bEdit );
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 25934ef621b5..56e93dabed68 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -1156,7 +1156,7 @@ void SdrItemBrowser::Undirty()
     }
 }
 
-IMPL_LINK(SdrItemBrowser,IdleHdl,Timer*,EMPTYARG)
+IMPL_LINK_NOARG(SdrItemBrowser, IdleHdl)
 {
     Undirty();
     return 0;
@@ -1278,7 +1278,7 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
     return 0;
 }
 
-IMPL_LINK(SdrItemBrowser,SetDirtyHdl,_SdrItemBrowserControl*,EMPTYARG)
+IMPL_LINK_NOARG(SdrItemBrowser, SetDirtyHdl)
 {
     SetDirty();
     return 0;
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index fe6c7f345559..95dbdcbc00a3 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -300,7 +300,7 @@ void SdrPaintView::ConfigurationChanged( ::utl::ConfigurationBroadcaster* , sal_
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-IMPL_LINK_INLINE_START(SdrPaintView,ImpComeBackHdl,Timer*,EMPTYARG)
+IMPL_LINK_NOARG_INLINE_START(SdrPaintView, ImpComeBackHdl)
 {
     if (bSomeObjChgdFlag) {
         bSomeObjChgdFlag=sal_False;
@@ -308,7 +308,7 @@ IMPL_LINK_INLINE_START(SdrPaintView,ImpComeBackHdl,Timer*,EMPTYARG)
     }
     return 0;
 }
-IMPL_LINK_INLINE_END(SdrPaintView,ImpComeBackHdl,Timer*,pTimer)
+IMPL_LINK_NOARG_INLINE_END(SdrPaintView,ImpComeBackHdl)
 
 void SdrPaintView::FlushComeBackTimer() const
 {
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index faf93a0155d8..736e40041148 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2562,7 +2562,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo
 
 // --------------------------------------------------------------------
 
-IMPL_LINK( SvxTableController, UpdateHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxTableController, UpdateHdl)
 {
     mnUpdateEvent = 0;
 
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index ddf01f7bbe29..192db50d3441 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -456,7 +456,7 @@ sal_Bool SvxColorDockingWindow::Close()
 |*
 \************************************************************************/
 
-IMPL_LINK( SvxColorDockingWindow, SelectHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl)
 {
     SfxDispatcher* pDispatcher = GetBindings().GetDispatcher();
     sal_uInt16 nPos = aColorSet.GetSelectItemId();
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 0cb08b1507db..e3597b17fd7b 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -464,7 +464,7 @@ void ExtrusionDepthWindow::DataChanged( const DataChangedEvent& rDCEvt )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( ExtrusionDepthWindow, SelectHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl)
 {
     int nSelected = getSelectedEntryId();
     if( nSelected != -1 )
@@ -900,7 +900,7 @@ void SAL_CALL ExtrusionSurfaceWindow::statusChanged(
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( ExtrusionSurfaceWindow, SelectHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(ExtrusionSurfaceWindow, SelectHdl)
 {
     if ( IsInPopupMode() )
         EndPopupMode();
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 725b7f2a4be4..62aa9a140bf0 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -554,7 +554,7 @@ FillControl::~FillControl()
 
 //------------------------------------------------------------------------
 
-IMPL_LINK_INLINE_START( FillControl, DelayHdl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(FillControl, DelayHdl)
 {
     SelectFillTypeHdl( NULL );
     ( (SvxFillToolBoxControl*)GetData() )->updateStatus( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillStyle" )));
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index c5c25e253ce7..5c0e657aaec6 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -253,7 +253,7 @@ void FontWorkGalleryDialog::insertSelectedFontwork()
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( FontWorkGalleryDialog, ClickOKHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(FontWorkGalleryDialog, ClickOKHdl)
 {
     insertSelectedFontwork();
     EndDialog( true );
@@ -262,7 +262,7 @@ IMPL_LINK( FontWorkGalleryDialog, ClickOKHdl, void*, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( FontWorkGalleryDialog, DoubleClickFavoriteHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(FontWorkGalleryDialog, DoubleClickFavoriteHdl)
 {
     insertSelectedFontwork();
     EndDialog( true );
@@ -411,7 +411,7 @@ void FontWorkAlignmentWindow::DataChanged( const DataChangedEvent& rDCEvt )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( FontWorkAlignmentWindow, SelectHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(FontWorkAlignmentWindow, SelectHdl)
 {
     if ( IsInPopupMode() )
         EndPopupMode();
@@ -621,7 +621,7 @@ void SAL_CALL FontWorkCharacterSpacingWindow::statusChanged( const ::com::sun::s
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( FontWorkCharacterSpacingWindow, SelectHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(FontWorkCharacterSpacingWindow, SelectHdl)
 {
     if ( IsInPopupMode() )
         EndPopupMode();
diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
index 3a6b02001e1c..2ec0687cfd69 100644
--- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx
+++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
@@ -93,7 +93,7 @@ void FormatPaintBrushToolBoxControl::Click()
 }
 
 // -----------------------------------------------------------------------
-IMPL_LINK(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl)
 {
     //there was no second click during waiting
     this->impl_executePaintBrush();
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index fb534742be53..9dd53da31af4 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -119,7 +119,7 @@ private:
     OUString            maCommand;
     Reference< XFrame > mxFrame;
 
-                    DECL_LINK( ImplModifyHdl, Timer* );
+                    DECL_LINK(ImplModifyHdl, void *);
 
 protected:
 
@@ -190,7 +190,7 @@ void ImplGrafMetricField::Modify()
 
 // -----------------------------------------------------------------------------
 
-IMPL_LINK( ImplGrafMetricField, ImplModifyHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(ImplGrafMetricField, ImplModifyHdl)
 {
     const sal_Int64 nVal = GetValue();
 
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index fdb7b14fca61..a24ae633d851 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -92,7 +92,7 @@ SvxLineBox::~SvxLineBox()
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxLineBox, DelayHdl_Impl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(SvxLineBox, DelayHdl_Impl)
 {
     if ( GetEntryCount() == 0 )
     {
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 603cc4fcbc24..13c689421c68 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -107,7 +107,7 @@ private:
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( TableWindow, SelectHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(TableWindow, SelectHdl)
 {
     CloseAndShowTableDialog();
     return 0;
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 2d95a08ae2ca..b1d3b07ea216 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -192,7 +192,7 @@ void SvxListBoxControl::StateChanged(
 }
 
 
-IMPL_LINK( SvxListBoxControl, PopupModeEndHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxListBoxControl, PopupModeEndHdl)
 {
     if( pPopupWin && 0 == pPopupWin->GetPopupModeFlags()  &&
         pPopupWin->IsUserSelected() )
@@ -230,7 +230,7 @@ void SvxListBoxControl::Impl_SetInfo( sal_uInt16 nCount )
 }
 
 
-IMPL_LINK( SvxListBoxControl, SelectHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxListBoxControl, SelectHdl)
 {
     if (pPopupWin)
     {
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 01334d416ac2..c81177ea4620 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -458,7 +458,7 @@ SvxLineEndWindow::~SvxLineEndWindow()
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxLineEndWindow, SelectHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl)
 {
     XLineEndItem*           pLineEndItem = NULL;
     XLineStartItem*         pLineStartItem = NULL;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index d24421d25e2c..e3669520f2a8 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -928,7 +928,7 @@ SfxPopupWindow* SvxColorWindow_Impl::Clone() const
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxColorWindow_Impl, SelectHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectHdl)
 {
     sal_uInt16 nItemId = aColorSet.GetSelectItemId();
     SvxColorItem aColorItem( aColorSet.GetItemColor( nItemId ), theSlotId );
@@ -1140,7 +1140,7 @@ void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
 // Per default bleiben ungesetzte Linien unveraendert
 // Mit Shift werden ungesetzte Linien zurueckgsetzt
 //
-IMPL_LINK( SvxFrameWindow_Impl, SelectHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl)
 {
     ::Color             aColBlack( COL_BLACK );
     SvxBoxItem          aBorderOuter( SID_ATTR_BORDER_OUTER );
@@ -1386,7 +1386,7 @@ SfxPopupWindow* SvxLineWindow_Impl::Clone() const
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl)
 {
     SvxLineItem     aLineItem( SID_FRAME_LINESTYLE );
     SvxBorderStyle  nStyle = SvxBorderStyle( m_aLineStyleLb.GetSelectEntryStyle() );
@@ -1935,7 +1935,7 @@ void SvxStyleToolBoxControl::SetFamilyState( sal_uInt16 nIdx,
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxStyleToolBoxControl, VisibilityNotification, void*, EMPTYARG )
+IMPL_LINK_NOARG(SvxStyleToolBoxControl, VisibilityNotification)
 {
 
     sal_uInt16 i;
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index c974a2236f22..f26ce03f9fb2 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -432,7 +432,7 @@ void SAL_CALL FindTextToolbarController::statusChanged( const css::frame::Featur
     }
 }
 
-IMPL_LINK( FindTextToolbarController, EditModifyHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(FindTextToolbarController, EditModifyHdl)
 {
     // enable or disable item DownSearch/UpSearch of findbar
     Window* pWindow = VCLUnoHelper::GetWindow( getParent() );
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 6100860d3926..3d347f319d78 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -631,7 +631,7 @@ void ChineseDictionaryDialog::setDirectionAndTextConversionOptions( bool bDirect
     updateAfterDirectionChange();
 }
 
-IMPL_LINK( ChineseDictionaryDialog, DirectionHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ChineseDictionaryDialog, DirectionHdl)
 {
     updateAfterDirectionChange();
     return 0;
@@ -657,12 +657,12 @@ void ChineseDictionaryDialog::updateAfterDirectionChange()
     updateButtons();
 }
 
-IMPL_LINK( ChineseDictionaryDialog, EditFieldsHdl, Control*, EMPTYARG )
+IMPL_LINK_NOARG(ChineseDictionaryDialog, EditFieldsHdl)
 {
     updateButtons();
     return 0;
 }
-IMPL_LINK( ChineseDictionaryDialog, MappingSelectHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ChineseDictionaryDialog, MappingSelectHdl)
 {
     DictionaryEntry* pE = getActiveDictionary().getFirstSelectedEntry();
     if(pE)
@@ -749,7 +749,7 @@ void ChineseDictionaryDialog::updateButtons()
     m_aPB_Modify.Enable( bModify );
 }
 
-IMPL_LINK( ChineseDictionaryDialog, AddHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ChineseDictionaryDialog, AddHdl)
 {
     if( !isEditFieldsHaveContent() )
         return 0;
@@ -767,7 +767,7 @@ IMPL_LINK( ChineseDictionaryDialog, AddHdl, void*, EMPTYARG )
     updateButtons();
     return 0;
 }
-IMPL_LINK( ChineseDictionaryDialog, ModifyHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ChineseDictionaryDialog, ModifyHdl)
 {
     rtl::OUString aTerm( m_aED_Term.GetText() );
     rtl::OUString aMapping( m_aED_Mapping.GetText() );
@@ -800,7 +800,7 @@ IMPL_LINK( ChineseDictionaryDialog, ModifyHdl, void*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( ChineseDictionaryDialog, DeleteHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ChineseDictionaryDialog, DeleteHdl)
 {
     DictionaryList& rActive  = getActiveDictionary();
     DictionaryList& rReverse = getReverseDictionary();
@@ -860,7 +860,7 @@ short ChineseDictionaryDialog::Execute()
     return nRet;
 }
 
-IMPL_LINK( ChineseDictionaryDialog, HeaderBarClick, void*, EMPTYARG )
+IMPL_LINK_NOARG(ChineseDictionaryDialog, HeaderBarClick)
 {
     if(m_pHeaderBar)
     {
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
index 892d5b793620..19709d89afeb 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
@@ -138,7 +138,7 @@ public:
 
 private:
     DECL_LINK( DirectionHdl, void* );
-    DECL_LINK( EditFieldsHdl, Control* );
+    DECL_LINK(EditFieldsHdl, void *);
     DECL_LINK( MappingSelectHdl, void* );
     DECL_LINK( AddHdl, void* );
     DECL_LINK( ModifyHdl, void* );
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
index d79a3a34c588..c6949185410a 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
@@ -132,13 +132,13 @@ void ChineseTranslationDialog::impl_UpdateVariantsCheckBox()
 //    m_aCB_Use_Variants.Enable( m_aRB_To_Traditional.IsChecked() );
 }
 
-IMPL_LINK( ChineseTranslationDialog, DirectionHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ChineseTranslationDialog, DirectionHdl)
 {
     impl_UpdateVariantsCheckBox();
     return 0;
 }
 
-IMPL_LINK( ChineseTranslationDialog, CommonTermsHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ChineseTranslationDialog, CommonTermsHdl)
 {
 // #117820# (search for other occurrences!)
 //    if( m_aCB_Translate_Commonterms.IsChecked() && m_aRB_To_Traditional.IsChecked() )
@@ -146,7 +146,7 @@ IMPL_LINK( ChineseTranslationDialog, CommonTermsHdl, void*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( ChineseTranslationDialog, OkHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ChineseTranslationDialog, OkHdl)
 {
     //save settings to configuration
     SvtLinguConfig  aLngCfg;
@@ -162,7 +162,7 @@ IMPL_LINK( ChineseTranslationDialog, OkHdl, void*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( ChineseTranslationDialog, DictionaryHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ChineseTranslationDialog, DictionaryHdl)
 {
     if( !m_pDictionaryDialog )
     {