New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problem

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

25 files changed, 115 insertions, 115 deletions

diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index cd9b273a16bc..21ab29cf5684 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -648,7 +648,7 @@ String SpellDialog::getReplacementString() const
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SpellDialog, ChangeHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SpellDialog, ChangeHdl)
 {
     if(aSentenceED.IsUndoEditMode())
     {
@@ -670,7 +670,7 @@ IMPL_LINK( SpellDialog, ChangeHdl, Button *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SpellDialog, ChangeAllHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SpellDialog, ChangeAllHdl)
 {
     aSentenceED.UndoActionStart( SPELLUNDO_CHANGE_GROUP );
     String aString = getReplacementString();
@@ -746,7 +746,7 @@ IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton )
 }
 
 //-----------------------------------------------------------------------
-IMPL_LINK( SpellDialog, UndoHdl, Button*, EMPTYARG )
+IMPL_LINK_NOARG(SpellDialog, UndoHdl)
 {
     aSentenceED.Undo();
     if(!aSentenceED.GetUndoActionCount())
@@ -814,7 +814,7 @@ void SpellDialog::Impl_Restore()
     aIgnorePB.SetText(aIgnoreOnceST);
 }
 
-IMPL_LINK( SpellDialog, IgnoreHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SpellDialog, IgnoreHdl)
 {
     if(aIgnorePB.GetText() == aResumeST)
     {
@@ -1086,7 +1086,7 @@ IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd)
 };
 
 //-----------------------------------------------------------------------
-IMPL_LINK(SpellDialog, CancelHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SpellDialog, CancelHdl)
 {
     //apply changes and ignored text parts first - if there are any
     rParent.ApplyChangedSentence(aSentenceED.CreateSpellPortions(true), false);
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 60772e9e24d3..b39b7381b396 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1425,7 +1425,7 @@ IMPL_LINK( ColorPickerDialog, ColorModifyHdl, void *, p )
 
 // --------------------------------------------------------------------
 
-IMPL_LINK( ColorPickerDialog, ModeModifyHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(ColorPickerDialog, ModeModifyHdl)
 {
     ColorMode eMode = HUE;
 
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 612f476d4ca2..2db6e32757e9 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -371,7 +371,7 @@ void SvxCharMapData::SetCharFont( const Font& rFont )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxCharMapData, OKHdl, OKButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxCharMapData, OKHdl)
 {
     String aStr = aShowText.GetText();
 
@@ -388,7 +388,7 @@ IMPL_LINK( SvxCharMapData, OKHdl, OKButton *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxCharMapData, FontSelectHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SvxCharMapData, FontSelectHdl)
 {
     sal_uInt16 nPos = aFontLB.GetSelectEntryPos(),
         nFont = (sal_uInt16)(sal_uLong)aFontLB.GetEntryData( nPos );
@@ -450,7 +450,7 @@ IMPL_LINK( SvxCharMapData, FontSelectHdl, ListBox *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxCharMapData, SubsetSelectHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SvxCharMapData, SubsetSelectHdl)
 {
     sal_uInt16 nPos = aSubsetLB.GetSelectEntryPos();
     const Subset* pSubset = reinterpret_cast<const Subset*> (aSubsetLB.GetEntryData(nPos));
@@ -465,7 +465,7 @@ IMPL_LINK( SvxCharMapData, SubsetSelectHdl, ListBox *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxCharMapData, CharDoubleClickHdl, Control *, EMPTYARG )
+IMPL_LINK_NOARG(SvxCharMapData, CharDoubleClickHdl)
 {
     mpDialog->EndDialog( sal_True );
     return 0;
@@ -473,7 +473,7 @@ IMPL_LINK( SvxCharMapData, CharDoubleClickHdl, Control *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxCharMapData, CharSelectHdl, Control *, EMPTYARG )
+IMPL_LINK_NOARG(SvxCharMapData, CharSelectHdl)
 {
     if ( !bOne )
     {
@@ -496,7 +496,7 @@ IMPL_LINK( SvxCharMapData, CharSelectHdl, Control *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxCharMapData, CharHighlightHdl, Control *, EMPTYARG )
+IMPL_LINK_NOARG(SvxCharMapData, CharHighlightHdl)
 {
     String aText;
     sal_UCS4 cChar = aShowSet.GetSelectCharacter();
@@ -535,7 +535,7 @@ IMPL_LINK( SvxCharMapData, CharHighlightHdl, Control *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxCharMapData, CharPreSelectHdl, Control *, EMPTYARG )
+IMPL_LINK_NOARG(SvxCharMapData, CharPreSelectHdl)
 {
     // adjust subset selection
     if( pSubsetMap )
@@ -552,7 +552,7 @@ IMPL_LINK( SvxCharMapData, CharPreSelectHdl, Control *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxCharMapData, DeleteHdl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxCharMapData, DeleteHdl)
 {
     aShowText.SetText( String() );
     aOKBtn.Disable();
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index ac5fd9e824c3..2d28672ad525 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -342,7 +342,7 @@ IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton)
 }
 
 //------------------------------------------------------------------------
-IMPL_LINK(FmSearchDialog, OnClickedSearchAgain, Button*, EMPTYARG)
+IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain)
 {
     if (m_pbClose.IsEnabled())
     {   // der Button hat die Funktion 'Suchen'
@@ -436,7 +436,7 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton )
 }
 
 //------------------------------------------------------------------------
-IMPL_LINK(FmSearchDialog, OnSearchTextModified, ComboBox*, EMPTYARG)
+IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified)
 {
     if ((m_cmbSearchText.GetText().Len() != 0) || !m_rbSearchForText.IsChecked())
         m_pbSearchAgain.Enable();
@@ -739,7 +739,7 @@ void FmSearchDialog::EnableControlPaint(sal_Bool bEnable)
 }
 
 //------------------------------------------------------------------------
-IMPL_LINK(FmSearchDialog, OnDelayedPaint, void*, EMPTYARG)
+IMPL_LINK_NOARG(FmSearchDialog, OnDelayedPaint)
 {
     EnableControlPaint(sal_True);
     return 0L;
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 3cfb82d8ef65..49b210657ff7 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -245,7 +245,7 @@ void SearchProgress::Terminate()
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( SearchProgress, ClickCancelBtn, void*, EMPTYARG )
+IMPL_LINK_NOARG(SearchProgress, ClickCancelBtn)
 {
     Terminate();
     return 0L;
@@ -253,7 +253,7 @@ IMPL_LINK( SearchProgress, ClickCancelBtn, void*, EMPTYARG )
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( SearchProgress, CleanUpHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SearchProgress, CleanUpHdl)
 {
     EndDialog( RET_OK );
     delete this;
@@ -380,7 +380,7 @@ void TakeProgress::Terminate()
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TakeProgress, ClickCancelBtn, void*, EMPTYARG )
+IMPL_LINK_NOARG(TakeProgress, ClickCancelBtn)
 {
     Terminate();
     return 0L;
@@ -388,7 +388,7 @@ IMPL_LINK( TakeProgress, ClickCancelBtn, void*, EMPTYARG )
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TakeProgress, CleanUpHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(TakeProgress, CleanUpHdl)
 {
     TPGalleryThemeProperties*   mpBrowser = (TPGalleryThemeProperties*) GetParent();
     ::std::vector<bool, std::allocator<bool> >           aRemoveEntries( mpBrowser->aFoundList.size(), false );
@@ -497,7 +497,7 @@ short ActualizeProgress::Execute()
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( ActualizeProgress, ClickCancelBtn, void*, EMPTYARG )
+IMPL_LINK_NOARG(ActualizeProgress, ClickCancelBtn)
 {
     pTheme->AbortActualize();
     EndDialog( RET_OK );
@@ -584,7 +584,7 @@ GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) :
 
 // -----------------------------------------------------------------------------
 
-IMPL_LINK( GalleryIdDialog, ClickOkHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl)
 {
     Gallery*    pGal = pThm->GetParent();
     const sal_uLong nId = GetId();
@@ -1015,7 +1015,7 @@ void TPGalleryThemeProperties::FillFilterList()
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TPGalleryThemeProperties, SelectFileTypeHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFileTypeHdl)
 {
     String aText( aCbbFileType.GetText() );
 
@@ -1051,7 +1051,7 @@ void TPGalleryThemeProperties::SearchFiles()
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl)
 {
     if( bInputAllowed )
     {
@@ -1114,7 +1114,7 @@ void TPGalleryThemeProperties::TakeFiles()
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TPGalleryThemeProperties, ClickPreviewHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickPreviewHdl)
 {
     if ( bInputAllowed )
     {
@@ -1165,7 +1165,7 @@ void TPGalleryThemeProperties::DoPreview()
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TPGalleryThemeProperties, ClickTakeHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl)
 {
     if( bInputAllowed )
     {
@@ -1192,7 +1192,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickTakeHdl, void*, EMPTYARG )
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TPGalleryThemeProperties, ClickTakeAllHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeAllHdl)
 {
     if( bInputAllowed )
     {
@@ -1206,7 +1206,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickTakeAllHdl, void *, EMPTYARG )
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TPGalleryThemeProperties, SelectFoundHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl)
 {
     if( bInputAllowed )
     {
@@ -1239,7 +1239,7 @@ IMPL_LINK( TPGalleryThemeProperties, SelectFoundHdl, void *, EMPTYARG )
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TPGalleryThemeProperties, DClickFoundHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(TPGalleryThemeProperties, DClickFoundHdl)
 {
     if( bInputAllowed )
     {
@@ -1254,7 +1254,7 @@ IMPL_LINK( TPGalleryThemeProperties, DClickFoundHdl, void *, EMPTYARG )
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TPGalleryThemeProperties, PreviewTimerHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(TPGalleryThemeProperties, PreviewTimerHdl)
 {
     aPreviewTimer.Stop();
     DoPreview();
@@ -1263,7 +1263,7 @@ IMPL_LINK( TPGalleryThemeProperties, PreviewTimerHdl, void *, EMPTYARG )
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TPGalleryThemeProperties, EndSearchProgressHdl, SearchProgress *, EMPTYARG )
+IMPL_LINK_NOARG(TPGalleryThemeProperties, EndSearchProgressHdl)
 {
   if( !aFoundList.empty() )
   {
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 2e8caee8b188..21ccf63117b3 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -144,7 +144,7 @@ GraphicFilterDialog::~GraphicFilterDialog()
 
 // -----------------------------------------------------------------------------
 
-IMPL_LINK( GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(GraphicFilterDialog, ImplPreviewTimeoutHdl)
 {
     maTimer.Stop();
     maPreview.SetGraphic( GetFilteredGraphic( maGraphic, mfScaleX, mfScaleY ) );
@@ -154,7 +154,7 @@ IMPL_LINK( GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer*, EMPTYARG )
 
 // -----------------------------------------------------------------------------
 
-IMPL_LINK( GraphicFilterDialog, ImplModifyHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl)
 {
     if( maGraphic.GetType() == GRAPHIC_BITMAP )
     {
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 1b44a8dbf54a..1b5e92fa196f 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -233,7 +233,7 @@ void SvxHpLinkDlg::Move()
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHpLinkDlg, ClickApplyHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl)
 {
     SfxItemSet aItemSet( SFX_APP()->GetPool(), SID_HYPERLINK_GETLINK,
                          SID_HYPERLINK_SETLINK );
@@ -265,7 +265,7 @@ IMPL_LINK ( SvxHpLinkDlg, ClickApplyHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHpLinkDlg, ClickCloseHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHpLinkDlg, ClickCloseHdl_Impl)
 {
     Close();
 
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index ae0beaa3623d..7239b4a8d695 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -75,7 +75,7 @@ SvxNameDialog::SvxNameDialog( Window* pWindow, const String& rName, const String
     }
 }
 
-IMPL_LINK(SvxNameDialog, ModifyHdl, Edit*, EMPTYARG)
+IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl)
 {
     if(aCheckNameHdl.IsSet())
         aBtnOK.Enable(aCheckNameHdl.Call(this) > 0);
@@ -109,7 +109,7 @@ SvxObjectNameDialog::SvxObjectNameDialog(
     aEdtName.SetModifyHdl(LINK(this, SvxObjectNameDialog, ModifyHdl));
 }
 
-IMPL_LINK(SvxObjectNameDialog, ModifyHdl, Edit*, EMPTYARG)
+IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl)
 {
     if(aCheckNameHdl.IsSet())
     {
@@ -190,21 +190,21 @@ SvxMessDialog::~SvxMessDialog()
 
 /*************************************************************************/
 
-IMPL_LINK_INLINE_START( SvxMessDialog, Button1Hdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SvxMessDialog, Button1Hdl)
 {
     EndDialog( RET_BTN_1 );
     return 0;
 }
-IMPL_LINK_INLINE_END( SvxMessDialog, Button1Hdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(SvxMessDialog, Button1Hdl)
 
 /*************************************************************************/
 
-IMPL_LINK_INLINE_START( SvxMessDialog, Button2Hdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SvxMessDialog, Button2Hdl)
 {
     EndDialog( RET_BTN_2 );
     return 0;
 }
-IMPL_LINK_INLINE_END( SvxMessDialog, Button2Hdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(SvxMessDialog, Button2Hdl)
 
 /*************************************************************************/
 
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index e5186492c42f..93705c65d19a 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -698,7 +698,7 @@ namespace svx
     }
 
     //-------------------------------------------------------------------------
-    IMPL_LINK( HangulHanjaConversionDialog, OnSuggestionSelected, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnSuggestionSelected)
     {
         m_pPlayground->GetWordInputControl().SetText( m_aSuggestions.GetSelectEntry() );
         OnSuggestionModified( NULL );
@@ -706,7 +706,7 @@ namespace svx
     }
 
     //-------------------------------------------------------------------------
-    IMPL_LINK( HangulHanjaConversionDialog, OnSuggestionModified, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnSuggestionModified)
     {
         m_aFind.Enable( m_pPlayground->GetWordInputControl().GetSavedValue() != m_pPlayground->GetWordInputControl().GetText() );
 
@@ -748,13 +748,13 @@ namespace svx
     }
 
     //-------------------------------------------------------------------------
-    IMPL_LINK( HangulHanjaConversionDialog, OnClose, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnClose)
     {
         Close();
         return 0L;
     }
 
-    IMPL_LINK( HangulHanjaConversionDialog, OnOption, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnOption)
     {
         HangulHanjaOptionsDialog        aOptDlg( this );
         aOptDlg.Execute();
@@ -980,7 +980,7 @@ namespace svx
         }
     }
 
-    IMPL_LINK( HangulHanjaOptionsDialog, OkHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaOptionsDialog, OkHdl)
     {
         sal_uInt32              nCnt = m_aDictList.size();
         sal_uInt32              n = 0;
@@ -1034,7 +1034,7 @@ namespace svx
         return 0;
     }
 
-    IMPL_LINK( HangulHanjaOptionsDialog, DictsLB_SelectHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DictsLB_SelectHdl)
     {
         bool    bSel = m_aDictsLB.FirstSelected() != NULL;
 
@@ -1044,7 +1044,7 @@ namespace svx
         return 0;
     }
 
-    IMPL_LINK( HangulHanjaOptionsDialog, NewDictHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaOptionsDialog, NewDictHdl)
     {
         String                      aName;
         HangulHanjaNewDictDialog    aNewDlg( this );
@@ -1077,7 +1077,7 @@ namespace svx
         return 0L;
     }
 
-    IMPL_LINK( HangulHanjaOptionsDialog, EditDictHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaOptionsDialog, EditDictHdl)
     {
         SvLBoxEntry*    pEntry = m_aDictsLB.FirstSelected();
         DBG_ASSERT( pEntry, "+HangulHanjaEditDictDialog::EditDictHdl(): call of edit should not be possible with no selection!" );
@@ -1089,7 +1089,7 @@ namespace svx
         return 0L;
     }
 
-    IMPL_LINK( HangulHanjaOptionsDialog, DeleteDictHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DeleteDictHdl)
     {
         sal_uInt16 nSelPos = m_aDictsLB.GetSelectEntryPos();
         if( nSelPos != LISTBOX_ENTRY_NOTFOUND )
@@ -1199,7 +1199,7 @@ namespace svx
     //=========================================================================
     //-------------------------------------------------------------------------
 
-    IMPL_LINK( HangulHanjaNewDictDialog, OKHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaNewDictDialog, OKHdl)
     {
         String  aName( m_aDictNameED.GetText() );
 
@@ -1212,7 +1212,7 @@ namespace svx
         return 0;
     }
 
-    IMPL_LINK( HangulHanjaNewDictDialog, ModifyHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaNewDictDialog, ModifyHdl)
     {
         String  aName( m_aDictNameED.GetText() );
 
@@ -1538,14 +1538,14 @@ namespace svx
     }
 
 
-    IMPL_LINK( HangulHanjaEditDictDialog, ScrollHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaEditDictDialog, ScrollHdl)
     {
         UpdateScrollbar();
 
         return 0;
     }
 
-    IMPL_LINK( HangulHanjaEditDictDialog, OriginalModifyHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaEditDictDialog, OriginalModifyHdl)
     {
         m_bModifiedOriginal = true;
         m_aOriginal = m_aOriginalLB.GetText();
@@ -1581,13 +1581,13 @@ namespace svx
         return 0;
     }
 
-    IMPL_LINK( HangulHanjaEditDictDialog, BookLBSelectHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaEditDictDialog, BookLBSelectHdl)
     {
         InitEditDictDialog( m_aBookLB.GetSelectEntryPos() );
         return 0;
     }
 
-    IMPL_LINK( HangulHanjaEditDictDialog, NewPBPushHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaEditDictDialog, NewPBPushHdl)
     {
         DBG_ASSERT( m_pSuggestions, "-HangulHanjaEditDictDialog::NewPBPushHdl(): no suggestions... search in hell..." );
         Reference< XConversionDictionary >  xDict = m_rDictList[ m_nCurrentDict ];
@@ -1656,7 +1656,7 @@ namespace svx
         return bRemovedSomething;
     }
 
-    IMPL_LINK( HangulHanjaEditDictDialog, DeletePBPushHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaEditDictDialog, DeletePBPushHdl)
     {
         if( DeleteEntryFromDictionary( m_aOriginal, m_rDictList[ m_nCurrentDict ] ) )
         {
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index cca1fa813af8..3531a203b230 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -414,7 +414,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkNewDocTp, ClickNewHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl)
 {
     rtl::OUString                       aService( RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_SERVICE_NAME ) );
     uno::Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 63d96e8a0b75..57b665fb2aba 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -203,7 +203,7 @@ void SvxHyperlinkDocTp::SetInitFocus()
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkDocTp, ClickFileopenHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl)
 {
     // Open Fileopen-Dialog
        ::sfx2::FileDialogHelper aDlg(
@@ -242,7 +242,7 @@ IMPL_LINK ( SvxHyperlinkDocTp, ClickFileopenHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkDocTp, ClickTargetHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickTargetHdl_Impl)
 {
     if ( GetPathType ( maStrURL ) == Type_ExistsFile  ||
          maStrURL == aEmptyStr                        ||
@@ -274,7 +274,7 @@ IMPL_LINK ( SvxHyperlinkDocTp, ClickTargetHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkDocTp, ModifiedPathHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedPathHdl_Impl)
 {
     maStrURL = GetCurrentURL();
 
@@ -292,7 +292,7 @@ IMPL_LINK ( SvxHyperlinkDocTp, ModifiedPathHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkDocTp, TimeoutHdl_Impl)
 {
     if ( IsMarkWndVisible() && ( GetPathType( maStrURL )==Type_ExistsFile ||
                                   maStrURL == aEmptyStr                   ||
@@ -317,7 +317,7 @@ IMPL_LINK ( SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkDocTp, ModifiedTargetHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedTargetHdl_Impl)
 {
     maStrURL = GetCurrentURL();
 
@@ -335,7 +335,7 @@ IMPL_LINK ( SvxHyperlinkDocTp, ModifiedTargetHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkDocTp, LostFocusPathHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkDocTp, LostFocusPathHdl_Impl)
 {
     maStrURL = GetCurrentURL();
 
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 68cc9b407294..ec74b25a0bf2 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -238,7 +238,7 @@ void SvxHyperlinkInternetTp::SetInitFocus()
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl)
 {
     String aScheme = GetSchemeFromURL( maCbbTarget.GetText() );
     if(aScheme.Len()!=0)
@@ -257,7 +257,7 @@ IMPL_LINK ( SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkInternetTp, TimeoutHdl_Impl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkInternetTp, TimeoutHdl_Impl)
 {
     RefreshMarkWindow();
     return( 0L );
@@ -269,7 +269,7 @@ IMPL_LINK ( SvxHyperlinkInternetTp, TimeoutHdl_Impl, Timer *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl)
 {
     String aStrLogin ( maEdLogin.GetText() );
     if ( aStrLogin.EqualsIgnoreCaseAscii( sAnonymous ) )
@@ -366,7 +366,7 @@ INetProtocol SvxHyperlinkInternetTp::GetSmartProtocolFromButtons() const
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkInternetTp, Click_SmartProtocol_Impl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl)
 {
     String aScheme = GetSchemeFromButtons();
     SetScheme( aScheme );
@@ -379,7 +379,7 @@ IMPL_LINK ( SvxHyperlinkInternetTp, Click_SmartProtocol_Impl, void*, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl)
 {
     // disable login-editfields if checked
     if ( maCbAnonymous.IsChecked() )
@@ -409,7 +409,7 @@ IMPL_LINK ( SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl)
 {
     RefreshMarkWindow();
     return (0L);
@@ -421,7 +421,7 @@ IMPL_LINK ( SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkInternetTp, ClickBrowseHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl)
 {
     /////////////////////////////////////////////////
     // Open URL if available
@@ -448,7 +448,7 @@ IMPL_LINK ( SvxHyperlinkInternetTp, ClickBrowseHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkInternetTp, ClickTargetHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickTargetHdl_Impl)
 {
     RefreshMarkWindow();
     ShowMarkWnd ();
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index bc1ab0b41c61..0f84219c976e 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -271,7 +271,7 @@ INetProtocol SvxHyperlinkMailTp::GetSmartProtocolFromButtons() const
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkMailTp, Click_SmartProtocol_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkMailTp, Click_SmartProtocol_Impl)
 {
     String aScheme = GetSchemeFromButtons();
     SetScheme( aScheme );
@@ -284,7 +284,7 @@ IMPL_LINK ( SvxHyperlinkMailTp, Click_SmartProtocol_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl)
 {
     String aScheme = GetSchemeFromURL( maCbbReceiver.GetText() );
     if(aScheme.Len()!=0)
@@ -299,7 +299,7 @@ IMPL_LINK ( SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl)
 {
     SfxViewFrame* pViewFrame = SfxViewFrame::Current();
     if( pViewFrame )
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 0e2bdc053456..04e90b5a5b10 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -486,7 +486,7 @@ void SvxHlinkDlgMarkWnd::SelectEntry ( String aStrMark )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl)
 {
     SvLBoxEntry* pEntry = maLbTree.GetCurEntry();
 
@@ -510,7 +510,7 @@ IMPL_LINK ( SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl)
 {
     Close();
 
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 4b6fd2cb03e5..33533a11c449 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -427,7 +427,7 @@ SfxDispatcher* SvxHyperlinkTabPageBase::GetDispatcher() const
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl)
 {
     SvxHyperlinkItem *pHyperlinkItem = (SvxHyperlinkItem *)
                                        GetItemSet().GetItem (SID_HYPERLINK_GETLINK);
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index da10e8331038..35c1fd11fd3f 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -135,14 +135,14 @@ struct SvxHyphenWordDialog_Impl
     void            SelLeft_Impl();
     void            SelRight_Impl();
 
-    DECL_LINK( Left_Impl, Button* );
-    DECL_LINK( Right_Impl, Button* );
-    DECL_LINK( CutHdl_Impl, Button* );
-    DECL_LINK( ContinueHdl_Impl, Button* );
-    DECL_LINK( DeleteHdl_Impl, Button* );
+    DECL_LINK(Left_Impl, void *);
+    DECL_LINK(Right_Impl, void *);
+    DECL_LINK(CutHdl_Impl, void *);
+    DECL_LINK(ContinueHdl_Impl, void *);
+    DECL_LINK(DeleteHdl_Impl, void *);
     DECL_LINK( HyphenateAllHdl_Impl, Button* );
-    DECL_LINK( CancelHdl_Impl, Button* );
-    DECL_LINK( GetFocusHdl_Impl, Edit* );
+    DECL_LINK(CancelHdl_Impl, void *);
+    DECL_LINK(GetFocusHdl_Impl, void *);
 
 
     SvxHyphenWordDialog_Impl(
@@ -489,7 +489,7 @@ void SvxHyphenWordDialog_Impl::SelRight_Impl()
 }
 
 
-IMPL_LINK( SvxHyphenWordDialog_Impl, CutHdl_Impl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, CutHdl_Impl)
 {
     if( !bBusy )
     {
@@ -531,7 +531,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, HyphenateAllHdl_Impl, Button *, EMPTYARG /*
 }
 
 
-IMPL_LINK( SvxHyphenWordDialog_Impl, DeleteHdl_Impl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, DeleteHdl_Impl)
 {
     if( !bBusy )
     {
@@ -543,7 +543,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, DeleteHdl_Impl, Button *, EMPTYARG )
 }
 
 
-IMPL_LINK( SvxHyphenWordDialog_Impl, ContinueHdl_Impl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, ContinueHdl_Impl)
 {
     if( !bBusy )
     {
@@ -555,7 +555,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, ContinueHdl_Impl, Button *, EMPTYARG )
 }
 
 
-IMPL_LINK( SvxHyphenWordDialog_Impl, CancelHdl_Impl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, CancelHdl_Impl)
 {
     if( !bBusy )
     {
@@ -568,7 +568,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, CancelHdl_Impl, Button *, EMPTYARG )
 }
 
 
-IMPL_LINK( SvxHyphenWordDialog_Impl, Left_Impl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, Left_Impl)
 {
     if( !bBusy )
     {
@@ -580,7 +580,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, Left_Impl, Button *, EMPTYARG )
 }
 
 
-IMPL_LINK( SvxHyphenWordDialog_Impl, Right_Impl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, Right_Impl)
 {
     if( !bBusy )
     {
@@ -592,7 +592,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, Right_Impl, Button *, EMPTYARG )
 }
 
 
-IMPL_LINK( SvxHyphenWordDialog_Impl, GetFocusHdl_Impl, Edit *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, GetFocusHdl_Impl)
 {
     aWordEdit.SetSelection( Selection( nOldPos, nOldPos + 1 ) );
     return 0;
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 6774c98f7e9e..db3fe8b055cd 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -638,7 +638,7 @@ void IconChoiceDialog::SetPosSizePages ( sal_uInt16 nId )
 |
 \**********************************************************************/
 
-IMPL_LINK ( IconChoiceDialog , ChosePageHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(IconChoiceDialog , ChosePageHdl_Impl)
 {
     sal_uLong nPos;
 
@@ -669,7 +669,7 @@ IMPL_LINK ( IconChoiceDialog , ChosePageHdl_Impl, void *, EMPTYARG )
 |
 \**********************************************************************/
 
-IMPL_LINK( IconChoiceDialog, OkHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(IconChoiceDialog, OkHdl)
 {
     bInOK = sal_True;
 
@@ -688,7 +688,7 @@ IMPL_LINK( IconChoiceDialog, OkHdl, Button *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( IconChoiceDialog, ResetHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(IconChoiceDialog, ResetHdl)
 {
     ResetPageImpl ();
 
@@ -710,7 +710,7 @@ IMPL_LINK( IconChoiceDialog, ResetHdl, Button *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( IconChoiceDialog, CancelHdl, Button*, EMPTYARG )
+IMPL_LINK_NOARG(IconChoiceDialog, CancelHdl)
 {
     Close();
 
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 2ff622ba546d..c85443fa7cef 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -110,7 +110,7 @@ InsertObjectDialog_Impl::InsertObjectDialog_Impl( Window * pParent, const ResId
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK_INLINE_START( SvInsertOleDlg, DoubleClickHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SvInsertOleDlg, DoubleClickHdl)
 {
     EndDialog( RET_OK );
     return 0;
@@ -119,7 +119,7 @@ IMPL_LINK_INLINE_END( SvInsertOleDlg, DoubleClickHdl, ListBox *, pListBox )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvInsertOleDlg, BrowseHdl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl)
 {
     Reference< XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
     if( xFactory.is() )
@@ -162,7 +162,7 @@ IMPL_LINK( SvInsertOleDlg, BrowseHdl, PushButton *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvInsertOleDlg, RadioHdl, RadioButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvInsertOleDlg, RadioHdl)
 {
     if ( aRbNewObject.IsChecked() )
     {
@@ -396,7 +396,7 @@ uno::Reference< io::XInputStream > SvInsertOleDlg::GetIconIfIconified( ::rtl::OU
     return uno::Reference< io::XInputStream >();
 }
 
-IMPL_LINK( SvInsertPlugInDialog, BrowseHdl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvInsertPlugInDialog, BrowseHdl)
 {
     Sequence< OUString > aFilterNames, aFilterTypes;
     void fillNetscapePluginFilters( Sequence< OUString >& rNames, Sequence< OUString >& rTypes );
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 42b9080715e9..e6d4e5ef8630 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -259,7 +259,7 @@ IMPL_LINK_INLINE_START( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioBut
 }
 IMPL_LINK_INLINE_END( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioButton )
 
-IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl)
 {
     SvTabListBox& rListBox = Links();
     sal_uInt16 nSelCnt = (sal_uInt16)rListBox.GetSelectionCount();
diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx
index cc76430f7da0..6de3daa5cd0f 100644
--- a/cui/source/dialogs/multifil.cxx
+++ b/cui/source/dialogs/multifil.cxx
@@ -142,7 +142,7 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxMultiFileDialog, DelHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxMultiFileDialog, DelHdl_Impl)
 {
     sal_uInt16 nPos = aPathLB.GetSelectEntryPos();
     aPathLB.RemoveEntry( nPos );
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 1f052682c75d..eee534e6d8b9 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -63,7 +63,7 @@ struct MultiPath_Impl
 
 // class SvxMultiPathDialog ----------------------------------------------
 
-IMPL_LINK( SvxMultiPathDialog, SelectHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxMultiPathDialog, SelectHdl_Impl)
 {
     sal_uLong nCount = pImpl->bIsRadioButtonMode ? aRadioLB.GetEntryCount() : aPathLB.GetEntryCount();
     bool bIsSelected = pImpl->bIsRadioButtonMode
@@ -87,7 +87,7 @@ IMPL_LINK( SvxMultiPathDialog, CheckHdl_Impl, svx::SvxRadioButtonListBox *, pBox
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxMultiPathDialog, AddHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl)
 {
     rtl::OUString aService( RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_SERVICE_NAME ) );
     Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
@@ -140,7 +140,7 @@ IMPL_LINK( SvxMultiPathDialog, AddHdl_Impl, PushButton *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxMultiPathDialog, DelHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxMultiPathDialog, DelHdl_Impl)
 {
     if ( pImpl->bIsRadioButtonMode )
     {
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 0bb2a3e91743..329d8765325a 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -199,25 +199,25 @@ void SvxPostItDialog::EnableTravel(sal_Bool bNext, sal_Bool bPrev)
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK_INLINE_START( SvxPostItDialog, PrevHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SvxPostItDialog, PrevHdl)
 {
     aPrevHdlLink.Call( this );
     return 0;
 }
-IMPL_LINK_INLINE_END( SvxPostItDialog, PrevHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(SvxPostItDialog, PrevHdl)
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK_INLINE_START( SvxPostItDialog, NextHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SvxPostItDialog, NextHdl)
 {
     aNextHdlLink.Call( this );
     return 0;
 }
-IMPL_LINK_INLINE_END( SvxPostItDialog, NextHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(SvxPostItDialog, NextHdl)
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxPostItDialog, Stamp, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxPostItDialog, Stamp)
 {
     Date aDate( Date::SYSTEM );
     Time aTime( Time::SYSTEM );
@@ -247,7 +247,7 @@ IMPL_LINK( SvxPostItDialog, Stamp, Button *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxPostItDialog, OKHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxPostItDialog, OKHdl)
 {
     LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
     pOutSet = new SfxItemSet( rSet );
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index f5b9affb4d80..41152a3ccc85 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -65,7 +65,7 @@ FmShowColsDialog::~FmShowColsDialog()
 }
 
 //--------------------------------------------------------------------------
-IMPL_LINK( FmShowColsDialog, OnClickedOk, Button*, EMPTYARG )
+IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk)
 {
     DBG_ASSERT(m_xColumns.is(), "FmShowColsDialog::OnClickedOk : you should call SetColumns before executing the dialog !");
     if (m_xColumns.is())
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 2013e6917162..531c3357825a 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -203,7 +203,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent,
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxSearchAttributeDialog, OKHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl)
 {
     SearchAttrItem aInvalidItem;
     aInvalidItem.pItem = (SfxPoolItem*)-1;
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index fbaecd0ec75b..2fd600c84f9b 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -344,7 +344,7 @@ IMPL_LINK( SvxZoomDialog, UserHdl, RadioButton *, pBtn )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxZoomDialog, SpinHdl, MetricField *, EMPTYARG )
+IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl)
 {
     if ( !aUserBtn.IsChecked() )
         return 0;