Use IMPL_LINK_NOARG[_TYPED] where applicable

Change-Id: I70598072c1d492e360ef46dd7b5ef5a2fa4be495

61 files changed, 91 insertions, 96 deletions

diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index f9d8a4c0dee8..a49be4491672 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -340,7 +340,7 @@ void ErrorBarResources::UpdateControlStates()
     }
 }
 
-IMPL_LINK( ErrorBarResources, CategoryChosen, void *,  )
+IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen )
 {
     m_bErrorKindUnique = true;
     SvxChartKindError eOldError = m_eErrorKind;
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index c4f84c496e28..fa0bb0e98676 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -735,10 +735,8 @@ void OfaViewTabPage::dispose()
 }
 
 #if defined( UNX )
-IMPL_LINK( OfaViewTabPage, OnAntialiasingToggled, void*, NOTINTERESTEDIN )
+IMPL_LINK_NOARG( OfaViewTabPage, OnAntialiasingToggled )
 {
-    (void)NOTINTERESTEDIN;
-
     bool bAAEnabled = m_pFontAntiAliasing->IsChecked();
 
     m_pAAPointLimitLabel->Enable( bAAEnabled );
@@ -749,9 +747,8 @@ IMPL_LINK( OfaViewTabPage, OnAntialiasingToggled, void*, NOTINTERESTEDIN )
 #endif
 
 // #i97672#
-IMPL_LINK( OfaViewTabPage, OnSelectionToggled, void*, NOTINTERESTEDIN )
+IMPL_LINK_NOARG( OfaViewTabPage, OnSelectionToggled )
 {
-    (void)NOTINTERESTEDIN;
     const bool bSelectionEnabled(m_pSelectionCB->IsChecked());
     m_pSelectionMF->Enable(bSelectionEnabled);
     return 0;
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index 011a1c66d4eb..4264b785ab22 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -278,7 +278,7 @@ namespace dbmm
         return MacroMigrationDialog_Base::onFinish();
     }
 
-    IMPL_LINK( MacroMigrationDialog, OnStartMigration, void*, /*_pNotInterestedIn*/ )
+    IMPL_LINK_NOARG( MacroMigrationDialog, OnStartMigration )
     {
         // prevent closing
         m_pData->bMigrationIsRunning = true;
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index 3c5d7507cd72..93cf4c0b748d 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -562,7 +562,7 @@ void DBContentLoader::cancel() throw(std::exception)
 {
 }
 
-IMPL_LINK( DBContentLoader, OnStartTableWizard, void*, /*NOTINTERESTEDIN*/ )
+IMPL_LINK_NOARG( DBContentLoader, OnStartTableWizard )
 {
     m_nStartWizard = 0;
     try
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 90e44b7c6f5f..f2943256c0a1 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -796,7 +796,7 @@ bool OApplicationController::isTableFormat()  const
     return OTableCopyHelper::isTableFormat(getViewClipboard());
 }
 
-IMPL_LINK( OApplicationController, OnAsyncDrop, void*, /*NOTINTERESTEDIN*/ )
+IMPL_LINK_NOARG( OApplicationController, OnAsyncDrop )
 {
     m_nAsyncDrop = 0;
     SolarMutexGuard aSolarGuard;
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 0928d17ba755..4e95d77abfe3 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -911,31 +911,31 @@ IMPL_LINK(OAppDetailPageHelper, OnEntryDoubleClick, SvTreeListBox*, _pTree)
     return bHandled ? 1L : 0L;
 }
 
-IMPL_LINK(OAppDetailPageHelper, OnEntrySelChange, void*, /*NOINTERESTEDIN*/)
+IMPL_LINK_NOARG(OAppDetailPageHelper, OnEntrySelChange)
 {
     getBorderWin().getView()->getAppController().onSelectionChanged();
     return 1L;
 }
 
-IMPL_LINK( OAppDetailPageHelper, OnCutEntry, void*, /*NOINTERESTEDIN*/ )
+IMPL_LINK_NOARG( OAppDetailPageHelper, OnCutEntry )
 {
     getBorderWin().getView()->getAppController().onCutEntry();
     return 1L;
 }
 
-IMPL_LINK( OAppDetailPageHelper, OnCopyEntry, void*, /*NOINTERESTEDIN*/ )
+IMPL_LINK_NOARG( OAppDetailPageHelper, OnCopyEntry )
 {
     getBorderWin().getView()->getAppController().onCopyEntry();
     return 1L;
 }
 
-IMPL_LINK( OAppDetailPageHelper, OnPasteEntry, void*, /*NOINTERESTEDIN*/ )
+IMPL_LINK_NOARG( OAppDetailPageHelper, OnPasteEntry )
 {
     getBorderWin().getView()->getAppController().onPasteEntry();
     return 1L;
 }
 
-IMPL_LINK( OAppDetailPageHelper, OnDeleteEntry, void*, /*NOINTERESTEDIN*/ )
+IMPL_LINK_NOARG( OAppDetailPageHelper, OnDeleteEntry )
 {
     getBorderWin().getView()->getAppController().onDeleteEntry();
     return 1L;
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 189117d2a90a..484e941648c7 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -1267,7 +1267,7 @@ void SbaXDataBrowserController::frameAction(const ::com::sun::star::frame::Frame
         }
 }
 
-IMPL_LINK( SbaXDataBrowserController, OnAsyncDisplayError, void*, /* _pNotInterestedIn */ )
+IMPL_LINK_NOARG( SbaXDataBrowserController, OnAsyncDisplayError )
 {
     if ( m_aCurrentError.isValid() )
     {
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index fe0ad003ab79..c49f99f502da 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -139,7 +139,7 @@ void UnoDataBrowserView::dispose()
     ODataView::dispose();
 }
 
-IMPL_LINK( UnoDataBrowserView, SplitHdl, void*, /*NOINTERESTEDIN*/ )
+IMPL_LINK_NOARG( UnoDataBrowserView, SplitHdl )
 {
     long nYPos = m_pSplitter->GetPosPixel().Y();
     m_pSplitter->SetPosPixel( Point( m_pSplitter->GetSplitPosPixel(), nYPos ) );
diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
index 5aadaaf0b6c1..dbec28796059 100644
--- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
+++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
@@ -193,7 +193,7 @@ namespace dbaui
 
         return NULL != pTransfer;
     }
-    IMPL_LINK(SbaTableQueryBrowser, OnCopyEntry, void*, /*NOTINTERESIN*/)
+    IMPL_LINK_NOARG(SbaTableQueryBrowser, OnCopyEntry)
     {
         SvTreeListEntry* pSelected = m_pTreeView->getListBox().FirstSelected();
         if( isEntryCopyAllowed( pSelected ) )
@@ -215,7 +215,7 @@ namespace dbaui
         if (pTransfer)
             pTransfer->CopyToClipboard(getView());
     }
-    IMPL_LINK( SbaTableQueryBrowser, OnAsyncDrop, void*, /*NOTINTERESTEDIN*/ )
+    IMPL_LINK_NOARG( SbaTableQueryBrowser, OnAsyncDrop )
     {
         m_nAsyncDrop = 0;
         SolarMutexGuard aSolarGuard;
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 3aef2d47f5af..d9537a80ebb8 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -361,7 +361,7 @@ Reference< ::com::sun::star::frame::XDispatch >  SAL_CALL SbaXGridPeer::queryDis
     return FmXGridPeer::queryDispatch(aURL, aTargetFrameName, nSearchFlags);
 }
 
-IMPL_LINK( SbaXGridPeer, OnDispatchEvent, void*, /*NOTINTERESTEDIN*/ )
+IMPL_LINK_NOARG( SbaXGridPeer, OnDispatchEvent )
 {
     VclPtr< SbaGridControl > pGrid = GetAs< SbaGridControl >();
     if ( pGrid )    // if this fails, we were disposing before arriving here
@@ -1444,7 +1444,7 @@ Reference< XPropertySet >  SbaGridControl::getDataSource() const
     return xReturn;
 }
 
-IMPL_LINK(SbaGridControl, AsynchDropEvent, void*, /*EMPTY_ARG*/)
+IMPL_LINK_NOARG(SbaGridControl, AsynchDropEvent)
 {
     m_nAsyncDropEvent = 0;
 
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index d80894fe1275..4514ea3c0403 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -2491,7 +2491,7 @@ bool SbaTableQueryBrowser::implSelect(const OUString& _rDataSourceName, const OU
     return false;
 }
 
-IMPL_LINK(SbaTableQueryBrowser, OnSelectionChange, void*, /*NOINTERESTEDIN*/)
+IMPL_LINK_NOARG(SbaTableQueryBrowser, OnSelectionChange)
 {
     return implSelect( m_pTreeView->getListBox().FirstSelected() ) ? 1L : 0L;
 }
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index 91fb5ddcb371..c1b15806da8c 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -177,7 +177,7 @@ IMPL_LINK_NOARG_TYPED(OSqlEdit, OnInvalidateTimer, Timer *, void)
         m_timerInvalidate.Start();
 }
 
-IMPL_LINK(OSqlEdit, ModifyHdl, void*, /*EMPTYTAG*/)
+IMPL_LINK_NOARG(OSqlEdit, ModifyHdl)
 {
     if (m_timerUndoActionCreation.IsActive())
         m_timerUndoActionCreation.Stop();
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 74fbdda370d1..3f541a1fd168 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -423,7 +423,7 @@ IMPL_LINK( OAddTableDlg, AddClickHdl, Button*, /*pButton*/ )
     return 0;
 }
 
-IMPL_LINK( OAddTableDlg, TableListDoubleClickHdl, void*, /*EMPTY_ARG*/ )
+IMPL_LINK_NOARG( OAddTableDlg, TableListDoubleClickHdl )
 {
     if ( impl_isAddAllowed() )
     {
@@ -436,7 +436,7 @@ IMPL_LINK( OAddTableDlg, TableListDoubleClickHdl, void*, /*EMPTY_ARG*/ )
     return 0L;  // not handled
 }
 
-IMPL_LINK( OAddTableDlg, TableListSelectHdl, void*, /*EMPTY_ARG*/ )
+IMPL_LINK_NOARG( OAddTableDlg, TableListSelectHdl )
 {
     m_pAddButton->Enable( m_xCurrentList->isLeafSelected() );
     return 0;
@@ -447,7 +447,7 @@ IMPL_LINK( OAddTableDlg, CloseClickHdl, Button*, /*pButton*/ )
     return int(Close());
 }
 
-IMPL_LINK( OAddTableDlg, OnTypeSelected, void*, /*EMPTY_ARG*/ )
+IMPL_LINK_NOARG( OAddTableDlg, OnTypeSelected )
 {
     if ( m_pCaseTables->IsChecked() )
         impl_switchTo( Tables );
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index bb3885c0fd58..c71fe8871088 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -935,7 +935,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
             m_aAsyncCaller.Call( NULL );
         }
 
-        IMPL_LINK( AsyncLoader, OnOpenDocument, void*, /*_pEmptyArg*/ )
+        IMPL_LINK_NOARG( AsyncLoader, OnOpenDocument )
         {
             try
             {
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index c5ceccbae91b..eddc0949f2cf 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -308,25 +308,25 @@ namespace dbaui
             OSL_FAIL("DirectSQLDialog::switchToHistory: invalid position!");
     }
 
-    IMPL_LINK( DirectSQLDialog, OnStatementModified, void*, /*NOTINTERESTEDIN*/ )
+    IMPL_LINK_NOARG( DirectSQLDialog, OnStatementModified )
     {
         m_pExecute->Enable(!m_pSQL->GetText().isEmpty());
         return 0L;
     }
 
-    IMPL_LINK( DirectSQLDialog, OnClose, void*, /*NOTINTERESTEDIN*/ )
+    IMPL_LINK_NOARG( DirectSQLDialog, OnClose )
     {
         EndDialog( RET_OK );
         return 0L;
     }
 
-    IMPL_LINK( DirectSQLDialog, OnExecute, void*, /*NOTINTERESTEDIN*/ )
+    IMPL_LINK_NOARG( DirectSQLDialog, OnExecute )
     {
         executeCurrent();
         return 0L;
     }
 
-    IMPL_LINK( DirectSQLDialog, OnListEntrySelected, void*, /*NOTINTERESTEDIN*/ )
+    IMPL_LINK_NOARG( DirectSQLDialog, OnListEntrySelected )
     {
         if (!m_pSQLHistory->IsTravelSelect())
         {
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index 950903da5ccd..a812a6b1afcb 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -124,7 +124,7 @@ IMPL_LINK_NOARG(ODatasourceSelectDialog, ManageClickHdl)
     return 0L;
 }
 
-IMPL_LINK( ODatasourceSelectDialog, ManageProcessFinished, void*, /**/ )
+IMPL_LINK_NOARG( ODatasourceSelectDialog, ManageProcessFinished )
 {
     StringBag aOdbcDatasources;
     OOdbcEnumeration aEnumeration;
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 9cdfc13d15bf..7abbb17ef6bb 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -557,7 +557,7 @@ namespace dbaui
             OnResetIndex();
     }
 
-    IMPL_LINK( DbaIndexDialog, OnCloseDialog, void*, /*NOTINTERESTEDIN*/ )
+    IMPL_LINK_NOARG( DbaIndexDialog, OnCloseDialog )
     {
         if (m_pIndexList->IsEditingActive())
         {
@@ -733,7 +733,7 @@ namespace dbaui
         return true;
     }
 
-    IMPL_LINK( DbaIndexDialog, OnModified, void*, /*NOTINTERESTEDIN*/ )
+    IMPL_LINK_NOARG( DbaIndexDialog, OnModified )
     {
         OSL_ENSURE(m_pPreviousSelection, "DbaIndexDialog, OnModified: invalid call!");
         Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(m_pPreviousSelection->GetUserData());
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index a2634ebce764..b1763b47356f 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -257,7 +257,7 @@ IMPL_LINK( OWizNameMatching, RightButtonClickHdl, Button *, pButton )
     return 0;
 }
 
-IMPL_LINK( OWizNameMatching, TableListClickHdl, void*, /*NOTINTERESTEDIN*/ )
+IMPL_LINK_NOARG( OWizNameMatching, TableListClickHdl )
 {
     SvTreeListEntry* pEntry = m_pCTRL_LEFT->FirstSelected();
     if(pEntry)
@@ -291,7 +291,7 @@ IMPL_LINK( OWizNameMatching, TableListClickHdl, void*, /*NOTINTERESTEDIN*/ )
     return 0;
 }
 
-IMPL_LINK( OWizNameMatching, TableListRightSelectHdl, void*, /*NOTINTERESTEDIN*/ )
+IMPL_LINK_NOARG( OWizNameMatching, TableListRightSelectHdl )
 {
     SvTreeListEntry* pEntry = m_pCTRL_RIGHT->FirstSelected();
     if(pEntry)
diff --git a/dbaccess/source/ui/misc/asyncmodaldialog.cxx b/dbaccess/source/ui/misc/asyncmodaldialog.cxx
index 2096c7a293c9..7769c1132e09 100644
--- a/dbaccess/source/ui/misc/asyncmodaldialog.cxx
+++ b/dbaccess/source/ui/misc/asyncmodaldialog.cxx
@@ -57,7 +57,7 @@ namespace dbaui
         DECL_LINK( onExecute, void* );
     };
 
-    IMPL_LINK( DialogExecutor_Impl, onExecute, void*, /* _notInterestedIn */ )
+    IMPL_LINK_NOARG( DialogExecutor_Impl, onExecute )
     {
         try
         {
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index a42e8e63b228..de79ceb57cc3 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2528,7 +2528,7 @@ void OQueryDesignView::dispose()
     OQueryView::dispose();
 }
 
-IMPL_LINK( OQueryDesignView, SplitHdl, void*, /*p*/ )
+IMPL_LINK_NOARG( OQueryDesignView, SplitHdl )
 {
     if (!getController().isReadOnly())
     {
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index 545e7712d361..f0408d945205 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -275,14 +275,14 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt )
     return nDND_Action;
 }
 
-IMPL_LINK( OTableWindowListBox, LookForUiHdl, void *, /*EMPTY_ARG*/)
+IMPL_LINK_NOARG( OTableWindowListBox, LookForUiHdl )
 {
     m_nUiEvent = 0;
     m_pTabWin->getTableView()->lookForUiActivities();
     return 0L;
 }
 
-IMPL_LINK( OTableWindowListBox, DropHdl, void *, /*EMPTY_ARG*/)
+IMPL_LINK_NOARG( OTableWindowListBox, DropHdl )
 {
     // create the connection
     m_nDropEvent = 0;
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index 9aa8ba3d6494..47ef55bbc19c 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -133,7 +133,7 @@ namespace dbaui
         if(m_pViewSwitch)
             m_pViewSwitch->GrabFocus();
     }
-    IMPL_LINK( OQueryContainerWindow, SplitHdl, void*, /*p*/ )
+    IMPL_LINK_NOARG( OQueryContainerWindow, SplitHdl )
     {
         m_pSplitter->SetPosPixel( Point( m_pSplitter->GetPosPixel().X(),m_pSplitter->GetSplitPosPixel() ) );
         Resize();
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 4db99e4d3151..841dc331e973 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -1967,7 +1967,7 @@ void OQueryController::setEscapeProcessing_fireEvent( const bool _bEscapeProcess
     fire( &nHandle, &aNewValue, &aOldValue, 1, sal_False );
 }
 
-IMPL_LINK( OQueryController, OnExecuteAddTable, void*, /*pNotInterestedIn*/ )
+IMPL_LINK_NOARG( OQueryController, OnExecuteAddTable )
 {
     Execute( ID_BROWSER_ADDTABLE,Sequence<PropertyValue>() );
     return 0L;
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 430d0a35aef0..6a88ef2f5417 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -467,7 +467,7 @@ void ORelationController::mergeData(const TTableConnectionData& _aConnectionData
     }
 }
 
-IMPL_LINK( ORelationController, OnThreadFinished, void*, /*NOTINTERESTEDIN*/ )
+IMPL_LINK_NOARG( ORelationController, OnThreadFinished )
 {
     ::SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 55b02a6593ab..203341077a09 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -624,7 +624,7 @@ bool OTableEditorCtrl::CursorMoving(long nNewRow, sal_uInt16 nNewCol)
     return true;
 }
 
-IMPL_LINK( OTableEditorCtrl, InvalidateFieldType, void*, /*EMPTYTAG*/ )
+IMPL_LINK_NOARG( OTableEditorCtrl, InvalidateFieldType )
 {
     nInvalidateTypeEvent = 0;
     Invalidate( GetFieldRectPixel(nOldDataPos, FIELD_TYPE) );
@@ -1456,14 +1456,14 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt)
 
 }
 
-IMPL_LINK( OTableEditorCtrl, DelayedCut, void*, /*EMPTYTAG*/ )
+IMPL_LINK_NOARG( OTableEditorCtrl, DelayedCut )
 {
     nCutEvent = 0;
     OTableRowView::cut();
     return 0;
 }
 
-IMPL_LINK( OTableEditorCtrl, DelayedPaste, void*, /*EMPTYTAG*/ )
+IMPL_LINK_NOARG( OTableEditorCtrl, DelayedPaste )
 {
     nPasteEvent = 0;
 
@@ -1491,14 +1491,14 @@ IMPL_LINK( OTableEditorCtrl, DelayedPaste, void*, /*EMPTYTAG*/ )
     return 0;
 }
 
-IMPL_LINK( OTableEditorCtrl, DelayedDelete, void*, /*EMPTYTAG*/ )
+IMPL_LINK_NOARG( OTableEditorCtrl, DelayedDelete )
 {
     nDeleteEvent = 0;
     DeleteRows();
     return 0;
 }
 
-IMPL_LINK( OTableEditorCtrl, DelayedInsNewRows, void*, /*EMPTYTAG*/ )
+IMPL_LINK_NOARG( OTableEditorCtrl, DelayedInsNewRows )
 {
     nInsNewRowsEvent = 0;
     sal_Int32 nPastePosition = GetView()->getController().getFirstEmptyRowPosition();
diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
index 8a4cde521d19..24fd827bf1c7 100644
--- a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
+++ b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
@@ -29,7 +29,7 @@ void MainThreadExecutor_Impl::execute()
     Application::PostUserEvent( LINK( this, MainThreadExecutor_Impl, executor ), NULL );
 }
 
-IMPL_LINK( MainThreadExecutor_Impl, executor, void*, pDummyParam )
+IMPL_LINK_NOARG( MainThreadExecutor_Impl, executor )
 {
     if ( m_xJob.is() )
     {
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 9dd84a1a0041..a40df372427f 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -182,7 +182,7 @@ namespace abp
     }
 
 
-    IMPL_LINK( OAddessBookSourcePilot, OnCancelClicked, void*, /*NOTINTERESTEDIN*/ )
+    IMPL_LINK_NOARG( OAddessBookSourcePilot, OnCancelClicked )
     {
         // do cleanups
         implCleanup();
diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx
index 57bb822c076f..6f219ca3cfd6 100644
--- a/extensions/source/abpilot/admininvokationpage.cxx
+++ b/extensions/source/abpilot/admininvokationpage.cxx
@@ -83,7 +83,7 @@ namespace abp
         return AddressBookSourcePage::canAdvance() && getDialog()->getDataSource().isConnected();
     }
 
-    IMPL_LINK( AdminDialogInvokationPage, OnInvokeAdminDialog, void*, /*NOTINTERESTEDIN*/ )
+    IMPL_LINK_NOARG( AdminDialogInvokationPage, OnInvokeAdminDialog )
     {
         OAdminDialogInvokation aInvokation( getORB(), getDialog()->getDataSource().getDataSource(), getDialog() );
         if ( aInvokation.invokeAdministration( AST_LDAP == getSettings().eType ) )
diff --git a/extensions/source/abpilot/fieldmappingpage.cxx b/extensions/source/abpilot/fieldmappingpage.cxx
index 9ad8a3b0f11d..0091e8b2bbfa 100644
--- a/extensions/source/abpilot/fieldmappingpage.cxx
+++ b/extensions/source/abpilot/fieldmappingpage.cxx
@@ -79,7 +79,7 @@ namespace abp
     }
 
 
-    IMPL_LINK( FieldMappingPage, OnInvokeDialog, void*, /*NOTINTERESTEDIN*/ )
+    IMPL_LINK_NOARG( FieldMappingPage, OnInvokeDialog )
     {
         AddressSettings& rSettings = getSettings();
 
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index a282abe51e7c..90bdf31a0ce7 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -262,7 +262,7 @@ namespace abp
     }
 
 
-    IMPL_LINK( TypeSelectionPage, OnTypeSelected, void*, /*NOTINTERESTEDIN*/ )
+    IMPL_LINK_NOARG( TypeSelectionPage, OnTypeSelected )
     {
         getDialog()->typeSelectionChanged( getSelectedType() );
         updateDialogTravelUI();
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index 9e6235055801..1699b8ddbd28 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -272,7 +272,7 @@ namespace bib
             pGridWin->GrabFocus();
     }
 
-    IMPL_LINK( BibBeamer, RecalcLayout_Impl, void*, /*pVoid*/ )
+    IMPL_LINK_NOARG( BibBeamer, RecalcLayout_Impl )
     {
         long nHeight = pToolBar->GetSizePixel().Height();
         SetItemSize( ID_TOOLBAR, nHeight );
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 4c39a326ac11..d2f252c84b2f 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -533,7 +533,7 @@ void BibToolBar::DataChanged( const DataChangedEvent& rDCEvt )
     ToolBox::DataChanged( rDCEvt );
 }
 
-IMPL_LINK( BibToolBar, OptionsChanged_Impl, void*, /*pVoid*/ )
+IMPL_LINK_NOARG( BibToolBar, OptionsChanged_Impl )
 {
     bool bRebuildToolBar = false;
     sal_Int16 eSymbolsSize = SvtMiscOptions().GetCurrentSymbolsSize();
@@ -557,7 +557,7 @@ IMPL_LINK( BibToolBar, OptionsChanged_Impl, void*, /*pVoid*/ )
 
 
 
-IMPL_LINK( BibToolBar, SettingsChanged_Impl, void*, /*pVoid*/ )
+IMPL_LINK_NOARG( BibToolBar, SettingsChanged_Impl )
 {
     // Check if toolbar button size have changed and we have to use system settings
     sal_Int16 eSymbolsSize = SvtMiscOptions().GetCurrentSymbolsSize();
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 5e4062de42eb..53a9bd4ddbf0 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -3229,7 +3229,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK( FormComponentPropertyHandler, OnDesignerClosed, void*, /*NOTINTERESTEDIN*/ )
+    IMPL_LINK_NOARG( FormComponentPropertyHandler, OnDesignerClosed )
     {
         OSL_ENSURE( m_xBrowserUI.is() && m_xCommandDesigner.is(), "FormComponentPropertyHandler::OnDesignerClosed: too many NULLs!" );
         if ( m_xBrowserUI.is() && m_xCommandDesigner.is() )
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 4b6b81d5e64e..3f02bd3a0b0c 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -660,7 +660,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK( FormLinkDialog, OnSuggest, void*, /*_pNotInterestedIn*/ )
+    IMPL_LINK_NOARG( FormLinkDialog, OnSuggest )
     {
         initializeFieldRowsFrom( m_aRelationDetailColumns, m_aRelationMasterColumns );
         return 0L;
@@ -674,7 +674,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK( FormLinkDialog, OnInitialize, void*, /*_pNotInterestedIn*/ )
+    IMPL_LINK_NOARG( FormLinkDialog, OnInitialize )
     {
         initializeColumnLabels();
         initializeFieldLists();
diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx
index 50f85e22489b..c6d76be1433d 100644
--- a/extensions/source/propctrlr/newdatatype.cxx
+++ b/extensions/source/propctrlr/newdatatype.cxx
@@ -79,7 +79,7 @@ namespace pcr
         ModalDialog::dispose();
     }
 
-    IMPL_LINK( NewDataTypeDialog, OnNameModified, void*, /*_pNotInterestedIn*/ )
+    IMPL_LINK_NOARG( NewDataTypeDialog, OnNameModified )
     {
         OUString sCurrentName = GetName();
         bool bNameIsOK = ( !sCurrentName.isEmpty() )
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 240b3f51131c..6a69e92d456b 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -460,7 +460,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK( OHyperlinkControl, OnHyperlinkClicked, void*, /*_NotInterestedIn*/ )
+    IMPL_LINK_NOARG( OHyperlinkControl, OnHyperlinkClicked )
     {
         ActionEvent aEvent( *this, OUString( "clicked" ) );
         m_aActionListeners.forEach< XActionListener >(
@@ -945,7 +945,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK( OComboboxControl, OnEntrySelected, void*, /*_pNothing*/ )
+    IMPL_LINK_NOARG( OComboboxControl, OnEntrySelected )
     {
         if ( !getTypedControlWindow()->IsTravelSelect() )
             // fire a commit
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index e6b053dd7ce2..5d83fa2c9660 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -493,7 +493,7 @@ IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
     return 0L;
 }
 
-IMPL_LINK( ImpTwain, ImplDestroyHdl, void*, /*p*/ )
+IMPL_LINK_NOARG( ImpTwain, ImplDestroyHdl )
 {
     if( hTwainWnd )
         DestroyWindow( hTwainWnd );
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index b0f8fe93f552..7a7ff0c7a095 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1025,7 +1025,7 @@ IMPL_LINK_NOARG(ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl)
     return 0;
 }
 
-IMPL_LINK( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl, void*, )
+IMPL_LINK_NOARG( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl )
 {
     mpNumZoom->Enable( mpRbMagnZoom->IsChecked() );
     return 0;
@@ -1076,7 +1076,7 @@ void ImpPDFTabViewerPage::dispose()
     SfxTabPage::dispose();
 }
 
-IMPL_LINK( ImpPDFTabViewerPage, ToggleRbBookmarksHdl, void*, )
+IMPL_LINK_NOARG( ImpPDFTabViewerPage, ToggleRbBookmarksHdl )
 {
     m_pNumBookmarkLevels->Enable( m_pRbVisibleBookmarkLevels->IsChecked() );
     return 0;
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index 50c483b97151..0d67724aa65f 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -311,7 +311,7 @@ namespace frm
     }
 
 
-    IMPL_LINK( RichTextControlImpl, OnInvalidateAllAttributes, void*, /*_pNotInterestedIn*/ )
+    IMPL_LINK_NOARG( RichTextControlImpl, OnInvalidateAllAttributes )
     {
         updateAllAttributes();
         return 0L;
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 313c28ff20cd..417ac6d30da4 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -549,7 +549,7 @@ namespace frm
     }
 
 
-    IMPL_LINK( ORichTextModel, OnEngineContentModified, void*, /*_pNotInterestedIn*/ )
+    IMPL_LINK_NOARG( ORichTextModel, OnEngineContentModified )
     {
         if ( !m_bSettingEngineText )
         {
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index dcbc676e900f..5b6d33416f85 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -175,7 +175,7 @@ Image PlacesListBox::getEntryIcon( PlacePtr pPlace )
     return theImage;
 }
 
-IMPL_LINK( PlacesListBox, Selection, void* , )
+IMPL_LINK_NOARG( PlacesListBox, Selection )
 {
     sal_uInt32 nSelected = mpImpl->GetCurrRow();
     PlacePtr pPlace = maPlaces[nSelected];
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 1e7e818fea57..90432ad734aa 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -1221,8 +1221,7 @@ IMPL_LINK_NOARG( SvtFileDialog, FilterSelectHdl_Impl )
     return 0;
 }
 
-IMPL_LINK_TYPED(
-    SvtFileDialog, FilterSelectTimerHdl_Impl, Timer*,, void)
+IMPL_LINK_NOARG_TYPED(SvtFileDialog, FilterSelectTimerHdl_Impl, Timer*, void)
 {
     // filter the view again
     ExecuteFilter();
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 7924a17dd102..657479acd56b 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -494,14 +494,14 @@ void OAddFieldWindow::_elementReplaced( const container::ContainerEvent& /*_rEve
 {
 }
 
-IMPL_LINK( OAddFieldWindow, OnSelectHdl, void* ,/*_pAddFieldDlg*/)
+IMPL_LINK_NOARG( OAddFieldWindow, OnSelectHdl )
 {
     m_aActions->EnableItem(SID_ADD_CONTROL_PAIR, ( m_pListBox.get() && m_pListBox->GetSelectionCount() > 0 ));
 
     return 0L;
 }
 
-IMPL_LINK( OAddFieldWindow, OnDoubleClickHdl, void* ,/*_pAddFieldDlg*/)
+IMPL_LINK_NOARG( OAddFieldWindow, OnDoubleClickHdl )
 {
     if ( m_aCreateLink.IsSet() )
         m_aCreateLink.Call(this);
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 3bea4c01bbc1..839fa91abfde 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -871,7 +871,7 @@ void OFieldExpressionControl::paste()
     }
 }
 
-IMPL_LINK( OFieldExpressionControl, DelayedPaste, void*,  )
+IMPL_LINK_NOARG( OFieldExpressionControl, DelayedPaste )
 {
     m_nPasteEvent = 0;
 
@@ -884,7 +884,7 @@ IMPL_LINK( OFieldExpressionControl, DelayedPaste, void*,  )
     return 0;
 }
 
-IMPL_LINK( OFieldExpressionControl, DelayedDelete, void*,  )
+IMPL_LINK_NOARG( OFieldExpressionControl, DelayedDelete )
 {
     m_nDeleteEvent = 0;
     DeleteRows();
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 4ddada521fd6..aaa341497fda 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -406,7 +406,7 @@ void ODesignView::ImplInitSettings()
     SetTextFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() );
 }
 
-IMPL_LINK( ODesignView, SplitHdl, void*,  )
+IMPL_LINK_NOARG( ODesignView, SplitHdl )
 {
     const Size aOutputSize = GetOutputSizePixel();
     const long nTest = aOutputSize.Width() * m_aSplitWin->GetItemSize(TASKPANE_ID) / 100;
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 39a3979417ea..486c2713ecc5 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -1747,7 +1747,7 @@ void OReportController::impl_initialize( )
     }
 }
 
-IMPL_LINK( OReportController, OnOpenHelpAgent, void* ,/*_pMemfun*/)
+IMPL_LINK_NOARG( OReportController, OnOpenHelpAgent )
 {
     doOpenHelpAgent();
     return 0L;
@@ -3149,7 +3149,7 @@ void OReportController::createNewFunction(const uno::Any& _aValue)
     xFunctions->insertByIndex(xFunctions->getCount(),uno::makeAny(xFunction));
 }
 
-IMPL_LINK( OReportController, OnExecuteReport, void* ,/*_pMemfun*/)
+IMPL_LINK_NOARG( OReportController, OnExecuteReport )
 {
     executeReport();
     return 0L;
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index 941979199fdc..ba805f1163ee 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -569,7 +569,7 @@ void PropBrw::Update( const uno::Reference< uno::XInterface>& _xReportComponent)
     }
 }
 
-IMPL_LINK( PropBrw, OnAsyncGetFocus, void*,  )
+IMPL_LINK_NOARG( PropBrw, OnAsyncGetFocus )
 {
     if (m_xBrowserComponentWindow.is())
         m_xBrowserComponentWindow->setFocus();
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
index a8cf31ee5cd1..af18023226bc 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
@@ -111,7 +111,7 @@ void ChangeRequestQueueProcessor::StartProcessing()
     }
 }
 
-IMPL_LINK(ChangeRequestQueueProcessor, ProcessEvent, void*, pUnused)
+IMPL_LINK_NOARG(ChangeRequestQueueProcessor, ProcessEvent)
 {
     (void)pUnused;
 
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index b790240f2cf9..4ca83641e93d 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1157,9 +1157,8 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con
     }
 }
 
-IMPL_LINK( FileDialogHelper_Impl, InitControls, void*, NOTINTERESTEDIN )
+IMPL_LINK_NOARG( FileDialogHelper_Impl, InitControls )
 {
-    (void)NOTINTERESTEDIN;
     mnPostUserEventId = 0;
     enablePasswordBox( true );
     updateFilterOptionsBox( );
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index 9a5807fc2e10..f8c67f3db5bb 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -455,7 +455,7 @@ void AsyncAccelExec::execAsync()
 }
 
 
-IMPL_LINK(AsyncAccelExec, impl_ts_asyncCallback, void*,)
+IMPL_LINK_NOARG(AsyncAccelExec, impl_ts_asyncCallback)
 {
     if (! m_xDispatch.is())
         return 0;
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 15901210f71d..1d111466647a 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -2413,7 +2413,7 @@ namespace svt { namespace table
     }
 
 
-    IMPL_LINK( TableControl_Impl, OnUpdateScrollbars, void*, /**/ )
+    IMPL_LINK_NOARG( TableControl_Impl, OnUpdateScrollbars )
     {
         // TODO: can't we simply use lcl_updateScrollbar here, so the scrollbars ranges are updated, instead of
         // doing a complete re-layout?
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index d7959e6fdd00..056582910ef0 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -375,7 +375,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )
     return DND_ACTION_LINK;
 }
 
-IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
+IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop )
 {
     OUString             sCommand, sFieldName,sURL;
     sal_Int32                   nCommandType = CommandType::COMMAND;
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index cee42391ebb1..da23bfd34dad 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2846,7 +2846,7 @@ void DbGridControl::Command(const CommandEvent& rEvt)
     }
 }
 
-IMPL_LINK(DbGridControl, OnDelete, void*, /*EMPTYTAG*/ )
+IMPL_LINK_NOARG(DbGridControl, OnDelete)
 {
     m_nDeleteEvent = 0;
     DeleteSelectedRows();
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 4b291c573975..3d86527ba7f8 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -485,7 +485,7 @@ void FmPropBrw::FillInfo( SfxChildWinInfo& rInfo ) const
 }
 
 
-IMPL_LINK( FmPropBrw, OnAsyncGetFocus, void*, /*NOTINTERESTEDIN*/ )
+IMPL_LINK_NOARG( FmPropBrw, OnAsyncGetFocus )
 {
     if (m_xBrowserComponentWindow.is())
         m_xBrowserComponentWindow->setFocus();
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 9480956fc422..d208c147ee17 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -3622,7 +3622,7 @@ void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, bool _bDeactivate
 }
 
 
-IMPL_LINK( FmXFormShell, OnFirstTimeActivation, void*, /*NOTINTERESTEDIN*/ )
+IMPL_LINK_NOARG( FmXFormShell, OnFirstTimeActivation )
 {
     if ( impl_checkDisposed() )
         return 0L;
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index a28064a46152..8044e8b6c6dc 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -608,7 +608,7 @@ void FmXFormView::displayAsyncErrorMessage( const SQLErrorEvent& _rEvent )
 }
 
 
-IMPL_LINK(FmXFormView, OnDelayedErrorMessage, void*, /*EMPTYTAG*/)
+IMPL_LINK_NOARG(FmXFormView, OnDelayedErrorMessage)
 {
     m_nErrorMessageEvent = 0;
     displayException( m_aAsyncError );
@@ -657,7 +657,7 @@ void FmXFormView::resumeTabOrderUpdate()
 }
 
 
-IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/)
+IMPL_LINK_NOARG(FmXFormView, OnActivate)
 {
     m_nActivationEvent = 0;
 
@@ -895,7 +895,7 @@ Reference< XFormController > FmXFormView::getFormController( const Reference< XF
 }
 
 
-IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/)
+IMPL_LINK_NOARG(FmXFormView, OnAutoFocus)
 {
     m_nAutoFocusEvent = 0;
 
@@ -1017,7 +1017,7 @@ void FmXFormView::breakCreateFormObject()
     m_xLastCreatedControlModel.clear();
 }
 
-IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ )
+IMPL_LINK_NOARG( FmXFormView, OnStartControlWizard )
 {
     m_nControlWizardEvent = 0;
     OSL_PRECOND( m_xLastCreatedControlModel.is(), "FmXFormView::OnStartControlWizard: illegal call!" );
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 1ded55099cd5..3cce6bd0820e 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -1757,7 +1757,7 @@ void FormController::focusGained(const FocusEvent& e) throw( RuntimeException, s
 }
 
 
-IMPL_LINK( FormController, OnActivated, void*, /**/ )
+IMPL_LINK_NOARG( FormController, OnActivated )
 {
     EventObject aEvent;
     aEvent.Source = *this;
@@ -1767,7 +1767,7 @@ IMPL_LINK( FormController, OnActivated, void*, /**/ )
 }
 
 
-IMPL_LINK( FormController, OnDeactivated, void*, /**/ )
+IMPL_LINK_NOARG( FormController, OnDeactivated )
 {
     EventObject aEvent;
     aEvent.Source = *this;
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 3d0d836ed736..498bffbd1a37 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -427,7 +427,7 @@ void PosSizePropertyPanel::HandleContextChange(
 
 
 
-IMPL_LINK( PosSizePropertyPanel, ChangeWidthHdl, void*, /*pBox*/ )
+IMPL_LINK_NOARG( PosSizePropertyPanel, ChangeWidthHdl )
 {
     if( mpCbxScale->IsChecked() &&
         mpCbxScale->IsEnabled() )
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 9c43b5f3b884..0e9e6f9a2ac6 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -489,7 +489,7 @@ SwHTMLParser::~SwHTMLParser()
     }
 }
 
-IMPL_LINK( SwHTMLParser, AsyncCallback, void*, /*pVoid*/ )
+IMPL_LINK_NOARG( SwHTMLParser, AsyncCallback )
 {
     nEventId=0;
 
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index bada3de87a31..acfd88125efc 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -695,7 +695,7 @@ bool SwColumnPage::FillItemSet(SfxItemSet *rSet)
 }
 
 // update ColumnManager
-IMPL_LINK( SwColumnPage, UpdateColMgr, void *, /*pField*/ )
+IMPL_LINK_NOARG( SwColumnPage, UpdateColMgr )
 {
     long nGutterWidth = pColMgr->GetGutterWidth();
     if(nCols > 1)
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index 09357e2b40b8..90f02e258868 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -1877,7 +1877,7 @@ void SwPostItMgr::SetActiveSidebarWin( SwSidebarWin* p)
     }
 }
 
-IMPL_LINK( SwPostItMgr, CalcHdl, void*, /* pVoid*/  )
+IMPL_LINK_NOARG( SwPostItMgr, CalcHdl )
 {
     mnEventId = 0;
     if ( mbLayouting )