New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problem

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

31 files changed, 103 insertions, 103 deletions

diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx
index c668c4e39780..503b2098c5f8 100644
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/sfx2/inc/sfx2/basedlgs.hxx
@@ -122,7 +122,7 @@ public:
     SfxBindings&            GetBindings()
                             { return *pBindings; }
 
-    DECL_LINK( TimerHdl, Timer* );
+    DECL_LINK(TimerHdl, void *);
 
 };
 
@@ -160,7 +160,7 @@ public:
     virtual void            FillInfo(SfxChildWinInfo&) const;
     void                    Initialize (SfxChildWinInfo* pInfo);
 
-    DECL_LINK( TimerHdl, Timer* );
+    DECL_LINK(TimerHdl, void *);
 
 };
 
@@ -204,7 +204,7 @@ private:
 
     SingleTabDlgImpl*   pImpl;
 
-    DECL_DLLPRIVATE_LINK( OKHdl_Impl, Button * );
+    DECL_DLLPRIVATE_LINK(OKHdl_Impl, void *);
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx
index 115a6dfe34c9..8e1dbee971d0 100644
--- a/sfx2/inc/sfx2/dinfdlg.hxx
+++ b/sfx2/inc/sfx2/dinfdlg.hxx
@@ -212,9 +212,9 @@ private:
     sal_Bool                        bEnableUseUserData  : 1,
                                 bHandleDelete       : 1;
 
-    DECL_LINK(          DeleteHdl, PushButton * );
-    DECL_LINK(          SignatureHdl, PushButton * );
-    DECL_LINK( ChangePassHdl, PushButton * );
+    DECL_LINK(DeleteHdl, void *);
+    DECL_LINK(SignatureHdl, void *);
+    DECL_LINK(ChangePassHdl, void *);
     void                ImplUpdateSignatures();
     void                ImplCheckPasswordState();
 
@@ -300,8 +300,8 @@ private:
     DECL_LINK( ClickHdlNoUpdate, Control* );
     DECL_LINK( ClickHdlReload, Control* );
     DECL_LINK( ClickHdlForward, Control* );
-    DECL_LINK( ClickHdlBrowseURL, PushButton* );
-    DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* );
+    DECL_LINK(ClickHdlBrowseURL, void *);
+    DECL_LINK(DialogClosedHdl, void *);
 
         using TabPage::DeactivatePage;
 
@@ -404,7 +404,7 @@ public:
     CustomPropertiesEditButton( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine );
     ~CustomPropertiesEditButton();
 
-    DECL_LINK(ClickHdl, PushButton*);
+    DECL_LINK(ClickHdl, void *);
 };
 
 class CustomPropertiesRemoveButton : public ImageButton
@@ -494,8 +494,8 @@ private:
     DECL_LINK(  BoxLoseFocusHdl, CustomPropertiesTypeBox* );
     //add lose focus handlers of Date/TimeField?
 
-    DECL_LINK(  EditTimeoutHdl, Timer* );
-    DECL_LINK(  BoxTimeoutHdl, Timer* );
+    DECL_LINK(EditTimeoutHdl, void *);
+    DECL_LINK(BoxTimeoutHdl, void *);
 
     bool        IsLineValid( CustomPropertyLine* pLine ) const;
     void        ValidateLine( CustomPropertyLine* pLine, bool bIsFromTypeBox );
@@ -553,7 +553,7 @@ private:
     PushButton              m_aAddBtn;
     FixedText               m_aPropertiesFT; // Sym2_5121----, Moved by Steve Yin
 
-    DECL_LINK(  AddHdl, PushButton* );
+    DECL_LINK(AddHdl, void *);
 
     using TabPage::DeactivatePage;
 
diff --git a/sfx2/inc/sfx2/docinsert.hxx b/sfx2/inc/sfx2/docinsert.hxx
index 6ec962764a73..28e4de832ab6 100644
--- a/sfx2/inc/sfx2/docinsert.hxx
+++ b/sfx2/inc/sfx2/docinsert.hxx
@@ -58,7 +58,7 @@ private:
     SfxItemSet*             m_pItemSet;
     std::vector<rtl::OUString> m_pURLList;
 
-    DECL_LINK(              DialogClosedHdl, sfx2::FileDialogHelper* );
+    DECL_LINK(DialogClosedHdl, void *);
 
 public:
     DocumentInserter(const String& rFactory,
diff --git a/sfx2/inc/sfx2/dockwin.hxx b/sfx2/inc/sfx2/dockwin.hxx
index e1436ab7f346..b4313c7348ba 100644
--- a/sfx2/inc/sfx2/dockwin.hxx
+++ b/sfx2/inc/sfx2/dockwin.hxx
@@ -110,7 +110,7 @@ public:
     virtual long        Notify( NotifyEvent& rNEvt );
     virtual void        FadeIn( sal_Bool );
     void                AutoShow( sal_Bool bShow = sal_True );
-    DECL_LINK( TimerHdl, Timer* );
+    DECL_LINK(TimerHdl, void *);
 
     SAL_DLLPRIVATE void Initialize_Impl();
     SAL_DLLPRIVATE sal_uInt16 GetWinBits_Impl() const;
diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx
index 5a014c14ace7..2e07153973c1 100644
--- a/sfx2/inc/sfx2/passwd.hxx
+++ b/sfx2/inc/sfx2/passwd.hxx
@@ -77,7 +77,7 @@ private:
 
     bool            mbAsciiOnly;
     DECL_DLLPRIVATE_LINK( EditModifyHdl, Edit* );
-    DECL_DLLPRIVATE_LINK( OKHdl, OKButton* );
+    DECL_DLLPRIVATE_LINK(OKHdl, void *);
 
     void            SetPasswdText();
 
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index 7db8f7a39b4b..36d78911a649 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -93,11 +93,11 @@ friend class SfxTabDialogController;
 
     DECL_DLLPRIVATE_LINK( ActivatePageHdl, TabControl * );
     DECL_DLLPRIVATE_LINK( DeactivatePageHdl, TabControl * );
-    DECL_DLLPRIVATE_LINK( OkHdl, Button * );
-    DECL_DLLPRIVATE_LINK( ResetHdl, Button * );
-    DECL_DLLPRIVATE_LINK( BaseFmtHdl, Button * );
-    DECL_DLLPRIVATE_LINK( UserHdl, Button * );
-    DECL_DLLPRIVATE_LINK( CancelHdl, Button * );
+    DECL_DLLPRIVATE_LINK(OkHdl, void *);
+    DECL_DLLPRIVATE_LINK(ResetHdl, void *);
+    DECL_DLLPRIVATE_LINK(BaseFmtHdl, void *);
+    DECL_DLLPRIVATE_LINK(UserHdl, void *);
+    DECL_DLLPRIVATE_LINK(CancelHdl, void *);
     SAL_DLLPRIVATE void Init_Impl(sal_Bool, const String *);
 
 protected:
diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx
index 11891202cc56..8174f38b7097 100644
--- a/sfx2/inc/srchdlg.hxx
+++ b/sfx2/inc/srchdlg.hxx
@@ -66,8 +66,8 @@ private:
     void                LoadConfig();
     void                SaveConfig();
 
-    DECL_LINK(          FindHdl, PushButton* );
-    DECL_LINK(          ToggleHdl, CheckBox* );
+    DECL_LINK(FindHdl, void *);
+    DECL_LINK(ToggleHdl, void *);
 
 public:
     SearchDialog( Window* pWindow, const ::rtl::OUString& rConfigName );
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 0f0c2f1b57b9..2ea1687f3074 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -754,7 +754,7 @@ void IndexTabPage_Impl::ClearIndex()
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( IndexTabPage_Impl, OpenHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(IndexTabPage_Impl, OpenHdl)
 {
     aIndexCB.GetDoubleClickHdl().Call( &aIndexCB );
     return 0;
@@ -1072,7 +1072,7 @@ void SearchTabPage_Impl::RememberSearchText( const String& rSearchText )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SearchTabPage_Impl, SearchHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(SearchTabPage_Impl, SearchHdl)
 {
     String aSearchText = TRIM( aSearchED.GetText() );
     if ( aSearchText.Len() > 0 )
@@ -1117,7 +1117,7 @@ IMPL_LINK( SearchTabPage_Impl, SearchHdl, PushButton*, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SearchTabPage_Impl, OpenHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(SearchTabPage_Impl, OpenHdl)
 {
     aResultsLB.GetDoubleClickHdl().Call( &aResultsLB );
     return 0;
@@ -1125,7 +1125,7 @@ IMPL_LINK( SearchTabPage_Impl, OpenHdl, PushButton*, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SearchTabPage_Impl, ModifyHdl, Edit*, EMPTYARG )
+IMPL_LINK_NOARG(SearchTabPage_Impl, ModifyHdl)
 {
     String aSearchText = TRIM( aSearchED.GetText() );
     aSearchBtn.Enable( aSearchText.Len() > 0 );
@@ -1401,7 +1401,7 @@ BookmarksTabPage_Impl::BookmarksTabPage_Impl( Window* pParent, SfxHelpIndexWindo
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( BookmarksTabPage_Impl, OpenHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(BookmarksTabPage_Impl, OpenHdl)
 {
     aBookmarksBox.GetDoubleClickHdl().Call( &aBookmarksBox );
     return 0;
@@ -1707,7 +1707,7 @@ IMPL_LINK( SfxHelpIndexWindow_Impl, ActivatePageHdl, TabControl *, pTabCtrl )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SfxHelpIndexWindow_Impl, SelectHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectHdl)
 {
     aTimer.Start();
 
@@ -1716,7 +1716,7 @@ IMPL_LINK( SfxHelpIndexWindow_Impl, SelectHdl, ListBox *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SfxHelpIndexWindow_Impl, InitHdl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, InitHdl)
 {
     bIsInitDone = true;
     Initialize();
@@ -1730,7 +1730,7 @@ IMPL_LINK( SfxHelpIndexWindow_Impl, InitHdl, Timer *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SfxHelpIndexWindow_Impl, SelectFactoryHdl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectFactoryHdl)
 {
     String* pFactory = (String*)(sal_uIntPtr)aActiveLB.GetEntryData( aActiveLB.GetSelectEntryPos() );
     if ( pFactory )
@@ -1746,7 +1746,7 @@ IMPL_LINK( SfxHelpIndexWindow_Impl, SelectFactoryHdl, Timer *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SfxHelpIndexWindow_Impl, KeywordHdl, IndexTabPage_Impl *, EMPTYARG )
+IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, KeywordHdl)
 {
     // keyword found on index?
     sal_Bool bIndex = pIPage->HasKeyword();
@@ -2348,7 +2348,7 @@ bool SfxHelpTextWindow_Impl::isHandledKey( const KeyCode& _rKeyCode )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SfxHelpTextWindow_Impl, SelectHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(SfxHelpTextWindow_Impl, SelectHdl)
 {
     try
     {
@@ -3049,7 +3049,7 @@ IMPL_LINK( SfxHelpWindow_Impl, SelectHdl, ToolBox* , pToolBox )
 
 //-------------------------------------------------------------------------
 
-IMPL_LINK( SfxHelpWindow_Impl, OpenHdl, SfxHelpIndexWindow_Impl* , EMPTYARG )
+IMPL_LINK_NOARG(SfxHelpWindow_Impl, OpenHdl)
 {
     pIndexWin->SelectExecutableEntry();
     String aEntry = pIndexWin->GetSelectEntry();
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 492cb1346965..2b07f86f62b9 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -168,7 +168,7 @@ private:
     void                InitializeIndex();
     void                ClearIndex();
 
-    DECL_LINK(          OpenHdl, PushButton* );
+    DECL_LINK(OpenHdl, void *);
     DECL_LINK(          TimeoutHdl, Timer* );
 
 public:
@@ -240,9 +240,9 @@ private:
     void                ClearSearchResults();
     void                RememberSearchText( const String& rSearchText );
 
-    DECL_LINK(          SearchHdl, PushButton* );
-    DECL_LINK(          OpenHdl, PushButton* );
-    DECL_LINK(          ModifyHdl, Edit* );
+    DECL_LINK(SearchHdl, void *);
+    DECL_LINK(OpenHdl, void *);
+    DECL_LINK(ModifyHdl, void *);
 
 public:
     SearchTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin );
@@ -286,7 +286,7 @@ private:
 
     long                nMinWidth;
 
-    DECL_LINK(          OpenHdl, PushButton* );
+    DECL_LINK(OpenHdl, void *);
 
 public:
     BookmarksTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin );
@@ -340,10 +340,10 @@ private:
     inline BookmarksTabPage_Impl*   GetBookmarksPage();
 
     DECL_LINK(          ActivatePageHdl, TabControl* );
-    DECL_LINK(          SelectHdl, ListBox* );
-    DECL_LINK(          InitHdl, Timer* );
-    DECL_LINK(          SelectFactoryHdl, Timer* );
-    DECL_LINK(          KeywordHdl, IndexTabPage_Impl* );
+    DECL_LINK(SelectHdl, void *);
+    DECL_LINK(InitHdl, void *);
+    DECL_LINK(SelectFactoryHdl, void *);
+    DECL_LINK(KeywordHdl, void *);
 
 public:
     SfxHelpIndexWindow_Impl( SfxHelpWindow_Impl* pParent );
@@ -477,7 +477,7 @@ private:
                             getCursor() const;
     bool                    isHandledKey( const KeyCode& _rKeyCode );
 
-    DECL_LINK(              SelectHdl, Timer* );
+    DECL_LINK(SelectHdl, void *);
     DECL_LINK(              NotifyHdl, SvtMiscOptions* );
     DECL_LINK(              FindHdl, sfx2::SearchDialog* );
     DECL_LINK(              CloseHdl, sfx2::SearchDialog* );
@@ -547,7 +547,7 @@ friend class SfxHelpIndexWindow_Impl;
     void                ShowStartPage();
 
     DECL_LINK(          SelectHdl, ToolBox* );
-    DECL_LINK(          OpenHdl, SfxHelpIndexWindow_Impl* );
+    DECL_LINK(OpenHdl, void *);
     DECL_LINK(          SelectFactoryHdl, SfxHelpIndexWindow_Impl* );
     DECL_LINK(          ChangeHdl, HelpListener_Impl* );
 
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 81c404cfd526..8cb8a0741492 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -324,7 +324,7 @@ void SfxModelessDialog::Move()
     Implements a timer event that is triggered by a move or resize of the window
     This will save config information to Views.xcu with a small delay
 */
-IMPL_LINK( SfxModelessDialog, TimerHdl, Timer*, EMPTYARG)
+IMPL_LINK_NOARG(SfxModelessDialog, TimerHdl)
 {
     pImp->aMoveTimer.Stop();
     if ( pImp->bConstructed && pImp->pMgr )
@@ -612,7 +612,7 @@ void SfxFloatingWindow::Move()
     Implements a timer event that is triggered by a move or resize of the window
     This will save config information to Views.xcu with a small delay
 */
-IMPL_LINK( SfxFloatingWindow, TimerHdl, Timer*, EMPTYARG)
+IMPL_LINK_NOARG(SfxFloatingWindow, TimerHdl)
 {
     pImp->aMoveTimer.Stop();
     if ( pImp->bConstructed && pImp->pMgr )
@@ -677,7 +677,7 @@ void SfxFloatingWindow::FillInfo(SfxChildWinInfo& rInfo) const
 
 // SfxSingleTabDialog ----------------------------------------------------
 
-IMPL_LINK( SfxSingleTabDialog, OKHdl_Impl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl)
 
 /*  [Description]
 
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 215212140aa9..8d9a3b0c0b38 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -877,7 +877,7 @@ SfxDocumentPage::SfxDocumentPage( Window* pParent, const SfxItemSet& rItemSet )
 
 //------------------------------------------------------------------------
 
-IMPL_LINK( SfxDocumentPage, DeleteHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(SfxDocumentPage, DeleteHdl)
 {
     String aName;
     if ( bEnableUseUserData && aUseUserDataCB.IsChecked() )
@@ -898,7 +898,7 @@ IMPL_LINK( SfxDocumentPage, DeleteHdl, PushButton*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( SfxDocumentPage, SignatureHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(SfxDocumentPage, SignatureHdl)
 {
     SfxObjectShell* pDoc = SfxObjectShell::Current();
     if( pDoc )
@@ -911,7 +911,7 @@ IMPL_LINK( SfxDocumentPage, SignatureHdl, PushButton*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( SfxDocumentPage, ChangePassHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(SfxDocumentPage, ChangePassHdl)
 {
     SfxObjectShell* pShell = SfxObjectShell::Current();
     do
@@ -1371,7 +1371,7 @@ IMPL_LINK( SfxInternetPage, ClickHdlForward, Control*, pCtrl )
 
 //------------------------------------------------------------------------
 
-IMPL_LINK( SfxInternetPage, ClickHdlBrowseURL, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(SfxInternetPage, ClickHdlBrowseURL)
 {
     if ( !pFileDlg )
         pFileDlg = new sfx2::FileDialogHelper(
@@ -1384,7 +1384,7 @@ IMPL_LINK( SfxInternetPage, ClickHdlBrowseURL, PushButton*, EMPTYARG )
 
 //------------------------------------------------------------------------
 
-IMPL_LINK( SfxInternetPage, DialogClosedHdl, sfx2::FileDialogHelper*, EMPTYARG )
+IMPL_LINK_NOARG(SfxInternetPage, DialogClosedHdl)
 {
     DBG_ASSERT( pFileDlg, "SfxInternetPage::DialogClosedHdl(): no file dialog" );
 
@@ -1756,7 +1756,7 @@ CustomPropertiesEditButton::~CustomPropertiesEditButton()
 {
 }
 
-IMPL_LINK( CustomPropertiesEditButton, ClickHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(CustomPropertiesEditButton, ClickHdl)
 {
     DurationDialog_Impl* pDurationDlg = new DurationDialog_Impl( this, m_pLine->m_aDurationField.GetDuration() );
     if( RET_OK == pDurationDlg->Execute() )
@@ -1941,13 +1941,13 @@ IMPL_LINK( CustomPropertiesWindow, BoxLoseFocusHdl, CustomPropertiesTypeBox*, pB
     return 0;
 }
 
-IMPL_LINK( CustomPropertiesWindow, EditTimeoutHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(CustomPropertiesWindow, EditTimeoutHdl)
 {
     ValidateLine( m_pCurrentLine, false );
     return 0;
 }
 
-IMPL_LINK( CustomPropertiesWindow, BoxTimeoutHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(CustomPropertiesWindow, BoxTimeoutHdl)
 {
     ValidateLine( m_pCurrentLine, true );
     return 0;
@@ -2371,7 +2371,7 @@ IMPL_LINK( CustomPropertiesControl, ScrollHdl, ScrollBar*, pScrollBar )
     return 0;
 }
 
-IMPL_LINK( CustomPropertiesControl, RemovedHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(CustomPropertiesControl, RemovedHdl)
 {
     m_aVertScroll.SetRangeMax( m_aPropertiesWin.GetVisibleLineCount() + 1 );
     if ( m_aPropertiesWin.GetOutputSizePixel().Height() < m_aPropertiesWin.GetVisibleLineCount() * m_aPropertiesWin.GetLineHeight() )
@@ -2402,7 +2402,7 @@ SfxCustomPropertiesPage::SfxCustomPropertiesPage( Window* pParent, const SfxItem
     m_aAddBtn.SetClickHdl( LINK( this, SfxCustomPropertiesPage, AddHdl ) );
 }
 
-IMPL_LINK( SfxCustomPropertiesPage, AddHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(SfxCustomPropertiesPage, AddHdl)
 {
     Any aAny;
     m_aPropertiesCtrl.AddLine( ::rtl::OUString(), aAny, true );
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 4fa2f035f466..cfaa5ffd58bf 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -1939,7 +1939,7 @@ void SfxDockingWindow::Move()
         pImp->aMoveTimer.Start();
 }
 
-IMPL_LINK( SfxDockingWindow, TimerHdl, Timer*, EMPTYARG)
+IMPL_LINK_NOARG(SfxDockingWindow, TimerHdl)
 {
     pImp->aMoveTimer.Stop();
     if ( IsReallyVisible() && IsFloatingMode() )
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index cb24cffbb7df..8da6138caa3b 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -694,7 +694,7 @@ void FileDialogHelper_Impl::updateVersions()
 }
 
 // -----------------------------------------------------------------------
-IMPL_LINK( FileDialogHelper_Impl, TimeOutHdl_Impl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(FileDialogHelper_Impl, TimeOutHdl_Impl)
 {
     if ( !mbHasPreview )
         return 0;
@@ -2298,7 +2298,7 @@ void FileDialogHelper::SetContext( Context _eNewContext )
 }
 
 // ------------------------------------------------------------------------
-IMPL_LINK( FileDialogHelper, ExecuteSystemFilePicker, void*, EMPTYARG )
+IMPL_LINK_NOARG(FileDialogHelper, ExecuteSystemFilePicker)
 {
     m_nError = mpImp->execute();
     if ( m_aDialogClosedLink.IsSet() )
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index 5bfce3c8db42..4f4e86d7089d 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -156,7 +156,7 @@ namespace sfx2
                                                       std::vector<rtl::OUString>&               rpURLList,
                                                       const SfxFilter*                    pFilter  );
 
-        DECL_LINK( TimeOutHdl_Impl, Timer* );
+        DECL_LINK(TimeOutHdl_Impl, void *);
         DECL_LINK( HandleEvent, FileDialogHelper* );
         DECL_LINK( InitControls, void* );
 
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index d66d14281dfd..681d3683bb0a 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -73,11 +73,11 @@ IMPL_LINK_INLINE_START( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit )
     maOKBtn.Enable( bEnable );
     return 0;
 }
-IMPL_LINK_INLINE_END( SfxPasswordDialog, EditModifyHdl, Edit *, EMPTYARG )
+IMPL_LINK_INLINE_END(SfxPasswordDialog, EditModifyHdl, Edit *, pEdit)
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SfxPasswordDialog, OKHdl, OKButton *, EMPTYARG )
+IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl)
 {
     bool bConfirmFailed = ( ( mnExtras & SHOWEXTRAS_CONFIRM ) == SHOWEXTRAS_CONFIRM ) &&
                             ( GetConfirm() != GetPassword() );
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index d30b8d64ce22..22efcf333ebb 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -387,7 +387,7 @@ void SfxSecurityPage_Impl::Reset_Impl( const SfxItemSet & )
 }
 
 
-IMPL_LINK( SfxSecurityPage_Impl, RecordChangesCBToggleHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SfxSecurityPage_Impl, RecordChangesCBToggleHdl)
 {
     // when change recording gets disabled protection must be disabled as well
     if (!m_aRecordChangesCB.IsChecked())    // the new check state is already present, thus the '!'
@@ -437,7 +437,7 @@ IMPL_LINK( SfxSecurityPage_Impl, RecordChangesCBToggleHdl, void*, EMPTYARG )
 }
 
 
-IMPL_LINK( SfxSecurityPage_Impl, ChangeProtectionPBHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SfxSecurityPage_Impl, ChangeProtectionPBHdl)
 {
     if (m_eRedlingMode == RL_NONE)
         return 0;
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx
index 5ea75dd7f385..0d5528a7398b 100644
--- a/sfx2/source/dialog/srchdlg.cxx
+++ b/sfx2/source/dialog/srchdlg.cxx
@@ -141,7 +141,7 @@ void SearchDialog::SaveConfig()
     aViewOpt.SetUserItem( USERITEM_NAME, aUserItem );
 }
 
-IMPL_LINK( SearchDialog, FindHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(SearchDialog, FindHdl)
 {
     String sSrchTxt = m_aSearchEdit.GetText();
     sal_uInt16 nPos = m_aSearchEdit.GetEntryPos( sSrchTxt );
@@ -153,7 +153,7 @@ IMPL_LINK( SearchDialog, FindHdl, PushButton*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( SearchDialog, ToggleHdl, CheckBox*, EMPTYARG )
+IMPL_LINK_NOARG(SearchDialog, ToggleHdl)
 {
     String sTemp = m_aWrapAroundBox.GetText();
     m_aWrapAroundBox.SetText( m_sToggleText );
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 8fd76ed79929..64d28b731c10 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -945,7 +945,7 @@ short SfxTabDialog::Ok()
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SfxTabDialog, CancelHdl, Button*, EMPTYARG )
+IMPL_LINK_NOARG(SfxTabDialog, CancelHdl)
 {
     EndDialog( RET_USER_CANCEL );
     return 0;
@@ -984,7 +984,7 @@ const SfxItemSet* SfxTabDialog::GetRefreshedSet()
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SfxTabDialog, OkHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SfxTabDialog, OkHdl)
 
 /*  [Description]
 
@@ -1048,7 +1048,7 @@ bool SfxTabDialog::PrepareLeaveCurrentPage()
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SfxTabDialog, UserHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SfxTabDialog, UserHdl)
 
 /*  [Description]
 
@@ -1074,7 +1074,7 @@ IMPL_LINK( SfxTabDialog, UserHdl, Button *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SfxTabDialog, ResetHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SfxTabDialog, ResetHdl)
 
 /*  [Description]
 
@@ -1101,7 +1101,7 @@ IMPL_LINK( SfxTabDialog, ResetHdl, Button *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SfxTabDialog, BaseFmtHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SfxTabDialog, BaseFmtHdl)
 
 /*  [Description]
 
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index a24cb892d859..b5809ba5018d 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -332,7 +332,7 @@ sal_Int8 DropListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt )
 }
 
 
-IMPL_LINK( DropListBox_Impl, OnAsyncExecuteDrop, SvLBoxEntry*, EMPTYARG )
+IMPL_LINK_NOARG(DropListBox_Impl, OnAsyncExecuteDrop)
 {
     pDialog->ActionSelect( SID_STYLE_NEW_BY_EXAMPLE );
     return 0;
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index f6ae242d7373..b43c6faa6bd3 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -353,13 +353,13 @@ void SfxVersionDialog::RecalcDateColumn()
     }
 }
 
-IMPL_LINK( SfxVersionDialog, DClickHdl_Impl, Control*, EMPTYARG )
+IMPL_LINK_NOARG(SfxVersionDialog, DClickHdl_Impl)
 {
     Open_Impl();
     return 0L;
 }
 
-IMPL_LINK( SfxVersionDialog, SelectHdl_Impl, Control*, EMPTYARG )
+IMPL_LINK_NOARG(SfxVersionDialog, SelectHdl_Impl)
 {
     bool bEnable = ( aVersionBox.FirstSelected() != NULL );
     SfxObjectShell* pObjShell = pViewFrame->GetObjectShell();
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index 2969f4a39cd6..8ad6af137945 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -172,7 +172,7 @@ void impl_FillURLList( sfx2::FileDialogHelper* _pFileDlg, std::vector<rtl::OUStr
     }
 }
 
-IMPL_LINK( DocumentInserter, DialogClosedHdl, sfx2::FileDialogHelper*, EMPTYARG )
+IMPL_LINK_NOARG(DocumentInserter, DialogClosedHdl)
 {
     DBG_ASSERT( m_pFileDlg, "DocumentInserter::DialogClosedHdl(): no file dialog" );
 
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index d137aa462ace..91ea159fb286 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -172,9 +172,9 @@ friend class SfxOrganizeListBox_Impl;
     DECL_LINK( AddFiles_Impl, Button * );
     DECL_LINK( OnAddressTemplateClicked, Button * );
 
-    DECL_LINK( ImportHdl, sfx2::FileDialogHelper* );
-    DECL_LINK( ExportHdl, sfx2::FileDialogHelper* );
-    DECL_LINK( AddFilesHdl, sfx2::FileDialogHelper* );
+    DECL_LINK(ImportHdl, void *);
+    DECL_LINK(ExportHdl, void *);
+    DECL_LINK(AddFilesHdl, void *);
 
     sal_Bool        DontDelete_Impl( SvLBoxEntry* pEntry );
 
@@ -2230,7 +2230,7 @@ IMPL_LINK( SfxOrganizeDlg_Impl, AddFiles_Impl, Button *, pButton )
 
 //-------------------------------------------------------------------------
 
-IMPL_LINK( SfxOrganizeDlg_Impl, ImportHdl, sfx2::FileDialogHelper *, EMPTYARG )
+IMPL_LINK_NOARG(SfxOrganizeDlg_Impl, ImportHdl)
 {
     DBG_ASSERT( pFileDlg, "SfxOrganizeDlg_Impl::ImportHdl(): no file dialog" );
 
@@ -2267,7 +2267,7 @@ IMPL_LINK( SfxOrganizeDlg_Impl, ImportHdl, sfx2::FileDialogHelper *, EMPTYARG )
 
 //-------------------------------------------------------------------------
 
-IMPL_LINK( SfxOrganizeDlg_Impl, ExportHdl, sfx2::FileDialogHelper *, EMPTYARG )
+IMPL_LINK_NOARG(SfxOrganizeDlg_Impl, ExportHdl)
 {
     DBG_ASSERT( pFileDlg, "SfxOrganizeDlg_Impl::ImportHdl(): no file dialog" );
     ::com::sun::star::uno::Sequence< ::rtl::OUString > aPaths;
@@ -2318,7 +2318,7 @@ IMPL_LINK( SfxOrganizeDlg_Impl, ExportHdl, sfx2::FileDialogHelper *, EMPTYARG )
 
 //-------------------------------------------------------------------------
 
-IMPL_LINK( SfxOrganizeDlg_Impl, AddFilesHdl, sfx2::FileDialogHelper *, EMPTYARG )
+IMPL_LINK_NOARG(SfxOrganizeDlg_Impl, AddFilesHdl)
 {
     if ( ERRCODE_NONE == pFileDlg->GetError() )
     {
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 3be70a36973f..2696882f154d 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -178,12 +178,12 @@ class SfxNewFileDialog_Impl
     DECL_LINK( Update, void * );
 
     DECL_LINK( RegionSelect, ListBox * );
-    DECL_LINK( TemplateSelect, ListBox * );
+    DECL_LINK(TemplateSelect, void *);
     DECL_LINK( DoubleClick, ListBox * );
     void TogglePreview(CheckBox *);
-    DECL_LINK( Expand, MoreButton * );
+    DECL_LINK( Expand, void * );
     DECL_LINK( PreviewClick, CheckBox * );
-    DECL_LINK( LoadFile, PushButton* );
+    DECL_LINK(LoadFile, void *);
     sal_uInt16  GetSelectedTemplatePos() const;
 
 public:
@@ -215,7 +215,7 @@ void SfxNewFileDialog_Impl::ClearInfo()
 
 //-------------------------------------------------------------------------
 
-IMPL_LINK( SfxNewFileDialog_Impl, Update, void *, EMPTYARG )
+IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update)
 {
     if ( xDocShell.Is() )
     {
@@ -317,12 +317,12 @@ IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox *, pBox )
 
 //-------------------------------------------------------------------------
 
-IMPL_LINK_INLINE_START( SfxNewFileDialog_Impl, Expand, MoreButton *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SfxNewFileDialog_Impl, Expand)
 {
     TemplateSelect(&aTemplateLb);
     return 0;
 }
-IMPL_LINK_INLINE_END( SfxNewFileDialog_Impl, Expand, MoreButton *, pMoreButton )
+IMPL_LINK_NOARG_INLINE_END(SfxNewFileDialog_Impl, Expand)
 
 //-------------------------------------------------------------------------
 
@@ -348,7 +348,7 @@ IMPL_LINK( SfxNewFileDialog_Impl, PreviewClick, CheckBox *, pBox )
 
 //-------------------------------------------------------------------------
 
-IMPL_LINK( SfxNewFileDialog_Impl, TemplateSelect, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SfxNewFileDialog_Impl, TemplateSelect)
 {
     // Still loading
     if ( xDocShell && xDocShell->GetProgress() )
@@ -376,12 +376,12 @@ IMPL_LINK_INLINE_END( SfxNewFileDialog_Impl, DoubleClick, ListBox *, pListBox )
 
 //-------------------------------------------------------------------------
 
-IMPL_LINK_INLINE_START( SfxNewFileDialog_Impl, LoadFile, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SfxNewFileDialog_Impl, LoadFile)
 {
     pAntiImpl->EndDialog(RET_TEMPLATE_LOAD);
     return 0;
 }
-IMPL_LINK_INLINE_END( SfxNewFileDialog_Impl, LoadFile, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(SfxNewFileDialog_Impl, LoadFile)
 //-------------------------------------------------------------------------
 
 sal_uInt16  SfxNewFileDialog_Impl::GetSelectedTemplatePos() const
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index ea797bed53aa..ea05d074b4cd 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -63,7 +63,7 @@ namespace com { namespace sun { namespace star { namespace frame { class XModule
 class DropListBox_Impl : public SvTreeListBox
 {
 private:
-    DECL_LINK( OnAsyncExecuteDrop, SvLBoxEntry* );
+    DECL_LINK(OnAsyncExecuteDrop, void *);
 
 protected:
     SfxCommonTemplateDialog_Impl* pDialog;
diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx
index d70e9046f3f4..2edeb5ece89c 100644
--- a/sfx2/source/inc/versdlg.hxx
+++ b/sfx2/source/inc/versdlg.hxx
@@ -70,8 +70,8 @@ class SfxVersionDialog : public SfxModalDialog
     LocaleDataWrapper*          mpLocaleWrapper;
     sal_Bool                    mbIsSaveVersionOnClose;
 
-    DECL_LINK(                  DClickHdl_Impl, Control* );
-    DECL_LINK(                  SelectHdl_Impl, Control* );
+    DECL_LINK(DClickHdl_Impl, void *);
+    DECL_LINK(SelectHdl_Impl, void *);
     DECL_LINK(                  ButtonHdl_Impl, Button* );
     void                        Init_Impl();
     void                        Open_Impl();
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 12e895f6578c..b7a68ec1b434 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -173,7 +173,7 @@ Window* SfxURLToolBoxControl_Impl::CreateItemWindow( Window* pParent )
     return pURLBox;
 }
 
-IMPL_LINK( SfxURLToolBoxControl_Impl, SelectHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SfxURLToolBoxControl_Impl, SelectHdl)
 {
     SvtURLBox* pURLBox = GetURLBox();
     String aName( pURLBox->GetURL() );
@@ -184,7 +184,7 @@ IMPL_LINK( SfxURLToolBoxControl_Impl, SelectHdl, void*, EMPTYARG )
     return 1L;
 }
 
-IMPL_LINK( SfxURLToolBoxControl_Impl, OpenHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SfxURLToolBoxControl_Impl, OpenHdl)
 {
     SvtURLBox* pURLBox = GetURLBox();
     OpenURL( pURLBox->GetURL(), pURLBox->IsCtrlOpen() );
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 0098ee534d4c..d7eb8516477b 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -528,7 +528,7 @@ IMPL_LINK( SfxVirtualMenu, Highlight, Menu *, pMenu )
     return sal_True;
 }
 
-IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG )
+IMPL_LINK_NOARG(SfxVirtualMenu, SettingsChanged)
 {
     sal_uInt16 nItemCount = pSVMenu->GetItemCount();
     SfxViewFrame *pViewFrame = pBindings->GetDispatcher()->GetFrame();
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index 068368733f06..75de3629797b 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -247,7 +247,7 @@ void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize )
 
 //-------------------------------------------------------------------------
 
-IMPL_LINK( SfxImageManager_Impl, OptionsChanged_Impl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SfxImageManager_Impl, OptionsChanged_Impl)
 {
     SetSymbolsSize_Impl( m_aOpt.GetCurrentSymbolsSize() );
     return 0L;
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 1cc71f228c51..53bfee21fddb 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -888,7 +888,7 @@ void SfxToolBoxControl::SetPopupWindow( SfxPopupWindow* pWindow )
 
 //--------------------------------------------------------------------
 
-IMPL_LINK( SfxToolBoxControl, PopupModeEndHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SfxToolBoxControl, PopupModeEndHdl)
 {
     if ( pImpl->mpPopupWindow->IsVisible() )
     {
@@ -1403,7 +1403,7 @@ void SfxPopupWindow::StateChanged(
 
 //--------------------------------------------------------------------
 
-IMPL_LINK( SfxPopupWindow, Delete, void *, EMPTYARG )
+IMPL_LINK_NOARG(SfxPopupWindow, Delete)
 {
     if ( m_aDeleteLink.IsSet() )
         m_aDeleteLink.Call( this );
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 28906a9bf25e..cb3bc575bb34 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -133,7 +133,7 @@ public:
     ~SfxInPlaceClient_Impl();
 
     void SizeHasChanged();
-    DECL_LINK           (TimerHdl, Timer*);
+    DECL_LINK(TimerHdl, void *);
     uno::Reference < frame::XFrame > GetFrame() const;
 
     // XEmbeddedClient
@@ -618,7 +618,7 @@ void SfxInPlaceClient_Impl::SizeHasChanged()
 }
 
 //--------------------------------------------------------------------
-IMPL_LINK( SfxInPlaceClient_Impl, TimerHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(SfxInPlaceClient_Impl, TimerHdl)
 {
     if ( m_pClient && m_xObject.is() )
         m_pClient->GetViewShell()->CheckIPClient_Impl( m_pClient, m_pClient->GetViewShell()->GetObjectShell()->GetVisArea() );
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index ddffcc2393de..97a5f06b81df 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -449,7 +449,7 @@ SfxDialogExecutor_Impl::SfxDialogExecutor_Impl( SfxViewShell* pViewSh, PrinterSe
 
 //--------------------------------------------------------------------
 
-IMPL_LINK( SfxDialogExecutor_Impl, Execute, void *, EMPTYARG )
+IMPL_LINK_NOARG(SfxDialogExecutor_Impl, Execute)
 {
     // Options noted locally
     if ( !_pOptions )