New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problem

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

27 files changed, 93 insertions, 93 deletions

diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 717d58975675..a17d4f88f4e2 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -283,7 +283,7 @@ void DbRegistrationOptionsPage::FillUserData()
 }
 // -----------------------------------------------------------------------
 
-IMPL_LINK( DbRegistrationOptionsPage, DeleteHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl)
 {
     SvLBoxEntry* pEntry = pPathBox->FirstSelected();
     if ( pEntry )
@@ -295,7 +295,7 @@ IMPL_LINK( DbRegistrationOptionsPage, DeleteHdl, void *, EMPTYARG )
     return 0;
 }
 // -----------------------------------------------------------------------
-IMPL_LINK( DbRegistrationOptionsPage, NewHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(DbRegistrationOptionsPage, NewHdl)
 {
     String sNewName,sNewLocation;
     openLinkDialog(sNewName,sNewLocation);
@@ -304,7 +304,7 @@ IMPL_LINK( DbRegistrationOptionsPage, NewHdl, void *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( DbRegistrationOptionsPage, EditHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(DbRegistrationOptionsPage, EditHdl)
 {
     SvLBoxEntry* pEntry = pPathBox->GetCurEntry();
     if ( !pEntry )
@@ -383,7 +383,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar )
 }
 // -----------------------------------------------------------------------
 
-IMPL_LINK( DbRegistrationOptionsPage, PathSelect_Impl, SvTabListBox *, EMPTYARG )
+IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathSelect_Impl)
 {
     SvLBoxEntry* pEntry = pPathBox->FirstSelected();
 
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index 529bc1a247e5..320385cbf13e 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -109,7 +109,7 @@ namespace svx
     }
 
     //------------------------------------------------------------------
-    IMPL_LINK( ODocumentLinkDialog, OnOk, void*, EMPTYARG )
+    IMPL_LINK_NOARG(ODocumentLinkDialog, OnOk)
     {
         // get the current URL
         ::rtl::OUString sURL = m_aURL.GetText();
@@ -167,7 +167,7 @@ namespace svx
     }
 
     //------------------------------------------------------------------
-    IMPL_LINK( ODocumentLinkDialog, OnBrowseFile, void*, EMPTYARG )
+    IMPL_LINK_NOARG(ODocumentLinkDialog, OnBrowseFile)
     {
         ::sfx2::FileDialogHelper aFileDlg(
                 ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0);
@@ -213,7 +213,7 @@ namespace svx
     }
 
     //------------------------------------------------------------------
-    IMPL_LINK( ODocumentLinkDialog, OnTextModified, Control*, EMPTYARG )
+    IMPL_LINK_NOARG(ODocumentLinkDialog, OnTextModified)
     {
         validate( );
         return 0L;
diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx
index 044fba2d37d4..3d8e668c79cd 100644
--- a/cui/source/options/doclinkdialog.hxx
+++ b/cui/source/options/doclinkdialog.hxx
@@ -77,7 +77,7 @@ namespace svx
         void    get(        String& _rName,         String& _rURL ) const;
 
     protected:
-        DECL_LINK( OnTextModified, Control* );
+        DECL_LINK(OnTextModified, void *);
         DECL_LINK( OnBrowseFile, void* );
         DECL_LINK( OnOk, void* );
 
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 28bcb7402cf3..035aa7fa0fad 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -317,7 +317,7 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet& )
     LanguageHdl(&aLanguageLB);
 }
 
-IMPL_LINK(SvxAsianLayoutPage, LanguageHdl, SvxLanguageBox*, EMPTYARG )
+IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl)
 {
     //set current value
     Locale aLocale;
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 9200d647cf31..da24c88a08e7 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -184,7 +184,7 @@ long SvxDefaultColorOptPage::GetColorIndex( const Color& rCol )
 // ResetToDefaults
 // ---------------
 
-IMPL_LINK( SvxDefaultColorOptPage, ResetToDefaults, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxDefaultColorOptPage, ResetToDefaults)
 {
     if( pColorConfig )
     {
@@ -204,7 +204,7 @@ IMPL_LINK( SvxDefaultColorOptPage, ResetToDefaults, void *, EMPTYARG )
 // AddChartColor
 // ------------
 
-IMPL_LINK( SvxDefaultColorOptPage, AddChartColor, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxDefaultColorOptPage, AddChartColor)
 {
     if( pColorConfig )
     {
@@ -274,7 +274,7 @@ IMPL_LINK( SvxDefaultColorOptPage, ListClickedHdl, ChartColorLB*, _pColorList )
     return 0L;
 }
 
-IMPL_LINK( SvxDefaultColorOptPage, BoxClickedHdl, ValueSet*, EMPTYARG )
+IMPL_LINK_NOARG(SvxDefaultColorOptPage, BoxClickedHdl)
 {
     sal_uInt16 nIdx = aLbChartColors.GetSelectEntryPos();
     if( nIdx != LISTBOX_ENTRY_NOTFOUND )
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 3d9bd772f657..f54c9b530d11 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -73,7 +73,7 @@ private:
     DECL_LINK( AddChartColor, void * );
     DECL_LINK( RemoveChartColor, PushButton * );
     DECL_LINK( ListClickedHdl, ChartColorLB * );
-    DECL_LINK( BoxClickedHdl, ValueSet * );
+    DECL_LINK(BoxClickedHdl, void *);
 
     void FillColorBox();
     long GetColorIndex( const Color& rCol );
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index d6e87b1ae310..ead33dd169cd 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -34,7 +34,7 @@
 
 // class SvxCTLOptionsPage -----------------------------------------------------
 
-IMPL_LINK( SvxCTLOptionsPage, SequenceCheckingCB_Hdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl)
 {
     sal_Bool bIsSequenceChecking = m_aSequenceCheckingCB.IsChecked();
     m_aRestrictedCB.Enable( bIsSequenceChecking );
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index d56ec090f1fc..d33fa83723a7 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -127,7 +127,7 @@ SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent,
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxNewDictionaryDialog, OKHdl_Impl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl)
 {
     String sDict = aNameEdit.GetText();
     sDict.EraseTrailingChars();
@@ -204,7 +204,7 @@ IMPL_LINK( SvxNewDictionaryDialog, OKHdl_Impl, Button *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK_INLINE_START( SvxNewDictionaryDialog, ModifyHdl_Impl, Edit *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SvxNewDictionaryDialog, ModifyHdl_Impl)
 {
     if ( aNameEdit.GetText().Len() )
         aOKBtn.Enable();
@@ -212,7 +212,7 @@ IMPL_LINK_INLINE_START( SvxNewDictionaryDialog, ModifyHdl_Impl, Edit *, EMPTYARG
         aOKBtn.Disable();
     return 0;
 }
-IMPL_LINK_INLINE_END( SvxNewDictionaryDialog, ModifyHdl_Impl, Edit *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(SvxNewDictionaryDialog, ModifyHdl_Impl)
 
 //==========================================================================
 //
@@ -425,7 +425,7 @@ void SvxEditDictionaryDialog::RemoveDictEntry(SvLBoxEntry* pEntry)
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectBookHdl_Impl)
 {
     sal_uInt16 nPos = aAllDictsLB.GetSelectEntryPos();
 
@@ -450,7 +450,7 @@ IMPL_LINK( SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl)
 {
     sal_uInt16 nDicPos = aAllDictsLB.GetSelectEntryPos();
     sal_uInt16 nLang = aLangLB.GetSelectLanguage();
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index b5f33837ae1f..1e612df6b53f 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -72,13 +72,13 @@ OfaMSFilterTabPage::~OfaMSFilterTabPage()
 {
 }
 
-IMPL_LINK( OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl, CheckBox*, EMPTYARG )
+IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl)
 {
     aWBasicWbctblCB.Enable( aWBasicCodeCB.IsChecked() );
     return 0;
 }
 
-IMPL_LINK( OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, CheckBox*, EMPTYARG )
+IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl)
 {
     aEBasicExectblCB.Enable( aEBasicCodeCB.IsChecked() );
     return 0;
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index aab983270fb6..83a6dfdd4b44 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -53,8 +53,8 @@ class OfaMSFilterTabPage : public SfxTabPage
     OfaMSFilterTabPage( Window* pParent, const SfxItemSet& rSet );
     virtual ~OfaMSFilterTabPage();
 
-    DECL_LINK( LoadWordBasicCheckHdl_Impl, CheckBox* );
-    DECL_LINK( LoadExcelBasicCheckHdl_Impl, CheckBox* );
+    DECL_LINK(LoadWordBasicCheckHdl_Impl, void *);
+    DECL_LINK(LoadExcelBasicCheckHdl_Impl, void *);
 public:
 
     static SfxTabPage*  Create( Window* pParent,
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index d3b92551819c..aacdd564aa4e 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -348,7 +348,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
 }
 
 #ifdef WNT
-IMPL_LINK( OfaMiscTabPage, OnFileDlgToggled, CheckBox*, EMPTYARG )
+IMPL_LINK_NOARG(OfaMiscTabPage, OnFileDlgToggled)
 {
     aODMADlgCB.Enable( !aFileDlgCB.IsChecked() );
     return 0;
@@ -543,7 +543,7 @@ IMPL_LINK( OfaMiscTabPage, TwoFigureConfigHdl, NumericField*, pEd )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( OfaMiscTabPage, HelpCheckHdl_Impl, CheckBox*, EMPTYARG )
+IMPL_LINK_NOARG(OfaMiscTabPage, HelpCheckHdl_Impl)
 {
     aExtHelpCB.Enable( aToolTipsCB.IsChecked() );
     aHelpAgentResetBtn.Enable( aHelpAgentCB.IsChecked() );
@@ -552,7 +552,7 @@ IMPL_LINK( OfaMiscTabPage, HelpCheckHdl_Impl, CheckBox*, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( OfaMiscTabPage, HelpAgentResetHdl_Impl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(OfaMiscTabPage, HelpAgentResetHdl_Impl)
 {
     SvtHelpOptions().resetAgentIgnoreURLCounter();
     return 0;
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index d875100a7236..cf69c7d2ee0b 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -77,8 +77,8 @@ private:
 
     DECL_LINK( TwoFigureHdl, NumericField* );
     DECL_LINK( TwoFigureConfigHdl, NumericField* );
-    DECL_LINK( HelpCheckHdl_Impl, CheckBox* );
-    DECL_LINK( HelpAgentResetHdl_Impl, PushButton* );
+    DECL_LINK(HelpCheckHdl_Impl, void *);
+    DECL_LINK(HelpAgentResetHdl_Impl, void *);
 #ifdef WNT
     DECL_LINK( OnFileDlgToggled, CheckBox* );
 #endif
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 9df47726e1ab..24d6a00a6108 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -691,7 +691,7 @@ SvxSecurityTabPage::~SvxSecurityTabPage()
     delete mpSecOptDlg;
 }
 
-IMPL_LINK( SvxSecurityTabPage, SecurityOptionsHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(SvxSecurityTabPage, SecurityOptionsHdl)
 {
     if ( !mpSecOptDlg )
         mpSecOptDlg = new svx::SecurityOptionsDialog( this, mpSecOptions );
@@ -699,7 +699,7 @@ IMPL_LINK( SvxSecurityTabPage, SecurityOptionsHdl, PushButton*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( SvxSecurityTabPage, SavePasswordHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl)
 {
     try
     {
@@ -756,7 +756,7 @@ IMPL_LINK( SvxSecurityTabPage, SavePasswordHdl, void*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( SvxSecurityTabPage, MasterPasswordHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordHdl)
 {
     try
     {
@@ -774,7 +774,7 @@ IMPL_LINK( SvxSecurityTabPage, MasterPasswordHdl, PushButton*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( SvxSecurityTabPage, MasterPasswordCBHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordCBHdl)
 {
     try
     {
@@ -820,7 +820,7 @@ IMPL_LINK( SvxSecurityTabPage, MasterPasswordCBHdl, void*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( SvxSecurityTabPage, ShowPasswordsHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(SvxSecurityTabPage, ShowPasswordsHdl)
 {
     try
     {
@@ -840,7 +840,7 @@ IMPL_LINK( SvxSecurityTabPage, ShowPasswordsHdl, PushButton*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( SvxSecurityTabPage, MacroSecPBHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SvxSecurityTabPage, MacroSecPBHdl)
 {
     try
     {
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index a7eefd6e72a1..05550057c71b 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -184,11 +184,11 @@ private:
 
     String              msPasswordStoringDeactivateStr;
 
-    DECL_LINK(          SecurityOptionsHdl, PushButton* );
+    DECL_LINK(SecurityOptionsHdl, void *);
     DECL_LINK(          SavePasswordHdl, void* );
-    DECL_LINK(          MasterPasswordHdl, PushButton* );
+    DECL_LINK(MasterPasswordHdl, void *);
     DECL_LINK(          MasterPasswordCBHdl, void* );
-    DECL_LINK(          ShowPasswordsHdl, PushButton* );
+    DECL_LINK(ShowPasswordsHdl, void *);
     DECL_LINK(          MacroSecPBHdl, void* );
 
     void                InitControls();
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 25d6b5a29cd6..0540511f2b19 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -196,7 +196,7 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage()
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxJavaOptionsPage, EnableHdl_Impl, CheckBox *, EMPTYARG )
+IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl)
 {
     sal_Bool bEnable = m_aJavaEnableCB.IsChecked();
     m_aJavaFoundLabel.Enable( bEnable );
@@ -223,7 +223,7 @@ IMPL_LINK( SvxJavaOptionsPage, CheckHdl_Impl, SvxSimpleTable *, pList )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxJavaOptionsPage, SelectHdl_Impl, SvxSimpleTable *, EMPTYARG )
+IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl)
 {
     // set installation directory info
     SvLBoxEntry* pEntry = m_aJavaList.FirstSelected();
@@ -239,7 +239,7 @@ IMPL_LINK( SvxJavaOptionsPage, SelectHdl_Impl, SvxSimpleTable *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxJavaOptionsPage, AddHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl)
 {
     try
     {
@@ -267,7 +267,7 @@ IMPL_LINK( SvxJavaOptionsPage, AddHdl_Impl, PushButton *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxJavaOptionsPage, ParameterHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl)
 {
     Sequence< ::rtl::OUString > aParameterList;
     if ( !m_pParamDlg )
@@ -315,7 +315,7 @@ IMPL_LINK( SvxJavaOptionsPage, ParameterHdl_Impl, PushButton *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxJavaOptionsPage, ClassPathHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl)
 {
     String sClassPath;
 
@@ -359,7 +359,7 @@ IMPL_LINK( SvxJavaOptionsPage, ClassPathHdl_Impl, PushButton *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxJavaOptionsPage, ResetHdl_Impl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(SvxJavaOptionsPage, ResetHdl_Impl)
 {
     LoadJREs();
     return 0;
@@ -367,7 +367,7 @@ IMPL_LINK( SvxJavaOptionsPage, ResetHdl_Impl, Timer *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxJavaOptionsPage, StartFolderPickerHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SvxJavaOptionsPage, StartFolderPickerHdl)
 {
     try
     {
@@ -745,7 +745,7 @@ SvxJavaParameterDlg::~SvxJavaParameterDlg()
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxJavaParameterDlg, ModifyHdl_Impl, Edit *, EMPTYARG )
+IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl)
 {
     String sParam = STRIM( m_aParameterEdit.GetText() );
     m_aAssignBtn.Enable( sParam.Len() > 0 );
@@ -755,7 +755,7 @@ IMPL_LINK( SvxJavaParameterDlg, ModifyHdl_Impl, Edit *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxJavaParameterDlg, AssignHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxJavaParameterDlg, AssignHdl_Impl)
 {
     String sParam = STRIM( m_aParameterEdit.GetText() );
     if ( sParam.Len() > 0 )
@@ -774,7 +774,7 @@ IMPL_LINK( SvxJavaParameterDlg, AssignHdl_Impl, PushButton *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxJavaParameterDlg, SelectHdl_Impl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SvxJavaParameterDlg, SelectHdl_Impl)
 {
     EnableRemoveButton();
     return 0;
@@ -782,7 +782,7 @@ IMPL_LINK( SvxJavaParameterDlg, SelectHdl_Impl, ListBox *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxJavaParameterDlg, DblClickHdl_Impl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SvxJavaParameterDlg, DblClickHdl_Impl)
 {
     sal_uInt16 nPos = m_aAssignedList.GetSelectEntryPos();
     if ( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -792,7 +792,7 @@ IMPL_LINK( SvxJavaParameterDlg, DblClickHdl_Impl, ListBox *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxJavaParameterDlg, RemoveHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxJavaParameterDlg, RemoveHdl_Impl)
 {
     sal_uInt16 nPos = m_aAssignedList.GetSelectEntryPos();
     if ( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -909,7 +909,7 @@ SvxJavaClassPathDlg::~SvxJavaClassPathDlg()
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxJavaClassPathDlg, AddArchiveHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl)
 {
     sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE, 0 );
     aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) );
@@ -946,7 +946,7 @@ IMPL_LINK( SvxJavaClassPathDlg, AddArchiveHdl_Impl, PushButton *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxJavaClassPathDlg, AddPathHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl)
 {
     rtl::OUString sService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FolderPicker" ) );
     Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
@@ -984,7 +984,7 @@ IMPL_LINK( SvxJavaClassPathDlg, AddPathHdl_Impl, PushButton *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxJavaClassPathDlg, RemoveHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxJavaClassPathDlg, RemoveHdl_Impl)
 {
     sal_uInt16 nPos = m_aPathList.GetSelectEntryPos();
     if ( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -1005,7 +1005,7 @@ IMPL_LINK( SvxJavaClassPathDlg, RemoveHdl_Impl, PushButton *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxJavaClassPathDlg, SelectHdl_Impl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SvxJavaClassPathDlg, SelectHdl_Impl)
 {
     EnableRemoveButton();
     return 0;
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 3bbfbb67d4e2..47df743d9293 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -82,13 +82,13 @@ private:
     ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener;
     ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker > xFolderPicker;
 
-    DECL_LINK(              EnableHdl_Impl, CheckBox * );
+    DECL_LINK(EnableHdl_Impl, void *);
     DECL_LINK(              CheckHdl_Impl, SvxSimpleTable * );
-    DECL_LINK(              SelectHdl_Impl, SvxSimpleTable * );
-    DECL_LINK(              AddHdl_Impl, PushButton * );
-    DECL_LINK(              ParameterHdl_Impl, PushButton * );
-    DECL_LINK(              ClassPathHdl_Impl, PushButton * );
-    DECL_LINK(              ResetHdl_Impl, Timer * );
+    DECL_LINK(SelectHdl_Impl, void *);
+    DECL_LINK(AddHdl_Impl, void *);
+    DECL_LINK(ParameterHdl_Impl, void *);
+    DECL_LINK(ClassPathHdl_Impl, void *);
+    DECL_LINK(ResetHdl_Impl, void *);
 
     DECL_LINK(              StartFolderPickerHdl, void * );
     DECL_LINK(              DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* );
@@ -130,11 +130,11 @@ private:
     CancelButton            m_aCancelBtn;
     HelpButton              m_aHelpBtn;
 
-    DECL_LINK(              ModifyHdl_Impl, Edit * );
-    DECL_LINK(              AssignHdl_Impl, PushButton * );
-    DECL_LINK(              SelectHdl_Impl, ListBox * );
-    DECL_LINK(              DblClickHdl_Impl, ListBox * );
-    DECL_LINK(              RemoveHdl_Impl, PushButton * );
+    DECL_LINK(ModifyHdl_Impl, void *);
+    DECL_LINK(AssignHdl_Impl, void *);
+    DECL_LINK(SelectHdl_Impl, void *);
+    DECL_LINK(DblClickHdl_Impl, void *);
+    DECL_LINK(RemoveHdl_Impl, void *);
 
     inline void             EnableRemoveButton()
                                 { m_aRemoveBtn.Enable(
@@ -170,10 +170,10 @@ private:
 
     String                  m_sOldPath;
 
-    DECL_LINK(              AddArchiveHdl_Impl, PushButton * );
-    DECL_LINK(              AddPathHdl_Impl, PushButton * );
-    DECL_LINK(              RemoveHdl_Impl, PushButton * );
-    DECL_LINK(              SelectHdl_Impl, ListBox * );
+    DECL_LINK(AddArchiveHdl_Impl, void *);
+    DECL_LINK(AddPathHdl_Impl, void *);
+    DECL_LINK(RemoveHdl_Impl, void *);
+    DECL_LINK(SelectHdl_Impl, void *);
 
     bool                    IsPathDuplicate( const String& _rPath );
     inline void             EnableRemoveButton()
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 3319c321ff00..034216a0fc81 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1623,7 +1623,7 @@ IMPL_LINK( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxLinguTabPage, PostDblClickHdl_Impl, SvTreeListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SvxLinguTabPage, PostDblClickHdl_Impl)
 {
     ClickHdl_Impl(&aLinguModulesEditPB);
     return 0;
@@ -1631,7 +1631,7 @@ IMPL_LINK( SvxLinguTabPage, PostDblClickHdl_Impl, SvTreeListBox *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxLinguTabPage, OpenURLHdl_Impl, svt::FixedHyperlink *, EMPTYARG )
+IMPL_LINK_NOARG(SvxLinguTabPage, OpenURLHdl_Impl)
 {
     ::rtl::OUString sURL( aMoreDictsLink.GetURL() );
     lcl_OpenURL( sURL );
@@ -2463,7 +2463,7 @@ IMPL_LINK( SvxEditModulesDlg, ClickHdl_Impl, PushButton *, pBtn )
     return 0;
 }
 
-IMPL_LINK( SvxEditModulesDlg, BackHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxEditModulesDlg, BackHdl_Impl)
 {
     rLinguData = *pDefaultLinguData;
     LangSelectHdl_Impl(0);
@@ -2472,7 +2472,7 @@ IMPL_LINK( SvxEditModulesDlg, BackHdl_Impl, PushButton *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxEditModulesDlg, OpenURLHdl_Impl, svt::FixedHyperlink *, EMPTYARG )
+IMPL_LINK_NOARG(SvxEditModulesDlg, OpenURLHdl_Impl)
 {
     ::rtl::OUString sURL( aMoreDictsLink.GetURL() );
     lcl_OpenURL( sURL );
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index ffe2a4dc17ab..ec1ca167a622 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -280,7 +280,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( OfaMemoryOptionsPage, GraphicCacheConfigHdl, NumericField*, EMPTYARG )
+IMPL_LINK_NOARG(OfaMemoryOptionsPage, GraphicCacheConfigHdl)
 {
     sal_Int32 n = GetNfGraphicCacheVal();
     SetNfGraphicObjectCacheMax( n );
diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx
index 1724b5e7505c..65b9a1431006 100644
--- a/cui/source/options/optmemory.hxx
+++ b/cui/source/options/optmemory.hxx
@@ -64,7 +64,7 @@ private:
     FixedLine           aQuickLaunchFL;
     CheckBox            aQuickLaunchCB;
 
-    DECL_LINK( GraphicCacheConfigHdl, NumericField* );
+    DECL_LINK(GraphicCacheConfigHdl, void *);
 
     sal_Int32 GetNfGraphicCacheVal() const; // returns # of Bytes
     inline void         SetNfGraphicCacheVal( long nSizeInBytes );
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 4d8f8a94eddd..ad03c209b649 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -400,7 +400,7 @@ void SvxPathTabPage::FillUserData()
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxPathTabPage, PathSelect_Impl, svx::OptHeaderTabListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl)
 {
     sal_uInt16 nSelCount = 0;
     SvLBoxEntry* pEntry = pPathBox->FirstSelected();
@@ -423,7 +423,7 @@ IMPL_LINK( SvxPathTabPage, PathSelect_Impl, svx::OptHeaderTabListBox *, EMPTYARG
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxPathTabPage, StandardHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl)
 {
     SvLBoxEntry* pEntry = pPathBox->FirstSelected();
     while ( pEntry )
@@ -544,7 +544,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const String& _rFolder )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxPathTabPage, PathHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl)
 {
     SvLBoxEntry* pEntry = pPathBox->GetCurEntry();
     sal_uInt16 nPos = ( pEntry != NULL ) ? ( (PathUserData_Impl*)pEntry->GetUserData() )->nRealId : 0;
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 57534fcb1a27..e2138e7d2f80 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -635,7 +635,7 @@ IMPL_LINK( SfxSaveTabPage, FilterHdl_Impl, ListBox *, pBox )
     return 0;
 };
 
-IMPL_LINK( SfxSaveTabPage, ODFVersionHdl_Impl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SfxSaveTabPage, ODFVersionHdl_Impl)
 {
     long nVersion = long( aODFVersionLB.GetEntryData( aODFVersionLB.GetSelectEntryPos() ) );
     bool bShown = SvtSaveOptions::ODFDefaultVersion( nVersion ) != SvtSaveOptions::ODFVER_LATEST;
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index 509221cd66f5..c3d64ccb1b82 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -86,7 +86,7 @@ private:
 #ifdef _SVX_OPTSAVE_CXX
     DECL_LINK( AutoClickHdl_Impl, CheckBox * );
     DECL_LINK( FilterHdl_Impl, ListBox * );
-    DECL_LINK( ODFVersionHdl_Impl, ListBox * );
+    DECL_LINK(ODFVersionHdl_Impl, void *);
 
     void    DetectHiddenControls();
 #endif
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 7e7beceaa88f..28d20f1c2b70 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -310,7 +310,7 @@ IMPL_LINK( SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, CheckBox *, pBox )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxOnlineUpdateTabPage, FileDialogHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl)
 {
     uno::Reference < lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
     uno::Reference < dialogs::XFolderPicker > xFolderPicker(
@@ -336,7 +336,7 @@ IMPL_LINK( SvxOnlineUpdateTabPage, FileDialogHdl_Impl, PushButton *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxOnlineUpdateTabPage, CheckNowHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl)
 {
     uno::Reference < lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
 
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index c9846d5931b7..c21999fdb4fd 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -54,8 +54,8 @@ private:
     rtl::OUString       m_aNeverChecked;
     rtl::OUString       m_aLastCheckedTemplate;
 
-    DECL_LINK(  FileDialogHdl_Impl, PushButton* ) ;
-    DECL_LINK(  CheckNowHdl_Impl, PushButton* ) ;
+    DECL_LINK(FileDialogHdl_Impl, void *) ;
+    DECL_LINK(CheckNowHdl_Impl, void *) ;
     DECL_LINK(  AutoCheckHdl_Impl, CheckBox* ) ;
 
     void        CalcButtonWidth();
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 96a5999ca491..ed19976d0f79 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -639,13 +639,13 @@ sal_uInt16  OfaTreeOptionsDialog::AddGroup(const String& rGroupName,
     return nRet - 1;
 }
 
-IMPL_LINK(OfaTreeOptionsDialog, ShowPageHdl_Impl, SvTreeListBox*, EMPTYARG)
+IMPL_LINK_NOARG(OfaTreeOptionsDialog, ShowPageHdl_Impl)
 {
     SelectHdl_Impl();
     return 0;
 }
 
-IMPL_LINK( OfaTreeOptionsDialog, BackHdl_Impl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(OfaTreeOptionsDialog, BackHdl_Impl)
 {
     if ( pCurrentPageEntry && aTreeLB.GetParent( pCurrentPageEntry ) )
     {
@@ -665,7 +665,7 @@ IMPL_LINK( OfaTreeOptionsDialog, BackHdl_Impl, PushButton*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( OfaTreeOptionsDialog, OKHdl_Impl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl)
 {
     aTreeLB.EndSelection();
     if ( pCurrentPageEntry && aTreeLB.GetParent( pCurrentPageEntry ) )
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index d14141fc788c..3775b71021d7 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -234,7 +234,7 @@ void WebConnectionInfoDialog::FillPasswordList()
 }
 
 // -----------------------------------------------------------------------
-IMPL_LINK( WebConnectionInfoDialog, RemovePasswordHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl)
 {
     try
     {
@@ -271,7 +271,7 @@ IMPL_LINK( WebConnectionInfoDialog, RemovePasswordHdl, PushButton*, EMPTYARG )
 }
 
 // -----------------------------------------------------------------------
-IMPL_LINK( WebConnectionInfoDialog, RemoveAllPasswordsHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(WebConnectionInfoDialog, RemoveAllPasswordsHdl)
 {
     try
     {
@@ -300,7 +300,7 @@ IMPL_LINK( WebConnectionInfoDialog, RemoveAllPasswordsHdl, PushButton*, EMPTYARG
 }
 
 // -----------------------------------------------------------------------
-IMPL_LINK( WebConnectionInfoDialog, ChangePasswordHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl)
 {
     try
     {
@@ -344,7 +344,7 @@ IMPL_LINK( WebConnectionInfoDialog, ChangePasswordHdl, PushButton*, EMPTYARG )
 }
 
 // -----------------------------------------------------------------------
-IMPL_LINK( WebConnectionInfoDialog, EntrySelectedHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(WebConnectionInfoDialog, EntrySelectedHdl)
 {
     SvLBoxEntry* pEntry = m_aPasswordsLB.GetCurEntry();
     if ( !pEntry )
diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx
index 08aadd6b3858..0bcbfc88a1a2 100644
--- a/cui/source/options/webconninfo.hxx
+++ b/cui/source/options/webconninfo.hxx
@@ -67,9 +67,9 @@ namespace svx
         sal_Int32           m_nPos;
 
     DECL_LINK( HeaderBarClickedHdl, SvxSimpleTable* );
-    DECL_LINK( RemovePasswordHdl, PushButton* );
-    DECL_LINK( RemoveAllPasswordsHdl, PushButton* );
-    DECL_LINK( ChangePasswordHdl, PushButton* );
+    DECL_LINK(RemovePasswordHdl, void *);
+    DECL_LINK(RemoveAllPasswordsHdl, void *);
+    DECL_LINK(ChangePasswordHdl, void *);
     DECL_LINK( EntrySelectedHdl, void* );
 
     void FillPasswordList();