New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problem

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

36 files changed, 97 insertions, 97 deletions

diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index 9a4a7b2b2df7..44b5f64aded1 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -1447,7 +1447,7 @@ IMPL_LINK(BrowseBox,ScrollHdl,ScrollBar*,pBar)
 
 //-------------------------------------------------------------------
 
-IMPL_LINK( BrowseBox,EndScrollHdl,ScrollBar*, EMPTYARG )
+IMPL_LINK_NOARG(BrowseBox, EndScrollHdl)
 {
     DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
 
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 9390602dd85f..73364e45011b 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -521,12 +521,12 @@ void BrowserDataWin::MouseMove( const MouseEvent& rEvt )
 
 //-------------------------------------------------------------------
 
-IMPL_LINK_INLINE_START( BrowserDataWin, RepeatedMouseMove, void *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(BrowserDataWin, RepeatedMouseMove)
 {
     GetParent()->MouseMove( BrowserMouseEvent( this, aRepeatEvt ) );
     return 0;
 }
-IMPL_LINK_INLINE_END( BrowserDataWin, RepeatedMouseMove, void *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(BrowserDataWin, RepeatedMouseMove)
 
 //-------------------------------------------------------------------
 
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index 1078e366f6e8..1d7b0253fa29 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -281,7 +281,7 @@ namespace svt
     }
 
     //------------------------------------------------------------------
-    IMPL_LINK( CheckBoxControl, OnClick, void*, EMPTYARG )
+    IMPL_LINK_NOARG(CheckBoxControl, OnClick)
     {
         m_aClickLink.Call(pBox);
         return m_aModifyLink.Call(pBox);
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 65756c1bf996..85700a777703 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -256,7 +256,7 @@ namespace svt
     }
 
     //------------------------------------------------------------------------------
-    IMPL_LINK(EditBrowseBox, StartEditHdl, void*, EMPTYARG)
+    IMPL_LINK_NOARG(EditBrowseBox, StartEditHdl)
     {
         nStartEvent = 0;
         if (IsEditing())
@@ -1114,7 +1114,7 @@ namespace svt
     }
 
     //------------------------------------------------------------------------------
-    IMPL_LINK(EditBrowseBox, EndEditHdl, void*, EMPTYARG)
+    IMPL_LINK_NOARG(EditBrowseBox, EndEditHdl)
     {
         nEndEvent = 0;
         ReleaseController(aOldController, nOldEditRow, nOldEditCol);
@@ -1127,7 +1127,7 @@ namespace svt
     }
 
     //------------------------------------------------------------------------------
-    IMPL_LINK(EditBrowseBox, ModifyHdl, void*, EMPTYARG)
+    IMPL_LINK_NOARG(EditBrowseBox, ModifyHdl)
     {
         if (nCellModifiedEvent)
             Application::RemoveUserEvent(nCellModifiedEvent);
@@ -1136,7 +1136,7 @@ namespace svt
     }
 
     //------------------------------------------------------------------------------
-    IMPL_LINK(EditBrowseBox, CellModifiedHdl, void*, EMPTYARG)
+    IMPL_LINK_NOARG(EditBrowseBox, CellModifiedHdl)
     {
         nCellModifiedEvent = 0;
         CellModified();
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index dc3f727ce175..4e1ff6e51081 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -209,7 +209,7 @@ public:
 
     Reference< XCommandEnvironment >    GetCommandEnvironment() const { return mxCmdEnv; }
 
-    DECL_LINK( ResetQuickSearch_Impl, Timer * );
+    DECL_LINK(ResetQuickSearch_Impl, void *);
 
     virtual PopupMenu*  CreateContextMenu( void );
     virtual void        ExcecuteContextMenuAction( sal_uInt16 nSelectedPopentry );
@@ -781,7 +781,7 @@ ViewTabListBox_Impl::~ViewTabListBox_Impl()
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( ViewTabListBox_Impl, ResetQuickSearch_Impl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(ViewTabListBox_Impl, ResetQuickSearch_Impl)
 {
     ::osl::MutexGuard aGuard( maMutex );
 
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 7c7b0af768e6..0393f8c935a9 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -232,7 +232,7 @@ class SvxIconChoiceCtrl_Impl
 
                         DECL_LINK( ScrollUpDownHdl, ScrollBar * );
                         DECL_LINK( ScrollLeftRightHdl, ScrollBar * );
-                        DECL_LINK( EditTimeoutHdl, Timer* );
+                        DECL_LINK(EditTimeoutHdl, void *);
                         DECL_LINK( UserEventHdl, void* );
                         DECL_LINK( EndScrollHdl, void* );
                         DECL_LINK( AutoArrangeHdl, void* );
@@ -320,7 +320,7 @@ class SvxIconChoiceCtrl_Impl
     void                VisRectChanged() { aVisRectChangedTimer.Start(); }
     void                SetOrigin( const Point&, sal_Bool bDoNotUpdateWallpaper = sal_False );
 
-                        DECL_LINK( TextEditEndedHdl, IcnViewEdit_Impl* );
+                        DECL_LINK(TextEditEndedHdl, void *);
 
     void                ShowFocus ( Rectangle& rRect );
     void                DrawFocusRect ( OutputDevice* pOut );
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index ca6d393218d4..b0edba9d3628 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -80,7 +80,7 @@ class IcnViewEdit_Impl : public MultiLineEdit
     sal_Bool            bGrabFocus;
 
     void            CallCallBackHdl_Impl();
-                    DECL_LINK( Timeout_Impl, Timer * );
+                    DECL_LINK(Timeout_Impl, void *);
                     DECL_LINK( ReturnHdl_Impl, Accelerator * );
                     DECL_LINK( EscapeHdl_Impl, Accelerator * );
 
@@ -265,7 +265,7 @@ IMPL_LINK( SvxIconChoiceCtrl_Impl, ScrollLeftRightHdl, ScrollBar*, pScrollBar )
     return 0;
 }
 
-IMPL_LINK( SvxIconChoiceCtrl_Impl, EndScrollHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, EndScrollHdl)
 {
     if( pView->HasBackground() && !pView->GetBackground().IsScrollable() &&
         bEndScrollInvalidate )
@@ -2940,21 +2940,21 @@ void SvxIconChoiceCtrl_Impl::ClearSelectedRectList()
     aSelectedRectList.Remove( 0, aSelectedRectList.Count() );
 }
 
-IMPL_LINK(SvxIconChoiceCtrl_Impl, AutoArrangeHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, AutoArrangeHdl)
 {
     aAutoArrangeTimer.Stop();
     Arrange( IsAutoArrange() );
     return 0;
 }
 
-IMPL_LINK(SvxIconChoiceCtrl_Impl, VisRectChangedHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, VisRectChangedHdl)
 {
     aVisRectChangedTimer.Stop();
     pView->VisibleRectChanged();
     return 0;
 }
 
-IMPL_LINK(SvxIconChoiceCtrl_Impl, DocRectChangedHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, DocRectChangedHdl)
 {
     aDocRectChangedTimer.Stop();
     pView->DocumentRectChanged();
@@ -2969,7 +2969,7 @@ sal_Bool SvxIconChoiceCtrl_Impl::IsTextHit( SvxIconChoiceCtrlEntry* pEntry, cons
     return sal_False;
 }
 
-IMPL_LINK(SvxIconChoiceCtrl_Impl, EditTimeoutHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, EditTimeoutHdl)
 {
     SvxIconChoiceCtrlEntry* pEntry = GetCurEntry();
     if( bEntryEditingEnabled && pEntry &&
@@ -3229,7 +3229,7 @@ void SvxIconChoiceCtrl_Impl::EditEntry( SvxIconChoiceCtrlEntry* pEntry )
         LINK( this, SvxIconChoiceCtrl_Impl, TextEditEndedHdl ) );
 }
 
-IMPL_LINK( SvxIconChoiceCtrl_Impl, TextEditEndedHdl, IcnViewEdit_Impl*, EMPTYARG )
+IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, TextEditEndedHdl)
 {
     DBG_ASSERT(pEdit,"TextEditEnded: pEdit not set");
     if( !pEdit )
@@ -3389,7 +3389,7 @@ void IcnViewEdit_Impl::CallCallBackHdl_Impl()
     }
 }
 
-IMPL_LINK( IcnViewEdit_Impl, Timeout_Impl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(IcnViewEdit_Impl, Timeout_Impl)
 {
     CallCallBackHdl_Impl();
     return 0;
@@ -3860,7 +3860,7 @@ void SvxIconChoiceCtrl_Impl::CallSelectHandler( SvxIconChoiceCtrlEntry* )
         aCallSelectHdlTimer.Start();
 }
 
-IMPL_LINK( SvxIconChoiceCtrl_Impl, CallSelectHdlHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, CallSelectHdlHdl)
 {
     pHdlEntry = 0;
     pView->ClickIcon();
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 7f6665bc1c2f..e1fdab322a83 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -309,7 +309,7 @@ void SvImpLBox::Clear()
 // Painten, Navigieren, Scrollen
 // *********************************************************************
 
-IMPL_LINK_INLINE_START( SvImpLBox, EndScrollHdl, ScrollBar *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SvImpLBox, EndScrollHdl)
 {
     if( nFlags & F_ENDSCROLL_SET_VIS_SIZE )
     {
@@ -319,7 +319,7 @@ IMPL_LINK_INLINE_START( SvImpLBox, EndScrollHdl, ScrollBar *, EMPTYARG )
     EndScroll();
     return 0;
 }
-IMPL_LINK_INLINE_END( SvImpLBox, EndScrollHdl, ScrollBar *, pScrollBar )
+IMPL_LINK_NOARG_INLINE_END(SvImpLBox, EndScrollHdl)
 
 
 // Handler vertikale ScrollBar
@@ -3030,7 +3030,7 @@ void SvImpLBox::BeginDrag()
     }
 }
 
-IMPL_LINK( SvImpLBox, BeginDragHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SvImpLBox, BeginDragHdl)
 {
     pView->StartDrag( 0, aAsyncBeginDragPos );
     return 0;
@@ -3245,7 +3245,7 @@ void SvImpLBox::SetCurEntry( SvLBoxEntry* pEntry )
         pView->Select( pEntry, sal_True );
 }
 
-IMPL_LINK( SvImpLBox, EditTimerCall, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(SvImpLBox, EditTimerCall)
 {
     if( pView->IsInplaceEditingEnabled() )
     {
diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx
index 1ecfcf0f61cc..f212136fabb9 100644
--- a/svtools/source/contnr/svlbox.cxx
+++ b/svtools/source/contnr/svlbox.cxx
@@ -187,23 +187,23 @@ void SvInplaceEdit2::Hide()
 }
 
 
-IMPL_LINK_INLINE_START( SvInplaceEdit2, ReturnHdl_Impl, Accelerator *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SvInplaceEdit2, ReturnHdl_Impl)
 {
     DBG_CHKTHIS(SvInplaceEdit2,0);
     bCanceled = sal_False;
     CallCallBackHdl_Impl();
     return 1;
 }
-IMPL_LINK_INLINE_END( SvInplaceEdit2, ReturnHdl_Impl, Accelerator *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(SvInplaceEdit2, ReturnHdl_Impl)
 
-IMPL_LINK_INLINE_START( SvInplaceEdit2, EscapeHdl_Impl, Accelerator *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SvInplaceEdit2, EscapeHdl_Impl)
 {
     DBG_CHKTHIS(SvInplaceEdit2,0);
     bCanceled = sal_True;
     CallCallBackHdl_Impl();
     return 1;
 }
-IMPL_LINK_INLINE_END( SvInplaceEdit2, EscapeHdl_Impl, Accelerator *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(SvInplaceEdit2, EscapeHdl_Impl)
 
 
 sal_Bool SvInplaceEdit2::KeyInput( const KeyEvent& rKEvt )
@@ -251,13 +251,13 @@ void SvInplaceEdit2::LoseFocus()
     }
 }
 
-IMPL_LINK_INLINE_START( SvInplaceEdit2, Timeout_Impl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SvInplaceEdit2, Timeout_Impl)
 {
     DBG_CHKTHIS(SvInplaceEdit2,0);
     CallCallBackHdl_Impl();
     return 0;
 }
-IMPL_LINK_INLINE_END( SvInplaceEdit2, Timeout_Impl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(SvInplaceEdit2, Timeout_Impl)
 
 void SvInplaceEdit2::CallCallBackHdl_Impl()
 {
@@ -1290,7 +1290,7 @@ void SvLBox::EditText( const String& rStr, const Rectangle& rRect,
         rSel, bMulti );
 }
 
-IMPL_LINK( SvLBox, TextEditEndedHdl_Impl, SvInplaceEdit2 *, EMPTYARG )
+IMPL_LINK_NOARG(SvLBox, TextEditEndedHdl_Impl)
 {
     DBG_CHKTHIS(SvLBox,0);
     if ( nImpFlags & SVLBOX_EDTEND_CALLED ) // Nesting verhindern
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index b1b2bd17737f..f2c54a7b43bc 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -699,7 +699,7 @@ void SvHeaderTabListBox::Clear()
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvHeaderTabListBox, ScrollHdl_Impl, SvTabListBox*, EMPTYARG )
+IMPL_LINK_NOARG(SvHeaderTabListBox, ScrollHdl_Impl)
 {
     m_pImpl->m_pHeaderBar->SetOffset( -GetXOffset() );
     return 0;
@@ -707,7 +707,7 @@ IMPL_LINK( SvHeaderTabListBox, ScrollHdl_Impl, SvTabListBox*, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvHeaderTabListBox, CreateAccessibleHdl_Impl, HeaderBar*, EMPTYARG )
+IMPL_LINK_NOARG(SvHeaderTabListBox, CreateAccessibleHdl_Impl)
 {
     Window* pParent = m_pImpl->m_pHeaderBar->GetAccessibleParentWindow();
     DBG_ASSERT( pParent, "SvHeaderTabListBox..CreateAccessibleHdl_Impl - accessible parent not found" );
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index de5529d00e03..d23862db2ce5 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -1082,7 +1082,7 @@ SvtTemplateWindow::~SvtTemplateWindow()
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK ( SvtTemplateWindow , IconClickHdl_Impl, SvtIconChoiceCtrl *, EMPTYARG )
+IMPL_LINK_NOARG(SvtTemplateWindow , IconClickHdl_Impl)
 {
     String aURL = pIconWin->GetSelectedIconURL();
     if ( !aURL.Len() )
@@ -1098,7 +1098,7 @@ IMPL_LINK ( SvtTemplateWindow , IconClickHdl_Impl, SvtIconChoiceCtrl *, EMPTYARG
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK ( SvtTemplateWindow , FileSelectHdl_Impl, SvtFileView *, EMPTYARG )
+IMPL_LINK_NOARG(SvtTemplateWindow , FileSelectHdl_Impl)
 {
     aSelectTimer.Start();
     return 0;
@@ -1106,7 +1106,7 @@ IMPL_LINK ( SvtTemplateWindow , FileSelectHdl_Impl, SvtFileView *, EMPTYARG )
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK ( SvtTemplateWindow , FileDblClickHdl_Impl, SvtFileView *, EMPTYARG )
+IMPL_LINK_NOARG(SvtTemplateWindow , FileDblClickHdl_Impl)
 {
     if ( aSelectTimer.IsActive() )
         aSelectTimer.Stop();
@@ -1125,7 +1125,7 @@ IMPL_LINK ( SvtTemplateWindow , FileDblClickHdl_Impl, SvtFileView *, EMPTYARG )
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK ( SvtTemplateWindow , NewFolderHdl_Impl, SvtFileView *, EMPTYARG )
+IMPL_LINK_NOARG(SvtTemplateWindow , NewFolderHdl_Impl)
 {
     pFrameWin->OpenFile( String(), sal_True, sal_False, sal_False );
     aFileViewTB.EnableItem( TI_DOCTEMPLATE_PRINT, sal_False );
@@ -1140,7 +1140,7 @@ IMPL_LINK ( SvtTemplateWindow , NewFolderHdl_Impl, SvtFileView *, EMPTYARG )
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK ( SvtTemplateWindow , TimeoutHdl_Impl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(SvtTemplateWindow , TimeoutHdl_Impl)
 {
     aSelectHdl.Call( this );
     String sURL = pFileWin->GetSelectedFile();
@@ -1170,7 +1170,7 @@ IMPL_LINK ( SvtTemplateWindow , ClickHdl_Impl, ToolBox *, pToolBox )
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK ( SvtTemplateWindow , ResizeHdl_Impl, SplitWindow *, EMPTYARG )
+IMPL_LINK_NOARG(SvtTemplateWindow , ResizeHdl_Impl)
 {
     Resize();
     return 0;
@@ -1736,7 +1736,7 @@ sal_Bool SvtDocumentTemplateDialog::CanEnableEditBtn() const
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK ( SvtDocumentTemplateDialog , SelectHdl_Impl, SvtTemplateWindow *, EMPTYARG )
+IMPL_LINK_NOARG(SvtDocumentTemplateDialog , SelectHdl_Impl)
 {
     aEditBtn.Enable( pImpl->pWin->IsTemplateFolderOpen() && CanEnableEditBtn() );
     aOKBtn.Enable( pImpl->pWin->IsFileSelected() );
@@ -1745,7 +1745,7 @@ IMPL_LINK ( SvtDocumentTemplateDialog , SelectHdl_Impl, SvtTemplateWindow *, EMP
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK ( SvtDocumentTemplateDialog , DoubleClickHdl_Impl, SvtTemplateWindow *, EMPTYARG )
+IMPL_LINK_NOARG(SvtDocumentTemplateDialog , DoubleClickHdl_Impl)
 {
     EndDialog( RET_OK );
 
@@ -1756,7 +1756,7 @@ IMPL_LINK ( SvtDocumentTemplateDialog , DoubleClickHdl_Impl, SvtTemplateWindow *
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK ( SvtDocumentTemplateDialog , NewFolderHdl_Impl, SvtTemplateWindow *, EMPTYARG )
+IMPL_LINK_NOARG(SvtDocumentTemplateDialog , NewFolderHdl_Impl)
 {
     String aNewTitle( pImpl->aTitle );
     aNewTitle += String( ASCII_STR(" - ") );
@@ -1769,7 +1769,7 @@ IMPL_LINK ( SvtDocumentTemplateDialog , NewFolderHdl_Impl, SvtTemplateWindow *,
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK ( SvtDocumentTemplateDialog , SendFocusHdl_Impl, SvtTemplateWindow *, EMPTYARG )
+IMPL_LINK_NOARG(SvtDocumentTemplateDialog , SendFocusHdl_Impl)
 {
     if ( pImpl->pWin->HasIconWinFocus() )
         aHelpBtn.GrabFocus();
@@ -1802,7 +1802,7 @@ IMPL_LINK ( SvtDocumentTemplateDialog , OKHdl_Impl, PushButton *, pBtn )
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK ( SvtDocumentTemplateDialog , OrganizerHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvtDocumentTemplateDialog , OrganizerHdl_Impl)
 {
     Window* pOldDefWin = Application::GetDefDialogParent();
     Application::SetDefDialogParent( this );
@@ -1877,7 +1877,7 @@ IMPL_LINK ( SvtDocumentTemplateDialog, UpdateHdl_Impl, Timer*, _pEventSource )
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK ( SvtDocumentTemplateDialog, OpenLinkHdl_Impl, svt::FixedHyperlink*, EMPTYARG )
+IMPL_LINK_NOARG(SvtDocumentTemplateDialog, OpenLinkHdl_Impl)
 {
     ::rtl::OUString sURL( aMoreTemplatesLink.GetURL() );
     if ( !sURL.isEmpty() )
diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx
index 6963f333540d..7e2c7506b48e 100644
--- a/svtools/source/contnr/templwin.hxx
+++ b/svtools/source/contnr/templwin.hxx
@@ -256,13 +256,13 @@ private:
 
     virtual void        Resize();
 
-    DECL_LINK(          IconClickHdl_Impl, SvtIconChoiceCtrl* );
-    DECL_LINK(          FileSelectHdl_Impl, SvtFileView* );
-    DECL_LINK(          FileDblClickHdl_Impl, SvtFileView* );
-    DECL_LINK(          NewFolderHdl_Impl, SvtFileView* );
-    DECL_LINK(          TimeoutHdl_Impl, Timer* );
+    DECL_LINK(IconClickHdl_Impl, void *);
+    DECL_LINK(FileSelectHdl_Impl, void *);
+    DECL_LINK(FileDblClickHdl_Impl, void *);
+    DECL_LINK(NewFolderHdl_Impl, void *);
+    DECL_LINK(TimeoutHdl_Impl, void *);
     DECL_LINK(          ClickHdl_Impl, ToolBox* );
-    DECL_LINK(          ResizeHdl_Impl, SplitWindow* );     // used for split and initial setting of toolbar pos
+    DECL_LINK(ResizeHdl_Impl, void *);     // used for split and initial setting of toolbar pos
 
     void                PrintFile( const String& rURL );
     void                AppendHistoryURL( const String& rURL, sal_uLong nGroup );
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 2a06db143eaa..c82b29f98c77 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -2505,7 +2505,7 @@ IMPL_LINK( CalendarField, ImplClickHdl, PushButton*, pBtn )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( CalendarField, ImplPopupModeEndHdl, FloatingWindow*, EMPTYARG )
+IMPL_LINK_NOARG(CalendarField, ImplPopupModeEndHdl)
 {
     EndDropDown();
     GrabFocus();
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index d3ec1770d4a8..e5d6197731f9 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -182,7 +182,7 @@ void FileControl::Resize()
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( FileControl, ButtonHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(FileControl, ButtonHdl)
 {
     ImplBrowseFile( );
 
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 7d4ffe57ee4e..ad5897de3ef8 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -1036,7 +1036,7 @@ long SvtURLBox::PreNotify( NotifyEvent& rNEvt )
 }
 
 //-------------------------------------------------------------------------
-IMPL_LINK( SvtURLBox, AutoCompleteHdl_Impl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SvtURLBox, AutoCompleteHdl_Impl)
 {
     if ( GetSubEdit()->GetAutocompleteAction() == AUTOCOMPLETE_KEYINPUT )
     {
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index d014cbbc2d4d..3222452380cf 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -2082,7 +2082,7 @@ void Ruler::ImplEndDrag()
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( Ruler, ImplUpdateHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(Ruler, ImplUpdateHdl)
 {
     mnUpdateEvtId = 0;
 
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 54476afe0838..e05590ac9405 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -336,7 +336,7 @@ IMPL_LINK( TabBarEdit, ImplEndEditHdl, void*, pCancel )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( TabBarEdit, ImplEndTimerHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(TabBarEdit, ImplEndTimerHdl)
 {
     if ( HasFocus() )
         return 0;
diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx
index 80acfcac22b9..3c25d0f8c5d3 100644
--- a/svtools/source/control/taskstat.cxx
+++ b/svtools/source/control/taskstat.cxx
@@ -158,7 +158,7 @@ TaskStatusBar::~TaskStatusBar()
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( TaskStatusBar, ImplTimerHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(TaskStatusBar, ImplTimerHdl)
 {
     sal_Bool bUpdate = ImplUpdateClock();
     if ( ImplUpdateFlashItems() )
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index e22ec21cc605..715040252dc5 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1137,7 +1137,7 @@ IMPL_LINK( ValueSet,ImplScrollHdl, ScrollBar*, pScrollBar )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( ValueSet,ImplTimerHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(ValueSet, ImplTimerHdl)
 {
     ImplTracking( GetPointerPosPixel(), true );
     return 0;
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index b295a73e871e..8a7f238e4ff4 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -1146,7 +1146,7 @@ void AssignmentPersistentData::Commit()
     }
 
     // -------------------------------------------------------------------
-    IMPL_LINK(AddressBookSourceDialog, OnDelayedInitialize, void*, EMPTYARG)
+    IMPL_LINK_NOARG(AddressBookSourceDialog, OnDelayedInitialize)
     {
         // load the initial data from the configuration
         loadConfiguration();
@@ -1191,7 +1191,7 @@ void AssignmentPersistentData::Commit()
     }
 
     // -------------------------------------------------------------------
-    IMPL_LINK(AddressBookSourceDialog, OnOkClicked, Button*, EMPTYARG)
+    IMPL_LINK_NOARG(AddressBookSourceDialog, OnOkClicked)
     {
         String sSelectedDS = lcl_getSelectedDataSource(  m_aDatasource );
         if ( m_pImpl->bWorkingPersistent )
@@ -1215,7 +1215,7 @@ void AssignmentPersistentData::Commit()
     }
 
     // -------------------------------------------------------------------
-    IMPL_LINK(AddressBookSourceDialog, OnAdministrateDatasources, void*, EMPTYARG)
+    IMPL_LINK_NOARG(AddressBookSourceDialog, OnAdministrateDatasources)
     {
         // collect some initial arguments for the dialog
         Sequence< Any > aArgs(1);
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index d26d58ee4520..a383af839c70 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -300,7 +300,7 @@ void PrinterSetupDialog::ImplSetInfo()
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( PrinterSetupDialog, ImplStatusHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(PrinterSetupDialog, ImplStatusHdl)
 {
     QueueInfo aInfo;
     ImplPrnDlgUpdateQueueInfo( &maLbName, aInfo );
@@ -311,7 +311,7 @@ IMPL_LINK( PrinterSetupDialog, ImplStatusHdl, Timer*, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( PrinterSetupDialog, ImplPropertiesHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(PrinterSetupDialog, ImplPropertiesHdl)
 {
     if ( !mpTempPrinter )
         mpTempPrinter = new Printer( mpPrinter->GetJobSetup() );
@@ -322,7 +322,7 @@ IMPL_LINK( PrinterSetupDialog, ImplPropertiesHdl, void*, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( PrinterSetupDialog, ImplChangePrinterHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(PrinterSetupDialog, ImplChangePrinterHdl)
 {
     mpTempPrinter = ImplPrnDlgListBoxSelect( &maLbName, &maBtnProperties,
                                              mpPrinter, mpTempPrinter );
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index 4fc594b0d5d8..3771a0c92a88 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -533,7 +533,7 @@ namespace svt
     }
 
     //--------------------------------------------------------------------
-    IMPL_LINK( RoadmapWizard, OnRoadmapItemSelected, void*, EMPTYARG )
+    IMPL_LINK_NOARG(RoadmapWizard, OnRoadmapItemSelected)
     {
         DBG_CHKTHIS( RoadmapWizard, CheckInvariants );
 
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 1ff0b9d268be..bf7f67df4a8e 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -418,7 +418,7 @@ namespace svt
     }
 
     //---------------------------------------------------------------------
-    IMPL_LINK(OWizardMachine, OnFinish, PushButton*, EMPTYARG)
+    IMPL_LINK_NOARG(OWizardMachine, OnFinish)
     {
         if ( isTravelingSuspended() )
             return 0;
@@ -635,7 +635,7 @@ namespace svt
     }
 
     //---------------------------------------------------------------------
-    IMPL_LINK(OWizardMachine, OnPrevPage, PushButton*, EMPTYARG)
+    IMPL_LINK_NOARG(OWizardMachine, OnPrevPage)
     {
         if ( isTravelingSuspended() )
             return 0;
@@ -645,7 +645,7 @@ namespace svt
     }
 
     //---------------------------------------------------------------------
-    IMPL_LINK(OWizardMachine, OnNextPage, PushButton*, EMPTYARG)
+    IMPL_LINK_NOARG(OWizardMachine, OnNextPage)
     {
         if ( isTravelingSuspended() )
             return 0;
diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index e64de75560e0..69de5c617789 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.cxx
@@ -1089,7 +1089,7 @@ void MultiLineEdit::Modify()
         pUpdateDataTimer->Start();
 }
 
-IMPL_LINK( MultiLineEdit, ImpUpdateDataHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(MultiLineEdit, ImpUpdateDataHdl)
 {
     UpdateData();
     return 0;
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index 74c41198dc62..8b13fcdbd46d 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -1581,7 +1581,7 @@ void TextEngine::UpdateViews( TextView* pCurView )
     maInvalidRec = Rectangle();
 }
 
-IMPL_LINK( TextEngine, IdleFormatHdl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(TextEngine, IdleFormatHdl)
 {
     FormatAndUpdate( mpIdleFormatter->GetView() );
     return 0;
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index 7b8eff56a51a..ed197e9018c8 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -1402,13 +1402,13 @@ ExportDialog::~ExportDialog()
 |* Speichert eingestellte Werte in ini-Datei
 |*
 \************************************************************************/
-IMPL_LINK( ExportDialog, UpdateHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(ExportDialog, UpdateHdl)
 {
     updateControls();
     return 0;
 }
 
-IMPL_LINK( ExportDialog, UpdateHdlMtfSizeX, void *, EMPTYARG )
+IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeX)
 {
     double fRatio = static_cast< double >( maOriginalSize.Height ) / maOriginalSize.Width;
 
@@ -1442,7 +1442,7 @@ IMPL_LINK( ExportDialog, UpdateHdlMtfSizeX, void *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( ExportDialog, UpdateHdlMtfSizeY, void *, EMPTYARG )
+IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeY)
 {
     double fRatio = static_cast< double >( maOriginalSize.Width ) / maOriginalSize.Height;
 
@@ -1476,7 +1476,7 @@ IMPL_LINK( ExportDialog, UpdateHdlMtfSizeY, void *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( ExportDialog, UpdateHdlNfResolution, void *, EMPTYARG )
+IMPL_LINK_NOARG(ExportDialog, UpdateHdlNfResolution)
 {
     sal_Int32 nResolution = maNfResolution.GetValue();
     if ( maLbResolution.GetSelectEntryPos() == 0 )      // pixels / cm
@@ -1490,14 +1490,14 @@ IMPL_LINK( ExportDialog, UpdateHdlNfResolution, void *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( ExportDialog, SbCompressionUpdateHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(ExportDialog, SbCompressionUpdateHdl)
 {
     maNfCompression.SetValue( maSbCompression.GetThumbPos() );
     updateControls();
     return 0;
 }
 
-IMPL_LINK( ExportDialog, OK, void *, EMPTYARG )
+IMPL_LINK_NOARG(ExportDialog, OK)
 {
     // writing config parameter
 
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 7c2de86b9767..bd83f38e201c 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -1085,7 +1085,7 @@ void GraphicObject::SetSwapState()
     }
 }
 
-IMPL_LINK( GraphicObject, ImplAutoSwapOutHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(GraphicObject, ImplAutoSwapOutHdl)
 {
     if( !IsSwappedOut() )
     {
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index 2c3e9d3fae73..094c59de3429 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -175,7 +175,7 @@ private:
     // #97680# --------------------
     std::vector< short > aContextBmpWidthVector;
 
-    DECL_LINK( EditTimerCall, Timer * );
+    DECL_LINK(EditTimerCall, void *);
 
     DECL_LINK( BeginDragHdl, void* );
     DECL_LINK( MyUserEvent,void*);
@@ -202,7 +202,7 @@ private:
     // ScrollBar-Handler
     DECL_LINK( ScrollUpDownHdl, ScrollBar * );
     DECL_LINK( ScrollLeftRightHdl, ScrollBar * );
-    DECL_LINK( EndScrollHdl, ScrollBar * );
+    DECL_LINK( EndScrollHdl, void * );
 
     void                SetNodeBmpYOffset( const Image& );
     void                SetNodeBmpTabDistance();
diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx
index 5b5667aad85e..c8ff4b078826 100644
--- a/svtools/source/inc/unoiface.hxx
+++ b/svtools/source/inc/unoiface.hxx
@@ -126,7 +126,7 @@ public:
 class VCLXFileControl : ::com::sun::star::awt::XTextComponent, public ::com::sun::star::awt::XTextLayoutConstrains, public VCLXWindow
 {
 protected:
-    DECL_LINK(      ModifyHdl, Edit* );
+    DECL_LINK(ModifyHdl, void *);
     TextListenerMultiplexer maTextListeners;
 
 public:
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index 283d34a2a01b..b8cd25a74ee8 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -461,7 +461,7 @@ css::uno::Reference< css::util::XURLTransformer > AcceleratorExecute::impl_ts_ge
 }
 
 //-----------------------------------------------
-IMPL_LINK(AcceleratorExecute, impl_ts_asyncCallback, void*, EMPTYARG)
+IMPL_LINK_NOARG(AcceleratorExecute, impl_ts_asyncCallback)
 {
     // replaced by AsyncAccelExec!
     return 0;
diff --git a/svtools/source/misc/filechangedchecker.cxx b/svtools/source/misc/filechangedchecker.cxx
index 50d73da26d9d..824e598b96d9 100644
--- a/svtools/source/misc/filechangedchecker.cxx
+++ b/svtools/source/misc/filechangedchecker.cxx
@@ -95,7 +95,7 @@ bool FileChangedChecker::hasFileChanged()
         return false;
 }
 
-IMPL_LINK(FileChangedChecker, TimerHandler, Timer *, EMPTYARG)
+IMPL_LINK_NOARG(FileChangedChecker, TimerHandler)
 {
     // If the file has changed, then update the graphic in the doc
     OSL_TRACE("Timeout Called");
diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx
index 4ff4af2a6bfb..243619d3a465 100644
--- a/svtools/source/misc/itemdel.cxx
+++ b/svtools/source/misc/itemdel.cxx
@@ -101,7 +101,7 @@ SfxItemDesruptor_Impl::~SfxItemDesruptor_Impl()
 }
 
 // ------------------------------------------------------------------------
-IMPL_LINK( SfxItemDesruptor_Impl, Delete, void *, EMPTYARG )
+IMPL_LINK_NOARG(SfxItemDesruptor_Impl, Delete)
 {
     {DBG_CHKTHIS(SfxItemDesruptor_Impl, 0);}
     delete this;
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index a5792aabfa07..3cdc5455abb9 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -548,7 +548,7 @@ namespace svt { namespace table
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    IMPL_LINK( TableControl, ImplSelectHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(TableControl, ImplSelectHdl)
     {
         Select();
         return 1;
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 7b943857e3e2..f656a249cdb4 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -103,9 +103,9 @@ public:
     virtual sal_Bool    EditingEntry( SvLBoxEntry* pEntry, Selection& );
     virtual sal_Bool    EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText );
 
-    DECL_LINK( OnSelectionChangeHdl, UnoTreeListBoxImpl* );
-    DECL_LINK( OnExpandingHdl, UnoTreeListBoxImpl* );
-    DECL_LINK( OnExpandedHdl, UnoTreeListBoxImpl* );
+    DECL_LINK(OnSelectionChangeHdl, void *);
+    DECL_LINK(OnExpandingHdl, void *);
+    DECL_LINK(OnExpandedHdl, void *);
 
 private:
     rtl::Reference< TreeControlPeer > mxPeer;
@@ -1537,7 +1537,7 @@ UnoTreeListBoxImpl::~UnoTreeListBoxImpl()
 
 // --------------------------------------------------------------------
 
-IMPL_LINK( UnoTreeListBoxImpl, OnSelectionChangeHdl, UnoTreeListBoxImpl*, EMPTYARG )
+IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnSelectionChangeHdl)
 {
     if( mxPeer.is() )
         mxPeer->onSelectionChanged();
@@ -1546,7 +1546,7 @@ IMPL_LINK( UnoTreeListBoxImpl, OnSelectionChangeHdl, UnoTreeListBoxImpl*, EMPTYA
 
 // --------------------------------------------------------------------
 
-IMPL_LINK(UnoTreeListBoxImpl, OnExpandingHdl, UnoTreeListBoxImpl*, EMPTYARG )
+IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnExpandingHdl)
 {
     UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( GetHdlEntry() );
 
@@ -1559,7 +1559,7 @@ IMPL_LINK(UnoTreeListBoxImpl, OnExpandingHdl, UnoTreeListBoxImpl*, EMPTYARG )
 
 // --------------------------------------------------------------------
 
-IMPL_LINK(UnoTreeListBoxImpl, OnExpandedHdl, UnoTreeListBoxImpl*, EMPTYARG )
+IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnExpandedHdl)
 {
     UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( GetHdlEntry() );
     if( pEntry && mxPeer.is() )
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index c00f0749146c..7602e3942ffc 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -729,7 +729,7 @@ sal_Int16 VCLXFileControl::getMaxTextLen() throw(::com::sun::star::uno::RuntimeE
 }
 
 
-IMPL_LINK( VCLXFileControl, ModifyHdl, Edit*, EMPTYARG )
+IMPL_LINK_NOARG(VCLXFileControl, ModifyHdl)
 {
     ::com::sun::star::awt::TextEvent aEvent;
     aEvent.Source = (::cppu::OWeakObject*)this;
diff --git a/svtools/workben/svdem.cxx b/svtools/workben/svdem.cxx
index 3989a0c8d029..abb28ac584cc 100644
--- a/svtools/workben/svdem.cxx
+++ b/svtools/workben/svdem.cxx
@@ -474,7 +474,7 @@ MyFontDialog::MyFontDialog( Window* pParent ) :
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( MyFontDialog, SelectFont, ComboBox*, EMPTYARG )
+IMPL_LINK_NOARG(MyFontDialog, SelectFont)
 {
     aStyleBox.Fill( aFontBox.GetText(), pList );
     FontInfo aInfo = pList->Get( aFontBox.GetText(), aStyleBox.GetText() );
@@ -485,7 +485,7 @@ IMPL_LINK( MyFontDialog, SelectFont, ComboBox*, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( MyFontDialog, SelectStyle, ComboBox*, EMPTYARG )
+IMPL_LINK_NOARG(MyFontDialog, SelectStyle)
 {
     FontInfo aInfo = pList->Get( aFontBox.GetText(), aStyleBox.GetText() );
     aSizeBox.Fill( &aInfo, pList );
@@ -495,7 +495,7 @@ IMPL_LINK( MyFontDialog, SelectStyle, ComboBox*, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( MyFontDialog, AttrHdl, Window*, EMPTYARG )
+IMPL_LINK_NOARG(MyFontDialog, AttrHdl)
 {
     SetAttr();
     return 0;
@@ -643,7 +643,7 @@ MyCalendar::~MyCalendar()
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( MyCalendar, RequestDateInfoHdl, Calendar*, EMPTYARG )
+IMPL_LINK_NOARG(MyCalendar, RequestDateInfoHdl)
 {
     sal_uInt16 nRequestYear = aCalendar.GetRequestYear();
     if ( (nRequestYear >= 1954) && (nRequestYear <= 1989) )
@@ -655,7 +655,7 @@ IMPL_LINK( MyCalendar, RequestDateInfoHdl, Calendar*, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( MyCalendar, DoubleClickHdl, Calendar*, EMPTYARG )
+IMPL_LINK_NOARG(MyCalendar, DoubleClickHdl)
 {
     Date aDate = aCalendar.GetCurDate();
     String aStr( RTL_CONSTASCII_USTRINGPARAM( "Info: " ) );