[Libreoffice-commits] core.git: 20 commits - avmedia/source basctl/source basic/source chart2/source cui/source dbaccess/source desktop/source editeng/source embeddedobj/test extensions/source filter/source forms/source fpicker/source framework/source include/editeng include/sfx2 include/svtools include/svx include/tools reportdesign/source sc/source sd/source sfx2/source starmath/source svl/source svtools/source svx/source sw/inc sw/qa sw/source test/source toolkit/source unotools/source uui/source vcl/generic vcl/source vcl/unx vcl/workben

Stephan Bergmann sbergman at redhat.com
Sun May 10 03:56:01 PDT 2015


 avmedia/source/framework/mediacontrol.cxx                            |    2 
 basctl/source/basicide/baside3.cxx                                   |    2 
 basctl/source/basicide/basobj2.cxx                                   |    1 
 basctl/source/basicide/iderdll.cxx                                   |    2 
 basic/source/classes/sbxmod.cxx                                      |    2 
 chart2/source/controller/dialogs/dlg_DataEditor.cxx                  |    2 
 chart2/source/controller/dialogs/res_ErrorBar.cxx                    |    2 
 chart2/source/controller/dialogs/tp_Scale.cxx                        |    2 
 cui/source/customize/macropg.cxx                                     |   14 
 cui/source/dialogs/SpellDialog.cxx                                   |   42 +-
 cui/source/dialogs/cuifmsearch.cxx                                   |    2 
 cui/source/dialogs/hlmailtp.cxx                                      |    2 
 cui/source/dialogs/hyphen.cxx                                        |    2 
 cui/source/dialogs/insdlg.cxx                                        |   24 -
 cui/source/dialogs/passwdomdlg.cxx                                   |    2 
 cui/source/dialogs/scriptdlg.cxx                                     |    2 
 cui/source/dialogs/thesdlg.cxx                                       |    3 
 cui/source/inc/SpellDialog.hxx                                       |    2 
 cui/source/inc/cuitabline.hxx                                        |    2 
 cui/source/inc/insdlg.hxx                                            |    4 
 cui/source/inc/macroass.hxx                                          |   12 
 cui/source/inc/macropg.hxx                                           |    6 
 cui/source/options/optgdlg.cxx                                       |    7 
 cui/source/options/optinet2.cxx                                      |    6 
 cui/source/options/treeopt.cxx                                       |    2 
 cui/source/tabpages/chardlg.cxx                                      |    2 
 cui/source/tabpages/macroass.cxx                                     |   36 -
 cui/source/tabpages/page.cxx                                         |    2 
 cui/source/tabpages/paragrph.cxx                                     |    2 
 cui/source/tabpages/tparea.cxx                                       |    2 
 cui/source/tabpages/tpline.cxx                                       |   10 
 dbaccess/source/ext/macromigration/macromigrationdialog.cxx          |    2 
 dbaccess/source/filter/xml/dbloader2.cxx                             |    2 
 dbaccess/source/ui/app/AppControllerDnD.cxx                          |    2 
 dbaccess/source/ui/app/AppDetailPageHelper.cxx                       |   10 
 dbaccess/source/ui/browser/brwctrlr.cxx                              |    2 
 dbaccess/source/ui/browser/brwview.cxx                               |    2 
 dbaccess/source/ui/browser/dsbrowserDnD.cxx                          |    4 
 dbaccess/source/ui/browser/sbagrid.cxx                               |    4 
 dbaccess/source/ui/browser/unodatbr.cxx                              |    2 
 dbaccess/source/ui/control/sqledit.cxx                               |    2 
 dbaccess/source/ui/dlg/TextConnectionHelper.cxx                      |    2 
 dbaccess/source/ui/dlg/adtabdlg.cxx                                  |    6 
 dbaccess/source/ui/dlg/dbwizsetup.cxx                                |    2 
 dbaccess/source/ui/dlg/directsql.cxx                                 |    8 
 dbaccess/source/ui/dlg/dsselect.cxx                                  |    2 
 dbaccess/source/ui/dlg/indexdialog.cxx                               |    4 
 dbaccess/source/ui/misc/WNameMatch.cxx                               |    4 
 dbaccess/source/ui/misc/asyncmodaldialog.cxx                         |    2 
 dbaccess/source/ui/querydesign/QueryDesignView.cxx                   |    2 
 dbaccess/source/ui/querydesign/TableWindowListBox.cxx                |    4 
 dbaccess/source/ui/querydesign/querycontainerwindow.cxx              |    2 
 dbaccess/source/ui/querydesign/querycontroller.cxx                   |    2 
 dbaccess/source/ui/relationdesign/RelationController.cxx             |    2 
 dbaccess/source/ui/tabledesign/TEditControl.cxx                      |   10 
 desktop/source/app/app.cxx                                           |    6 
 desktop/source/app/officeipcthread.cxx                               |    4 
 editeng/source/items/numitem.cxx                                     |   10 
 embeddedobj/test/MainThreadExecutor/xexecutor.cxx                    |    2 
 extensions/source/abpilot/abspilot.cxx                               |    2 
 extensions/source/abpilot/admininvokationpage.cxx                    |    2 
 extensions/source/abpilot/fieldmappingpage.cxx                       |    2 
 extensions/source/abpilot/typeselectionpage.cxx                      |    2 
 extensions/source/bibliography/bibbeam.cxx                           |    2 
 extensions/source/bibliography/bibview.cxx                           |    4 
 extensions/source/bibliography/bibview.hxx                           |    2 
 extensions/source/bibliography/framectr.cxx                          |    4 
 extensions/source/bibliography/framectr.hxx                          |    2 
 extensions/source/bibliography/toolbar.cxx                           |    4 
 extensions/source/propctrlr/formcomponenthandler.cxx                 |    2 
 extensions/source/propctrlr/formlinkdialog.cxx                       |    4 
 extensions/source/propctrlr/newdatatype.cxx                          |    2 
 extensions/source/propctrlr/standardcontrol.cxx                      |    4 
 extensions/source/scanner/scanwin.cxx                                |    2 
 filter/source/pdf/impdialog.cxx                                      |    6 
 filter/source/xsltdialog/xmlfiltertabdialog.cxx                      |    4 
 forms/source/component/Edit.cxx                                      |    2 
 forms/source/component/FormattedField.cxx                            |    2 
 forms/source/component/clickableimage.cxx                            |    6 
 forms/source/component/clickableimage.hxx                            |    2 
 forms/source/richtext/richtextimplcontrol.cxx                        |    2 
 forms/source/richtext/richtextmodel.cxx                              |    2 
 fpicker/source/office/PlacesListBox.cxx                              |    4 
 fpicker/source/office/iodlg.cxx                                      |  207 ++++------
 fpicker/source/office/iodlg.hxx                                      |   16 
 framework/source/fwe/classes/addonsoptions.cxx                       |    2 
 framework/source/layoutmanager/layoutmanager.cxx                     |    2 
 framework/source/uielement/complextoolbarcontroller.cxx              |    4 
 framework/source/uielement/generictoolbarcontroller.cxx              |    2 
 framework/source/uielement/macrosmenucontroller.cxx                  |    2 
 framework/source/uielement/newmenucontroller.cxx                     |    2 
 framework/source/uielement/recentfilesmenucontroller.cxx             |    2 
 framework/source/uielement/toolbarmanager.cxx                        |    2 
 framework/source/uielement/toolbarsmenucontroller.cxx                |    2 
 include/editeng/numitem.hxx                                          |    2 
 include/sfx2/fcontnr.hxx                                             |    2 
 include/svtools/asynclink.hxx                                        |    4 
 include/svtools/calendar.hxx                                         |    2 
 include/svtools/svparser.hxx                                         |    4 
 include/svtools/treelistbox.hxx                                      |    2 
 include/svx/colrctrl.hxx                                             |    2 
 include/tools/link.hxx                                               |   21 -
 reportdesign/source/ui/dlg/AddField.cxx                              |    4 
 reportdesign/source/ui/dlg/GroupsSorting.cxx                         |    4 
 reportdesign/source/ui/report/DesignView.cxx                         |    2 
 reportdesign/source/ui/report/ReportController.cxx                   |    4 
 reportdesign/source/ui/report/dlgedfac.cxx                           |    2 
 reportdesign/source/ui/report/propbrw.cxx                            |    2 
 sc/source/core/data/userdat.cxx                                      |    2 
 sc/source/ui/condformat/condformatdlg.cxx                            |    2 
 sc/source/ui/docshell/externalrefmgr.cxx                             |    2 
 sc/source/ui/inc/content.hxx                                         |    2 
 sc/source/ui/inc/csvtablebox.hxx                                     |    6 
 sc/source/ui/miscdlgs/acredlin.cxx                                   |    2 
 sc/source/ui/navipi/content.cxx                                      |    4 
 sc/source/ui/optdlg/calcoptionsdlg.cxx                               |    2 
 sc/source/ui/optdlg/opredlin.cxx                                     |    2 
 sc/source/ui/pagedlg/scuitphfedit.cxx                                |    2 
 sc/source/ui/sidebar/AlignmentPropertyPanel.cxx                      |   12 
 sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx                 |    2 
 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx                   |    2 
 sc/source/ui/vba/vbaeventshelper.cxx                                 |    2 
 sc/source/ui/view/preview.cxx                                        |    4 
 sc/source/ui/view/prevwsh.cxx                                        |    2 
 sc/source/ui/view/viewdata.cxx                                       |    2 
 sd/source/ui/annotations/annotationwindow.cxx                        |    2 
 sd/source/ui/app/sdmod1.cxx                                          |    2 
 sd/source/ui/dlg/headerfooterdlg.cxx                                 |    2 
 sd/source/ui/dlg/navigatr.cxx                                        |    2 
 sd/source/ui/dlg/sdtreelb.cxx                                        |    4 
 sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx |    2 
 sd/source/ui/inc/sdtreelb.hxx                                        |    2 
 sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx             |    2 
 sfx2/source/appl/fileobj.cxx                                         |   42 +-
 sfx2/source/appl/fileobj.hxx                                         |    4 
 sfx2/source/appl/impldde.cxx                                         |   11 
 sfx2/source/appl/shutdownicon.cxx                                    |   14 
 sfx2/source/appl/shutdownicon.hxx                                    |    3 
 sfx2/source/bastyp/fltfnc.cxx                                        |    4 
 sfx2/source/control/recentdocsview.cxx                               |    2 
 sfx2/source/dialog/dinfdlg.cxx                                       |    4 
 sfx2/source/dialog/filedlghelper.cxx                                 |    3 
 sfx2/source/dialog/tplcitem.cxx                                      |   12 
 sfx2/source/inc/tplcitem.hxx                                         |    3 
 sfx2/source/inet/inettbc.cxx                                         |    2 
 sfx2/source/menu/virtmenu.cxx                                        |    2 
 sfx2/source/sidebar/AsynchronousCall.cxx                             |    2 
 sfx2/source/sidebar/Deck.cxx                                         |    2 
 sfx2/source/sidebar/SidebarToolBox.cxx                               |    4 
 sfx2/source/sidebar/TabBar.cxx                                       |    4 
 sfx2/source/view/viewsh.cxx                                          |    2 
 starmath/source/dialog.cxx                                           |   30 -
 starmath/source/edit.cxx                                             |    4 
 svl/source/numbers/zforlist.cxx                                      |    2 
 svtools/source/contnr/imivctl1.cxx                                   |    6 
 svtools/source/contnr/treelistbox.cxx                                |    6 
 svtools/source/control/asynclink.cxx                                 |   14 
 svtools/source/control/calendar.cxx                                  |   12 
 svtools/source/control/inettbc.cxx                                   |   24 -
 svtools/source/dialogs/PlaceEditDialog.cxx                           |   10 
 svtools/source/dialogs/ServerDetailsControls.cxx                     |    8 
 svtools/source/dialogs/addresstemplate.cxx                           |    2 
 svtools/source/hatchwindow/documentcloser.cxx                        |    1 
 svtools/source/misc/acceleratorexecute.cxx                           |    2 
 svtools/source/svrtf/svparser.cxx                                    |   24 -
 svtools/source/table/tablecontrol_impl.cxx                           |    2 
 svtools/source/uno/contextmenuhelper.cxx                             |    2 
 svtools/source/uno/generictoolboxcontroller.cxx                      |    2 
 svtools/source/uno/popupmenucontrollerbase.cxx                       |    2 
 svtools/source/uno/popupwindowcontroller.cxx                         |    1 
 svtools/source/uno/toolboxcontroller.cxx                             |    2 
 svx/source/engine3d/float3d.cxx                                      |    2 
 svx/source/engine3d/objfac3d.cxx                                     |    2 
 svx/source/fmcomp/fmgridcl.cxx                                       |    2 
 svx/source/fmcomp/gridctrl.cxx                                       |    2 
 svx/source/form/datanavi.cxx                                         |    2 
 svx/source/form/fmPropBrw.cxx                                        |    2 
 svx/source/form/fmobjfac.cxx                                         |    2 
 svx/source/form/fmshimp.cxx                                          |    2 
 svx/source/form/fmvwimp.cxx                                          |    8 
 svx/source/form/formcontroller.cxx                                   |    4 
 svx/source/gallery2/GalleryControl.cxx                               |    2 
 svx/source/gallery2/galbrws2.cxx                                     |    2 
 svx/source/gallery2/galmisc.cxx                                      |    2 
 svx/source/sidebar/area/AreaPropertyPanel.cxx                        |    4 
 svx/source/sidebar/graphic/GraphicPropertyPanel.cxx                  |   14 
 svx/source/sidebar/line/LinePropertyPanel.cxx                        |   10 
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx                  |   14 
 svx/source/sidebar/text/TextCharacterSpacingControl.cxx              |    4 
 svx/source/sidebar/tools/Popup.cxx                                   |    2 
 svx/source/tbxctrls/colrctrl.cxx                                     |    4 
 sw/inc/dbmgr.hxx                                                     |    2 
 sw/inc/doc.hxx                                                       |    2 
 sw/inc/docsh.hxx                                                     |    2 
 sw/inc/htmltbl.hxx                                                   |    2 
 sw/qa/tiledrendering/tiledrendering.cxx                              |    4 
 sw/source/core/doc/doclay.cxx                                        |    4 
 sw/source/core/doc/htmltbl.cxx                                       |    7 
 sw/source/core/draw/dobjfac.cxx                                      |    2 
 sw/source/filter/html/swhtml.cxx                                     |    2 
 sw/source/ui/config/mailconfigpage.cxx                               |   10 
 sw/source/ui/dbui/addresslistdialog.cxx                              |   34 -
 sw/source/ui/dbui/addresslistdialog.hxx                              |    2 
 sw/source/ui/dbui/mmoutputpage.hxx                                   |   10 
 sw/source/ui/dbui/mmoutputtypepage.cxx                               |   24 -
 sw/source/ui/dialog/uiregionsw.cxx                                   |    2 
 sw/source/ui/dialog/wordcountdialog.cxx                              |    2 
 sw/source/ui/frmdlg/column.cxx                                       |    2 
 sw/source/ui/misc/glosbib.cxx                                        |    2 
 sw/source/ui/table/tabledlg.cxx                                      |    2 
 sw/source/uibase/app/apphdl.cxx                                      |    2 
 sw/source/uibase/dbui/dbui.cxx                                       |    2 
 sw/source/uibase/dialog/regionsw.cxx                                 |    8 
 sw/source/uibase/docvw/PostItMgr.cxx                                 |    2 
 sw/source/uibase/envelp/syncbtn.cxx                                  |    2 
 sw/source/uibase/inc/basesh.hxx                                      |    2 
 sw/source/uibase/inc/dbtree.hxx                                      |    2 
 sw/source/uibase/inc/numfmtlb.hxx                                    |    2 
 sw/source/uibase/inc/pview.hxx                                       |    6 
 sw/source/uibase/inc/redlndlg.hxx                                    |   20 
 sw/source/uibase/inc/unotools.hxx                                    |    4 
 sw/source/uibase/inc/view.hxx                                        |   16 
 sw/source/uibase/inc/wrtsh.hxx                                       |    2 
 sw/source/uibase/ribbar/workctrl.cxx                                 |    2 
 sw/source/uibase/shells/textsh2.cxx                                  |    4 
 sw/source/uibase/sidebar/PageColumnControl.cxx                       |    2 
 sw/source/uibase/sidebar/PageMarginControl.cxx                       |    4 
 sw/source/uibase/sidebar/PageSizeControl.cxx                         |    2 
 sw/source/uibase/sidebar/WrapPropertyPanel.cxx                       |    2 
 sw/source/uibase/uiview/viewling.cxx                                 |    2 
 sw/source/uibase/uiview/viewmdi.cxx                                  |   22 -
 sw/source/uibase/utlui/glbltree.cxx                                  |    2 
 test/source/bootstrapfixture.cxx                                     |    2 
 test/source/vclbootstrapprotector.cxx                                |    2 
 toolkit/source/awt/asynccallback.cxx                                 |    2 
 unotools/source/ucbhelper/ucblockbytes.cxx                           |    2 
 uui/source/authfallbackdlg.cxx                                       |    4 
 vcl/generic/print/genprnpsp.cxx                                      |    2 
 vcl/source/app/svapp.cxx                                             |    4 
 vcl/source/control/combobox.cxx                                      |    2 
 vcl/source/control/lstbox.cxx                                        |    2 
 vcl/unx/generic/app/sm.cxx                                           |    8 
 vcl/unx/gtk/window/gtksalframe.cxx                                   |   13 
 vcl/workben/svpclient.cxx                                            |    2 
 244 files changed, 676 insertions(+), 709 deletions(-)

New commits:
commit 6dc42c82bade7ed1cf2cf142ab9137ad8f98e188
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun May 10 11:24:40 2015 +0200

    Use IMPL_LINK_NOARG[_TYPED] where applicable
    
    Change-Id: I70598072c1d492e360ef46dd7b5ef5a2fa4be495

diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index f9d8a4c..a49be44 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 c4f84c4..fa0bb0e 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 011a1c6..4264b78 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 3c5d750..93cf4c0 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 90e44b7..f294325 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 0928d17..4e95d77 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 189117d..484e941 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 fe0ad00..c49f99f 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 5aadaaf..dbec287 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 3aef2d4..d9537a8 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 d80894f..4514ea3 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 91fb5dd..c1b1580 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 74fbdda..3f541a1 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 bb3885c..c71fe88 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 c5ceccb..eddc094 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 950903d..a812a6b 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 9cdfc13..7abbb17 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 a2634eb..b1763b4 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 2096c7a..7769c11 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 a42e8e6..de79ceb 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 545e771..f0408d9 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 9aa8ba3..47ef55b 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 4db99e4..841dc33 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 430d0a3..6a88ef2 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 55b02a6..2033410 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 8a4cde5..24fd827 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 9dd84a1..a40df37 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 57bb822..6f219ca 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 9ad8a3b..0091e8b 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 a282abe..90bdf31 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 9e62350..1699b8d 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 4c39a32..d2f252c 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 5e4062d..53a9bd4 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 4b6b81d..3f02bd3 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 50f85e2..c6d76be 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 240b3f5..6a69e92 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 e6b053d..5d83fa2 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 b0f8fe9..7a7ff0c 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 50c483b..0d67724 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 313c28f..417ac6d 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 dcbc676..5b6d334 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 1e7e818..90432ad 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 7924a17..657479a 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 3bea4c0..839fa91 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 4ddada5..aaa3414 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 39a3979..486c271 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 9419791..ba805f1 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 a8cf31e..af18023 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 b790240..4ca8364 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 9a5807f..f8c67f3 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 1590121..1d11146 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 d7959e6..0565829 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 cee4239..da23bfd 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 4b291c5..3d86527 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 9480956..d208c14 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 a28064a..8044e8b 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 1ded550..3cce6bd 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 3d0d836..498bffb 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 9c43b5f..0e9e6f9 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 bada3de..acfd881 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 09357e2..90f02e2 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 )
commit 892cb24be673e8441a75bdde950c2087a24bdf74
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun May 10 10:33:29 2015 +0200

    Fix uses of SAL_DLLPRIVATE DECL_LINK etc.
    
    Change-Id: Ibab84ce977e34bbae04e703a87a3211d20813558

diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx
index 747199b..b51abc6 100644
--- a/sc/source/ui/inc/csvtablebox.hxx
+++ b/sc/source/ui/inc/csvtablebox.hxx
@@ -127,9 +127,9 @@ protected:
     virtual Size                GetOptimalSize() const SAL_OVERRIDE;
 
 private:
-    SAL_DLLPRIVATE              DECL_LINK( CsvCmdHdl, ScCsvControl* );
-    SAL_DLLPRIVATE              DECL_LINK( ScrollHdl, ScrollBar* );
-    SAL_DLLPRIVATE              DECL_LINK( ScrollEndHdl, ScrollBar* );
+    DECL_DLLPRIVATE_LINK( CsvCmdHdl, ScCsvControl* );
+    DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar* );
+    DECL_DLLPRIVATE_LINK( ScrollEndHdl, ScrollBar* );
 
     // accessibility ----------------------------------------------------------
 public:
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index dfcd231..47defa8 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -203,7 +203,7 @@ friend class SwConnectionDisposedListener_Impl;
     SAL_DLLPRIVATE SwDSParam*          FindDSData(const SwDBData& rData, bool bCreate);
     SAL_DLLPRIVATE SwDSParam*          FindDSConnection(const OUString& rSource, bool bCreate);
 
-    SAL_DLLPRIVATE DECL_LINK( PrtCancelHdl, Button * );
+    DECL_DLLPRIVATE_LINK( PrtCancelHdl, Button * );
 
     /// Insert data record as text into document.
     SAL_DLLPRIVATE void ImportFromConnection( SwWrtShell* pSh);
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 137e6cf..af0aed6 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -148,7 +148,7 @@ class SW_DLLPUBLIC SwDocShell
     SAL_DLLPRIVATE void                  CalcLayoutForOLEObjects();
 
     SAL_DLLPRIVATE void                  Init_Impl();
-    SAL_DLLPRIVATE DECL_STATIC_LINK( SwDocShell, IsLoadFinished, void* );
+    DECL_DLLPRIVATE_STATIC_LINK( SwDocShell, IsLoadFinished, void* );
 
     using SfxObjectShell::GetVisArea;
 
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx
index 1e99dc3..7dc3061 100644
--- a/sw/source/ui/dbui/mmoutputpage.hxx
+++ b/sw/source/ui/dbui/mmoutputpage.hxx
@@ -178,11 +178,11 @@ class SwSendMailDialog : public ModelessDialog //SfxModalDialog
     sal_Int32               m_nSendCount;
     sal_Int32               m_nErrorCount;
 
-    SAL_DLLPRIVATE DECL_LINK( StopHdl_Impl, PushButton* );
-    SAL_DLLPRIVATE DECL_LINK( CloseHdl_Impl, void* );
-    SAL_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, StartSendMails, SwSendMailDialog* );
-    SAL_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, StopSendMails, SwSendMailDialog* );
-    SAL_DLLPRIVATE DECL_LINK_TYPED( RemoveThis, Idle*, void );
+    DECL_DLLPRIVATE_LINK( StopHdl_Impl, PushButton* );
+    DECL_DLLPRIVATE_LINK( CloseHdl_Impl, void* );
+    DECL_DLLPRIVATE_STATIC_LINK( SwSendMailDialog, StartSendMails, SwSendMailDialog* );
+    DECL_DLLPRIVATE_STATIC_LINK( SwSendMailDialog, StopSendMails, SwSendMailDialog* );
+    DECL_DLLPRIVATE_LINK_TYPED( RemoveThis, Idle*, void );
 
     SAL_DLLPRIVATE void        IterateMails();
     SAL_DLLPRIVATE void        SendMails();
diff --git a/sw/source/uibase/inc/dbtree.hxx b/sw/source/uibase/inc/dbtree.hxx
index 94179d4..dfb7930 100644
--- a/sw/source/uibase/inc/dbtree.hxx
+++ b/sw/source/uibase/inc/dbtree.hxx
@@ -41,7 +41,7 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox
 
     SwDBTreeList_Impl* pImpl;
 
-    SAL_DLLPRIVATE DECL_LINK( DBCompare, SvSortData* );
+    DECL_DLLPRIVATE_LINK( DBCompare, SvSortData* );
 
     SAL_DLLPRIVATE void          InitTreeList();
     SAL_DLLPRIVATE virtual void  RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx
index ede0731..8d285be 100644
--- a/sw/source/uibase/inc/numfmtlb.hxx
+++ b/sw/source/uibase/inc/numfmtlb.hxx
@@ -38,7 +38,7 @@ class SW_DLLPUBLIC NumFormatListBox : public ListBox
                                               //to be shown in the number format dialog
     bool                bUseAutomaticLanguage;//determine whether language is automatically assigned
 
-    SAL_DLLPRIVATE DECL_LINK( SelectHdl, ListBox * );
+    DECL_DLLPRIVATE_LINK( SelectHdl, ListBox * );
 
     SAL_DLLPRIVATE double          GetDefValue(const short nFormatType) const;
     SAL_DLLPRIVATE void            Init(short nFormatType, bool bUsrFmts);
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index e11c697..26b8be1 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -184,9 +184,9 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell
     SAL_DLLPRIVATE Point           AlignToPixel(const Point& rPt) const;
 
     SAL_DLLPRIVATE int             _CreateScrollbar( bool bHori );
-    SAL_DLLPRIVATE DECL_LINK( ScrollHdl, SwScrollbar * );
-    SAL_DLLPRIVATE DECL_LINK( EndScrollHdl, SwScrollbar * );
-    SAL_DLLPRIVATE DECL_LINK( BtnPage, Button * );
+    DECL_DLLPRIVATE_LINK( ScrollHdl, SwScrollbar * );
+    DECL_DLLPRIVATE_LINK( EndScrollHdl, SwScrollbar * );
+    DECL_DLLPRIVATE_LINK( BtnPage, Button * );
     SAL_DLLPRIVATE bool            ChgPage( int eMvMode, bool bUpdateScrollbar = true );
 
     SAL_DLLPRIVATE virtual SfxPrinter*     GetPrinter( bool bCreate = false ) SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx
index 6c5aabb..68fa0fd 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -93,16 +93,16 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
     // prevent update dialog data during longer operations (cf #102657#)
     bool                    bInhibitActivate;
 
-    SAL_DLLPRIVATE DECL_LINK( AcceptHdl,     void* );
-    SAL_DLLPRIVATE DECL_LINK( AcceptAllHdl,  void* );
-    SAL_DLLPRIVATE DECL_LINK( RejectHdl,     void* );
-    SAL_DLLPRIVATE DECL_LINK( RejectAllHdl,  void* );
-    SAL_DLLPRIVATE DECL_LINK( UndoHdl,           void* );
-    SAL_DLLPRIVATE DECL_LINK( DeselectHdl,       void* );
-    SAL_DLLPRIVATE DECL_LINK( SelectHdl,     void* );
-    SAL_DLLPRIVATE DECL_LINK_TYPED( SelectTimerHdl, Timer*, void );
-    SAL_DLLPRIVATE DECL_LINK_TYPED( GotoHdl, Timer*, void );
-    SAL_DLLPRIVATE DECL_LINK( CommandHdl,        void* );
+    DECL_DLLPRIVATE_LINK( AcceptHdl,     void* );
+    DECL_DLLPRIVATE_LINK( AcceptAllHdl,  void* );
+    DECL_DLLPRIVATE_LINK( RejectHdl,     void* );
+    DECL_DLLPRIVATE_LINK( RejectAllHdl,  void* );
+    DECL_DLLPRIVATE_LINK( UndoHdl,           void* );
+    DECL_DLLPRIVATE_LINK( DeselectHdl,       void* );
+    DECL_DLLPRIVATE_LINK( SelectHdl,     void* );
+    DECL_DLLPRIVATE_LINK_TYPED( SelectTimerHdl, Timer*, void );
+    DECL_DLLPRIVATE_LINK_TYPED( GotoHdl, Timer*, void );
+    DECL_DLLPRIVATE_LINK( CommandHdl,        void* );
 
     SAL_DLLPRIVATE sal_uInt16            CalcDiff(sal_uInt16 nStart, bool bChild);
     SAL_DLLPRIVATE void          InsertChildren(SwRedlineDataParent *pParent, const SwRangeRedline& rRedln, const sal_uInt16 nAutoFmt);
diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx
index 64dc616..3dd2086 100644
--- a/sw/source/uibase/inc/unotools.hxx
+++ b/sw/source/uibase/inc/unotools.hxx
@@ -89,8 +89,8 @@ class SW_DLLPUBLIC SwOneExampleFrame
 
     static  bool    bShowServiceNotAvailableMessage;
 
-    SAL_DLLPRIVATE DECL_LINK_TYPED( TimeoutHdl, Idle*, void );
-    SAL_DLLPRIVATE DECL_LINK( PopupHdl, Menu* );
+    DECL_DLLPRIVATE_LINK_TYPED( TimeoutHdl, Idle*, void );
+    DECL_DLLPRIVATE_LINK( PopupHdl, Menu* );
 
     SAL_DLLPRIVATE void  CreateControl();
     SAL_DLLPRIVATE void  DisposeControl();
diff --git a/sw/source/uibase/inc/view.hxx b/sw/source/uibase/inc/view.hxx
index 77f4013..6f0cec2 100644
--- a/sw/source/uibase/inc/view.hxx
+++ b/sw/source/uibase/inc/view.hxx
@@ -279,12 +279,12 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
 
     // create control elements
     SAL_DLLPRIVATE void          CreateBtns();
-    SAL_DLLPRIVATE DECL_LINK( BtnPage, Button * );
+    DECL_DLLPRIVATE_LINK( BtnPage, Button * );
 
-    SAL_DLLPRIVATE DECL_LINK_TYPED( TimeoutHdl, Timer*, void );
-    SAL_DLLPRIVATE DECL_LINK( UpdatePercentHdl, GraphicFilter* );
+    DECL_DLLPRIVATE_LINK_TYPED( TimeoutHdl, Timer*, void );
+    DECL_DLLPRIVATE_LINK( UpdatePercentHdl, GraphicFilter* );
 
-    SAL_DLLPRIVATE DECL_LINK( FieldPopupModeEndHdl, void* );
+    DECL_DLLPRIVATE_LINK( FieldPopupModeEndHdl, void* );
 
     inline long     GetXScroll() const;
     inline long     GetYScroll() const;
@@ -305,10 +305,10 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
     SAL_DLLPRIVATE long          PhyPageDown();
 
     SAL_DLLPRIVATE int               _CreateScrollbar( bool bHori );
-    SAL_DLLPRIVATE DECL_LINK( ScrollHdl, SwScrollbar * );
-    SAL_DLLPRIVATE DECL_LINK( EndScrollHdl, SwScrollbar * );
+    DECL_DLLPRIVATE_LINK( ScrollHdl, SwScrollbar * );
+    DECL_DLLPRIVATE_LINK( EndScrollHdl, SwScrollbar * );
     SAL_DLLPRIVATE bool          UpdateScrollbars();
-    SAL_DLLPRIVATE DECL_LINK( WindowChildEventListener, VclSimpleEvent* );
+    DECL_DLLPRIVATE_LINK( WindowChildEventListener, VclSimpleEvent* );
     SAL_DLLPRIVATE void          CalcVisArea( const Size &rPixelSz );
 
     SAL_DLLPRIVATE void            CreatePageButtons(bool bShow);
commit 67e82c48e1729a2ea939ffacb6b237a64cefa763
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat May 9 22:07:19 2015 +0200

    No more need for EMPTYARG in C++11
    
    Change-Id: I8a6abc563fa80a801d1907100d0b1138d260c36e

diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 4c2063b..df1b15f 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -574,7 +574,7 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
 }
 
 // select event handler on the listbox
-IMPL_LINK( _SvxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG )
+IMPL_LINK( _SvxMacroTabPage, SelectEvent_Impl, SvTabListBox*, )
 {
     _SvxMacroTabPage_Impl*    pImpl = mpImpl;
     SvHeaderTabListBox&        rListBox = pImpl->pEventLB->GetListBox();
@@ -597,7 +597,7 @@ IMPL_LINK( _SvxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn )
     return GenericHandler_Impl( this, pBtn );
 }
 
-IMPL_LINK( _SvxMacroTabPage, DoubleClickHdl_Impl, SvTabListBox *, EMPTYARG )
+IMPL_LINK( _SvxMacroTabPage, DoubleClickHdl_Impl, SvTabListBox *, )
 {
     return GenericHandler_Impl( this, NULL );
 }
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 325f6f3..a27774c 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -441,7 +441,7 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent
 /* Initialize, asynchronous to prevent virtial calls
    from a constructor
  */
-IMPL_LINK( SpellDialog, InitHdl, SpellDialog *, EMPTYARG )
+IMPL_LINK( SpellDialog, InitHdl, SpellDialog *, )
 {
     SetUpdateMode( false );
     //show or hide AutoCorrect depending on the modules abilities
@@ -911,7 +911,7 @@ int SpellDialog::InitUserDicts()
 }
 
 
-IMPL_LINK(SpellDialog, AddToDictClickHdl, PushButton*, EMPTYARG )
+IMPL_LINK(SpellDialog, AddToDictClickHdl, PushButton*, )
 {
     return AddToDictionaryExecute(1, m_pAddToDictMB->GetPopupMenu());
 }
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 77d1150..76c132a 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -410,7 +410,7 @@ IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified)
     return 0;
 }
 
-IMPL_LINK(FmSearchDialog, OnFocusGrabbed, ComboBox*, EMPTYARG)
+IMPL_LINK(FmSearchDialog, OnFocusGrabbed, ComboBox*,)
 {
     m_pcmbSearchText->SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
     return 0;
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index c24e4eb..a4e08f8 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -354,7 +354,7 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, CutHdl_Impl)
 }
 
 
-IMPL_LINK( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, EMPTYARG /*pButton*/ )
+IMPL_LINK( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, /*pButton*/ )
 {
     if( !bBusy )
     {
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index d48e043..8fcabe5 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -762,7 +762,7 @@ IMPL_LINK( SfxInsertFloatingFrameDialog, CheckHdl, CheckBox*, pCB )
 
 
 
-IMPL_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, EMPTYARG )
+IMPL_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, )
 {
     vcl::Window* pOldParent = Application::GetDefDialogParent();
     Application::SetDefDialogParent( this );
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index 1b47dda..88d52d8 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -94,7 +94,7 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl(
         m_pOptionsExpander->Hide();
 }
 
-IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG /*pBtn*/ )
+IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, /*pBtn*/ )
 {
     bool bInvalidState = !m_pOpenReadonlyCB->IsChecked() &&
             m_pPasswdToOpenED->GetText().isEmpty() &&
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index f573967..a8566ea 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -542,7 +542,7 @@ void SvxThesaurusDialog::dispose()
     SvxStandardDialog::dispose();
 }
 
-IMPL_LINK( SvxThesaurusDialog, ReplaceBtnHdl_Impl, Button *, EMPTYARG /*pBtn*/ )
+IMPL_LINK( SvxThesaurusDialog, ReplaceBtnHdl_Impl, Button *, /*pBtn*/ )
 {
     EndDialog(RET_OK);
     return 0;
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index f752b80..b882722 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -261,7 +261,7 @@ bool _SfxMacroTabPage::IsReadOnly() const
     return mpImpl->bReadOnly;
 }
 
-IMPL_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG )
+IMPL_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, )
 {
     _SfxMacroTabPage_Impl*  pImpl = mpImpl;
     SvHeaderTabListBox&     rListBox = pImpl->pEventLB->GetListBox();
@@ -279,7 +279,7 @@ IMPL_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, EMPTYARG )
+IMPL_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, )
 {
     _SfxMacroTabPage_Impl*  pImpl = mpImpl;
     pImpl->pGroupLB->GroupSelected();
@@ -293,7 +293,7 @@ IMPL_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox*, EMPTYARG )
+IMPL_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox*, )
 {
     EnableButtons();
     return 0;
@@ -346,7 +346,7 @@ IMPL_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn )
     return 0;
 }
 
-IMPL_LINK_TYPED( _SfxMacroTabPage, TimeOut_Impl, Idle*, EMPTYARG, void )
+IMPL_LINK_TYPED( _SfxMacroTabPage, TimeOut_Impl, Idle*,, void )
 {
     // FillMacroList() can take a long time -> show wait cursor and disable input
     SfxTabDialog* pTabDlg = GetTabDialog();
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 590676c..89c0641 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -1701,7 +1701,7 @@ void SvxPageDescPage::DisableVerticalPageDir()
     }
 }
 
-IMPL_LINK( SvxPageDescPage, FrameDirectionModify_Impl, ListBox*,  EMPTYARG)
+IMPL_LINK( SvxPageDescPage, FrameDirectionModify_Impl, ListBox*,)
 {
     m_pBspWin->SetFrameDirection( (sal_uInt32) m_pTextFlowBox->GetSelectEntryValue() );
     m_pBspWin->Invalidate();
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index 5c8b4b3..1444b79 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -180,7 +180,7 @@ namespace dbaui
         TabPage::dispose();
     }
 
-    IMPL_LINK(OTextConnectionHelper, OnControlModified, Control*, /*EMPTYARG*/)
+    IMPL_LINK(OTextConnectionHelper, OnControlModified, Control*,)
     {
         callModifiedHdl();
         return 0L;
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index 58cf4d4..9e62d15 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -174,7 +174,7 @@ namespace bib
         mpBibView->Resize();
     }
 
-    IMPL_LINK( BibView, CallMappingHdl, BibView*, EMPTYARG )
+    IMPL_LINK( BibView, CallMappingHdl, BibView*, )
     {
         m_pDatMan->CreateMappingDialog( this );
         return 0;
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index 7235c1b..dcbc676 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* , EMPTYARG )
+IMPL_LINK( PlacesListBox, Selection, void* , )
 {
     sal_uInt32 nSelected = mpImpl->GetCurrRow();
     PlacePtr pPlace = maPlaces[nSelected];
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index cfb4ce4..1e7e818 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -674,7 +674,7 @@ void SvtFileDialog::Init_Impl
     Resize();
 }
 
-IMPL_LINK( SvtFileDialog, NewFolderHdl_Impl, PushButton*, EMPTYARG )
+IMPL_LINK( SvtFileDialog, NewFolderHdl_Impl, PushButton*, )
 {
     _pFileView->EndInplaceEditing( false );
 
@@ -1222,7 +1222,7 @@ IMPL_LINK_NOARG( SvtFileDialog, FilterSelectHdl_Impl )
 }
 
 IMPL_LINK_TYPED(
-    SvtFileDialog, FilterSelectTimerHdl_Impl, Timer*, EMPTYARG, void)
+    SvtFileDialog, FilterSelectTimerHdl_Impl, Timer*,, void)
 {
     // filter the view again
     ExecuteFilter();
diff --git a/include/tools/link.hxx b/include/tools/link.hxx
index 45e7298..a48c3b8 100644
--- a/include/tools/link.hxx
+++ b/include/tools/link.hxx
@@ -113,8 +113,6 @@
 #define LINK(Instance, Class, Member) ::tools::detail::makeLink( \
     static_cast<Class *>(Instance), &Class::LinkStub##Member)
 
-#define EMPTYARG
-
 template<typename Arg = void *, typename Ret = sal_IntPtr> class Link {
 public:
     typedef Ret Stub(void *, Arg);
diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx
index d0415ab..d35e885 100644
--- a/sc/source/ui/vba/vbaeventshelper.cxx
+++ b/sc/source/ui/vba/vbaeventshelper.cxx
@@ -472,7 +472,7 @@ void ScVbaEventListener::postWindowResizeEvent( vcl::Window* pWindow )
     }
 }
 
-IMPL_LINK( ScVbaEventListener, processWindowResizeEvent, vcl::Window*, EMPTYARG pWindow )
+IMPL_LINK( ScVbaEventListener, processWindowResizeEvent, vcl::Window*, pWindow )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index b188464..7b72aba 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -482,7 +482,7 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll )
     return 0;
 }
 
-IMPL_LINK (ScPreviewShell, CloseHdl, SystemWindow*, EMPTYARG)
+IMPL_LINK (ScPreviewShell, CloseHdl, SystemWindow*,)
 {
     ExitPreview();
     return 0;
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index e2082c2..a8b8a13 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -364,7 +364,7 @@ void ShutdownIcon::StartFileDialog()
 
 
 
-IMPL_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYARG )
+IMPL_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, )
 {
     DBG_ASSERT( m_pFileDlg, "ShutdownIcon, DialogClosedHdl_Impl(): no file dialog" );
 
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index 0f71527..612166c 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -155,7 +155,7 @@ void SfxTemplateControllerItem::StateChanged( sal_uInt16 nSID, SfxItemState eSta
 }
 
 IMPL_LINK(SfxTemplateControllerItem, SetWaterCanStateHdl_Impl,
-                                    SfxTemplateControllerItem*, EMPTYARG)
+                                    SfxTemplateControllerItem*,)
 {
     nUserEventId = 0;
     SfxBoolItem* pState = 0;
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index f976942..7522c57 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -277,7 +277,7 @@ Image TabBar::GetItemImage (const DeckDescriptor& rDeckDescriptor) const
         mxFrame);
 }
 
-IMPL_LINK(TabBar::Item, HandleClick, Button*, EMPTYARG)
+IMPL_LINK(TabBar::Item, HandleClick, Button*,)
 {
     try
     {
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 98f4513..e62257b 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -149,7 +149,7 @@ void SetFontStyle(const OUString &rStyleName, vcl::Font &rFont)
 
 /**************************************************************************/
 
-IMPL_LINK( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, EMPTYARG/*pButton*/ )
+IMPL_LINK( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *,/*pButton*/ )
 {
     m_pZoom->Enable(m_pSizeZoomed->IsChecked());
     return 0;
@@ -305,7 +305,7 @@ IMPL_LINK( SmFontDialog, FontModifyHdl, ComboBox *, pComboBox )
 }
 
 
-IMPL_LINK( SmFontDialog, AttrChangeHdl, CheckBox *, EMPTYARG /*pCheckBox*/ )
+IMPL_LINK( SmFontDialog, AttrChangeHdl, CheckBox *, /*pCheckBox*/ )
 {
     if (m_pBoldCheckBox->IsChecked())
         Face.SetWeight(FontWeight(WEIGHT_BOLD));
@@ -445,7 +445,7 @@ public:
     }
 };
 
-IMPL_LINK( SmFontSizeDialog, DefaultButtonClickHdl, Button *, EMPTYARG /*pButton*/ )
+IMPL_LINK( SmFontSizeDialog, DefaultButtonClickHdl, Button *, /*pButton*/ )
 {
     if (SaveDefaultsQuery(this).Execute() == RET_YES)
     {
@@ -553,7 +553,7 @@ IMPL_LINK( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu )
 }
 
 
-IMPL_LINK( SmFontTypeDialog, DefaultButtonClickHdl, Button *, EMPTYARG /*pButton*/ )
+IMPL_LINK( SmFontTypeDialog, DefaultButtonClickHdl, Button *, /*pButton*/ )
 {
     if (SaveDefaultsQuery(this).Execute() == RET_YES)
     {
@@ -750,7 +750,7 @@ IMPL_LINK( SmDistanceDialog, MenuSelectHdl, Menu *, pMenu )
 }
 
 
-IMPL_LINK( SmDistanceDialog, DefaultButtonClickHdl, Button *, EMPTYARG /*pButton*/ )
+IMPL_LINK( SmDistanceDialog, DefaultButtonClickHdl, Button *, /*pButton*/ )
 {
     if (SaveDefaultsQuery(this).Execute() == RET_YES)
     {
@@ -1056,7 +1056,7 @@ void SmDistanceDialog::WriteTo(SmFormat &rFormat) /*const*/
     rFormat.RequestApplyChanges();
 }
 
-IMPL_LINK( SmAlignDialog, DefaultButtonClickHdl, Button *, EMPTYARG /*pButton*/ )
+IMPL_LINK( SmAlignDialog, DefaultButtonClickHdl, Button *, /*pButton*/ )
 {
     if (SaveDefaultsQuery(this).Execute() == RET_YES)
     {
@@ -1394,7 +1394,7 @@ void SmShowSymbolSetWindow::Resize()
     calccols();
 }
 
-IMPL_LINK( SmShowSymbolSetWindow, ScrollHdl, ScrollBar*, EMPTYARG /*pScrollBar*/)
+IMPL_LINK( SmShowSymbolSetWindow, ScrollHdl, ScrollBar*, /*pScrollBar*/)
 {
     Invalidate();
     return 0;
@@ -1844,7 +1844,7 @@ SmSym * SmSymDefineDialog::GetSymbol(const ComboBox &rComboBox)
 }
 
 
-IMPL_LINK( SmSymDefineDialog, OldSymbolChangeHdl, ComboBox *, EMPTYARG pComboBox )
+IMPL_LINK( SmSymDefineDialog, OldSymbolChangeHdl, ComboBox *, pComboBox )
 {
     (void) pComboBox;
 #if OSL_DEBUG_LEVEL > 1
@@ -1855,7 +1855,7 @@ IMPL_LINK( SmSymDefineDialog, OldSymbolChangeHdl, ComboBox *, EMPTYARG pComboBox
 }
 
 
-IMPL_LINK( SmSymDefineDialog, OldSymbolSetChangeHdl, ComboBox *, EMPTYARG pComboBox )
+IMPL_LINK( SmSymDefineDialog, OldSymbolSetChangeHdl, ComboBox *, pComboBox )
 {
     (void) pComboBox;
 #if OSL_DEBUG_LEVEL > 1
@@ -1895,7 +1895,7 @@ IMPL_LINK( SmSymDefineDialog, ModifyHdl, ComboBox *, pComboBox )
 }
 
 
-IMPL_LINK( SmSymDefineDialog, FontChangeHdl, ListBox *, EMPTYARG pListBox )
+IMPL_LINK( SmSymDefineDialog, FontChangeHdl, ListBox *, pListBox )
 {
     (void) pListBox;
 #if OSL_DEBUG_LEVEL > 1
@@ -1907,7 +1907,7 @@ IMPL_LINK( SmSymDefineDialog, FontChangeHdl, ListBox *, EMPTYARG pListBox )
 }
 
 
-IMPL_LINK( SmSymDefineDialog, SubsetChangeHdl, ListBox *, EMPTYARG pListBox )
+IMPL_LINK( SmSymDefineDialog, SubsetChangeHdl, ListBox *, pListBox )
 {
     (void) pListBox;
     sal_Int32 nPos = pFontsSubsetLB->GetSelectEntryPos();
@@ -1923,7 +1923,7 @@ IMPL_LINK( SmSymDefineDialog, SubsetChangeHdl, ListBox *, EMPTYARG pListBox )
 }
 
 
-IMPL_LINK( SmSymDefineDialog, StyleChangeHdl, ComboBox *, EMPTYARG pComboBox )
+IMPL_LINK( SmSymDefineDialog, StyleChangeHdl, ComboBox *, pComboBox )
 {
     (void) pComboBox;
 #if OSL_DEBUG_LEVEL > 1
@@ -1967,7 +1967,7 @@ IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl)
 }
 
 
-IMPL_LINK( SmSymDefineDialog, AddClickHdl, Button *, EMPTYARG pButton )
+IMPL_LINK( SmSymDefineDialog, AddClickHdl, Button *, pButton )
 {
     (void) pButton;
 #if OSL_DEBUG_LEVEL > 1
@@ -1998,7 +1998,7 @@ IMPL_LINK( SmSymDefineDialog, AddClickHdl, Button *, EMPTYARG pButton )
 }
 
 
-IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, EMPTYARG pButton )
+IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, pButton )
 {
     (void) pButton;
 #if OSL_DEBUG_LEVEL > 1
@@ -2039,7 +2039,7 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, EMPTYARG pButton )
 }
 
 
-IMPL_LINK( SmSymDefineDialog, DeleteClickHdl, Button *, EMPTYARG pButton )
+IMPL_LINK( SmSymDefineDialog, DeleteClickHdl, Button *, pButton )
 {
     (void) pButton;
 #if OSL_DEBUG_LEVEL > 1
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 1167cf6..ce8471f 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -572,7 +572,7 @@ void SmEditWindow::CreateEditView()
 }
 
 
-IMPL_LINK( SmEditWindow, EditStatusHdl, EditStatus *, EMPTYARG /*pStat*/ )
+IMPL_LINK( SmEditWindow, EditStatusHdl, EditStatus *, /*pStat*/ )
 {
     if (!pEditView)
         return 1;
@@ -583,7 +583,7 @@ IMPL_LINK( SmEditWindow, EditStatusHdl, EditStatus *, EMPTYARG /*pStat*/ )
     }
 }
 
-IMPL_LINK( SmEditWindow, ScrollHdl, ScrollBar *, EMPTYARG /*pScrollBar*/ )
+IMPL_LINK( SmEditWindow, ScrollHdl, ScrollBar *, /*pScrollBar*/ )
 {
     OSL_ENSURE(pEditView, "EditView missing");
     if (pEditView)
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 561246b..34e35ba 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -3307,7 +3307,7 @@ IMPL_LINK_NOARG_TYPED(IcnViewEdit_Impl, Timeout_Impl, Idle *, void)
     CallCallBackHdl_Impl();
 }
 
-IMPL_LINK( IcnViewEdit_Impl, ReturnHdl_Impl, Accelerator*, EMPTYARG  )
+IMPL_LINK( IcnViewEdit_Impl, ReturnHdl_Impl, Accelerator*,  )
 {
     bCanceled = false;
     bGrabFocus = true;
@@ -3315,7 +3315,7 @@ IMPL_LINK( IcnViewEdit_Impl, ReturnHdl_Impl, Accelerator*, EMPTYARG  )
     return 1;
 }
 
-IMPL_LINK( IcnViewEdit_Impl, EscapeHdl_Impl, Accelerator*, EMPTYARG  )
+IMPL_LINK( IcnViewEdit_Impl, EscapeHdl_Impl, Accelerator*,  )
 {
     bCanceled = true;
     bGrabFocus = true;
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index 2db9142..90fdea7 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -146,13 +146,13 @@ void PlaceEditDialog::InitDetails( )
     SelectTypeHdl( m_pLBServerType );
 }
 
-IMPL_LINK ( PlaceEditDialog,  OKHdl, Button *, EMPTYARG )
+IMPL_LINK ( PlaceEditDialog,  OKHdl, Button *, )
 {
     EndDialog( RET_OK );
     return 1;
 }
 
-IMPL_LINK ( PlaceEditDialog, DelHdl, Button *, EMPTYARG )
+IMPL_LINK ( PlaceEditDialog, DelHdl, Button *, )
 {
     // ReUsing existing symbols...
     EndDialog( RET_NO );
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 25bd129..2eb65f4 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2957,7 +2957,7 @@ namespace svxform
     }
 
 
-    IMPL_LINK( NamespaceItemDialog, SelectHdl, SvSimpleTable *,  EMPTYARG )
+    IMPL_LINK( NamespaceItemDialog, SelectHdl, SvSimpleTable *, )
     {
         bool bEnable = ( m_pNamespacesList->FirstSelected() != NULL );
         m_pEditNamespaceBtn->Enable( bEnable );
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index 7ada52b..0e94ee4 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -381,7 +381,7 @@ IMPL_LINK(TextCharacterSpacingControl, VSSelHdl, void *, pControl)
     return 0;
 }
 
-IMPL_LINK(TextCharacterSpacingControl, KerningSelectHdl, ListBox*, EMPTYARG)
+IMPL_LINK(TextCharacterSpacingControl, KerningSelectHdl, ListBox*,)
 {
     if ( maLBKerning->GetSelectEntryPos() > 0 )
     {
@@ -406,7 +406,7 @@ IMPL_LINK(TextCharacterSpacingControl, KerningSelectHdl, ListBox*, EMPTYARG)
     KerningModifyHdl( NULL );
     return 0;
 }
-IMPL_LINK(TextCharacterSpacingControl, KerningModifyHdl, MetricField*, EMPTYARG)
+IMPL_LINK(TextCharacterSpacingControl, KerningModifyHdl, MetricField*,)
 {
     if ( maVSSpacing->GetSelectItemId() > 0 )
     {
diff --git a/sw/qa/tiledrendering/tiledrendering.cxx b/sw/qa/tiledrendering/tiledrendering.cxx
index 8aade36..446e430 100644
--- a/sw/qa/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/tiledrendering/tiledrendering.cxx
@@ -111,7 +111,7 @@ public:
     DECL_LINK ( ChooseDocumentHdl, Button * );
 };
 
-IMPL_LINK ( TiledRenderingDialog, RenderHdl, Button *, EMPTYARG )
+IMPL_LINK ( TiledRenderingDialog, RenderHdl, Button *, )
 {
     int contextWidth = mpContextWidth->GetValue();
     int contextHeight = mpContextHeight->GetValue();
@@ -147,7 +147,7 @@ IMPL_LINK ( TiledRenderingDialog, RenderHdl, Button *, EMPTYARG )
     return 1;
 }
 
-IMPL_LINK ( TiledRenderingDialog,  ChooseDocumentHdl, Button *, EMPTYARG )
+IMPL_LINK ( TiledRenderingDialog,  ChooseDocumentHdl, Button *, )
 {
     FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE, 0 );
     uno::Reference < XFilePicker > xFP = aDlgHelper.GetFilePicker();
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 70ce57e..c73ebca 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1266,7 +1266,7 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel(
     return pNewFmt;
 }
 
-IMPL_LINK( SwDoc, BackgroundDone, SvxBrushItem*, EMPTYARG )
+IMPL_LINK( SwDoc, BackgroundDone, SvxBrushItem*, )
 {
     SwViewShell* pStartSh = getIDocumentLayoutAccess().GetCurrentViewShell();
     if(pStartSh)
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 7f86ef0..98953c0 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -183,7 +183,7 @@ void SwGlossaryGroupDlg::Apply()
     }
 }
 
-IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*, EMPTYARG  )
+IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*,  )
 {
     m_pNewPB->Enable(false);
     SvTreeListEntry* pFirstEntry = m_pGroupTLB->FirstSelected();
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index c53f786..4293b03 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -401,7 +401,7 @@ IMPL_LINK(PageMarginControl, ImplMarginHdl, void *, pControl)
     return 0;
 }
 
-IMPL_LINK( PageMarginControl, ModifyLRMarginHdl, MetricField *, EMPTYARG )
+IMPL_LINK( PageMarginControl, ModifyLRMarginHdl, MetricField *, )
 {
     mpMarginValueSet->SetNoSelection();
     mpMarginValueSet->SelectItem(0);
@@ -415,7 +415,7 @@ IMPL_LINK( PageMarginControl, ModifyLRMarginHdl, MetricField *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( PageMarginControl, ModifyULMarginHdl, MetricField *, EMPTYARG )
+IMPL_LINK( PageMarginControl, ModifyULMarginHdl, MetricField *, )
 {
     mpMarginValueSet->SetNoSelection();
     mpMarginValueSet->SelectItem(0);
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 27ddf86..38505c6 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -1217,7 +1217,7 @@ SwNavigationPI* SwGlobalTree::GetParentWindow()
     return static_cast<SwNavigationPI*>(Window::GetParent());
 }
 
-IMPL_STATIC_LINK(SwGlobalTree, ShowFrameHdl, SwGlobalTree*, EMPTYARG)
+IMPL_STATIC_LINK(SwGlobalTree, ShowFrameHdl, SwGlobalTree*,)
 {
     const SfxObjectShell* pShell = SwGlobalTree::GetShowShell();
     SfxViewFrame* pFirst = pShell ? SfxViewFrame::GetFirst(pShell) : NULL;
diff --git a/uui/source/authfallbackdlg.cxx b/uui/source/authfallbackdlg.cxx
index 58362cb..e801c74 100644
--- a/uui/source/authfallbackdlg.cxx
+++ b/uui/source/authfallbackdlg.cxx
@@ -47,13 +47,13 @@ void AuthFallbackDlg::dispose()
     ModalDialog::dispose();
 }
 
-IMPL_LINK ( AuthFallbackDlg,  OKHdl, Button *, EMPTYARG )
+IMPL_LINK ( AuthFallbackDlg,  OKHdl, Button *, )
 {
     EndDialog( RET_OK );
     return 1;
 }
 
-IMPL_LINK ( AuthFallbackDlg,  CancelHdl, Button *, EMPTYARG )
+IMPL_LINK ( AuthFallbackDlg,  CancelHdl, Button *, )
 {
     EndDialog( RET_CANCEL );
     return 0;
commit 4f00dce2b3f08aea41390786ffdaa29179598dec
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat May 9 21:59:01 2015 +0200

    Use IMPL_[STATIC_]LINK_NOARG where applicable
    
    Change-Id: I1e24b032bdeea017b0e77c5446e55310899ce752

diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 99cad0d..e0440c7 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -1630,7 +1630,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeEdgeStyleHdl_Impl)
 
 // fdo#43209
 
-IMPL_LINK( SvxLineTabPage, ChangeCapStyleHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG( SvxLineTabPage, ChangeCapStyleHdl_Impl )
 {
     ChangePreviewHdl_Impl( this );
 
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index ffcc37a..d52353d 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -247,7 +247,7 @@ void OEditControl::keyReleased(const ::com::sun::star::awt::KeyEvent& /*e*/) thr
 }
 
 
-IMPL_LINK(OEditControl, OnKeyPressed, void*, /*EMPTYARG*/)
+IMPL_LINK_NOARG(OEditControl, OnKeyPressed)
 {
     m_nKeyEvent = 0;
 
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index ac7112d..79eab7e 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -240,7 +240,7 @@ void OFormattedControl::keyReleased(const ::com::sun::star::awt::KeyEvent& /*e*/
 {
 }
 
-IMPL_LINK(OFormattedControl, OnKeyPressed, void*, /*EMPTYARG*/)
+IMPL_LINK_NOARG(OFormattedControl, OnKeyPressed)
 {
     m_nKeyEvent = 0;
     Reference<XFormComponent>  xFComp(getModel(), UNO_QUERY);
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index b6ae4eb..7235c1b 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -188,7 +188,7 @@ IMPL_LINK( PlacesListBox, Selection, void* , EMPTYARG )
     return 0;
 }
 
-IMPL_LINK ( PlacesListBox, DoubleClick, void*, EMPTYARG )
+IMPL_LINK_NOARG( PlacesListBox, DoubleClick )
 {
     sal_uInt16 nSelected = mpImpl->GetCurrRow();
     PlacePtr pPlace = maPlaces[nSelected];
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 87a1300..cfb4ce4 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -1147,7 +1147,7 @@ void SvtFileDialog::EnableAutocompletion( bool _bEnable )
 
 
 
-IMPL_LINK( SvtFileDialog, FilterSelectHdl_Impl, void*, EMPTYARG )
+IMPL_LINK_NOARG( SvtFileDialog, FilterSelectHdl_Impl )
 {
     OUString sSelectedFilterDisplayName;
     SvtFileDialogFilter_Impl* pSelectedFilter = _pImp->GetSelectedFilterEntry( sSelectedFilterDisplayName );
@@ -1228,7 +1228,7 @@ IMPL_LINK_TYPED(
     ExecuteFilter();
 }
 
-IMPL_LINK( SvtFileDialog, FileNameGetFocusHdl_Impl, void*, EMPTYARG )
+IMPL_LINK_NOARG( SvtFileDialog, FileNameGetFocusHdl_Impl )
 {
     _pFileView->SetNoSelection();
     _pFileView->Update();
@@ -1237,7 +1237,7 @@ IMPL_LINK( SvtFileDialog, FileNameGetFocusHdl_Impl, void*, EMPTYARG )
 
 
 
-IMPL_LINK( SvtFileDialog, FileNameModifiedHdl_Impl, void*, EMPTYARG )
+IMPL_LINK_NOARG( SvtFileDialog, FileNameModifiedHdl_Impl )
 {
     FileNameGetFocusHdl_Impl( NULL );
     return 0;
@@ -1245,7 +1245,7 @@ IMPL_LINK( SvtFileDialog, FileNameModifiedHdl_Impl, void*, EMPTYARG )
 
 
 
-IMPL_LINK ( SvtFileDialog, URLBoxModifiedHdl_Impl, void*, EMPTYARG )
+IMPL_LINK_NOARG( SvtFileDialog, URLBoxModifiedHdl_Impl )
 {
     OUString _aPath = _pImp->_pEdCurrentPath->GetURL();
     OpenURL_Impl(_aPath);
@@ -1254,7 +1254,7 @@ IMPL_LINK ( SvtFileDialog, URLBoxModifiedHdl_Impl, void*, EMPTYARG )
 
 
 
-IMPL_LINK ( SvtFileDialog, ConnectToServerPressed_Hdl, void*, EMPTYARG )
+IMPL_LINK_NOARG( SvtFileDialog, ConnectToServerPressed_Hdl )
 {
     _pFileView->EndInplaceEditing( false );
 
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 570ca90..925bb43 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -1651,7 +1651,7 @@ Mutex& AddonsOptions::GetOwnStaticMutex()
     return *pMutex;
 }
 
-IMPL_STATIC_LINK( AddonsOptions, Notify, void*, EMPTYARG )
+IMPL_STATIC_LINK_NOARG( AddonsOptions, Notify )
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     m_pDataContainer->ReadConfigurationData();
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index 98eff30..c27d0e9 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -132,7 +132,7 @@ void AlignmentPropertyPanel::Initialize()
     mpMtrAngle->SetAccessibleRelationLabeledBy(mpFtRotate);
 }
 
-IMPL_LINK( AlignmentPropertyPanel, AngleModifiedHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG( AlignmentPropertyPanel, AngleModifiedHdl )
 {
     OUString sTmp = mpMtrAngle->GetText();
     if (sTmp.isEmpty())
@@ -171,7 +171,7 @@ IMPL_LINK( AlignmentPropertyPanel, AngleModifiedHdl, void *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( AlignmentPropertyPanel, RotationHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG( AlignmentPropertyPanel, RotationHdl )
 {
     sal_Int32 nTmp = mpCtrlDial->GetRotation();
     SfxInt32Item aAngleItem( SID_ATTR_ALIGN_DEGREES,(sal_uInt32) nTmp);
@@ -182,7 +182,7 @@ IMPL_LINK( AlignmentPropertyPanel, RotationHdl, void *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( AlignmentPropertyPanel, ClickStackHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG( AlignmentPropertyPanel, ClickStackHdl )
 {
     bool bVertical = mpCbStacked->IsChecked();
     SfxBoolItem  aStackItem( SID_ATTR_ALIGN_STACKED, bVertical );
@@ -191,7 +191,7 @@ IMPL_LINK( AlignmentPropertyPanel, ClickStackHdl, void *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK(AlignmentPropertyPanel, MFLeftIndentMdyHdl, void*, EMPTYARG)
+IMPL_LINK_NOARG(AlignmentPropertyPanel, MFLeftIndentMdyHdl)
 {
     mpCBXWrapText->EnableTriState(false);
     sal_uInt16 nVal = (sal_uInt16)mpMFLeftIndent->GetValue();
@@ -201,7 +201,7 @@ IMPL_LINK(AlignmentPropertyPanel, MFLeftIndentMdyHdl, void*, EMPTYARG)
     return 0L;
 }
 
-IMPL_LINK(AlignmentPropertyPanel, CBOXMergnCellClkHdl, void*, EMPTYARG)
+IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXMergnCellClkHdl)
 {
     bool bState = mpCBXMergeCell->IsChecked();
 
@@ -218,7 +218,7 @@ IMPL_LINK(AlignmentPropertyPanel, CBOXMergnCellClkHdl, void*, EMPTYARG)
     return 0;
 }
 
-IMPL_LINK(AlignmentPropertyPanel, CBOXWrapTextClkHdl, void*, EMPTYARG)
+IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXWrapTextClkHdl)
 {
     bool bState = mpCBXWrapText->IsChecked();
     SfxBoolItem aItem( SID_ATTR_ALIGN_LINEBREAK , bState);
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index a805a28..5c7ade4 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -232,7 +232,7 @@ IMPL_LINK_TYPED(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, ToolBox*, pT
     }
 }
 
-IMPL_LINK(CellAppearancePropertyPanel, CBOXGridShowClkHdl, void*, EMPTYARG)
+IMPL_LINK_NOARG(CellAppearancePropertyPanel, CBOXGridShowClkHdl)
 {
     bool bState = mpCBXShowGrid->IsChecked();
     SfxBoolItem aItem( FID_TAB_TOGGLE_GRID , bState);
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index f3c492f..137643b 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -149,7 +149,7 @@ IMPL_LINK( NumberFormatPropertyPanel, NumFormatSelectHdl, ListBox*, pBox )
     return 0L;
 }
 
-IMPL_LINK( NumberFormatPropertyPanel, NumFormatValueHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG( NumberFormatPropertyPanel, NumFormatValueHdl )
 {
     OUString      aFormat;
     OUString      sBreak = ",";
diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx b/sfx2/source/sidebar/AsynchronousCall.cxx
index 2806804..a4080fd 100644
--- a/sfx2/source/sidebar/AsynchronousCall.cxx
+++ b/sfx2/source/sidebar/AsynchronousCall.cxx
@@ -56,7 +56,7 @@ void AsynchronousCall::CancelRequest()
     }
 }
 
-IMPL_LINK(AsynchronousCall, HandleUserCall, void*, EMPTYARG )
+IMPL_LINK_NOARG(AsynchronousCall, HandleUserCall )
 {
     mnCallId = 0;
     if (maAction)
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index fe68160..ae6ba6d 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -302,7 +302,7 @@ void Deck::PrintWindowSubTree (vcl::Window* pRoot, int nIndentation)
         PrintWindowSubTree(pRoot->GetChild(nIndex), nIndentation+1);
 }
 
-IMPL_LINK(Deck, HandleVerticalScrollBarChange,void*, EMPTYARG)
+IMPL_LINK_NOARG(Deck, HandleVerticalScrollBarChange)
 {
     const sal_Int32 nYOffset (-mpVerticalScrollBar->GetThumbPos());
     mpScrollContainer->SetPosPixel(
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index d40d3cb..f976942 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -343,7 +343,7 @@ void TabBar::UpdateFocusManager (FocusManager& rFocusManager)
     rFocusManager.SetButtons(aButtons);
 }
 
-IMPL_LINK(TabBar, OnToolboxClicked, void*, EMPTYARG)
+IMPL_LINK_NOARG(TabBar, OnToolboxClicked)
 {
     if ( ! mpMenuButton)
         return 0;
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index 7d4267b..2db9142 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -159,7 +159,7 @@ IMPL_LINK ( PlaceEditDialog, DelHdl, Button *, EMPTYARG )
     return 1;
 }
 
-IMPL_LINK ( PlaceEditDialog, EditHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG( PlaceEditDialog, EditHdl )
 {
     OUString sUrl = GetServerUrl( );
     OUString sName = OUString( m_pEDServerName->GetText() ).trim( );
@@ -167,7 +167,7 @@ IMPL_LINK ( PlaceEditDialog, EditHdl, void *, EMPTYARG )
     return 1;
 }
 
-IMPL_LINK ( PlaceEditDialog, EditUsernameHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG( PlaceEditDialog, EditUsernameHdl )
 {
     for ( std::vector< std::shared_ptr< DetailsContainer > >::iterator it = m_aDetailsContainers.begin( );
             it != m_aDetailsContainers.end( ); ++it )
@@ -177,7 +177,7 @@ IMPL_LINK ( PlaceEditDialog, EditUsernameHdl, void *, EMPTYARG )
     return 1;
 }
 
-IMPL_LINK( PlaceEditDialog, SelectTypeHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG( PlaceEditDialog, SelectTypeHdl )
 {
     if (m_xCurrentDetails.get())
         m_xCurrentDetails->show(false);
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx
index 90e8df4..7a17bfd 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -63,7 +63,7 @@ void DetailsContainer::notifyChange( )
     m_aChangeHdl.Call( this );
 }
 
-IMPL_LINK( DetailsContainer, ValueChangeHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG( DetailsContainer, ValueChangeHdl )
 {
     notifyChange( );
     return 0;
@@ -356,7 +356,7 @@ void CmisDetailsContainer::selectRepository( )
     notifyChange( );
 }
 
-IMPL_LINK( CmisDetailsContainer, SelectServerTypeHdl, void *, EMPTYARG  )
+IMPL_LINK_NOARG( CmisDetailsContainer, SelectServerTypeHdl  )
 {
     // Set a sample URL for the server
     sal_uInt16 nId = m_pLBServerType->GetSelectEntryPos( );
@@ -364,7 +364,7 @@ IMPL_LINK( CmisDetailsContainer, SelectServerTypeHdl, void *, EMPTYARG  )
     return 0;
 }
 
-IMPL_LINK( CmisDetailsContainer, RefreshReposHdl, void *, EMPTYARG  )
+IMPL_LINK_NOARG( CmisDetailsContainer, RefreshReposHdl  )
 {
     OUString sBindingUrl = m_pEDBinding->GetText().trim( );
 
@@ -420,7 +420,7 @@ IMPL_LINK( CmisDetailsContainer, RefreshReposHdl, void *, EMPTYARG  )
     return 0;
 }
 
-IMPL_LINK( CmisDetailsContainer, SelectRepoHdl, void *, EMPTYARG  )
+IMPL_LINK_NOARG( CmisDetailsContainer, SelectRepoHdl  )
 {
     selectRepository( );
     return 0;
diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx
index ff694bd..6f87d31 100644
--- a/svx/source/gallery2/GalleryControl.cxx
+++ b/svx/source/gallery2/GalleryControl.cxx
@@ -225,7 +225,7 @@ void GalleryControl::ThemeSelectionHasChanged()
     mpBrowser2->SelectTheme(mpBrowser1->GetSelectedTheme());
 }
 
-IMPL_LINK( GalleryControl, SplitHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG( GalleryControl, SplitHdl )
 {
     if(mpSplitter->IsHorizontal())
     {
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index a065235..766ba52 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -1107,7 +1107,7 @@ IMPL_LINK_TYPED( AreaPropertyPanel, ClickTrGrHdl_Impl, ToolBox*, pToolBox, void
 
 
 
-IMPL_LINK(AreaPropertyPanel, ChangeTrgrTypeHdl_Impl, void *, EMPTYARG)
+IMPL_LINK_NOARG(AreaPropertyPanel, ChangeTrgrTypeHdl_Impl)
 {
     sal_Int32 nSelectType = mpLBTransType->GetSelectEntryPos();
     bool bGradient = false;
@@ -1204,7 +1204,7 @@ IMPL_LINK(AreaPropertyPanel, ChangeTrgrTypeHdl_Impl, void *, EMPTYARG)
 
 
 
-IMPL_LINK(AreaPropertyPanel, ModifyTransparentHdl_Impl, void*, EMPTYARG)
+IMPL_LINK_NOARG(AreaPropertyPanel, ModifyTransparentHdl_Impl)
 {
     const sal_uInt16 nTrans = (sal_uInt16)mpMTRTransparent->GetValue();
     mnLastTransSolid = nTrans;
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index 35aa1b6..53806ea 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -148,7 +148,7 @@ void GraphicPropertyPanel::Initialize()
 
 
 
-IMPL_LINK( GraphicPropertyPanel, ModifyBrightnessHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG( GraphicPropertyPanel, ModifyBrightnessHdl )
 {
     const sal_Int16 nBright = mpMtrBrightness->GetValue();
     const SfxInt16Item aBrightItem( SID_ATTR_GRAF_LUMINANCE, nBright );
@@ -158,7 +158,7 @@ IMPL_LINK( GraphicPropertyPanel, ModifyBrightnessHdl, void *, EMPTYARG )
 
 
 
-IMPL_LINK( GraphicPropertyPanel, ModifyContrastHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG( GraphicPropertyPanel, ModifyContrastHdl )
 {
     const sal_Int16 nContrast = mpMtrContrast->GetValue();
     const SfxInt16Item aContrastItem( SID_ATTR_GRAF_CONTRAST, nContrast );
@@ -168,7 +168,7 @@ IMPL_LINK( GraphicPropertyPanel, ModifyContrastHdl, void *, EMPTYARG )
 
 
 
-IMPL_LINK( GraphicPropertyPanel, ModifyTransHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG( GraphicPropertyPanel, ModifyTransHdl )
 {
     const sal_Int16 nTrans = mpMtrTrans->GetValue();
     const SfxInt16Item aTransItem( SID_ATTR_GRAF_TRANSPARENCE, nTrans );
@@ -188,7 +188,7 @@ IMPL_LINK_NOARG( GraphicPropertyPanel, ClickColorModeHdl )
 
 
 
-IMPL_LINK( GraphicPropertyPanel, RedHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG( GraphicPropertyPanel, RedHdl )
 {
     const sal_Int16 nRed = mpMtrRed->GetValue();
     const SfxInt16Item aRedItem( SID_ATTR_GRAF_RED, nRed );
@@ -198,7 +198,7 @@ IMPL_LINK( GraphicPropertyPanel, RedHdl, void*, EMPTYARG )
 
 
 
-IMPL_LINK( GraphicPropertyPanel, GreenHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG( GraphicPropertyPanel, GreenHdl )
 {
     const sal_Int16 nGreen = mpMtrGreen->GetValue();
     const SfxInt16Item aGreenItem( SID_ATTR_GRAF_GREEN, nGreen );
@@ -208,7 +208,7 @@ IMPL_LINK( GraphicPropertyPanel, GreenHdl, void*, EMPTYARG )
 
 
 
-IMPL_LINK(GraphicPropertyPanel, BlueHdl, void *, EMPTYARG)
+IMPL_LINK_NOARG(GraphicPropertyPanel, BlueHdl)
 {
     const sal_Int16 nBlue = mpMtrBlue->GetValue();
     const SfxInt16Item aBlueItem( SID_ATTR_GRAF_BLUE, nBlue );
@@ -218,7 +218,7 @@ IMPL_LINK(GraphicPropertyPanel, BlueHdl, void *, EMPTYARG)
 
 
 
-IMPL_LINK(GraphicPropertyPanel, GammaHdl, void *, EMPTYARG)
+IMPL_LINK_NOARG(GraphicPropertyPanel, GammaHdl)
 {
     const sal_Int32 nGamma = mpMtrGamma->GetValue();
     const SfxInt32Item nGammaItem( SID_ATTR_GRAF_GAMMA, nGamma );
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 90224e5..589247e 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -663,7 +663,7 @@ IMPL_LINK_NOARG(LinePropertyPanel, ChangeLineStyleHdl)
     return 0;
 }
 
-IMPL_LINK(LinePropertyPanel, ChangeStartHdl, void*, EMPTYARG)
+IMPL_LINK_NOARG(LinePropertyPanel, ChangeStartHdl)
 {
     sal_Int32  nPos = mpLBStart->GetSelectEntryPos();
     if( nPos != LISTBOX_ENTRY_NOTFOUND && mpLBStart->IsValueChangedFromSaved() )
@@ -678,7 +678,7 @@ IMPL_LINK(LinePropertyPanel, ChangeStartHdl, void*, EMPTYARG)
     return 0;
 }
 
-IMPL_LINK(LinePropertyPanel, ChangeEndHdl, void*, EMPTYARG)
+IMPL_LINK_NOARG(LinePropertyPanel, ChangeEndHdl)
 {
     sal_Int32  nPos = mpLBEnd->GetSelectEntryPos();
     if( nPos != LISTBOX_ENTRY_NOTFOUND && mpLBEnd->IsValueChangedFromSaved() )
@@ -693,7 +693,7 @@ IMPL_LINK(LinePropertyPanel, ChangeEndHdl, void*, EMPTYARG)
     return 0;
 }
 
-IMPL_LINK(LinePropertyPanel, ChangeEdgeStyleHdl, void*, EMPTYARG)
+IMPL_LINK_NOARG(LinePropertyPanel, ChangeEdgeStyleHdl)
 {
     const sal_Int32 nPos(mpLBEdgeStyle->GetSelectEntryPos());
 
@@ -730,7 +730,7 @@ IMPL_LINK(LinePropertyPanel, ChangeEdgeStyleHdl, void*, EMPTYARG)
     return 0;
 }
 
-IMPL_LINK(LinePropertyPanel, ChangeCapStyleHdl, void*, EMPTYARG)
+IMPL_LINK_NOARG(LinePropertyPanel, ChangeCapStyleHdl)
 {
     const sal_Int32 nPos(mpLBCapStyle->GetSelectEntryPos());
 
@@ -771,7 +771,7 @@ IMPL_LINK_TYPED(LinePropertyPanel, ToolboxWidthSelectHdl,ToolBox*, pToolBox, voi
     }
 }
 
-IMPL_LINK( LinePropertyPanel, ChangeTransparentHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG( LinePropertyPanel, ChangeTransparentHdl )
 {
     sal_uInt16 nVal = (sal_uInt16)mpMFTransparent->GetValue();
     XLineTransparenceItem aItem( nVal );
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index d0495b6..3d0d836 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -451,7 +451,7 @@ IMPL_LINK( PosSizePropertyPanel, ChangeWidthHdl, void*, /*pBox*/ )
 
 
 
-IMPL_LINK( PosSizePropertyPanel, ChangeHeightHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG( PosSizePropertyPanel, ChangeHeightHdl )
 {
     if( mpCbxScale->IsChecked() &&
         mpCbxScale->IsEnabled() )
@@ -475,7 +475,7 @@ IMPL_LINK( PosSizePropertyPanel, ChangeHeightHdl, void *, EMPTYARG )
 
 
 
-IMPL_LINK( PosSizePropertyPanel, ChangePosXHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG( PosSizePropertyPanel, ChangePosXHdl )
 {
     executePosX();
     return 0;
@@ -483,7 +483,7 @@ IMPL_LINK( PosSizePropertyPanel, ChangePosXHdl, void *, EMPTYARG )
 
 
 
-IMPL_LINK( PosSizePropertyPanel, ChangePosYHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG( PosSizePropertyPanel, ChangePosYHdl )
 {
     executePosY();
     return 0;
@@ -491,7 +491,7 @@ IMPL_LINK( PosSizePropertyPanel, ChangePosYHdl, void *, EMPTYARG )
 
 
 
-IMPL_LINK( PosSizePropertyPanel, ClickAutoHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG( PosSizePropertyPanel, ClickAutoHdl )
 {
     if ( mpCbxScale->IsChecked() )
     {
@@ -508,7 +508,7 @@ IMPL_LINK( PosSizePropertyPanel, ClickAutoHdl, void *, EMPTYARG )
 
 
 
-IMPL_LINK( PosSizePropertyPanel, AngleModifiedHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG( PosSizePropertyPanel, AngleModifiedHdl )
 {
     OUString sTmp = mpMtrAngle->GetText();
     if (sTmp.isEmpty())
@@ -556,7 +556,7 @@ IMPL_LINK( PosSizePropertyPanel, AngleModifiedHdl, void *, EMPTYARG )
 
 
 
-IMPL_LINK( PosSizePropertyPanel, RotationHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG( PosSizePropertyPanel, RotationHdl )
 {
     sal_Int32 nTmp = mpDial->GetRotation();
 
diff --git a/svx/source/sidebar/tools/Popup.cxx b/svx/source/sidebar/tools/Popup.cxx
index c1a04c3..221af08 100644
--- a/svx/source/sidebar/tools/Popup.cxx
+++ b/svx/source/sidebar/tools/Popup.cxx
@@ -111,7 +111,7 @@ void Popup::CreateContainerAndControl()
     mxControl.reset(maControlCreator(mxContainer.get()));
 }
 
-IMPL_LINK(Popup, PopupModeEndHandler, void*, EMPTYARG)
+IMPL_LINK_NOARG(Popup, PopupModeEndHandler)
 {
     if (maPopupModeEndCallback)
         maPopupModeEndCallback();
diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx
index d73654b..db1c856 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.cxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.cxx
@@ -104,7 +104,7 @@ IMPL_LINK(PageColumnControl, ImplColumnHdl, void *, pControl)
     return 0;
 }
 
-IMPL_LINK(PageColumnControl, MoreButtonClickHdl_Impl, void *, EMPTYARG)
+IMPL_LINK_NOARG(PageColumnControl, MoreButtonClickHdl_Impl)
 {
     mrPagePropPanel.GetBindings()->GetDispatcher()->Execute( FN_FORMAT_PAGE_COLUMN_DLG, SfxCallMode::ASYNCHRON );
 
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx
index 5ff9246..0b287f8 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -172,7 +172,7 @@ IMPL_LINK(PageSizeControl, ImplSizeHdl, void *, pControl)
     return 0;
 }
 
-IMPL_LINK(PageSizeControl, MoreButtonClickHdl_Impl, void *, EMPTYARG)
+IMPL_LINK_NOARG(PageSizeControl, MoreButtonClickHdl_Impl)
 {
     mrPagePropPanel.GetBindings()->GetDispatcher()->Execute( FN_FORMAT_PAGE_SETTING_DLG, SfxCallMode::ASYNCHRON );
 
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index 78369ee..62d28b6 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -164,7 +164,7 @@ void WrapPropertyPanel::Initialize()
     mpBindings->Update( FN_FRAME_WRAP_IDEAL );
 }
 
-IMPL_LINK(WrapPropertyPanel, WrapTypeHdl, void *, EMPTYARG)
+IMPL_LINK_NOARG(WrapPropertyPanel, WrapTypeHdl)
 {
     sal_uInt16 nSlot = 0;
     if ( mpRBWrapLeft->IsChecked() )
diff --git a/test/source/vclbootstrapprotector.cxx b/test/source/vclbootstrapprotector.cxx
index d2671aa..2aad563 100644
--- a/test/source/vclbootstrapprotector.cxx
+++ b/test/source/vclbootstrapprotector.cxx
@@ -63,7 +63,7 @@ private:
 // unobootstrapprotector) is called before InitVCL (above), but component
 // context is disposed (redundantly again in unobootstrapprotector) from within
 // DeInitVCL (cf. Desktop::DeInit, desktop/source/app/app.cxx):
-IMPL_STATIC_LINK(Protector, deinitHook, void *, EMPTYARG) {
+IMPL_STATIC_LINK_NOARG(Protector, deinitHook) {
     css::uno::Reference<css::uno::XComponentContext> context;
     try {
         context = comphelper::getProcessComponentContext();
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 7910b83..4edae11 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -382,7 +382,7 @@ void Application::Yield()
     ImplYield( true, false );
 }
 
-IMPL_STATIC_LINK( ImplSVAppData, ImplQuitMsg, void*, EMPTYARG )
+IMPL_STATIC_LINK_NOARG( ImplSVAppData, ImplQuitMsg )
 {
     ImplGetSVData()->maAppData.mbAppQuit = true;
     return 0;
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index b55f1cb..e222bdf 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -430,7 +430,7 @@ IMPL_LINK_NOARG(ComboBox, ImplSelectHdl)
     return 0;
 }
 
-IMPL_LINK( ComboBox, ImplListItemSelectHdl,  void*, EMPTYARG )
+IMPL_LINK_NOARG( ComboBox, ImplListItemSelectHdl )
 {
     CallEventListeners( VCLEVENT_DROPDOWN_SELECT );
     return 1;
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 156561b..a84a238 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -244,7 +244,7 @@ IMPL_LINK( ListBox, ImplFocusHdl, void *, nPos )
     return 1;
 }
 
-IMPL_LINK( ListBox, ImplListItemSelectHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG( ListBox, ImplListItemSelectHdl )
 {
     CallEventListeners( VCLEVENT_DROPDOWN_SELECT );
     return 1;
diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
index 9d30921..6d2bf82 100644
--- a/vcl/unx/generic/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -283,7 +283,7 @@ IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, pStateVal )
     return 0;
 }
 
-IMPL_STATIC_LINK( SessionManagerClient, InteractionHdl, void*, EMPTYARG )
+IMPL_STATIC_LINK_NOARG( SessionManagerClient, InteractionHdl )
 {
     SAL_INFO("vcl.sm", "interaction link");
     if( m_pSession )
@@ -295,7 +295,7 @@ IMPL_STATIC_LINK( SessionManagerClient, InteractionHdl, void*, EMPTYARG )
     return 0;
 }
 
-IMPL_STATIC_LINK( SessionManagerClient, ShutDownCancelHdl, void*, EMPTYARG )
+IMPL_STATIC_LINK_NOARG( SessionManagerClient, ShutDownCancelHdl )
 {
     SAL_INFO("vcl.sm", "shutdown cancel");
     if( m_pSession )
@@ -345,7 +345,7 @@ void SessionManagerClient::SaveYourselfProc(
     SAL_INFO("vcl.sm", "waiting for save yourself event to be processed" );
 }
 
-IMPL_STATIC_LINK( SessionManagerClient, ShutDownHdl, void*, EMPTYARG )
+IMPL_STATIC_LINK_NOARG( SessionManagerClient, ShutDownHdl )
 {
     if( m_pSession )
     {
commit 9168952759630e9fe41e478bd94dd6e0a709619d
Author: Stephan Bergmann <sbergman at redhat.com>

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list