New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problem

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

20 files changed, 55 insertions, 55 deletions

diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 1f657a712cfd..a59932199334 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -250,7 +250,7 @@ void SwChangeDBDlg::UpdateFlds()
     pSh->EndAllAction();
 }
 
-IMPL_LINK( SwChangeDBDlg, ButtonHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SwChangeDBDlg, ButtonHdl)
 {
     String sTableName, sColumnName;
     SwDBData aData;
@@ -265,7 +265,7 @@ IMPL_LINK( SwChangeDBDlg, ButtonHdl, Button *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( SwChangeDBDlg, TreeSelectHdl, SvTreeListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SwChangeDBDlg, TreeSelectHdl)
 {
     sal_Bool bEnable = sal_False;
 
@@ -300,7 +300,7 @@ void SwChangeDBDlg::ShowDBName(const SwDBData& rDBData)
     aDocDBNameFT.SetText(sName);
 }
 
-IMPL_LINK( SwChangeDBDlg, AddDBHdl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SwChangeDBDlg, AddDBHdl)
 {
     String sNewDB = SwNewDBMgr::LoadAndRegisterDataSource();
     if(sNewDB.Len())
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 4a4c8a86ffb6..88fdbf91f0ea 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -473,7 +473,7 @@ IMPL_LINK( SwFldDBPage, TreeSelectHdl, SvTreeListBox *, pBox )
     return 0;
 }
 
-IMPL_LINK( SwFldDBPage, AddDBHdl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldDBPage, AddDBHdl)
 {
     String sNewDB = SwNewDBMgr::LoadAndRegisterDataSource();
     if(sNewDB.Len())
@@ -486,7 +486,7 @@ IMPL_LINK( SwFldDBPage, AddDBHdl, PushButton *, EMPTYARG )
 /*--------------------------------------------------------------------
     Description: Modify
  --------------------------------------------------------------------*/
-IMPL_LINK( SwFldDBPage, ModifyHdl, Edit *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldDBPage, ModifyHdl)
 {
     CheckInsert();
     return 0;
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index 07e76a171708..41df21066b73 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -70,8 +70,8 @@ class SwFldDBPage : public SwFldPage
     DECL_LINK( TypeHdl, ListBox* );
     DECL_LINK( NumSelectHdl, NumFormatListBox* pLB = 0);
     DECL_LINK( TreeSelectHdl, SvTreeListBox* pBox );
-    DECL_LINK( ModifyHdl, Edit *pED = 0 );
-    DECL_LINK( AddDBHdl, PushButton* );
+    DECL_LINK(ModifyHdl, void *);
+    DECL_LINK(AddDBHdl, void *);
 
     void                CheckInsert();
 
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 7160fc2f0b69..d119fffb3591 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -215,7 +215,7 @@ void SwFldDokInfPage::Reset(const SfxItemSet& )
     }
 }
 
-IMPL_LINK( SwFldDokInfPage, TypeHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldDokInfPage, TypeHdl)
 {
     // save old ListBoxPos
     SvLBoxEntry* pOldEntry = pSelEntry;
@@ -238,7 +238,7 @@ IMPL_LINK( SwFldDokInfPage, TypeHdl, ListBox *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldDokInfPage, SubTypeHdl)
 {
     sal_uInt16 nSubType = (sal_uInt16)(sal_uLong)pSelEntry->GetUserData();
     sal_uInt16 nPos = aSelectionLB.GetSelectEntryPos();
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index ac19388d5c9f..57182d6ed1b2 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -61,8 +61,8 @@ class SwFldDokInfPage : public SwFldPage
     sal_uLong               nOldFormat;
     ::rtl::OUString     m_sOldCustomFieldName;
 
-    DECL_LINK( TypeHdl, ListBox* pLB = 0 );
-    DECL_LINK( SubTypeHdl, ListBox* pLB = 0 );
+    DECL_LINK(TypeHdl, void * = 0);
+    DECL_LINK(SubTypeHdl, void * = 0);
 
     sal_uInt16              FillSelectionLB(sal_uInt16 nSubTypeId);
 
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 5b685316ad9f..2bce604a1ae0 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -190,7 +190,7 @@ void SwFldDokPage::Reset(const SfxItemSet& )
     }
 }
 
-IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
 {
     // save old ListBoxPos
     const sal_uInt16 nOld = GetTypeSel();
@@ -450,7 +450,7 @@ void SwFldDokPage::AddSubType(sal_uInt16 nTypeId)
     aSelectionLB.SetEntryData(nPos, reinterpret_cast<void*>(nTypeId));
 }
 
-IMPL_LINK( SwFldDokPage, SubTypeHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldDokPage, SubTypeHdl)
 {
     sal_uInt16 nPos = aSelectionLB.GetSelectEntryPos();
     if(nPos == LISTBOX_ENTRY_NOTFOUND)
@@ -519,7 +519,7 @@ sal_uInt16 SwFldDokPage::FillFormatLB(sal_uInt16 nTypeId)
     return nSize;
 }
 
-IMPL_LINK( SwFldDokPage, FormatHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldDokPage, FormatHdl)
 {
     sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel());
 
diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx
index 9bff88a0bb9c..4dba662d93dc 100644
--- a/sw/source/ui/fldui/flddok.hxx
+++ b/sw/source/ui/fldui/flddok.hxx
@@ -62,9 +62,9 @@ class SwFldDokPage : public SwFldPage
     sal_uInt16              nOldSel;
     sal_uLong               nOldFormat;
 
-    DECL_LINK( TypeHdl, ListBox* pLB = 0 );
-    DECL_LINK( FormatHdl, ListBox* pLB = 0 );
-    DECL_LINK( SubTypeHdl, ListBox* pLB = 0 );
+    DECL_LINK(TypeHdl, void *);
+    DECL_LINK(FormatHdl, void * = 0);
+    DECL_LINK(SubTypeHdl, void *);
 
     void                AddSubType(sal_uInt16 nTypeId);
     sal_uInt16              FillFormatLB(sal_uInt16 nTypeId);
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 5938f599c499..89d0ef3ef78a 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -241,7 +241,7 @@ void SwFldEditDlg::InsertHdl()
 /*--------------------------------------------------------------------
      Description: kick off changing of the field
  --------------------------------------------------------------------*/
-IMPL_LINK( SwFldEditDlg, OKHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldEditDlg, OKHdl)
 {
     if (GetOKButton()->IsEnabled())
     {
@@ -307,7 +307,7 @@ IMPL_LINK( SwFldEditDlg, NextPrevHdl, Button *, pButton )
     return 0;
 }
 
-IMPL_LINK( SwFldEditDlg, AddressHdl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldEditDlg, AddressHdl)
 {
     SwFldPage* pTabPage = (SwFldPage*)GetTabPage();
     SwFldMgr& rMgr = pTabPage->GetFldMgr();
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index a8fab0674490..03572c2cad30 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -189,7 +189,7 @@ void SwFldFuncPage::Reset(const SfxItemSet& )
     }
 }
 
-IMPL_LINK( SwFldFuncPage, TypeHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl)
 {
     // save old ListBoxPos
     const sal_uInt16 nOld = GetTypeSel();
@@ -410,7 +410,7 @@ IMPL_LINK( SwFldFuncPage, TypeHdl, ListBox *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( SwFldFuncPage, SelectHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldFuncPage, SelectHdl)
 {
     sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel());
 
@@ -420,7 +420,7 @@ IMPL_LINK( SwFldFuncPage, SelectHdl, ListBox *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( SwFldFuncPage, InsertMacroHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldFuncPage, InsertMacroHdl)
 {
     SelectHdl();
     InsertHdl();
@@ -475,7 +475,7 @@ IMPL_LINK( SwFldFuncPage, ListModifyHdl, Control*, pControl)
     return 0;
 }
 
-IMPL_LINK( SwFldFuncPage, ListEnableHdl, void*, EMPTYARG)
+IMPL_LINK_NOARG(SwFldFuncPage, ListEnableHdl)
 {
     //enable "Add" button when text is in the Edit that's not already member of the box
     aListAddPB.Enable(aListItemED.GetText().Len() &&
@@ -673,7 +673,7 @@ void    SwFldFuncPage::FillUserData()
     SetUserData(sData);
 }
 
-IMPL_LINK( SwFldFuncPage, ModifyHdl, Edit *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldFuncPage, ModifyHdl)
 {
     String aName(aNameED.GetText());
     const sal_uInt16 nLen = aName.Len();
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index 9db7ed3d2fbe..b3b75c037c13 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -75,10 +75,10 @@ class SwFldFuncPage : public SwFldPage
     sal_uLong           nOldFormat;
     bool            bDropDownLBChanged;
 
-    DECL_LINK( TypeHdl, ListBox* pLB = 0 );
-    DECL_LINK( SelectHdl, ListBox* pLB = 0 );
-    DECL_LINK( InsertMacroHdl, ListBox* pLB = 0 );
-    DECL_LINK( ModifyHdl, Edit *pEd = 0 );
+    DECL_LINK(TypeHdl, void *);
+    DECL_LINK(SelectHdl, void * = 0);
+    DECL_LINK(InsertMacroHdl, void *);
+    DECL_LINK(ModifyHdl, void * = 0);
     DECL_LINK( ListModifyHdl, Control*);
     DECL_LINK( ListEnableHdl, void*);
 
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index 4c63d8db7f8d..262ab14efff6 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -381,7 +381,7 @@ void SwFldPage::EnableInsert(sal_Bool bEnable)
     m_bInsert = bEnable;
 }
 
-IMPL_LINK( SwFldPage, NumFormatHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldPage, NumFormatHdl)
 {
     InsertHdl();
 
diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx
index 40c4ef60ae75..ae7772756cf5 100644
--- a/sw/source/ui/fldui/fldpage.hxx
+++ b/sw/source/ui/fldui/fldpage.hxx
@@ -62,7 +62,7 @@ protected:
     SwWrtShell*         GetWrtShell() { return m_pWrtShell;}
 
     DECL_LINK( InsertHdl, Button *pBtn = 0 );
-    DECL_LINK( NumFormatHdl, ListBox *pBtn = 0 );
+    DECL_LINK(NumFormatHdl, void *);
 
     void                Init();
     void                SavePos( const ListBox* pLst1,
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 948380f87732..e3332d088ae3 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -277,7 +277,7 @@ void SwFldRefPage::Reset(const SfxItemSet& )
     }
 }
 
-IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldRefPage, TypeHdl)
 {
     // save old ListBoxPos
     const sal_uInt16 nOld = GetTypeSel();
@@ -415,7 +415,7 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( SwFldRefPage, SubTypeHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldRefPage, SubTypeHdl)
 {
     sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel());
 
@@ -769,7 +769,7 @@ sal_uInt16 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId)
     Description: Modify
  --------------------------------------------------------------------*/
 
-IMPL_LINK( SwFldRefPage, ModifyHdl, Edit *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldRefPage, ModifyHdl)
 {
     String aName(aNameED.GetText());
     const sal_uInt16 nLen = aName.Len();
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index 9268e0a96561..30a56ff67f27 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -72,9 +72,9 @@ class SwFldRefPage : public SwFldPage
     // fallback, if previously selected text node doesn't exist anymore
     sal_uInt16 mnSavedSelectedPos;
 
-    DECL_LINK( TypeHdl, ListBox* pLB = 0 );
-    DECL_LINK( SubTypeHdl, ListBox* pLB = 0 );
-    DECL_LINK( ModifyHdl, Edit *pEd = 0 );
+    DECL_LINK(TypeHdl, void *);
+    DECL_LINK(SubTypeHdl, void * = 0);
+    DECL_LINK(ModifyHdl, void * = 0);
 
     void                UpdateSubType();
     sal_uInt16              FillFormatLB(sal_uInt16 nTypeId);
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index 81b754c10a26..d40a04a88b7a 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -211,7 +211,7 @@ SfxItemSet* SwFldDlg::CreateInputItemSet( sal_uInt16 nID  )
      Description: kick off inserting of new fields
  --------------------------------------------------------------------*/
 
-IMPL_LINK( SwFldDlg, OKHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldDlg, OKHdl)
 {
     if (GetOKButton().IsEnabled())
     {
@@ -224,7 +224,7 @@ IMPL_LINK( SwFldDlg, OKHdl, Button *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( SwFldDlg, CancelHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldDlg, CancelHdl)
 {
     Close();
     return 0;
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 64fb7e1cb495..c0170edddb1e 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -192,7 +192,7 @@ void SwFldVarPage::Reset(const SfxItemSet& )
     }
 }
 
-IMPL_LINK( SwFldVarPage, TypeHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldVarPage, TypeHdl)
 {
     // save old ListBoxPos
     const sal_uInt16 nOld = GetTypeSel();
@@ -824,7 +824,7 @@ sal_uInt16 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId)
 /*--------------------------------------------------------------------
     Description: Modify
  --------------------------------------------------------------------*/
-IMPL_LINK( SwFldVarPage, ModifyHdl, Edit *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldVarPage, ModifyHdl)
 {
     String sValue(aValueED.GetText());
     sal_Bool bHasValue = sValue.Len() != 0;
@@ -1098,7 +1098,7 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox )
     return sal_True;
 }
 
-IMPL_LINK( SwFldVarPage, ChapterHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldVarPage, ChapterHdl)
 {
     sal_Bool bEnable = aChapterLevelLB.GetSelectEntryPos() != 0;
 
@@ -1109,7 +1109,7 @@ IMPL_LINK( SwFldVarPage, ChapterHdl, ListBox *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( SwFldVarPage, SeparatorHdl, Edit *, EMPTYARG )
+IMPL_LINK_NOARG(SwFldVarPage, SeparatorHdl)
 {
     sal_Bool bEnable = aSeparatorED.GetText().Len() != 0 ||
                     aChapterLevelLB.GetSelectEntryPos() == 0;
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index f4d55ceb5755..f925dca4fb24 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -86,12 +86,12 @@ class SwFldVarPage : public SwFldPage
     sal_uLong               nOldFormat;
     sal_Bool                bInit;
 
-    DECL_LINK( TypeHdl, ListBox* pLB = 0 );
+    DECL_LINK(TypeHdl, void *);
     DECL_LINK( SubTypeHdl, ListBox* pLB = 0 );
-    DECL_LINK( ModifyHdl, Edit *pED = 0 );
+    DECL_LINK(ModifyHdl, void * = 0);
     DECL_LINK( TBClickHdl, ToolBox *pTB = 0);
-    DECL_LINK( ChapterHdl, ListBox *pLB = 0);
-    DECL_LINK( SeparatorHdl, Edit *pED = 0 );
+    DECL_LINK(ChapterHdl, void * = 0);
+    DECL_LINK(SeparatorHdl, void * = 0);
 
     void                UpdateSubType();
     sal_uInt16              FillFormatLB(sal_uInt16 nTypeId);
diff --git a/sw/source/ui/fldui/fldwrap.cxx b/sw/source/ui/fldui/fldwrap.cxx
index 0a9cf44f2924..7963e4d82234 100644
--- a/sw/source/ui/fldui/fldwrap.cxx
+++ b/sw/source/ui/fldui/fldwrap.cxx
@@ -59,7 +59,7 @@ SwChildWinWrapper::SwChildWinWrapper(Window *pParentWindow, sal_uInt16 nId) :
     m_aUpdateTimer.SetTimeoutHdl(LINK(this, SwChildWinWrapper, UpdateHdl));
 }
 
-IMPL_LINK( SwChildWinWrapper, UpdateHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SwChildWinWrapper, UpdateHdl)
 {
     GetWindow()->Activate();    // update dialog
 
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index af01ff5cdf30..94de28a1a639 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -191,7 +191,7 @@ void SwFldInputDlg::Apply()
 }
 
 
-IMPL_LINK(SwFldInputDlg, NextHdl, PushButton*, EMPTYARG)
+IMPL_LINK_NOARG(SwFldInputDlg, NextHdl)
 {
     EndDialog(RET_OK);
     return 0;
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index bbdd2b98fd5b..b7af46e91c1d 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -130,7 +130,7 @@ SwJavaEditDialog::~SwJavaEditDialog()
     Application::SetDefDialogParent( pOldDefDlgParent );
 }
 
-IMPL_LINK_INLINE_START( SwJavaEditDialog, PrevHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SwJavaEditDialog, PrevHdl)
 {
     SetFld();
     pMgr->GoPrev();
@@ -140,9 +140,9 @@ IMPL_LINK_INLINE_START( SwJavaEditDialog, PrevHdl, Button *, EMPTYARG )
 
     return 0;
 }
-IMPL_LINK_INLINE_END( SwJavaEditDialog, PrevHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(SwJavaEditDialog, PrevHdl)
 
-IMPL_LINK_INLINE_START( SwJavaEditDialog, NextHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SwJavaEditDialog, NextHdl)
 {
     SetFld();
     pMgr->GoNext();
@@ -152,9 +152,9 @@ IMPL_LINK_INLINE_START( SwJavaEditDialog, NextHdl, Button *, EMPTYARG )
 
     return 0;
 }
-IMPL_LINK_INLINE_END( SwJavaEditDialog, NextHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(SwJavaEditDialog, NextHdl)
 
-IMPL_LINK( SwJavaEditDialog, OKHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SwJavaEditDialog, OKHdl)
 {
     SetFld();
     EndDialog( RET_OK );
@@ -255,7 +255,7 @@ sal_Bool SwJavaEditDialog::IsUpdate()
     return pFld && ( bIsUrl != pFld->GetFormat() || pFld->GetPar2() != aType || pFld->GetPar1() != aText );
 }
 
-IMPL_LINK( SwJavaEditDialog, RadioButtonHdl, RadioButton *, EMPTYARG )
+IMPL_LINK_NOARG(SwJavaEditDialog, RadioButtonHdl)
 {
     sal_Bool bEnable = aUrlRB.IsChecked();
     aUrlPB.Enable(bEnable);
@@ -291,7 +291,7 @@ IMPL_LINK( SwJavaEditDialog, InsertFileHdl, PushButton *, pBtn )
     return 0;
 }
 
-IMPL_LINK( SwJavaEditDialog, DlgClosedHdl, sfx2::FileDialogHelper *, EMPTYARG )
+IMPL_LINK_NOARG(SwJavaEditDialog, DlgClosedHdl)
 {
     if ( pFileDlg->GetError() == ERRCODE_NONE )
     {