[Libreoffice-commits] .: avmedia/inc avmedia/source basctl/source chart2/source cui/source dbaccess/source desktop/source editeng/source extensions/source filter/source forms/source formula/source fpicker/source framework/inc framework/source reportdesign/source sc/inc sc/source sc/workben sd/inc sd/source sfx2/inc sfx2/source slideshow/test starmath/inc starmath/source svtools/source svtools/workben svx/inc svx/source sw/inc sw/source toolkit/source tools/inc ucbhelper/workben unotools/source uui/source vbahelper/source vcl/inc vcl/source vcl/unx xmlsecurity/inc xmlsecurity/source xmlsecurity/workben

Stephan Bergmann sbergmann at kemper.freedesktop.org
Thu Mar 1 09:01:17 PST 2012


 avmedia/inc/mediacontrol.hxx                                           |    4 
 avmedia/source/framework/mediacontrol.cxx                              |    4 
 avmedia/source/framework/soundhandler.cxx                              |    2 
 basctl/source/basicide/baside2.hxx                                     |    4 
 basctl/source/basicide/baside2b.cxx                                    |    6 -
 basctl/source/basicide/basides2.cxx                                    |    4 
 basctl/source/basicide/bastype3.hxx                                    |    4 
 basctl/source/basicide/bastypes.cxx                                    |    4 
 basctl/source/basicide/macrodlg.cxx                                    |    4 
 basctl/source/basicide/macrodlg.hxx                                    |    2 
 basctl/source/basicide/moduldl2.cxx                                    |    6 -
 basctl/source/basicide/moduldlg.hxx                                    |    6 -
 basctl/source/dlged/dlged.cxx                                          |    4 
 basctl/source/dlged/managelang.cxx                                     |    8 -
 basctl/source/inc/basidesh.hxx                                         |    2 
 basctl/source/inc/dlged.hxx                                            |    4 
 basctl/source/inc/managelang.hxx                                       |    8 -
 chart2/source/controller/dialogs/ChartTypeDialogController.cxx         |    2 
 chart2/source/controller/dialogs/DataBrowser.cxx                       |    4 
 chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx      |    2 
 chart2/source/controller/dialogs/dlg_DataEditor.cxx                    |    8 -
 chart2/source/controller/dialogs/dlg_ObjectProperties.cxx              |    2 
 chart2/source/controller/dialogs/res_ErrorBar.cxx                      |    6 -
 chart2/source/controller/dialogs/res_LegendPosition.cxx                |    2 
 chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx             |    4 
 chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx               |   12 +-
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx           |    6 -
 chart2/source/controller/dialogs/tp_AxisLabel.cxx                      |    2 
 chart2/source/controller/dialogs/tp_AxisPositions.cxx                  |    4 
 chart2/source/controller/dialogs/tp_ChartType.cxx                      |   30 +++---
 chart2/source/controller/dialogs/tp_DataSource.cxx                     |   16 +--
 chart2/source/controller/dialogs/tp_RangeChooser.cxx                   |    6 -
 chart2/source/controller/dialogs/tp_Scale.cxx                          |    2 
 chart2/source/controller/dialogs/tp_SeriesToAxis.cxx                   |    2 
 chart2/source/controller/dialogs/tp_SeriesToAxis.hxx                   |    2 
 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx        |    2 
 chart2/source/controller/main/ChartController_Window.cxx               |    2 
 cui/source/customize/acccfg.cxx                                        |   16 +--
 cui/source/customize/macropg.cxx                                       |    2 
 cui/source/customize/macropg_impl.hxx                                  |    2 
 cui/source/customize/selector.cxx                                      |    2 
 cui/source/dialogs/SpellDialog.cxx                                     |   10 +-
 cui/source/dialogs/colorpicker.cxx                                     |    2 
 cui/source/dialogs/cuicharmap.cxx                                      |   16 +--
 cui/source/dialogs/cuifmsearch.cxx                                     |    6 -
 cui/source/dialogs/cuigaldlg.cxx                                       |   30 +++---
 cui/source/dialogs/cuigrfflt.cxx                                       |    4 
 cui/source/dialogs/cuihyperdlg.cxx                                     |    4 
 cui/source/dialogs/dlgname.cxx                                         |   12 +-
 cui/source/dialogs/hangulhanjadlg.cxx                                  |   32 +++---
 cui/source/dialogs/hldocntp.cxx                                        |    2 
 cui/source/dialogs/hldoctp.cxx                                         |   12 +-
 cui/source/dialogs/hlinettp.cxx                                        |   16 +--
 cui/source/dialogs/hlmailtp.cxx                                        |    6 -
 cui/source/dialogs/hlmarkwn.cxx                                        |    4 
 cui/source/dialogs/hltpbase.cxx                                        |    2 
 cui/source/dialogs/hyphen.cxx                                          |   28 ++---
 cui/source/dialogs/iconcdlg.cxx                                        |    8 -
 cui/source/dialogs/insdlg.cxx                                          |    8 -
 cui/source/dialogs/linkdlg.cxx                                         |    2 
 cui/source/dialogs/multifil.cxx                                        |    2 
 cui/source/dialogs/multipat.cxx                                        |    6 -
 cui/source/dialogs/postdlg.cxx                                         |   12 +-
 cui/source/dialogs/showcols.cxx                                        |    2 
 cui/source/dialogs/srchxtra.cxx                                        |    2 
 cui/source/dialogs/zoom.cxx                                            |    2 
 cui/source/factory/dlgfact.cxx                                         |    8 -
 cui/source/factory/dlgfact.hxx                                         |    8 -
 cui/source/inc/SpellDialog.hxx                                         |   10 +-
 cui/source/inc/acccfg.hxx                                              |   16 +--
 cui/source/inc/autocdlg.hxx                                            |   10 +-
 cui/source/inc/backgrnd.hxx                                            |    6 -
 cui/source/inc/chardlg.hxx                                             |   20 ++--
 cui/source/inc/cuicharmap.hxx                                          |   16 +--
 cui/source/inc/cuifmsearch.hxx                                         |    4 
 cui/source/inc/cuigaldlg.hxx                                           |    2 
 cui/source/inc/cuigrfflt.hxx                                           |    2 
 cui/source/inc/cuitabarea.hxx                                          |    2 
 cui/source/inc/dbregister.hxx                                          |    2 
 cui/source/inc/dlgname.hxx                                             |    8 -
 cui/source/inc/grfpage.hxx                                             |    4 
 cui/source/inc/hldoctp.hxx                                             |    2 
 cui/source/inc/hlinettp.hxx                                            |    2 
 cui/source/inc/iconcdlg.hxx                                            |    6 -
 cui/source/inc/insdlg.hxx                                              |    8 -
 cui/source/inc/linkdlg.hxx                                             |    2 
 cui/source/inc/multifil.hxx                                            |    2 
 cui/source/inc/multipat.hxx                                            |    4 
 cui/source/inc/numfmt.hxx                                              |    2 
 cui/source/inc/numpages.hxx                                            |   32 +++---
 cui/source/inc/optasian.hxx                                            |    2 
 cui/source/inc/optdict.hxx                                             |    8 -
 cui/source/inc/optlingu.hxx                                            |    8 -
 cui/source/inc/optpath.hxx                                             |    6 -
 cui/source/inc/page.hxx                                                |   12 +-
 cui/source/inc/paragrph.hxx                                            |   22 ++--
 cui/source/inc/postdlg.hxx                                             |    8 -
 cui/source/inc/selector.hxx                                            |    2 
 cui/source/inc/showcols.hxx                                            |    2 
 cui/source/inc/srchxtra.hxx                                            |    2 
 cui/source/inc/tabstpge.hxx                                            |    8 -
 cui/source/inc/treeopt.hxx                                             |    6 -
 cui/source/inc/zoom.hxx                                                |    2 
 cui/source/options/dbregister.cxx                                      |    8 -
 cui/source/options/doclinkdialog.cxx                                   |    6 -
 cui/source/options/doclinkdialog.hxx                                   |    2 
 cui/source/options/optasian.cxx                                        |    2 
 cui/source/options/optchart.cxx                                        |    6 -
 cui/source/options/optchart.hxx                                        |    2 
 cui/source/options/optctl.cxx                                          |    2 
 cui/source/options/optdict.cxx                                         |   10 +-
 cui/source/options/optfltr.cxx                                         |    4 
 cui/source/options/optfltr.hxx                                         |    4 
 cui/source/options/optgdlg.cxx                                         |    6 -
 cui/source/options/optgdlg.hxx                                         |    4 
 cui/source/options/optinet2.cxx                                        |   12 +-
 cui/source/options/optinet2.hxx                                        |    6 -
 cui/source/options/optjava.cxx                                         |   32 +++---
 cui/source/options/optjava.hxx                                         |   30 +++---
 cui/source/options/optlingu.cxx                                        |    8 -
 cui/source/options/optmemory.cxx                                       |    2 
 cui/source/options/optmemory.hxx                                       |    2 
 cui/source/options/optpath.cxx                                         |    6 -
 cui/source/options/optsave.cxx                                         |    2 
 cui/source/options/optsave.hxx                                         |    2 
 cui/source/options/optupdt.cxx                                         |    4 
 cui/source/options/optupdt.hxx                                         |    4 
 cui/source/options/treeopt.cxx                                         |    6 -
 cui/source/options/webconninfo.cxx                                     |    8 -
 cui/source/options/webconninfo.hxx                                     |    6 -
 cui/source/tabpages/align.cxx                                          |    2 
 cui/source/tabpages/autocdlg.cxx                                       |   10 +-
 cui/source/tabpages/backgrnd.cxx                                       |    6 -
 cui/source/tabpages/border.cxx                                         |    8 -
 cui/source/tabpages/chardlg.cxx                                        |   20 ++--
 cui/source/tabpages/grfpage.cxx                                        |    4 
 cui/source/tabpages/labdlg.cxx                                         |    4 
 cui/source/tabpages/numfmt.cxx                                         |    2 
 cui/source/tabpages/numpages.cxx                                       |   32 +++---
 cui/source/tabpages/page.cxx                                           |   16 +--
 cui/source/tabpages/paragrph.cxx                                       |   24 ++---
 cui/source/tabpages/swpossizetabpage.cxx                               |    8 -
 cui/source/tabpages/swpossizetabpage.hxx                               |    8 -
 cui/source/tabpages/tabarea.cxx                                        |    2 
 cui/source/tabpages/tabline.cxx                                        |    4 
 cui/source/tabpages/tabstpge.cxx                                       |    8 -
 cui/source/tabpages/textanim.cxx                                       |    8 -
 cui/source/tabpages/textattr.cxx                                       |    4 
 cui/source/tabpages/tparea.cxx                                         |   38 +++----
 cui/source/tabpages/tpbitmap.cxx                                       |   18 +--
 cui/source/tabpages/tpcolor.cxx                                        |   22 ++--
 cui/source/tabpages/tpgradnt.cxx                                       |   12 +-
 cui/source/tabpages/tphatch.cxx                                        |   12 +-
 cui/source/tabpages/tpline.cxx                                         |    6 -
 cui/source/tabpages/tplnedef.cxx                                       |   18 +--
 cui/source/tabpages/tplneend.cxx                                       |   12 +-
 cui/source/tabpages/tpshadow.cxx                                       |    4 
 cui/source/tabpages/transfrm.cxx                                       |   14 +-
 dbaccess/source/ui/app/AppController.cxx                               |    2 
 dbaccess/source/ui/app/AppDetailPageHelper.cxx                         |    2 
 dbaccess/source/ui/app/AppSwapWindow.cxx                               |    2 
 dbaccess/source/ui/browser/brwctrlr.cxx                                |    4 
 dbaccess/source/ui/browser/genericcontroller.cxx                       |    4 
 dbaccess/source/ui/control/RelationControl.cxx                         |    4 
 dbaccess/source/ui/control/TableGrantCtrl.cxx                          |    4 
 dbaccess/source/ui/control/sqledit.cxx                                 |    4 
 dbaccess/source/ui/dlg/CollectionView.cxx                              |    8 -
 dbaccess/source/ui/dlg/UserAdmin.cxx                                   |    4 
 dbaccess/source/ui/dlg/adminpages.cxx                                  |    2 
 dbaccess/source/ui/dlg/adminpages.hxx                                  |    2 
 dbaccess/source/ui/dlg/dsselect.cxx                                    |    2 
 dbaccess/source/ui/dlg/sqlmessage.cxx                                  |    2 
 dbaccess/source/ui/inc/CollectionView.hxx                              |    8 -
 dbaccess/source/ui/inc/WCopyTable.hxx                                  |    8 -
 dbaccess/source/ui/misc/WCopyTable.cxx                                 |    8 -
 dbaccess/source/ui/querydesign/JoinTableView.cxx                       |    2 
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx                  |    2 
 dbaccess/source/ui/tabledesign/TEditControl.cxx                        |    2 
 desktop/source/app/app.cxx                                             |    6 -
 desktop/source/deployment/gui/dp_gui_dialog2.cxx                       |   24 ++---
 desktop/source/deployment/gui/dp_gui_dialog2.hxx                       |    4 
 desktop/source/deployment/gui/dp_gui_updatedialog.cxx                  |    8 -
 desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx           |    2 
 desktop/source/deployment/gui/license_dialog.cxx                       |   12 +-
 editeng/source/editeng/impedit.hxx                                     |    6 -
 editeng/source/editeng/impedit2.cxx                                    |    2 
 editeng/source/editeng/impedit3.cxx                                    |   10 +-
 editeng/source/misc/hangulhanja.cxx                                    |   14 +-
 editeng/source/outliner/outliner.cxx                                   |    2 
 extensions/source/abpilot/abpfinalpage.cxx                             |    2 
 extensions/source/abpilot/abpfinalpage.hxx                             |    2 
 extensions/source/bibliography/datman.cxx                              |    4 
 extensions/source/dbpilots/listcombowizard.cxx                         |    2 
 extensions/source/plugin/aqua/sysplug.mm                               |    2 
 extensions/source/propctrlr/browserview.cxx                            |    2 
 extensions/source/propctrlr/propcontroller.cxx                         |    2 
 extensions/source/propctrlr/propertyeditor.cxx                         |    4 
 extensions/source/propctrlr/propertyeditor.hxx                         |    4 
 extensions/source/update/ui/updatecheckui.cxx                          |   16 +--
 filter/source/pdf/impdialog.cxx                                        |   24 ++---
 filter/source/pdf/impdialog.hxx                                        |    4 
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx                   |    4 
 filter/source/xsltdialog/xmlfiltertabdialog.cxx                        |    2 
 filter/source/xsltdialog/xmlfiltertabdialog.hxx                        |    2 
 filter/source/xsltdialog/xmlfiltertabpagexslt.cxx                      |    2 
 forms/source/component/Button.cxx                                      |    2 
 forms/source/component/DatabaseForm.cxx                                |    2 
 formula/source/ui/dlg/ControlHelper.hxx                                |    2 
 formula/source/ui/dlg/formula.cxx                                      |   26 ++---
 formula/source/ui/dlg/funcpage.cxx                                     |    2 
 formula/source/ui/dlg/funcpage.hxx                                     |    2 
 formula/source/ui/dlg/funcutl.cxx                                      |    4 
 formula/source/ui/dlg/parawin.cxx                                      |    2 
 formula/source/ui/dlg/parawin.hxx                                      |    2 
 fpicker/source/office/commonpicker.cxx                                 |    2 
 fpicker/source/office/iodlg.cxx                                        |   14 +-
 fpicker/source/office/iodlg.hxx                                        |    8 -
 framework/inc/classes/fwktabwindow.hxx                                 |    4 
 framework/inc/classes/menumanager.hxx                                  |    2 
 framework/inc/services/layoutmanager.hxx                               |    4 
 framework/inc/services/licensedlg.hxx                                  |   10 +-
 framework/inc/services/substitutepathvars.hxx                          |    2 
 framework/inc/uielement/addonstoolbarmanager.hxx                       |   12 +-
 framework/inc/uielement/menubarmanager.hxx                             |    2 
 framework/inc/uielement/statusbarmanager.hxx                           |    4 
 framework/inc/uielement/toolbarmanager.hxx                             |   14 +-
 framework/source/classes/fwktabwindow.cxx                              |    4 
 framework/source/classes/menumanager.cxx                               |    2 
 framework/source/dispatch/closedispatcher.cxx                          |    2 
 framework/source/layoutmanager/layoutmanager.cxx                       |    6 -
 framework/source/services/autorecovery.cxx                             |    4 
 framework/source/services/backingwindow.cxx                            |    2 
 framework/source/services/license.cxx                                  |   10 +-
 framework/source/services/substitutepathvars.cxx                       |    2 
 framework/source/uielement/addonstoolbarmanager.cxx                    |   12 +-
 framework/source/uielement/menubarmanager.cxx                          |    2 
 framework/source/uielement/statusbarmanager.cxx                        |    4 
 framework/source/uielement/toolbarmanager.cxx                          |   14 +-
 reportdesign/source/ui/dlg/Condition.cxx                               |    2 
 reportdesign/source/ui/dlg/GroupsSorting.cxx                           |    4 
 reportdesign/source/ui/dlg/Navigator.cxx                               |    2 
 reportdesign/source/ui/inc/DesignView.hxx                              |    2 
 reportdesign/source/ui/report/DesignView.cxx                           |    2 
 reportdesign/source/ui/report/ReportController.cxx                     |    2 
 sc/inc/arealink.hxx                                                    |    2 
 sc/inc/chartlis.hxx                                                    |    2 
 sc/inc/chartlock.hxx                                                   |    2 
 sc/inc/document.hxx                                                    |    2 
 sc/inc/externalrefmgr.hxx                                              |    2 
 sc/inc/scmod.hxx                                                       |    4 
 sc/inc/tablink.hxx                                                     |    2 
 sc/source/core/data/documen2.cxx                                       |    2 
 sc/source/core/tool/appoptio.cxx                                       |   16 +--
 sc/source/core/tool/chartlis.cxx                                       |    2 
 sc/source/core/tool/chartlock.cxx                                      |    2 
 sc/source/core/tool/docoptio.cxx                                       |    6 -
 sc/source/core/tool/viewopti.cxx                                       |    6 -
 sc/source/ui/app/inputhdl.cxx                                          |    2 
 sc/source/ui/app/inputwin.cxx                                          |    6 -
 sc/source/ui/app/scmod.cxx                                             |    4 
 sc/source/ui/attrdlg/attrdlg.cxx                                       |    2 
 sc/source/ui/attrdlg/condfrmt.cxx                                      |   28 ++---
 sc/source/ui/cctrl/checklistmenu.cxx                                   |    4 
 sc/source/ui/dbgui/consdlg.cxx                                         |    2 
 sc/source/ui/dbgui/dapidata.cxx                                        |    2 
 sc/source/ui/dbgui/dbnamdlg.cxx                                        |   14 +-
 sc/source/ui/dbgui/fieldwnd.cxx                                        |    8 -
 sc/source/ui/dbgui/filtdlg.cxx                                         |    4 
 sc/source/ui/dbgui/pvfundlg.cxx                                        |    4 
 sc/source/ui/dbgui/pvlaydlg.cxx                                        |   12 +-
 sc/source/ui/dbgui/scendlg.cxx                                         |    2 
 sc/source/ui/dbgui/scuiasciiopt.cxx                                    |    2 
 sc/source/ui/dbgui/textimportoptions.cxx                               |    2 
 sc/source/ui/dbgui/tpsort.cxx                                          |    2 
 sc/source/ui/dbgui/validate.cxx                                        |   10 +-
 sc/source/ui/docshell/arealink.cxx                                     |    4 
 sc/source/ui/docshell/autostyl.cxx                                     |    4 
 sc/source/ui/docshell/externalrefmgr.cxx                               |    2 
 sc/source/ui/docshell/tablink.cxx                                      |    2 
 sc/source/ui/drawfunc/fupoor.cxx                                       |    6 -
 sc/source/ui/formdlg/dwfunctr.cxx                                      |    2 
 sc/source/ui/inc/acredlin.hxx                                          |   16 +--
 sc/source/ui/inc/anyrefdg.hxx                                          |    2 
 sc/source/ui/inc/autostyl.hxx                                          |    4 
 sc/source/ui/inc/cellsh.hxx                                            |    2 
 sc/source/ui/inc/checklistmenu.hxx                                     |    2 
 sc/source/ui/inc/condfrmt.hxx                                          |    4 
 sc/source/ui/inc/conflictsdlg.hxx                                      |    6 -
 sc/source/ui/inc/content.hxx                                           |    2 
 sc/source/ui/inc/crdlg.hxx                                             |    2 
 sc/source/ui/inc/crnrdlg.hxx                                           |    2 
 sc/source/ui/inc/dapidata.hxx                                          |    2 
 sc/source/ui/inc/datafdlg.hxx                                          |   14 +-
 sc/source/ui/inc/dwfunctr.hxx                                          |    2 
 sc/source/ui/inc/fieldwnd.hxx                                          |    8 -
 sc/source/ui/inc/filtdlg.hxx                                           |    4 
 sc/source/ui/inc/fupoor.hxx                                            |    4 
 sc/source/ui/inc/gridwin.hxx                                           |    2 
 sc/source/ui/inc/inputwin.hxx                                          |    6 -
 sc/source/ui/inc/instbdlg.hxx                                          |   12 +-
 sc/source/ui/inc/linkarea.hxx                                          |    8 -
 sc/source/ui/inc/mtrindlg.hxx                                          |    4 
 sc/source/ui/inc/navipi.hxx                                            |    2 
 sc/source/ui/inc/notemark.hxx                                          |    2 
 sc/source/ui/inc/opredlin.hxx                                          |    2 
 sc/source/ui/inc/optsolver.hxx                                         |   10 +-
 sc/source/ui/inc/protectiondlg.hxx                                     |    4 
 sc/source/ui/inc/pvfundlg.hxx                                          |    4 
 sc/source/ui/inc/pvlaydlg.hxx                                          |   12 +-
 sc/source/ui/inc/retypepassdlg.hxx                                     |   10 +-
 sc/source/ui/inc/scendlg.hxx                                           |    2 
 sc/source/ui/inc/scuiasciiopt.hxx                                      |    2 
 sc/source/ui/inc/solveroptions.hxx                                     |    6 -
 sc/source/ui/inc/solvrdlg.hxx                                          |    2 
 sc/source/ui/inc/tabbgcolordlg.hxx                                     |    4 
 sc/source/ui/inc/tabopdlg.hxx                                          |    2 
 sc/source/ui/inc/tabview.hxx                                           |    2 
 sc/source/ui/inc/tabvwsh.hxx                                           |    4 
 sc/source/ui/inc/textimportoptions.hxx                                 |    2 
 sc/source/ui/inc/tpdefaults.hxx                                        |    2 
 sc/source/ui/inc/tphf.hxx                                              |    4 
 sc/source/ui/inc/tphfedit.hxx                                          |    2 
 sc/source/ui/inc/tptable.hxx                                           |    4 
 sc/source/ui/inc/tpview.hxx                                            |    2 
 sc/source/ui/inc/validate.hxx                                          |   10 +-
 sc/source/ui/inc/viewdata.hxx                                          |    2 
 sc/source/ui/miscdlgs/acredlin.cxx                                     |   16 +--
 sc/source/ui/miscdlgs/anyrefdg.cxx                                     |    2 
 sc/source/ui/miscdlgs/conflictsdlg.cxx                                 |   14 +-
 sc/source/ui/miscdlgs/crdlg.cxx                                        |    4 
 sc/source/ui/miscdlgs/crnrdlg.cxx                                      |   22 ++--
 sc/source/ui/miscdlgs/datafdlg.cxx                                     |   14 +-
 sc/source/ui/miscdlgs/delcodlg.cxx                                     |    4 
 sc/source/ui/miscdlgs/filldlg.cxx                                      |    2 
 sc/source/ui/miscdlgs/inscodlg.cxx                                     |    4 
 sc/source/ui/miscdlgs/instbdlg.cxx                                     |   12 +-
 sc/source/ui/miscdlgs/lbseldlg.cxx                                     |    4 
 sc/source/ui/miscdlgs/linkarea.cxx                                     |    8 -
 sc/source/ui/miscdlgs/mtrindlg.cxx                                     |    6 -
 sc/source/ui/miscdlgs/mvtabdlg.cxx                                     |    2 
 sc/source/ui/miscdlgs/optsolver.cxx                                    |   10 +-
 sc/source/ui/miscdlgs/protectiondlg.cxx                                |    4 
 sc/source/ui/miscdlgs/retypepassdlg.cxx                                |   10 +-
 sc/source/ui/miscdlgs/scuiautofmt.cxx                                  |   12 +-
 sc/source/ui/miscdlgs/sharedocdlg.cxx                                  |    2 
 sc/source/ui/miscdlgs/shtabdlg.cxx                                     |    4 
 sc/source/ui/miscdlgs/simpref.cxx                                      |    4 
 sc/source/ui/miscdlgs/solveroptions.cxx                                |    6 -
 sc/source/ui/miscdlgs/solvrdlg.cxx                                     |    2 
 sc/source/ui/miscdlgs/tabbgcolordlg.cxx                                |    4 
 sc/source/ui/miscdlgs/tabopdlg.cxx                                     |    2 
 sc/source/ui/namedlg/namedefdlg.cxx                                    |   12 +-
 sc/source/ui/namedlg/namedlg.cxx                                       |   18 +--
 sc/source/ui/namedlg/namemgrtable.cxx                                  |    4 
 sc/source/ui/navipi/content.cxx                                        |    2 
 sc/source/ui/navipi/navipi.cxx                                         |    2 
 sc/source/ui/optdlg/opredlin.cxx                                       |    2 
 sc/source/ui/optdlg/tpdefaults.cxx                                     |    2 
 sc/source/ui/optdlg/tpview.cxx                                         |    2 
 sc/source/ui/pagedlg/tphf.cxx                                          |    6 -
 sc/source/ui/pagedlg/tphfedit.cxx                                      |    2 
 sc/source/ui/pagedlg/tptable.cxx                                       |    4 
 sc/source/ui/view/cellsh1.cxx                                          |    2 
 sc/source/ui/view/gridwin.cxx                                          |    2 
 sc/source/ui/view/notemark.cxx                                         |    2 
 sc/source/ui/view/tabview.cxx                                          |    4 
 sc/source/ui/view/tabvwsh4.cxx                                         |    4 
 sc/source/ui/view/viewdata.cxx                                         |    4 
 sc/workben/test.cxx                                                    |   10 +-
 sd/inc/CustomAnimationEffect.hxx                                       |    2 
 sd/inc/drawdoc.hxx                                                     |    4 
 sd/source/core/CustomAnimationEffect.cxx                               |    2 
 sd/source/core/drawdoc2.cxx                                            |    2 
 sd/source/core/drawdoc4.cxx                                            |    2 
 sd/source/filter/html/pubdlg.cxx                                       |   22 ++--
 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx               |   10 +-
 sd/source/ui/animations/CustomAnimationCreateDialog.cxx                |    8 -
 sd/source/ui/animations/CustomAnimationCreateDialog.hxx                |    4 
 sd/source/ui/animations/CustomAnimationDialog.cxx                      |   16 +--
 sd/source/ui/animations/CustomAnimationPane.cxx                        |    4 
 sd/source/ui/animations/CustomAnimationPane.hxx                        |    4 
 sd/source/ui/animations/DialogListBox.cxx                              |    2 
 sd/source/ui/animations/SlideTransitionPane.cxx                        |   22 ++--
 sd/source/ui/animations/SlideTransitionPane.hxx                        |    2 
 sd/source/ui/annotations/annotationmanager.cxx                         |    2 
 sd/source/ui/annotations/annotationtag.cxx                             |    2 
 sd/source/ui/annotations/annotationwindow.cxx                          |    2 
 sd/source/ui/dlg/animobjs.cxx                                          |   12 +-
 sd/source/ui/dlg/brkdlg.cxx                                            |    4 
 sd/source/ui/dlg/copydlg.cxx                                           |    8 -
 sd/source/ui/dlg/custsdlg.cxx                                          |    4 
 sd/source/ui/dlg/dlgass.cxx                                            |   48 +++++-----
 sd/source/ui/dlg/dlgassim.cxx                                          |    2 
 sd/source/ui/dlg/dlgassim.hxx                                          |    2 
 sd/source/ui/dlg/dlgfield.cxx                                          |    2 
 sd/source/ui/dlg/filedlg.cxx                                           |    4 
 sd/source/ui/dlg/headerfooterdlg.cxx                                   |   12 +-
 sd/source/ui/dlg/inspagob.cxx                                          |    2 
 sd/source/ui/dlg/navigatr.cxx                                          |    8 -
 sd/source/ui/dlg/paragr.cxx                                            |    4 
 sd/source/ui/dlg/present.cxx                                           |    6 -
 sd/source/ui/dlg/prntopts.cxx                                          |    2 
 sd/source/ui/dlg/sdpreslt.cxx                                          |    4 
 sd/source/ui/dlg/tpaction.cxx                                          |    8 -
 sd/source/ui/dlg/tpoption.cxx                                          |    2 
 sd/source/ui/dlg/vectdlg.cxx                                           |    6 -
 sd/source/ui/framework/configuration/ConfigurationUpdater.cxx          |    2 
 sd/source/ui/framework/configuration/ConfigurationUpdater.hxx          |    2 
 sd/source/ui/func/fupoor.cxx                                           |    6 -
 sd/source/ui/inc/BreakDlg.hxx                                          |    2 
 sd/source/ui/inc/DialogListBox.hxx                                     |    2 
 sd/source/ui/inc/FormShellManager.hxx                                  |    2 
 sd/source/ui/inc/OutlineView.hxx                                       |    4 
 sd/source/ui/inc/View.hxx                                              |    4 
 sd/source/ui/inc/ViewShellImplementation.hxx                           |    2 
 sd/source/ui/inc/custsdlg.hxx                                          |    4 
 sd/source/ui/inc/dlgass.hxx                                            |    2 
 sd/source/ui/inc/fupoor.hxx                                            |    6 -
 sd/source/ui/inc/headerfooterdlg.hxx                                   |    2 
 sd/source/ui/inc/navigatr.hxx                                          |    2 
 sd/source/ui/inc/prntopts.hxx                                          |    2 
 sd/source/ui/inc/pubdlg.hxx                                            |   18 +--
 sd/source/ui/inc/taskpane/ScrollPanel.hxx                              |    2 
 sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx                     |    2 
 sd/source/ui/inc/tpoption.hxx                                          |    2 
 sd/source/ui/inc/vectdlg.hxx                                           |    4 
 sd/source/ui/notes/EditWindow.cxx                                      |   10 +-
 sd/source/ui/presenter/CanvasUpdateRequester.cxx                       |    2 
 sd/source/ui/slideshow/SlideShowRestarter.cxx                          |    2 
 sd/source/ui/slideshow/showwin.cxx                                     |    2 
 sd/source/ui/slideshow/showwindow.hxx                                  |    2 
 sd/source/ui/slideshow/slideshow.cxx                                   |    2 
 sd/source/ui/slideshow/slideshowimpl.cxx                               |   12 +-
 sd/source/ui/slideshow/slideshowimpl.hxx                               |    6 -
 sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx                   |    2 
 sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx                   |    2 
 sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx               |    2 
 sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx               |    2 
 sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx                   |    2 
 sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx                   |    2 
 sd/source/ui/slidesorter/controller/SlsAnimator.cxx                    |    2 
 sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx         |    2 
 sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx            |    2 
 sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx                |    2 
 sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx        |    2 
 sd/source/ui/slidesorter/view/SlsToolTip.cxx                           |    2 
 sd/source/ui/table/TableDesignPane.cxx                                 |    4 
 sd/source/ui/table/TableDesignPane.hxx                                 |    4 
 sd/source/ui/toolpanel/LayoutMenu.cxx                                  |    4 
 sd/source/ui/toolpanel/LayoutMenu.hxx                                  |    4 
 sd/source/ui/toolpanel/ScrollPanel.cxx                                 |    2 
 sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx                |    2 
 sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx                |    2 
 sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx          |    2 
 sd/source/ui/tools/EventMultiplexer.cxx                                |    2 
 sd/source/ui/tools/TimerBasedTaskExecution.cxx                         |    2 
 sd/source/ui/view/FormShellManager.cxx                                 |    2 
 sd/source/ui/view/ToolBarManager.cxx                                   |    6 -
 sd/source/ui/view/ViewShellImplementation.cxx                          |    2 
 sd/source/ui/view/outlview.cxx                                         |   10 +-
 sd/source/ui/view/sdview4.cxx                                          |    4 
 sd/source/ui/view/viewoverlaymanager.cxx                               |    2 
 sfx2/inc/sfx2/basedlgs.hxx                                             |    6 -
 sfx2/inc/sfx2/dinfdlg.hxx                                              |   18 +--
 sfx2/inc/sfx2/docinsert.hxx                                            |    2 
 sfx2/inc/sfx2/dockwin.hxx                                              |    2 
 sfx2/inc/sfx2/passwd.hxx                                               |    2 
 sfx2/inc/sfx2/tabdlg.hxx                                               |   10 +-
 sfx2/inc/srchdlg.hxx                                                   |    4 
 sfx2/source/appl/newhelp.cxx                                           |   22 ++--
 sfx2/source/appl/newhelp.hxx                                           |   22 ++--
 sfx2/source/dialog/basedlgs.cxx                                        |    6 -
 sfx2/source/dialog/dinfdlg.cxx                                         |   20 ++--
 sfx2/source/dialog/dockwin.cxx                                         |    2 
 sfx2/source/dialog/filedlghelper.cxx                                   |    4 
 sfx2/source/dialog/filedlgimpl.hxx                                     |    2 
 sfx2/source/dialog/passwd.cxx                                          |    4 
 sfx2/source/dialog/securitypage.cxx                                    |    4 
 sfx2/source/dialog/srchdlg.cxx                                         |    4 
 sfx2/source/dialog/tabdlg.cxx                                          |   10 +-
 sfx2/source/dialog/templdlg.cxx                                        |    2 
 sfx2/source/dialog/versdlg.cxx                                         |    4 
 sfx2/source/doc/docinsert.cxx                                          |    2 
 sfx2/source/doc/docvor.cxx                                             |   12 +-
 sfx2/source/doc/new.cxx                                                |   18 +--
 sfx2/source/inc/templdgi.hxx                                           |    2 
 sfx2/source/inc/versdlg.hxx                                            |    4 
 sfx2/source/inet/inettbc.cxx                                           |    4 
 sfx2/source/menu/virtmenu.cxx                                          |    2 
 sfx2/source/toolbox/imgmgr.cxx                                         |    2 
 sfx2/source/toolbox/tbxitem.cxx                                        |    4 
 sfx2/source/view/ipclient.cxx                                          |    4 
 sfx2/source/view/viewprn.cxx                                           |    2 
 slideshow/test/demoshow.cxx                                            |    2 
 starmath/inc/dialog.hxx                                                |    2 
 starmath/inc/view.hxx                                                  |    2 
 starmath/source/dialog.cxx                                             |    2 
 starmath/source/view.cxx                                               |    2 
 svtools/source/brwbox/brwbox2.cxx                                      |    2 
 svtools/source/brwbox/datwin.cxx                                       |    4 
 svtools/source/brwbox/ebbcontrols.cxx                                  |    2 
 svtools/source/brwbox/editbrowsebox.cxx                                |    8 -
 svtools/source/contnr/fileview.cxx                                     |    4 
 svtools/source/contnr/imivctl.hxx                                      |    4 
 svtools/source/contnr/imivctl1.cxx                                     |   18 +--
 svtools/source/contnr/svimpbox.cxx                                     |    8 -
 svtools/source/contnr/svlbox.cxx                                       |   14 +-
 svtools/source/contnr/svtabbx.cxx                                      |    4 
 svtools/source/contnr/templwin.cxx                                     |   24 ++---
 svtools/source/contnr/templwin.hxx                                     |   12 +-
 svtools/source/control/calendar.cxx                                    |    2 
 svtools/source/control/filectrl.cxx                                    |    2 
 svtools/source/control/inettbc.cxx                                     |    2 
 svtools/source/control/ruler.cxx                                       |    2 
 svtools/source/control/tabbar.cxx                                      |    2 
 svtools/source/control/taskstat.cxx                                    |    2 
 svtools/source/control/valueset.cxx                                    |    2 
 svtools/source/dialogs/addresstemplate.cxx                             |    6 -
 svtools/source/dialogs/prnsetup.cxx                                    |    6 -
 svtools/source/dialogs/roadmapwizard.cxx                               |    2 
 svtools/source/dialogs/wizardmachine.cxx                               |    6 -
 svtools/source/edit/svmedit.cxx                                        |    2 
 svtools/source/edit/texteng.cxx                                        |    2 
 svtools/source/filter/exportdialog.cxx                                 |   12 +-
 svtools/source/graphic/grfmgr.cxx                                      |    2 
 svtools/source/inc/svimpbox.hxx                                        |    4 
 svtools/source/inc/unoiface.hxx                                        |    2 
 svtools/source/misc/acceleratorexecute.cxx                             |    2 
 svtools/source/misc/filechangedchecker.cxx                             |    2 
 svtools/source/misc/itemdel.cxx                                        |    2 
 svtools/source/table/tablecontrol.cxx                                  |    2 
 svtools/source/uno/treecontrolpeer.cxx                                 |   12 +-
 svtools/source/uno/unoiface.cxx                                        |    2 
 svtools/workben/svdem.cxx                                              |   10 +-
 svx/inc/svdibrow.hxx                                                   |    4 
 svx/inc/svx/charmap.hxx                                                |    2 
 svx/inc/svx/fillctrl.hxx                                               |    2 
 svx/inc/svx/hdft.hxx                                                   |   10 +-
 svx/inc/svx/imapdlg.hxx                                                |    2 
 svx/inc/svx/itemwin.hxx                                                |    2 
 svx/inc/svx/numvset.hxx                                                |    2 
 svx/inc/svx/passwd.hxx                                                 |    4 
 svx/inc/svx/rubydialog.hxx                                             |    8 -
 svx/inc/svx/srchdlg.hxx                                                |   10 +-
 svx/inc/svx/svdpntv.hxx                                                |    2 
 svx/source/dialog/_bmpmask.cxx                                         |    4 
 svx/source/dialog/_contdlg.cxx                                         |    6 -
 svx/source/dialog/charmap.cxx                                          |    2 
 svx/source/dialog/contimp.hxx                                          |    4 
 svx/source/dialog/dlgctl3d.cxx                                         |    8 -
 svx/source/dialog/docrecovery.cxx                                      |   38 +++----
 svx/source/dialog/fontwork.cxx                                         |   16 +--
 svx/source/dialog/hdft.cxx                                             |   16 +--
 svx/source/dialog/imapdlg.cxx                                          |    8 -
 svx/source/dialog/optgrid.cxx                                          |    4 
 svx/source/dialog/orienthelper.cxx                                     |    2 
 svx/source/dialog/passwd.cxx                                           |    4 
 svx/source/dialog/rubydialog.cxx                                       |    8 -
 svx/source/dialog/srchdlg.cxx                                          |   10 +-
 svx/source/dialog/svxbmpnumvalueset.cxx                                |    2 
 svx/source/engine3d/float3d.cxx                                        |   10 +-
 svx/source/fmcomp/gridcell.cxx                                         |    6 -
 svx/source/form/datanavi.cxx                                           |   28 ++---
 svx/source/form/filtnav.cxx                                            |    2 
 svx/source/form/fmshimp.cxx                                            |    2 
 svx/source/form/formcontroller.cxx                                     |    4 
 svx/source/form/navigatortree.cxx                                      |    8 -
 svx/source/gallery2/galbrws.cxx                                        |    2 
 svx/source/gallery2/galbrws1.cxx                                       |    6 -
 svx/source/gallery2/galbrws2.cxx                                       |    4 
 svx/source/inc/datanavi.hxx                                            |   28 ++---
 svx/source/svdraw/svdibrow.cxx                                         |    4 
 svx/source/svdraw/svdpntv.cxx                                          |    4 
 svx/source/table/tablecontroller.cxx                                   |    2 
 svx/source/tbxctrls/colrctrl.cxx                                       |    2 
 svx/source/tbxctrls/extrusioncontrols.cxx                              |    4 
 svx/source/tbxctrls/fillctrl.cxx                                       |    2 
 svx/source/tbxctrls/fontworkgallery.cxx                                |    8 -
 svx/source/tbxctrls/formatpaintbrushctrl.cxx                           |    2 
 svx/source/tbxctrls/grafctrl.cxx                                       |    4 
 svx/source/tbxctrls/itemwin.cxx                                        |    2 
 svx/source/tbxctrls/layctrl.cxx                                        |    2 
 svx/source/tbxctrls/lboxctrl.cxx                                       |    4 
 svx/source/tbxctrls/linectrl.cxx                                       |    2 
 svx/source/tbxctrls/tbcontrl.cxx                                       |    8 -
 svx/source/tbxctrls/tbunosearchcontrollers.cxx                         |    2 
 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx  |   14 +-
 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx  |    2 
 svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx |    8 -
 sw/inc/colwd.hxx                                                       |    2 
 sw/source/core/docnode/threadmanager.cxx                               |    2 
 sw/source/core/inc/blink.hxx                                           |    2 
 sw/source/core/inc/threadmanager.hxx                                   |    2 
 sw/source/core/text/blink.cxx                                          |    2 
 sw/source/ui/app/apphdl.cxx                                            |   12 +-
 sw/source/ui/chrdlg/break.cxx                                          |   10 +-
 sw/source/ui/chrdlg/chardlg.cxx                                        |    4 
 sw/source/ui/chrdlg/drpcps.cxx                                         |    8 -
 sw/source/ui/chrdlg/numpara.cxx                                        |    4 
 sw/source/ui/config/mailconfigpage.cxx                                 |   16 +--
 sw/source/ui/config/optcomp.cxx                                        |    4 
 sw/source/ui/config/optload.cxx                                        |   12 +-
 sw/source/ui/config/optpage.cxx                                        |   22 ++--
 sw/source/ui/dbui/addresslistdialog.cxx                                |    8 -
 sw/source/ui/dbui/addresslistdialog.hxx                                |    8 -
 sw/source/ui/dbui/createaddresslistdialog.cxx                          |   16 +--
 sw/source/ui/dbui/createaddresslistdialog.hxx                          |   16 +--
 sw/source/ui/dbui/customizeaddresslistdialog.cxx                       |    4 
 sw/source/ui/dbui/customizeaddresslistdialog.hxx                       |    4 
 sw/source/ui/dbui/mailmergechildwindow.cxx                             |    6 -
 sw/source/ui/dbui/mailmergehelper.cxx                                  |    2 
 sw/source/ui/dbui/mmaddressblockpage.cxx                               |   14 +-
 sw/source/ui/dbui/mmaddressblockpage.hxx                               |   12 +-
 sw/source/ui/dbui/mmgreetingspage.cxx                                  |    6 -
 sw/source/ui/dbui/mmgreetingspage.hxx                                  |    6 -
 sw/source/ui/dbui/mmlayoutpage.cxx                                     |    4 
 sw/source/ui/dbui/mmlayoutpage.hxx                                     |    2 
 sw/source/ui/dbui/mmmergepage.cxx                                      |    6 -
 sw/source/ui/dbui/mmmergepage.hxx                                      |    4 
 sw/source/ui/dbui/mmoutputpage.cxx                                     |    4 
 sw/source/ui/dbui/mmoutputpage.hxx                                     |    8 -
 sw/source/ui/dbui/mmoutputtypepage.cxx                                 |    2 
 sw/source/ui/dbui/mmoutputtypepage.hxx                                 |    2 
 sw/source/ui/dbui/mmpreparemergepage.cxx                               |    2 
 sw/source/ui/dbui/mmpreparemergepage.hxx                               |    2 
 sw/source/ui/dialog/docstdlg.cxx                                       |    2 
 sw/source/ui/dialog/uiregionsw.cxx                                     |   20 ++--
 sw/source/ui/dialog/wordcountdialog.cxx                                |    2 
 sw/source/ui/docvw/HeaderFooterWin.cxx                                 |    2 
 sw/source/ui/docvw/PageBreakWin.cxx                                    |    4 
 sw/source/ui/docvw/SidebarWin.cxx                                      |    4 
 sw/source/ui/docvw/edtdd.cxx                                           |    2 
 sw/source/ui/docvw/edtwin.cxx                                          |    8 -
 sw/source/ui/envelp/envfmt.cxx                                         |    2 
 sw/source/ui/envelp/envfmt.hxx                                         |    2 
 sw/source/ui/envelp/envlop1.cxx                                        |    4 
 sw/source/ui/envelp/envprt.cxx                                         |    4 
 sw/source/ui/envelp/envprt.hxx                                         |    4 
 sw/source/ui/envelp/label1.cxx                                         |   14 +-
 sw/source/ui/envelp/labelexp.cxx                                       |    2 
 sw/source/ui/envelp/labfmt.cxx                                         |   14 +-
 sw/source/ui/envelp/labfmt.hxx                                         |   10 +-
 sw/source/ui/envelp/mailmrge.cxx                                       |    6 -
 sw/source/ui/envelp/swuilabimp.hxx                                     |   10 +-
 sw/source/ui/envelp/syncbtn.cxx                                        |    2 
 sw/source/ui/fldui/changedb.cxx                                        |    6 -
 sw/source/ui/fldui/flddb.cxx                                           |    4 
 sw/source/ui/fldui/flddb.hxx                                           |    4 
 sw/source/ui/fldui/flddinf.cxx                                         |    4 
 sw/source/ui/fldui/flddinf.hxx                                         |    4 
 sw/source/ui/fldui/flddok.cxx                                          |    6 -
 sw/source/ui/fldui/flddok.hxx                                          |    6 -
 sw/source/ui/fldui/fldedt.cxx                                          |    4 
 sw/source/ui/fldui/fldfunc.cxx                                         |   10 +-
 sw/source/ui/fldui/fldfunc.hxx                                         |    8 -
 sw/source/ui/fldui/fldpage.cxx                                         |    2 
 sw/source/ui/fldui/fldpage.hxx                                         |    2 
 sw/source/ui/fldui/fldref.cxx                                          |    6 -
 sw/source/ui/fldui/fldref.hxx                                          |    6 -
 sw/source/ui/fldui/fldtdlg.cxx                                         |    4 
 sw/source/ui/fldui/fldvar.cxx                                          |    8 -
 sw/source/ui/fldui/fldvar.hxx                                          |    8 -
 sw/source/ui/fldui/fldwrap.cxx                                         |    2 
 sw/source/ui/fldui/inpdlg.cxx                                          |    2 
 sw/source/ui/fldui/javaedit.cxx                                        |   14 +-
 sw/source/ui/frmdlg/column.cxx                                         |    8 -
 sw/source/ui/frmdlg/cption.cxx                                         |   10 +-
 sw/source/ui/frmdlg/frmpage.cxx                                        |   22 ++--
 sw/source/ui/frmdlg/wrap.cxx                                           |    2 
 sw/source/ui/inc/HeaderFooterWin.hxx                                   |    2 
 sw/source/ui/inc/PageBreakWin.hxx                                      |    2 
 sw/source/ui/inc/basesh.hxx                                            |    2 
 sw/source/ui/inc/bookmark.hxx                                          |    2 
 sw/source/ui/inc/break.hxx                                             |    4 
 sw/source/ui/inc/changedb.hxx                                          |    6 -
 sw/source/ui/inc/chrdlg.hxx                                            |    4 
 sw/source/ui/inc/column.hxx                                            |    8 -
 sw/source/ui/inc/conttree.hxx                                          |    8 -
 sw/source/ui/inc/convert.hxx                                           |    2 
 sw/source/ui/inc/cption.hxx                                            |    6 -
 sw/source/ui/inc/docstdlg.hxx                                          |    2 
 sw/source/ui/inc/drpcps.hxx                                            |    6 -
 sw/source/ui/inc/edtwin.hxx                                            |   10 +-
 sw/source/ui/inc/envlop.hxx                                            |    4 
 sw/source/ui/inc/fldedt.hxx                                            |    4 
 sw/source/ui/inc/fldtdlg.hxx                                           |    4 
 sw/source/ui/inc/frmpage.hxx                                           |   16 +--
 sw/source/ui/inc/glosbib.hxx                                           |    6 -
 sw/source/ui/inc/glossary.hxx                                          |    4 
 sw/source/ui/inc/inpdlg.hxx                                            |    2 
 sw/source/ui/inc/inputwin.hxx                                          |    4 
 sw/source/ui/inc/insfnote.hxx                                          |    6 -
 sw/source/ui/inc/insrule.hxx                                           |    2 
 sw/source/ui/inc/instable.hxx                                          |    2 
 sw/source/ui/inc/javaedit.hxx                                          |   10 +-
 sw/source/ui/inc/linenum.hxx                                           |    6 -
 sw/source/ui/inc/mailconfigpage.hxx                                    |    4 
 sw/source/ui/inc/mailmergechildwindow.hxx                              |    2 
 sw/source/ui/inc/mailmergehelper.hxx                                   |    2 
 sw/source/ui/inc/mailmrge.hxx                                          |    6 -
 sw/source/ui/inc/navipi.hxx                                            |    4 
 sw/source/ui/inc/num.hxx                                               |    8 -
 sw/source/ui/inc/numpara.hxx                                           |    4 
 sw/source/ui/inc/optcomp.hxx                                           |    4 
 sw/source/ui/inc/optload.hxx                                           |   10 +-
 sw/source/ui/inc/optpage.hxx                                           |   16 +--
 sw/source/ui/inc/outline.hxx                                           |    8 -
 sw/source/ui/inc/pgfnote.hxx                                           |    6 -
 sw/source/ui/inc/pggrid.hxx                                            |    2 
 sw/source/ui/inc/regionsw.hxx                                          |   18 +--
 sw/source/ui/inc/srtdlg.hxx                                            |    2 
 sw/source/ui/inc/swrenamexnameddlg.hxx                                 |    2 
 sw/source/ui/inc/swuicnttab.hxx                                        |   12 +-
 sw/source/ui/inc/swuiidxmrk.hxx                                        |   18 +--
 sw/source/ui/inc/syncbtn.hxx                                           |    2 
 sw/source/ui/inc/tautofmt.hxx                                          |    2 
 sw/source/ui/inc/titlepage.hxx                                         |   10 +-
 sw/source/ui/inc/view.hxx                                              |    8 -
 sw/source/ui/inc/wrap.hxx                                              |    2 
 sw/source/ui/index/cntex.cxx                                           |    2 
 sw/source/ui/index/cnttab.cxx                                          |   30 +++---
 sw/source/ui/index/swuiidxmrk.cxx                                      |   26 ++---
 sw/source/ui/misc/bookmark.cxx                                         |    2 
 sw/source/ui/misc/docfnote.cxx                                         |    8 -
 sw/source/ui/misc/glosbib.cxx                                          |    6 -
 sw/source/ui/misc/glossary.cxx                                         |   14 +-
 sw/source/ui/misc/impfnote.hxx                                         |    6 -
 sw/source/ui/misc/insfnote.cxx                                         |   14 +-
 sw/source/ui/misc/insrule.cxx                                          |    2 
 sw/source/ui/misc/linenum.cxx                                          |    6 -
 sw/source/ui/misc/num.cxx                                              |    8 -
 sw/source/ui/misc/outline.cxx                                          |   14 +-
 sw/source/ui/misc/pgfnote.cxx                                          |   14 +-
 sw/source/ui/misc/pggrid.cxx                                           |    4 
 sw/source/ui/misc/redlndlg.cxx                                         |   20 ++--
 sw/source/ui/misc/srtdlg.cxx                                           |    2 
 sw/source/ui/misc/titlepage.cxx                                        |   10 +-
 sw/source/ui/ribbar/inputwin.cxx                                       |    4 
 sw/source/ui/ribbar/workctrl.cxx                                       |    2 
 sw/source/ui/shells/basesh.cxx                                         |    2 
 sw/source/ui/table/colwd.cxx                                           |    4 
 sw/source/ui/table/convert.cxx                                         |    4 
 sw/source/ui/table/instable.cxx                                        |    8 -
 sw/source/ui/table/tabledlg.cxx                                        |    6 -
 sw/source/ui/table/tablepg.hxx                                         |    4 
 sw/source/ui/table/tautofmt.cxx                                        |   12 +-
 sw/source/ui/uiview/view.cxx                                           |    6 -
 sw/source/ui/uiview/viewling.cxx                                       |    2 
 sw/source/ui/uno/unomailmerge.cxx                                      |    2 
 sw/source/ui/utlui/content.cxx                                         |    4 
 sw/source/ui/utlui/glbltree.cxx                                        |    4 
 sw/source/ui/utlui/gloslst.cxx                                         |    8 -
 sw/source/ui/utlui/navipi.cxx                                          |    6 -
 sw/source/ui/utlui/swrenamexnameddlg.cxx                               |    2 
 toolkit/source/awt/vclxwindow.cxx                                      |    2 
 tools/inc/tools/link.hxx                                               |   15 +--
 ucbhelper/workben/ucbexplorer/ucbexplorer.cxx                          |    4 
 unotools/source/ucbhelper/ucblockbytes.cxx                             |    2 
 uui/source/logindlg.cxx                                                |    6 -
 uui/source/logindlg.hxx                                                |    6 -
 uui/source/masterpasscrtdlg.cxx                                        |    4 
 uui/source/masterpasscrtdlg.hxx                                        |    4 
 uui/source/masterpassworddlg.cxx                                       |    2 
 uui/source/masterpassworddlg.hxx                                       |    2 
 uui/source/newerverwarn.cxx                                            |    4 
 uui/source/newerverwarn.hxx                                            |    4 
 uui/source/passworddlg.cxx                                             |    2 
 uui/source/passworddlg.hxx                                             |    2 
 uui/source/secmacrowarnings.cxx                                        |    8 -
 uui/source/sslwarndlg.cxx                                              |    4 
 uui/source/sslwarndlg.hxx                                              |    4 
 uui/source/unknownauthdlg.cxx                                          |    4 
 uui/source/unknownauthdlg.hxx                                          |    4 
 vbahelper/source/vbahelper/vbaapplicationbase.cxx                      |    2 
 vcl/inc/idlemgr.hxx                                                    |    2 
 vcl/source/app/idlemgr.cxx                                             |    2 
 vcl/source/control/combobox.cxx                                        |   10 +-
 vcl/source/control/edit.cxx                                            |    2 
 vcl/source/control/ilstbox.cxx                                         |    4 
 vcl/source/control/lstbox.cxx                                          |   12 +-
 vcl/source/control/menubtn.cxx                                         |    2 
 vcl/source/control/scrbar.cxx                                          |    2 
 vcl/source/control/tabctrl.cxx                                         |    2 
 vcl/source/control/throbber.cxx                                        |    2 
 vcl/source/gdi/animate.cxx                                             |    2 
 vcl/source/gdi/print3.cxx                                              |    2 
 vcl/source/helper/threadex.cxx                                         |    2 
 vcl/source/window/cursor.cxx                                           |    2 
 vcl/source/window/dialog.cxx                                           |    2 
 vcl/source/window/dockmgr.cxx                                          |   14 +-
 vcl/source/window/dockwin.cxx                                          |    8 -
 vcl/source/window/floatwin.cxx                                         |    2 
 vcl/source/window/menu.cxx                                             |   26 ++---
 vcl/source/window/printdlg.cxx                                         |    2 
 vcl/source/window/scrwnd.cxx                                           |    2 
 vcl/source/window/scrwnd.hxx                                           |    2 
 vcl/source/window/seleng.cxx                                           |    2 
 vcl/source/window/toolbox.cxx                                          |    4 
 vcl/source/window/toolbox2.cxx                                         |    2 
 vcl/source/window/window.cxx                                           |    6 -
 vcl/source/window/winproc.cxx                                          |    2 
 vcl/unx/generic/app/i18n_status.cxx                                    |    2 
 vcl/unx/generic/window/salframe.cxx                                    |    2 
 xmlsecurity/inc/xmlsecurity/certificatechooser.hxx                     |    2 
 xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx                |    6 -
 xmlsecurity/inc/xmlsecurity/macrosecurity.hxx                          |    2 
 xmlsecurity/source/dialogs/certificatechooser.cxx                      |    8 -
 xmlsecurity/source/dialogs/certificateviewer.cxx                       |    6 -
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx                 |   14 +-
 xmlsecurity/source/dialogs/macrosecurity.cxx                           |   16 +--
 xmlsecurity/source/dialogs/warnings.cxx                                |    4 
 xmlsecurity/workben/signaturetest.cxx                                  |    6 -
 812 files changed, 2429 insertions(+), 2426 deletions(-)

New commits:
commit bd205223ec029a875c662474bb6d423d3cdd1994
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Mar 1 18:00:32 2012 +0100

    New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problem
    
    ...see ebe26f72e90337da2d14f3029de148904e3e30b6 "WaE: 'unused' attribute ignored when parsing type"
    for the problem.

diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index 45f0fdf..5570eb1 100644
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
@@ -89,10 +89,10 @@ private:
                         DECL_LINK( implTimeHdl, Slider* );
                         DECL_LINK( implTimeEndHdl, Slider* );
                         DECL_LINK( implVolumeHdl, Slider* );
-                        DECL_LINK( implVolumeEndHdl, Slider* );
+                        DECL_LINK(implVolumeEndHdl, void *);
                         DECL_LINK( implSelectHdl, ToolBox* );
                         DECL_LINK( implZoomSelectHdl, ListBox* );
-                        DECL_LINK( implTimeoutHdl, Timer* );
+                        DECL_LINK(implTimeoutHdl, void *);
 
     ImageList           maImageList;
     Timer               maTimer;
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index cdfce1a..decf7be 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -480,7 +480,7 @@ IMPL_LINK( MediaControl, implVolumeHdl, Slider*, p )
 
 // ------------------------------------------------------------------------------
 
-IMPL_LINK( MediaControl, implVolumeEndHdl, Slider*, EMPTYARG )
+IMPL_LINK_NOARG(MediaControl, implVolumeEndHdl)
 {
     return 0;
 }
@@ -603,7 +603,7 @@ IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox*, p )
 
 // ------------------------------------------------------------------------------
 
-IMPL_LINK( MediaControl, implTimeoutHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(MediaControl, implTimeoutHdl)
 {
     update();
     maTimer.Start();
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index f540313..4c8a502 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -445,7 +445,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL&
     @onerror    -
     @threadsafe yes
 *//*-*************************************************************************************************************/
-IMPL_LINK( SoundHandler, implts_PlayerNotify, void*, EMPTYARG )
+IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify)
 {
     // SAFE {
     ::osl::ClearableMutexGuard aLock( m_aLock );
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index a44e02b..0be4bb7 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -110,7 +110,7 @@ private:
     SyntaxHighlighter   aHighlighter;
     Timer           aSyntaxIdleTimer;
     Table           aSyntaxLineTable;
-    DECL_LINK( SyntaxTimerHdl, Timer * );
+    DECL_LINK(SyntaxTimerHdl, void *);
     ProgressInfo*   pProgress;
     ModulWindow*    pModulWindow;
 
@@ -248,7 +248,7 @@ protected:
     virtual void    Paint( const Rectangle& rRect );
 
     DECL_LINK( ButtonHdl, ImageButton * );
-    DECL_LINK( TreeListHdl, SvTreeListBox * );
+    DECL_LINK(TreeListHdl, void *);
     DECL_LINK( implEndDragHdl, HeaderBar * );
     DECL_LINK( EditAccHdl, Accelerator * );
 
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index d42a407..b7e394c 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -876,7 +876,7 @@ void EditorWindow::DoDelayedSyntaxHighlight( sal_uLong nPara )
     }
 }
 
-IMPL_LINK( EditorWindow, SyntaxTimerHdl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(EditorWindow, SyntaxTimerHdl)
 {
     DBG_ASSERT( pEditView, "Noch keine View, aber Syntax-Highlight ?!" );
 
@@ -1454,7 +1454,7 @@ IMPL_LINK_INLINE_END( WatchWindow, ButtonHdl, ImageButton *, pButton )
 
 
 
-IMPL_LINK_INLINE_START( WatchWindow, TreeListHdl, SvTreeListBox *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(WatchWindow, TreeListHdl)
 {
     SvLBoxEntry* pCurEntry = aTreeListBox.GetCurEntry();
     if ( pCurEntry && pCurEntry->GetUserData() )
@@ -1462,7 +1462,7 @@ IMPL_LINK_INLINE_START( WatchWindow, TreeListHdl, SvTreeListBox *, EMPTYARG )
 
     return 0;
 }
-IMPL_LINK_INLINE_END( WatchWindow, TreeListHdl, SvTreeListBox *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(WatchWindow, TreeListHdl)
 
 
 IMPL_LINK_INLINE_START( WatchWindow, implEndDragHdl, HeaderBar *, pBar )
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index 7917321..f4a0d0e 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -58,12 +58,12 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 namespace css = ::com::sun::star;
 
-IMPL_LINK_INLINE_START( BasicIDEShell, ObjectDialogCancelHdl, ObjectCatalog *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(BasicIDEShell, ObjectDialogCancelHdl)
 {
     ShowObjectDialog( sal_False, sal_True );
     return 0;
 }
-IMPL_LINK_INLINE_END( BasicIDEShell, ObjectDialogCancelHdl, ObjectCatalog *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(BasicIDEShell, ObjectDialogCancelHdl)
 
 Reference< view::XRenderable > BasicIDEShell::GetRenderable()
 {
diff --git a/basctl/source/basicide/bastype3.hxx b/basctl/source/basicide/bastype3.hxx
index bc27eaa..c3e9780 100644
--- a/basctl/source/basicide/bastype3.hxx
+++ b/basctl/source/basicide/bastype3.hxx
@@ -48,8 +48,8 @@ private:
 
 protected:
     DECL_LINK( EditAccHdl, Accelerator * );
-    DECL_LINK( ImplGetFocusHdl, Control* );
-    DECL_LINK( ImplLoseFocusHdl, Control* );
+    DECL_LINK(ImplGetFocusHdl, void *);
+    DECL_LINK(ImplLoseFocusHdl, void *);
 
 public:
                     ExtendedEdit( Window* pParent, IDEResId nRes );
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 67244ea..7cffc4b 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -344,7 +344,7 @@ ExtendedEdit::ExtendedEdit( Window* pParent, IDEResId nRes ) :
     Control::SetLoseFocusHdl( LINK( this, ExtendedEdit, ImplLoseFocusHdl ) );
 }
 
-IMPL_LINK( ExtendedEdit, ImplGetFocusHdl, Control*, EMPTYARG )
+IMPL_LINK_NOARG(ExtendedEdit, ImplGetFocusHdl)
 {
     Application::InsertAccel( &aAcc );
     aLoseFocusHdl.Call( this );
@@ -352,7 +352,7 @@ IMPL_LINK( ExtendedEdit, ImplGetFocusHdl, Control*, EMPTYARG )
 }
 
 
-IMPL_LINK( ExtendedEdit, ImplLoseFocusHdl, Control*, EMPTYARG )
+IMPL_LINK_NOARG(ExtendedEdit, ImplLoseFocusHdl)
 {
     Application::RemoveAccel( &aAcc );
     return 0;
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index dea7cc0..05e27d3 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -497,7 +497,7 @@ void MacroChooser::CheckButtons()
 
 
 
-IMPL_LINK_INLINE_START( MacroChooser, MacroDoubleClickHdl, SvTreeListBox *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(MacroChooser, MacroDoubleClickHdl)
 {
     StoreMacroDescription();
     if ( nMode == MACROCHOOSER_RECORDING )
@@ -510,7 +510,7 @@ IMPL_LINK_INLINE_START( MacroChooser, MacroDoubleClickHdl, SvTreeListBox *, EMPT
     EndDialog( MACRO_OK_RUN );
     return 0;
 }
-IMPL_LINK_INLINE_END( MacroChooser, MacroDoubleClickHdl, SvTreeListBox *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(MacroChooser, MacroDoubleClickHdl)
 
 IMPL_LINK( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox )
 {
diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx
index 85cce75..ef4f3bf 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -79,7 +79,7 @@ private:
     sal_uInt16              nMode;
 
     DECL_LINK( MacroSelectHdl, SvTreeListBox * );
-    DECL_LINK( MacroDoubleClickHdl, SvTreeListBox * );
+    DECL_LINK(MacroDoubleClickHdl, void *);
     DECL_LINK( BasicSelectHdl, SvTreeListBox * );
     DECL_LINK( EditModifyHdl, Edit * );
     DECL_LINK( ButtonHdl, Button * );
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 0f7a1ce..ebb1137 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -380,7 +380,7 @@ sal_Bool BasicCheckBox::EditedEntry( SvLBoxEntry* pEntry, const String& rNewText
 // NewObjectDialog
 //----------------------------------------------------------------------------
 
-IMPL_LINK(NewObjectDialog, OkButtonHandler, Button *, EMPTYARG)
+IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler)
 {
     if (BasicIDE::IsValidSbxName(aEdit.GetText()))
         EndDialog(1);
@@ -455,7 +455,7 @@ sal_Int32 GotoLineDialog::GetLineNumber()
     return rtl::OUString( aEdit.GetText() ).toInt32();
 }
 
-IMPL_LINK(GotoLineDialog, OkButtonHandler, Button *, EMPTYARG)
+IMPL_LINK_NOARG(GotoLineDialog, OkButtonHandler)
 {
     if ( GetLineNumber() )
         EndDialog(1);
@@ -469,7 +469,7 @@ IMPL_LINK(GotoLineDialog, OkButtonHandler, Button *, EMPTYARG)
 // ExportDialog
 //----------------------------------------------------------------------------
 
-IMPL_LINK(ExportDialog, OkButtonHandler, Button *, EMPTYARG)
+IMPL_LINK_NOARG(ExportDialog, OkButtonHandler)
 {
     mbExportAsPackage = maExportAsPackageButton.IsChecked();
     EndDialog(1);
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index dd4e03a..0626bab 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -62,7 +62,7 @@ private:
     OKButton        aOKButton;
     CancelButton    aCancelButton;
 
-    DECL_LINK(OkButtonHandler, Button *);
+    DECL_LINK(OkButtonHandler, void *);
 
 public:
     NewObjectDialog(Window * pParent, NewObjectMode nMode, bool bCheckName = false);
@@ -78,7 +78,7 @@ class GotoLineDialog : public ModalDialog
     Edit            aEdit;
     OKButton        aOKButton;
     CancelButton    aCancelButton;
-    DECL_LINK(OkButtonHandler, Button *);
+    DECL_LINK(OkButtonHandler, void *);
 public:
     GotoLineDialog( Window * pParent );
     sal_Int32   GetLineNumber();
@@ -94,7 +94,7 @@ private:
 
     sal_Bool        mbExportAsPackage;
 
-    DECL_LINK(OkButtonHandler, Button *);
+    DECL_LINK(OkButtonHandler, void *);
 
 public:
     ExportDialog( Window * pParent );
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 2769145..c90e0f2 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -507,7 +507,7 @@ void DlgEditor::Paint( const Rectangle& rRect )
 }
 
 
-IMPL_LINK( DlgEditor, PaintTimeout, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(DlgEditor, PaintTimeout)
 {
     if( !pDlgEdView )
         return 0;
@@ -618,7 +618,7 @@ IMPL_LINK( DlgEditor, PaintTimeout, Timer *, EMPTYARG )
 }
 
 
-IMPL_LINK( DlgEditor, MarkTimeout, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(DlgEditor, MarkTimeout)
 {
     BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
 
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index c224f85..01935d5 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -203,7 +203,7 @@ void ManageLanguageDialog::ClearLanguageBox()
     m_aLanguageLB.Clear();
 }
 
-IMPL_LINK( ManageLanguageDialog, AddHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(ManageLanguageDialog, AddHdl)
 {
     SetDefaultLanguageDialog aDlg( this, m_pLocalizationMgr );
     if ( RET_OK == aDlg.Execute() )
@@ -222,7 +222,7 @@ IMPL_LINK( ManageLanguageDialog, AddHdl, Button *, EMPTYARG )
     return 1;
 }
 
-IMPL_LINK( ManageLanguageDialog, DeleteHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl)
 {
     QueryBox aQBox( this, IDEResId( RID_QRYBOX_LANGUAGE ) );
     aQBox.SetButtonText( RET_OK, m_sDeleteStr );
@@ -253,7 +253,7 @@ IMPL_LINK( ManageLanguageDialog, DeleteHdl, Button *, EMPTYARG )
     return 1;
 }
 
-IMPL_LINK( ManageLanguageDialog, MakeDefHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(ManageLanguageDialog, MakeDefHdl)
 {
     sal_uInt16 nPos = m_aLanguageLB.GetSelectEntryPos();
     LanguageEntry* pSelectEntry = (LanguageEntry*)( m_aLanguageLB.GetEntryData( nPos ) );
@@ -272,7 +272,7 @@ IMPL_LINK( ManageLanguageDialog, MakeDefHdl, Button *, EMPTYARG )
     return 1;
 }
 
-IMPL_LINK( ManageLanguageDialog, SelectHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl)
 {
     sal_uInt16 nCount = m_aLanguageLB.GetEntryCount();
     bool bEmpty = ( !nCount ||
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index 3f1b757..2978eed 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -118,7 +118,7 @@ friend class ContainerListenerImpl;
     void                ImplStartListening( StarBASIC* pBasic );
 
     DECL_LINK( TabBarHdl, TabBar* );
-    DECL_LINK( ObjectDialogCancelHdl, ObjectCatalog * );
+    DECL_LINK(ObjectDialogCancelHdl, void *);
     DECL_LINK( TabBarSplitHdl, TabBar * );
 #endif
 
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index 1d7b1f9..ae7483e 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -96,8 +96,8 @@ class Window;
 class DlgEditor: public SfxBroadcaster
 {
 private:
-    DECL_LINK( PaintTimeout, Timer * );
-    DECL_LINK( MarkTimeout, Timer * );
+    DECL_LINK(PaintTimeout, void *);
+    DECL_LINK(MarkTimeout, void *);
 
     void Print( Printer* pPrinter, const ::rtl::OUString& rTitle );
 
diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx
index 3ff9db6..4828bf9 100644
--- a/basctl/source/inc/managelang.hxx
+++ b/basctl/source/inc/managelang.hxx
@@ -79,10 +79,10 @@ private:
     void                FillLanguageBox();
     void                ClearLanguageBox();
 
-    DECL_LINK(          AddHdl, Button * );
-    DECL_LINK(          DeleteHdl, Button * );
-    DECL_LINK(          MakeDefHdl, Button * );
-    DECL_LINK(          SelectHdl, ListBox * );
+    DECL_LINK(AddHdl, void *);
+    DECL_LINK(DeleteHdl, void *);
+    DECL_LINK(MakeDefHdl, void *);
+    DECL_LINK(SelectHdl, void *);
 
 public:
     ManageLanguageDialog( Window* pParent, boost::shared_ptr<LocalizationMgr> _pLMgr );
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index af6794b..98247b9 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -1218,7 +1218,7 @@ void CombiColumnLineChartDialogController::setTemplateProperties( const uno::Ref
     }
 }
 
-IMPL_LINK( CombiColumnLineChartDialogController, ChangeLineCountHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(CombiColumnLineChartDialogController, ChangeLineCountHdl)
 {
     if( m_pChangeListener )
         m_pChangeListener->stateChanged(this);
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 182a36f..c518e64 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -356,13 +356,13 @@ void SeriesHeader::SetEditChangedHdl( const Link & rLink )
     m_aChangeLink = rLink;
 }
 
-IMPL_LINK( SeriesHeader, SeriesNameChanged, void * , EMPTYARG )
+IMPL_LINK_NOARG(SeriesHeader, SeriesNameChanged)
 {
     notifyChanges();
     return 0;
 }
 
-IMPL_LINK( SeriesHeader, SeriesNameEdited, void * , EMPTYARG )
+IMPL_LINK_NOARG(SeriesHeader, SeriesNameEdited)
 {
     m_bSeriesNameChangePending = true;
     return 0;
diff --git a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
index ae490b6..7b33086 100644
--- a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
+++ b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
@@ -58,7 +58,7 @@ void TimerTriggeredControllerLock::startTimer()
         m_apControllerLockGuard = std::auto_ptr< ControllerLockGuard >( new  ControllerLockGuard(m_xModel) );
     m_aTimer.Start();
 }
-IMPL_LINK( TimerTriggeredControllerLock, TimerTimeout, void*, EMPTYARG )
+IMPL_LINK_NOARG(TimerTriggeredControllerLock, TimerTimeout)
 {
     m_apControllerLockGuard.reset();
     return 0;
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index dea3e88..05a578d 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -128,7 +128,7 @@ DataEditor::~DataEditor()
 }
 
 // react on click (or keypress) on toolbar icon
-IMPL_LINK( DataEditor, ToolboxHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(DataEditor, ToolboxHdl)
 {
     switch( m_aTbxData.GetCurItemId() )
     {
@@ -159,7 +159,7 @@ IMPL_LINK( DataEditor, ToolboxHdl, void *, EMPTYARG )
 }
 
 // refresh toolbar icons according to currently selected cell in brwose box
-IMPL_LINK( DataEditor, BrowserCursorMovedHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(DataEditor, BrowserCursorMovedHdl)
 {
     if( m_bReadOnly )
         return 0;
@@ -196,7 +196,7 @@ void DataEditor::SetReadOnly( bool bReadOnly )
     m_apBrwData->SetReadOnly( m_bReadOnly );
 }
 
-IMPL_LINK( DataEditor, MiscHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(DataEditor, MiscHdl)
 {
     SvtMiscOptions aMiscOptions;
     sal_Int16 nStyle( aMiscOptions.GetToolboxStyle() );
@@ -206,7 +206,7 @@ IMPL_LINK( DataEditor, MiscHdl, void*, EMPTYARG )
     return 0L;
 }
 
-IMPL_LINK( DataEditor, CellModified, void*, EMPTYARG )
+IMPL_LINK_NOARG(DataEditor, CellModified)
 {
     return 0;
 }
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index e3a6d22..0b586c6 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -640,7 +640,7 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
     }
 }
 
-IMPL_LINK( SchAttribTabDlg, OKPressed, void * , EMPTYARG )
+IMPL_LINK_NOARG(SchAttribTabDlg, OKPressed)
 {
     m_bOKPressed = true;
     return m_aOriginalOKClickHdl.Call( this );
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index e05c519..49359d4 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -418,14 +418,14 @@ IMPL_LINK( ErrorBarResources, CategoryChosen, void *,  )
     return 0;
 }
 
-IMPL_LINK( ErrorBarResources, SynchronizePosAndNeg, void *, EMPTYARG )
+IMPL_LINK_NOARG(ErrorBarResources, SynchronizePosAndNeg)
 {
     UpdateControlStates();
     PosValueChanged( 0 );
     return 0;
 }
 
-IMPL_LINK( ErrorBarResources, PosValueChanged, void *, EMPTYARG )
+IMPL_LINK_NOARG(ErrorBarResources, PosValueChanged)
 {
     if( m_aCbSyncPosNeg.IsChecked())
     {
@@ -441,7 +441,7 @@ IMPL_LINK( ErrorBarResources, PosValueChanged, void *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( ErrorBarResources, IndicatorChanged, void *, EMPTYARG )
+IMPL_LINK_NOARG(ErrorBarResources, IndicatorChanged)
 {
     m_bIndicatorUnique = true;
     if( m_aRbBoth.IsChecked())
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 4755e04..30e207c 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -182,7 +182,7 @@ void LegendPositionResources::writeToModel( const ::com::sun::star::uno::Referen
     }
 }
 
-IMPL_LINK( LegendPositionResources, PositionEnableHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(LegendPositionResources, PositionEnableHdl)
 {
     sal_Bool bEnable = m_aCbxShow.IsChecked();
 
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index db3c0c4..d460831 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -298,7 +298,7 @@ void ThreeD_SceneAppearance_TabPage::updateScheme()
     }
 }
 
-IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl)
 {
     if( !m_bUpdateOtherControls )
         return 0;
@@ -324,7 +324,7 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, void*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectShading, void*, EMPTYARG )
+IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectShading)
 {
     if( !m_bUpdateOtherControls )
         return 0;
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index 53802dd..18f4481 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -200,7 +200,7 @@ void ThreeD_SceneGeometry_TabPage::applyAnglesToModel()
     m_bAngleChangePending = false;
 }
 
-IMPL_LINK( ThreeD_SceneGeometry_TabPage, AngleEdited, void*, EMPTYARG )
+IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, AngleEdited)
 {
     m_nXRotation = m_aMFXRotation.GetValue();
     m_nYRotation = m_aMFYRotation.GetValue();
@@ -209,7 +209,7 @@ IMPL_LINK( ThreeD_SceneGeometry_TabPage, AngleEdited, void*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( ThreeD_SceneGeometry_TabPage, AngleChanged, void*, EMPTYARG )
+IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, AngleChanged)
 {
     applyAnglesToModel();
     return 0;
@@ -236,26 +236,26 @@ void ThreeD_SceneGeometry_TabPage::applyPerspectiveToModel()
     m_bPerspectiveChangePending = false;
 }
 
-IMPL_LINK( ThreeD_SceneGeometry_TabPage, PerspectiveEdited, void*, EMPTYARG )
+IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveEdited)
 {
     m_bPerspectiveChangePending = true;
     return 0;
 }
 
-IMPL_LINK( ThreeD_SceneGeometry_TabPage, PerspectiveChanged, void*, EMPTYARG )
+IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveChanged)
 {
     applyPerspectiveToModel();
     return 0;
 }
 
-IMPL_LINK( ThreeD_SceneGeometry_TabPage, PerspectiveToggled, void*, EMPTYARG )
+IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveToggled)
 {
     m_aMFPerspective.Enable( m_aCbxPerspective.IsChecked() );
     applyPerspectiveToModel();
     return 0;
 }
 
-IMPL_LINK( ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled, void*, EMPTYARG )
+IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled)
 {
     ControllerLockHelperGuard aGuard( m_rControllerLockHelper );
 
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 3d58744..b094fb9 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -372,7 +372,7 @@ void ThreeD_SceneIllumination_TabPage::commitPendingChanges()
 {
 }
 
-IMPL_LINK( ThreeD_SceneIllumination_TabPage, fillControlsFromModel, void *, EMPTYARG )
+IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, fillControlsFromModel)
 {
     if( m_bInCommitToModel )//don't read own changes
         return 0;
@@ -408,7 +408,7 @@ void ThreeD_SceneIllumination_TabPage::applyLightSourcesToModel()
     m_aTimerTriggeredControllerLock.startTimer();
 }
 
-IMPL_LINK( ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, PreviewChangeHdl)
 {
     m_aTimerTriggeredControllerLock.startTimer();
 
@@ -460,7 +460,7 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, void*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( ThreeD_SceneIllumination_TabPage, PreviewSelectHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, PreviewSelectHdl)
 {
     sal_uInt32 nLightNumber = m_aCtl_Preview.GetSvx3DLightControl().GetSelectedLight();
     if(nLightNumber<8)
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index ab07160..e0892c3 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -303,7 +303,7 @@ void SchAxisLabelTabPage::SetComplexCategories( bool bComplexCategories )
 // event handling routines
 // -----------------------
 
-IMPL_LINK ( SchAxisLabelTabPage, ToggleShowLabel, void *, EMPTYARG )
+IMPL_LINK_NOARG(SchAxisLabelTabPage, ToggleShowLabel)
 {
     sal_Bool bEnable = ( aCbShowDescription.GetState() != STATE_NOCHECK );
 
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index b51b303..d60b44c 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -459,7 +459,7 @@ void AxisPositionsTabPage::SupportAxisPositioning( bool bSupportAxisPositioning
     m_bSupportAxisPositioning = bSupportAxisPositioning;
 }
 
-IMPL_LINK ( AxisPositionsTabPage, CrossesAtSelectHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl)
 {
     sal_uInt16 nPos = m_aLB_CrossesAt.GetSelectEntryPos();
     m_aED_CrossesAt.Show( (2==nPos) && !m_bCrossingAxisIsCategoryAxis );
@@ -474,7 +474,7 @@ IMPL_LINK ( AxisPositionsTabPage, CrossesAtSelectHdl, void *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK ( AxisPositionsTabPage, PlaceLabelsSelectHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(AxisPositionsTabPage, PlaceLabelsSelectHdl)
 {
     sal_uInt16 nLabelPos = m_aLB_PlaceLabels.GetSelectEntryPos();
 
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index dbe13b7..3c95ec1 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -95,7 +95,7 @@ public:
     void fillParameter( ChartTypeParameter& rParameter );
 
 private:
-    DECL_LINK( AxisTypeCheckHdl, CheckBox* );
+    DECL_LINK( AxisTypeCheckHdl, void* );
 private:
     CheckBox    m_aCB_XAxis_Categories;
 };
@@ -132,7 +132,7 @@ void AxisTypeResourceGroup::fillParameter( ChartTypeParameter& rParameter )
 {
     rParameter.bXAxisWithValues = !m_aCB_XAxis_Categories.IsChecked();
 }
-IMPL_LINK( AxisTypeResourceGroup, AxisTypeCheckHdl, CheckBox*, EMPTYARG )
+IMPL_LINK_NOARG(AxisTypeResourceGroup, AxisTypeCheckHdl)
 {
     if( m_pChangeListener )
         m_pChangeListener->stateChanged(this);
@@ -157,7 +157,7 @@ public:
     void fillParameter( ChartTypeParameter& rParameter );
 
 private:
-    DECL_LINK( Dim3DLookCheckHdl, CheckBox* );
+    DECL_LINK( Dim3DLookCheckHdl, void* );
     DECL_LINK( SelectSchemeHdl, void* );
 
 private:
@@ -225,13 +225,13 @@ void Dim3DLookResourceGroup::fillParameter( ChartTypeParameter& rParameter )
     else
         rParameter.eThreeDLookScheme = ThreeDLookScheme_Unknown;
 }
-IMPL_LINK( Dim3DLookResourceGroup, Dim3DLookCheckHdl, CheckBox*, EMPTYARG )
+IMPL_LINK_NOARG(Dim3DLookResourceGroup, Dim3DLookCheckHdl)
 {
     if(m_pChangeListener)
         m_pChangeListener->stateChanged(this);
     return 0;
 }
-IMPL_LINK( Dim3DLookResourceGroup, SelectSchemeHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(Dim3DLookResourceGroup, SelectSchemeHdl)
 {
     if(m_pChangeListener)
         m_pChangeListener->stateChanged(this);
@@ -254,7 +254,7 @@ public:
     void fillParameter( ChartTypeParameter& rParameter );
 
 private:
-    DECL_LINK( SortByXValuesCheckHdl, CheckBox* );
+    DECL_LINK( SortByXValuesCheckHdl, void* );
 
 private:
     CheckBox    m_aCB_XValueSorting;
@@ -288,7 +288,7 @@ void SortByXValuesResourceGroup::fillParameter( ChartTypeParameter& rParameter )
 {
     rParameter.bSortByXValues = m_aCB_XValueSorting.IsChecked();
 }
-IMPL_LINK( SortByXValuesResourceGroup, SortByXValuesCheckHdl, CheckBox*, EMPTYARG )
+IMPL_LINK_NOARG(SortByXValuesResourceGroup, SortByXValuesCheckHdl)
 {
     if(m_pChangeListener)
         m_pChangeListener->stateChanged(this);
@@ -428,7 +428,7 @@ IMPL_LINK( StackingResourceGroup, StackingChangeHdl, RadioButton*, pRadio )
         m_pChangeListener->stateChanged(this);
     return 0;
 }
-IMPL_LINK( StackingResourceGroup, StackingEnableHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(StackingResourceGroup, StackingEnableHdl)
 {
     if( m_pChangeListener )
         m_pChangeListener->stateChanged(this);
@@ -447,7 +447,7 @@ public:
     virtual void StateChanged( StateChangedType nType );
 
 private:
-    DECL_LINK( SplineModeRadioHdl, RadioButton* );
+    DECL_LINK( SplineModeRadioHdl, void* );
 
     void adjustControlPositions();
     void adjustSize();
@@ -583,7 +583,7 @@ void SplinePropertiesDialog::fillParameter( ChartTypeParameter& rParameter, bool
     rParameter.nCurveResolution = static_cast< sal_Int32 >( m_aMF_SplineResolution.GetValue());
     rParameter.nSplineOrder = static_cast< sal_Int32 >( m_aMF_SplineOrder.GetValue());
 }
-IMPL_LINK( SplinePropertiesDialog, SplineModeRadioHdl, RadioButton*, EMPTYARG )
+IMPL_LINK_NOARG(SplinePropertiesDialog, SplineModeRadioHdl)
 {
     m_aFT_SplineOrder.Enable(m_aRB_Splines_B.IsChecked());
     m_aMF_SplineOrder.Enable(m_aRB_Splines_B.IsChecked());
@@ -686,14 +686,14 @@ void SplineResourceGroup::fillParameter( ChartTypeParameter& rParameter )
 {
     getSplinePropertiesDialog().fillParameter( rParameter, m_aCB_Splines.IsChecked() );
 }
-IMPL_LINK( SplineResourceGroup, SplineChangeHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SplineResourceGroup, SplineChangeHdl)
 {
     if( m_pChangeListener )
         m_pChangeListener->stateChanged(this);
     return 0;
 }
 
-IMPL_LINK( SplineResourceGroup, SplineDetailsDialogHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SplineResourceGroup, SplineDetailsDialogHdl)
 {
 
     ChartTypeParameter aOldParameter;
@@ -770,7 +770,7 @@ void GeometryResourceGroup::fillParameter( ChartTypeParameter& rParameter )
     if( m_aGeometryResources.GetSelectEntryCount() )
         rParameter.nGeometry3D = m_aGeometryResources.GetSelectEntryPos();
 }
-IMPL_LINK( GeometryResourceGroup, GeometryChangeHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl)
 {
     if( m_pChangeListener )
         m_pChangeListener->stateChanged(this);
@@ -964,7 +964,7 @@ ChartTypeDialogController* ChartTypeTabPage::getSelectedMainType()
         pTypeController = m_aChartTypeDialogControllerList[nM];
     return pTypeController;
 }
-IMPL_LINK( ChartTypeTabPage, SelectSubTypeHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(ChartTypeTabPage, SelectSubTypeHdl)
 {
     if( m_pCurrentMainType )
     {
@@ -977,7 +977,7 @@ IMPL_LINK( ChartTypeTabPage, SelectSubTypeHdl, void *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( ChartTypeTabPage, SelectMainTypeHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(ChartTypeTabPage, SelectMainTypeHdl)
 {
     ChartTypeParameter aParameter( this->getCurrentParamter() );
 
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 3d99e97..0c66967 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -594,7 +594,7 @@ void DataSourceTabPage::updateControlState()
     isValid();
 }
 
-IMPL_LINK( DataSourceTabPage, SeriesSelectionChangedHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(DataSourceTabPage, SeriesSelectionChangedHdl)
 {
     m_rDialogModel.startControllerLockTimer();
     if( m_apLB_SERIES->FirstSelected())
@@ -607,7 +607,7 @@ IMPL_LINK( DataSourceTabPage, SeriesSelectionChangedHdl, void *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( DataSourceTabPage, RoleSelectionChangedHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl)
 {
     m_rDialogModel.startControllerLockTimer();
     SvLBoxEntry * pEntry = m_aLB_ROLE.FirstSelected();
@@ -634,7 +634,7 @@ IMPL_LINK( DataSourceTabPage, RoleSelectionChangedHdl, void *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( DataSourceTabPage, MainRangeButtonClickedHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl)
 {
     OSL_ASSERT( m_pCurrentRangeChoosingField == 0 );
     m_pCurrentRangeChoosingField = & m_aEDT_RANGE;
@@ -678,7 +678,7 @@ IMPL_LINK( DataSourceTabPage, MainRangeButtonClickedHdl, void *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( DataSourceTabPage, CategoriesRangeButtonClickedHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(DataSourceTabPage, CategoriesRangeButtonClickedHdl)
 {
     OSL_ASSERT( m_pCurrentRangeChoosingField == 0 );
     m_pCurrentRangeChoosingField = & m_aEDT_CATEGORIES;
@@ -693,7 +693,7 @@ IMPL_LINK( DataSourceTabPage, CategoriesRangeButtonClickedHdl, void *, EMPTYARG
     return 0;
 }
 
-IMPL_LINK( DataSourceTabPage, AddButtonClickedHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(DataSourceTabPage, AddButtonClickedHdl)
 {
     m_rDialogModel.startControllerLockTimer();
     SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_apLB_SERIES->FirstSelected());
@@ -733,7 +733,7 @@ IMPL_LINK( DataSourceTabPage, AddButtonClickedHdl, void *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( DataSourceTabPage, RemoveButtonClickedHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(DataSourceTabPage, RemoveButtonClickedHdl)
 {
     m_rDialogModel.startControllerLockTimer();
     SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_apLB_SERIES->FirstSelected());
@@ -778,7 +778,7 @@ IMPL_LINK( DataSourceTabPage, RemoveButtonClickedHdl, void *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( DataSourceTabPage, UpButtonClickedHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(DataSourceTabPage, UpButtonClickedHdl)
 {
     m_rDialogModel.startControllerLockTimer();
     SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_apLB_SERIES->FirstSelected());
@@ -795,7 +795,7 @@ IMPL_LINK( DataSourceTabPage, UpButtonClickedHdl, void *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( DataSourceTabPage, DownButtonClickedHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(DataSourceTabPage, DownButtonClickedHdl)
 {
     m_rDialogModel.startControllerLockTimer();
     SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_apLB_SERIES->FirstSelected());
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 67889c3..fb064f9 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -344,14 +344,14 @@ bool RangeChooserTabPage::isValid()
     return bIsValid;
 }
 
-IMPL_LINK( RangeChooserTabPage, ControlEditedHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(RangeChooserTabPage, ControlEditedHdl)
 {
     setDirty();
     isValid();
     return 0;
 }
 
-IMPL_LINK( RangeChooserTabPage, ControlChangedHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedHdl)
 {
     setDirty();
     if( isValid())
@@ -359,7 +359,7 @@ IMPL_LINK( RangeChooserTabPage, ControlChangedHdl, void*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( RangeChooserTabPage, ChooseRangeHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl)
 {
     rtl::OUString aRange = m_aED_Range.GetText();
     // using assignment for broken gcc 3.3
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index fd456ff..7bcdb92 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -392,7 +392,7 @@ enum AxisTypeListBoxEntry
     TYPE_DATE=2
 };
 
-IMPL_LINK( ScaleTabPage, SelectAxisTypeHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl)
 {
     sal_uInt16 nPos = m_aLB_AxisType.GetSelectEntryPos();
     if( nPos==TYPE_DATE )
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index 5b3b320..daa9baf 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -80,7 +80,7 @@ SchOptionTabPage::~SchOptionTabPage()
 {
 }
 
-IMPL_LINK( SchOptionTabPage, EnableHdl, RadioButton *, EMPTYARG )
+IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl)
 {
     if( m_nAllSeriesAxisIndex == 0 )
         aCBAxisSideBySide.Enable( aRbtAxis2.IsChecked());
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index f09b248..034b7b7 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -78,7 +78,7 @@ private: //member
 
     CheckBox    m_aCBIncludeHiddenCells;
 
-    DECL_LINK(EnableHdl, RadioButton * );
+    DECL_LINK(EnableHdl, void * );
 
     sal_Int32   m_nAllSeriesAxisIndex;
 
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index e40d59b..eb70c70 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -165,7 +165,7 @@ void TitlesAndObjectsTabPage::commitToModel()
     }
 }
 
-IMPL_LINK( TitlesAndObjectsTabPage, ChangeHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(TitlesAndObjectsTabPage, ChangeHdl)
 {
     if( m_bCommitToModel )
         commitToModel();
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 5434530..6a2a18b 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -580,7 +580,7 @@ void ChartController::stopDoubleClickWaiting()
     m_bWaitingForDoubleClick = false;
 }
 
-IMPL_LINK( ChartController, DoubleClickWaitingHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ChartController, DoubleClickWaitingHdl)
 {
     m_bWaitingForDoubleClick = false;
 
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 9ed0741..87daa00 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1036,7 +1036,7 @@ void SfxAcceleratorConfigPage::ResetConfig()
 }
 
 //-----------------------------------------------
-IMPL_LINK( SfxAcceleratorConfigPage, Load, Button*, EMPTYARG )
+IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Load)
 {
     // ask for filename, where we should load the new config data from
     StartFileDialog( 0, aLoadAccelConfigStr );
@@ -1044,14 +1044,14 @@ IMPL_LINK( SfxAcceleratorConfigPage, Load, Button*, EMPTYARG )
 }
 
 //-----------------------------------------------
-IMPL_LINK( SfxAcceleratorConfigPage, Save, Button*, EMPTYARG )
+IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Save)
 {
     StartFileDialog( WB_SAVEAS, aSaveAccelConfigStr );
     return 0;
 }
 
 //-----------------------------------------------
-IMPL_LINK(SfxAcceleratorConfigPage, Default, PushButton*, EMPTYARG)
+IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Default)
 {
     css::uno::Reference< css::form::XReset > xReset(m_xAct, css::uno::UNO_QUERY);
     if (xReset.is())
@@ -1068,7 +1068,7 @@ IMPL_LINK(SfxAcceleratorConfigPage, Default, PushButton*, EMPTYARG)
 }
 
 //-----------------------------------------------
-IMPL_LINK( SfxAcceleratorConfigPage, ChangeHdl, Button*, EMPTYARG )
+IMPL_LINK_NOARG(SfxAcceleratorConfigPage, ChangeHdl)
 {
     sal_uInt16    nPos        = (sal_uInt16) aEntriesBox.GetModel()->GetRelPos( aEntriesBox.FirstSelected() );
     TAccInfo* pEntry      = (TAccInfo*)aEntriesBox.GetEntry(0, nPos)->GetUserData();
@@ -1086,7 +1086,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, ChangeHdl, Button*, EMPTYARG )
 }
 
 //-----------------------------------------------
-IMPL_LINK( SfxAcceleratorConfigPage, RemoveHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl)
 {
     // get selected entry
     sal_uInt16    nPos   = (sal_uInt16) aEntriesBox.GetModel()->GetRelPos( aEntriesBox.FirstSelected() );
@@ -1191,7 +1191,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
 }
 
 //-----------------------------------------------
-IMPL_LINK( SfxAcceleratorConfigPage, RadioHdl, RadioButton *, EMPTYARG )
+IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl)
 {
     css::uno::Reference< css::ui::XAcceleratorConfiguration > xOld = m_xAct;
 
@@ -1225,7 +1225,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, RadioHdl, RadioButton *, EMPTYARG )
 }
 
 //-----------------------------------------------
-IMPL_LINK( SfxAcceleratorConfigPage, LoadHdl, sfx2::FileDialogHelper*, EMPTYARG )
+IMPL_LINK_NOARG(SfxAcceleratorConfigPage, LoadHdl)
 {
     DBG_ASSERT( m_pFileDlg, "SfxInternetPage::DialogClosedHdl(): no file dialog" );
 
@@ -1309,7 +1309,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, LoadHdl, sfx2::FileDialogHelper*, EMPTYARG
 }
 
 //-----------------------------------------------
-IMPL_LINK( SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, EMPTYARG )
+IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl)
 {
     DBG_ASSERT( m_pFileDlg, "SfxInternetPage::DialogClosedHdl(): no file dialog" );
 
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 7a29e06..6f8b8d5 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -877,7 +877,7 @@ SvxMacroAssignDlg::~SvxMacroAssignDlg()
 
 //===============================================
 
-IMPL_LINK(AssignComponentDialog, ButtonHandler, Button *, EMPTYARG)
+IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler)
 {
     ::rtl::OUString aMethodName = maMethodEdit.GetText();
     maURL = ::rtl::OUString();
diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx
index c79b91f..e8632b8 100644
--- a/cui/source/customize/macropg_impl.hxx
+++ b/cui/source/customize/macropg_impl.hxx
@@ -59,7 +59,7 @@ private:
 
     ::rtl::OUString maURL;
 
-    DECL_LINK(ButtonHandler, Button *);
+    DECL_LINK(ButtonHandler, void *);
 
 public:
     AssignComponentDialog( Window * pParent, const ::rtl::OUString& rURL );
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 2f624e2..4b6159f 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -128,7 +128,7 @@ void SvxConfigFunctionListBox_Impl::MouseMove( const MouseEvent& rMEvt )
 }
 
 
-IMPL_LINK( SvxConfigFunctionListBox_Impl, TimerHdl, Timer*, EMPTYARG)
+IMPL_LINK_NOARG(SvxConfigFunctionListBox_Impl, TimerHdl)
 {
     aTimer.Stop();
     Point aMousePos = GetPointerPosPixel();
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index cd9b273..21ab29c 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -648,7 +648,7 @@ String SpellDialog::getReplacementString() const
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SpellDialog, ChangeHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SpellDialog, ChangeHdl)
 {
     if(aSentenceED.IsUndoEditMode())
     {
@@ -670,7 +670,7 @@ IMPL_LINK( SpellDialog, ChangeHdl, Button *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SpellDialog, ChangeAllHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SpellDialog, ChangeAllHdl)
 {
     aSentenceED.UndoActionStart( SPELLUNDO_CHANGE_GROUP );
     String aString = getReplacementString();
@@ -746,7 +746,7 @@ IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton )
 }
 
 //-----------------------------------------------------------------------
-IMPL_LINK( SpellDialog, UndoHdl, Button*, EMPTYARG )
+IMPL_LINK_NOARG(SpellDialog, UndoHdl)
 {
     aSentenceED.Undo();
     if(!aSentenceED.GetUndoActionCount())
@@ -814,7 +814,7 @@ void SpellDialog::Impl_Restore()
     aIgnorePB.SetText(aIgnoreOnceST);
 }
 
-IMPL_LINK( SpellDialog, IgnoreHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SpellDialog, IgnoreHdl)
 {
     if(aIgnorePB.GetText() == aResumeST)
     {
@@ -1086,7 +1086,7 @@ IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd)
 };
 
 //-----------------------------------------------------------------------
-IMPL_LINK(SpellDialog, CancelHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SpellDialog, CancelHdl)
 {
     //apply changes and ignored text parts first - if there are any
     rParent.ApplyChangedSentence(aSentenceED.CreateSpellPortions(true), false);
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 60772e9..b39b738 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1425,7 +1425,7 @@ IMPL_LINK( ColorPickerDialog, ColorModifyHdl, void *, p )
 
 // --------------------------------------------------------------------
 
-IMPL_LINK( ColorPickerDialog, ModeModifyHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(ColorPickerDialog, ModeModifyHdl)
 {
     ColorMode eMode = HUE;
 
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 612f476..2db6e32 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -371,7 +371,7 @@ void SvxCharMapData::SetCharFont( const Font& rFont )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxCharMapData, OKHdl, OKButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxCharMapData, OKHdl)
 {
     String aStr = aShowText.GetText();
 
@@ -388,7 +388,7 @@ IMPL_LINK( SvxCharMapData, OKHdl, OKButton *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxCharMapData, FontSelectHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SvxCharMapData, FontSelectHdl)
 {
     sal_uInt16 nPos = aFontLB.GetSelectEntryPos(),
         nFont = (sal_uInt16)(sal_uLong)aFontLB.GetEntryData( nPos );
@@ -450,7 +450,7 @@ IMPL_LINK( SvxCharMapData, FontSelectHdl, ListBox *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxCharMapData, SubsetSelectHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(SvxCharMapData, SubsetSelectHdl)
 {
     sal_uInt16 nPos = aSubsetLB.GetSelectEntryPos();
     const Subset* pSubset = reinterpret_cast<const Subset*> (aSubsetLB.GetEntryData(nPos));
@@ -465,7 +465,7 @@ IMPL_LINK( SvxCharMapData, SubsetSelectHdl, ListBox *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxCharMapData, CharDoubleClickHdl, Control *, EMPTYARG )
+IMPL_LINK_NOARG(SvxCharMapData, CharDoubleClickHdl)
 {
     mpDialog->EndDialog( sal_True );
     return 0;
@@ -473,7 +473,7 @@ IMPL_LINK( SvxCharMapData, CharDoubleClickHdl, Control *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxCharMapData, CharSelectHdl, Control *, EMPTYARG )
+IMPL_LINK_NOARG(SvxCharMapData, CharSelectHdl)
 {
     if ( !bOne )
     {
@@ -496,7 +496,7 @@ IMPL_LINK( SvxCharMapData, CharSelectHdl, Control *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxCharMapData, CharHighlightHdl, Control *, EMPTYARG )
+IMPL_LINK_NOARG(SvxCharMapData, CharHighlightHdl)
 {
     String aText;
     sal_UCS4 cChar = aShowSet.GetSelectCharacter();
@@ -535,7 +535,7 @@ IMPL_LINK( SvxCharMapData, CharHighlightHdl, Control *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxCharMapData, CharPreSelectHdl, Control *, EMPTYARG )
+IMPL_LINK_NOARG(SvxCharMapData, CharPreSelectHdl)
 {
     // adjust subset selection
     if( pSubsetMap )
@@ -552,7 +552,7 @@ IMPL_LINK( SvxCharMapData, CharPreSelectHdl, Control *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxCharMapData, DeleteHdl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxCharMapData, DeleteHdl)
 {
     aShowText.SetText( String() );
     aOKBtn.Disable();
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index ac5fd9e..2d28672 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -342,7 +342,7 @@ IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton)
 }
 
 //------------------------------------------------------------------------
-IMPL_LINK(FmSearchDialog, OnClickedSearchAgain, Button*, EMPTYARG)
+IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain)
 {
     if (m_pbClose.IsEnabled())
     {   // der Button hat die Funktion 'Suchen'
@@ -436,7 +436,7 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton )
 }
 
 //------------------------------------------------------------------------
-IMPL_LINK(FmSearchDialog, OnSearchTextModified, ComboBox*, EMPTYARG)
+IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified)
 {
     if ((m_cmbSearchText.GetText().Len() != 0) || !m_rbSearchForText.IsChecked())
         m_pbSearchAgain.Enable();
@@ -739,7 +739,7 @@ void FmSearchDialog::EnableControlPaint(sal_Bool bEnable)
 }
 
 //------------------------------------------------------------------------
-IMPL_LINK(FmSearchDialog, OnDelayedPaint, void*, EMPTYARG)
+IMPL_LINK_NOARG(FmSearchDialog, OnDelayedPaint)
 {
     EnableControlPaint(sal_True);
     return 0L;
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 3cfb82d..49b2106 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -245,7 +245,7 @@ void SearchProgress::Terminate()
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( SearchProgress, ClickCancelBtn, void*, EMPTYARG )
+IMPL_LINK_NOARG(SearchProgress, ClickCancelBtn)
 {
     Terminate();
     return 0L;
@@ -253,7 +253,7 @@ IMPL_LINK( SearchProgress, ClickCancelBtn, void*, EMPTYARG )
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( SearchProgress, CleanUpHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SearchProgress, CleanUpHdl)
 {
     EndDialog( RET_OK );
     delete this;
@@ -380,7 +380,7 @@ void TakeProgress::Terminate()
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TakeProgress, ClickCancelBtn, void*, EMPTYARG )
+IMPL_LINK_NOARG(TakeProgress, ClickCancelBtn)
 {
     Terminate();
     return 0L;
@@ -388,7 +388,7 @@ IMPL_LINK( TakeProgress, ClickCancelBtn, void*, EMPTYARG )
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TakeProgress, CleanUpHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(TakeProgress, CleanUpHdl)
 {
     TPGalleryThemeProperties*   mpBrowser = (TPGalleryThemeProperties*) GetParent();
     ::std::vector<bool, std::allocator<bool> >           aRemoveEntries( mpBrowser->aFoundList.size(), false );
@@ -497,7 +497,7 @@ short ActualizeProgress::Execute()
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( ActualizeProgress, ClickCancelBtn, void*, EMPTYARG )
+IMPL_LINK_NOARG(ActualizeProgress, ClickCancelBtn)
 {
     pTheme->AbortActualize();
     EndDialog( RET_OK );
@@ -584,7 +584,7 @@ GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) :
 
 // -----------------------------------------------------------------------------
 
-IMPL_LINK( GalleryIdDialog, ClickOkHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl)
 {
     Gallery*    pGal = pThm->GetParent();
     const sal_uLong nId = GetId();
@@ -1015,7 +1015,7 @@ void TPGalleryThemeProperties::FillFilterList()
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TPGalleryThemeProperties, SelectFileTypeHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFileTypeHdl)
 {
     String aText( aCbbFileType.GetText() );
 
@@ -1051,7 +1051,7 @@ void TPGalleryThemeProperties::SearchFiles()
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl)
 {
     if( bInputAllowed )
     {
@@ -1114,7 +1114,7 @@ void TPGalleryThemeProperties::TakeFiles()
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TPGalleryThemeProperties, ClickPreviewHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickPreviewHdl)
 {
     if ( bInputAllowed )
     {
@@ -1165,7 +1165,7 @@ void TPGalleryThemeProperties::DoPreview()
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TPGalleryThemeProperties, ClickTakeHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl)
 {
     if( bInputAllowed )
     {
@@ -1192,7 +1192,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickTakeHdl, void*, EMPTYARG )
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TPGalleryThemeProperties, ClickTakeAllHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeAllHdl)
 {
     if( bInputAllowed )
     {
@@ -1206,7 +1206,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickTakeAllHdl, void *, EMPTYARG )
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TPGalleryThemeProperties, SelectFoundHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl)
 {
     if( bInputAllowed )
     {
@@ -1239,7 +1239,7 @@ IMPL_LINK( TPGalleryThemeProperties, SelectFoundHdl, void *, EMPTYARG )
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TPGalleryThemeProperties, DClickFoundHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(TPGalleryThemeProperties, DClickFoundHdl)
 {
     if( bInputAllowed )
     {
@@ -1254,7 +1254,7 @@ IMPL_LINK( TPGalleryThemeProperties, DClickFoundHdl, void *, EMPTYARG )
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TPGalleryThemeProperties, PreviewTimerHdl, void *, EMPTYARG )
+IMPL_LINK_NOARG(TPGalleryThemeProperties, PreviewTimerHdl)
 {
     aPreviewTimer.Stop();
     DoPreview();
@@ -1263,7 +1263,7 @@ IMPL_LINK( TPGalleryThemeProperties, PreviewTimerHdl, void *, EMPTYARG )
 
 // ------------------------------------------------------------------------
 
-IMPL_LINK( TPGalleryThemeProperties, EndSearchProgressHdl, SearchProgress *, EMPTYARG )
+IMPL_LINK_NOARG(TPGalleryThemeProperties, EndSearchProgressHdl)
 {
   if( !aFoundList.empty() )
   {
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 2e8caee..21ccf63 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -144,7 +144,7 @@ GraphicFilterDialog::~GraphicFilterDialog()
 
 // -----------------------------------------------------------------------------
 
-IMPL_LINK( GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(GraphicFilterDialog, ImplPreviewTimeoutHdl)
 {
     maTimer.Stop();
     maPreview.SetGraphic( GetFilteredGraphic( maGraphic, mfScaleX, mfScaleY ) );
@@ -154,7 +154,7 @@ IMPL_LINK( GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer*, EMPTYARG )
 
 // -----------------------------------------------------------------------------
 
-IMPL_LINK( GraphicFilterDialog, ImplModifyHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl)
 {
     if( maGraphic.GetType() == GRAPHIC_BITMAP )
     {
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 1b44a8d..1b5e92f 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -233,7 +233,7 @@ void SvxHpLinkDlg::Move()
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHpLinkDlg, ClickApplyHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl)
 {
     SfxItemSet aItemSet( SFX_APP()->GetPool(), SID_HYPERLINK_GETLINK,
                          SID_HYPERLINK_SETLINK );
@@ -265,7 +265,7 @@ IMPL_LINK ( SvxHpLinkDlg, ClickApplyHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHpLinkDlg, ClickCloseHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHpLinkDlg, ClickCloseHdl_Impl)
 {
     Close();
 
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index ae0beaa..7239b4a 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -75,7 +75,7 @@ SvxNameDialog::SvxNameDialog( Window* pWindow, const String& rName, const String
     }
 }
 
-IMPL_LINK(SvxNameDialog, ModifyHdl, Edit*, EMPTYARG)
+IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl)
 {
     if(aCheckNameHdl.IsSet())
         aBtnOK.Enable(aCheckNameHdl.Call(this) > 0);
@@ -109,7 +109,7 @@ SvxObjectNameDialog::SvxObjectNameDialog(
     aEdtName.SetModifyHdl(LINK(this, SvxObjectNameDialog, ModifyHdl));
 }
 
-IMPL_LINK(SvxObjectNameDialog, ModifyHdl, Edit*, EMPTYARG)
+IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl)
 {
     if(aCheckNameHdl.IsSet())
     {
@@ -190,21 +190,21 @@ SvxMessDialog::~SvxMessDialog()
 
 /*************************************************************************/
 
-IMPL_LINK_INLINE_START( SvxMessDialog, Button1Hdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SvxMessDialog, Button1Hdl)
 {
     EndDialog( RET_BTN_1 );
     return 0;
 }
-IMPL_LINK_INLINE_END( SvxMessDialog, Button1Hdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(SvxMessDialog, Button1Hdl)
 
 /*************************************************************************/
 
-IMPL_LINK_INLINE_START( SvxMessDialog, Button2Hdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SvxMessDialog, Button2Hdl)
 {
     EndDialog( RET_BTN_2 );
     return 0;
 }
-IMPL_LINK_INLINE_END( SvxMessDialog, Button2Hdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(SvxMessDialog, Button2Hdl)
 
 /*************************************************************************/
 
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index e518649..93705c6 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -698,7 +698,7 @@ namespace svx
     }
 
     //-------------------------------------------------------------------------
-    IMPL_LINK( HangulHanjaConversionDialog, OnSuggestionSelected, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnSuggestionSelected)
     {
         m_pPlayground->GetWordInputControl().SetText( m_aSuggestions.GetSelectEntry() );
         OnSuggestionModified( NULL );
@@ -706,7 +706,7 @@ namespace svx
     }
 
     //-------------------------------------------------------------------------
-    IMPL_LINK( HangulHanjaConversionDialog, OnSuggestionModified, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnSuggestionModified)
     {
         m_aFind.Enable( m_pPlayground->GetWordInputControl().GetSavedValue() != m_pPlayground->GetWordInputControl().GetText() );
 
@@ -748,13 +748,13 @@ namespace svx
     }
 
     //-------------------------------------------------------------------------
-    IMPL_LINK( HangulHanjaConversionDialog, OnClose, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnClose)
     {
         Close();
         return 0L;
     }
 
-    IMPL_LINK( HangulHanjaConversionDialog, OnOption, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnOption)
     {
         HangulHanjaOptionsDialog        aOptDlg( this );
         aOptDlg.Execute();
@@ -980,7 +980,7 @@ namespace svx
         }
     }
 
-    IMPL_LINK( HangulHanjaOptionsDialog, OkHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaOptionsDialog, OkHdl)
     {
         sal_uInt32              nCnt = m_aDictList.size();
         sal_uInt32              n = 0;
@@ -1034,7 +1034,7 @@ namespace svx
         return 0;
     }
 
-    IMPL_LINK( HangulHanjaOptionsDialog, DictsLB_SelectHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DictsLB_SelectHdl)
     {
         bool    bSel = m_aDictsLB.FirstSelected() != NULL;
 
@@ -1044,7 +1044,7 @@ namespace svx
         return 0;
     }
 
-    IMPL_LINK( HangulHanjaOptionsDialog, NewDictHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaOptionsDialog, NewDictHdl)
     {
         String                      aName;
         HangulHanjaNewDictDialog    aNewDlg( this );
@@ -1077,7 +1077,7 @@ namespace svx
         return 0L;
     }
 
-    IMPL_LINK( HangulHanjaOptionsDialog, EditDictHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaOptionsDialog, EditDictHdl)
     {
         SvLBoxEntry*    pEntry = m_aDictsLB.FirstSelected();
         DBG_ASSERT( pEntry, "+HangulHanjaEditDictDialog::EditDictHdl(): call of edit should not be possible with no selection!" );
@@ -1089,7 +1089,7 @@ namespace svx
         return 0L;
     }
 
-    IMPL_LINK( HangulHanjaOptionsDialog, DeleteDictHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DeleteDictHdl)
     {
         sal_uInt16 nSelPos = m_aDictsLB.GetSelectEntryPos();
         if( nSelPos != LISTBOX_ENTRY_NOTFOUND )
@@ -1199,7 +1199,7 @@ namespace svx
     //=========================================================================
     //-------------------------------------------------------------------------
 
-    IMPL_LINK( HangulHanjaNewDictDialog, OKHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaNewDictDialog, OKHdl)
     {
         String  aName( m_aDictNameED.GetText() );
 
@@ -1212,7 +1212,7 @@ namespace svx
         return 0;
     }
 
-    IMPL_LINK( HangulHanjaNewDictDialog, ModifyHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaNewDictDialog, ModifyHdl)
     {
         String  aName( m_aDictNameED.GetText() );
 
@@ -1538,14 +1538,14 @@ namespace svx
     }
 
 
-    IMPL_LINK( HangulHanjaEditDictDialog, ScrollHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaEditDictDialog, ScrollHdl)
     {
         UpdateScrollbar();
 
         return 0;
     }
 
-    IMPL_LINK( HangulHanjaEditDictDialog, OriginalModifyHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaEditDictDialog, OriginalModifyHdl)
     {
         m_bModifiedOriginal = true;
         m_aOriginal = m_aOriginalLB.GetText();
@@ -1581,13 +1581,13 @@ namespace svx
         return 0;
     }
 
-    IMPL_LINK( HangulHanjaEditDictDialog, BookLBSelectHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaEditDictDialog, BookLBSelectHdl)
     {
         InitEditDictDialog( m_aBookLB.GetSelectEntryPos() );
         return 0;
     }
 
-    IMPL_LINK( HangulHanjaEditDictDialog, NewPBPushHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaEditDictDialog, NewPBPushHdl)
     {
         DBG_ASSERT( m_pSuggestions, "-HangulHanjaEditDictDialog::NewPBPushHdl(): no suggestions... search in hell..." );
         Reference< XConversionDictionary >  xDict = m_rDictList[ m_nCurrentDict ];
@@ -1656,7 +1656,7 @@ namespace svx
         return bRemovedSomething;
     }
 
-    IMPL_LINK( HangulHanjaEditDictDialog, DeletePBPushHdl, void*, EMPTYARG )
+    IMPL_LINK_NOARG(HangulHanjaEditDictDialog, DeletePBPushHdl)
     {
         if( DeleteEntryFromDictionary( m_aOriginal, m_rDictList[ m_nCurrentDict ] ) )
         {
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index cca1fa8..3531a20 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -414,7 +414,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkNewDocTp, ClickNewHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl)
 {
     rtl::OUString                       aService( RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_SERVICE_NAME ) );
     uno::Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 63d96e8..57b665f 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -203,7 +203,7 @@ void SvxHyperlinkDocTp::SetInitFocus()
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkDocTp, ClickFileopenHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl)
 {
     // Open Fileopen-Dialog
        ::sfx2::FileDialogHelper aDlg(
@@ -242,7 +242,7 @@ IMPL_LINK ( SvxHyperlinkDocTp, ClickFileopenHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkDocTp, ClickTargetHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickTargetHdl_Impl)
 {
     if ( GetPathType ( maStrURL ) == Type_ExistsFile  ||
          maStrURL == aEmptyStr                        ||
@@ -274,7 +274,7 @@ IMPL_LINK ( SvxHyperlinkDocTp, ClickTargetHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkDocTp, ModifiedPathHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedPathHdl_Impl)
 {
     maStrURL = GetCurrentURL();
 
@@ -292,7 +292,7 @@ IMPL_LINK ( SvxHyperlinkDocTp, ModifiedPathHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkDocTp, TimeoutHdl_Impl)
 {
     if ( IsMarkWndVisible() && ( GetPathType( maStrURL )==Type_ExistsFile ||
                                   maStrURL == aEmptyStr                   ||
@@ -317,7 +317,7 @@ IMPL_LINK ( SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkDocTp, ModifiedTargetHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedTargetHdl_Impl)
 {
     maStrURL = GetCurrentURL();
 
@@ -335,7 +335,7 @@ IMPL_LINK ( SvxHyperlinkDocTp, ModifiedTargetHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkDocTp, LostFocusPathHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkDocTp, LostFocusPathHdl_Impl)
 {
     maStrURL = GetCurrentURL();
 
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 68cc9b4..ec74b25 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -238,7 +238,7 @@ void SvxHyperlinkInternetTp::SetInitFocus()
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl)
 {
     String aScheme = GetSchemeFromURL( maCbbTarget.GetText() );
     if(aScheme.Len()!=0)
@@ -257,7 +257,7 @@ IMPL_LINK ( SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkInternetTp, TimeoutHdl_Impl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkInternetTp, TimeoutHdl_Impl)
 {
     RefreshMarkWindow();
     return( 0L );
@@ -269,7 +269,7 @@ IMPL_LINK ( SvxHyperlinkInternetTp, TimeoutHdl_Impl, Timer *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl)
 {
     String aStrLogin ( maEdLogin.GetText() );
     if ( aStrLogin.EqualsIgnoreCaseAscii( sAnonymous ) )
@@ -366,7 +366,7 @@ INetProtocol SvxHyperlinkInternetTp::GetSmartProtocolFromButtons() const
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkInternetTp, Click_SmartProtocol_Impl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl)
 {
     String aScheme = GetSchemeFromButtons();
     SetScheme( aScheme );
@@ -379,7 +379,7 @@ IMPL_LINK ( SvxHyperlinkInternetTp, Click_SmartProtocol_Impl, void*, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl)
 {
     // disable login-editfields if checked
     if ( maCbAnonymous.IsChecked() )
@@ -409,7 +409,7 @@ IMPL_LINK ( SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl)
 {
     RefreshMarkWindow();
     return (0L);
@@ -421,7 +421,7 @@ IMPL_LINK ( SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkInternetTp, ClickBrowseHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl)
 {
     /////////////////////////////////////////////////
     // Open URL if available
@@ -448,7 +448,7 @@ IMPL_LINK ( SvxHyperlinkInternetTp, ClickBrowseHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkInternetTp, ClickTargetHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickTargetHdl_Impl)
 {
     RefreshMarkWindow();
     ShowMarkWnd ();
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index bc1ab0b..0f84219 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -271,7 +271,7 @@ INetProtocol SvxHyperlinkMailTp::GetSmartProtocolFromButtons() const
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkMailTp, Click_SmartProtocol_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkMailTp, Click_SmartProtocol_Impl)
 {
     String aScheme = GetSchemeFromButtons();
     SetScheme( aScheme );
@@ -284,7 +284,7 @@ IMPL_LINK ( SvxHyperlinkMailTp, Click_SmartProtocol_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl)
 {
     String aScheme = GetSchemeFromURL( maCbbReceiver.GetText() );
     if(aScheme.Len()!=0)
@@ -299,7 +299,7 @@ IMPL_LINK ( SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl)
 {
     SfxViewFrame* pViewFrame = SfxViewFrame::Current();
     if( pViewFrame )
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 0e2bdc0..04e90b5 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -486,7 +486,7 @@ void SvxHlinkDlgMarkWnd::SelectEntry ( String aStrMark )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl)
 {
     SvLBoxEntry* pEntry = maLbTree.GetCurEntry();
 
@@ -510,7 +510,7 @@ IMPL_LINK ( SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl)
 {
     Close();
 
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 4b6fd2c..33533a1 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -427,7 +427,7 @@ SfxDispatcher* SvxHyperlinkTabPageBase::GetDispatcher() const
 |*
 |************************************************************************/
 
-IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl)
 {
     SvxHyperlinkItem *pHyperlinkItem = (SvxHyperlinkItem *)
                                        GetItemSet().GetItem (SID_HYPERLINK_GETLINK);
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index da10e83..35c1fd1 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -135,14 +135,14 @@ struct SvxHyphenWordDialog_Impl
     void            SelLeft_Impl();
     void            SelRight_Impl();
 
-    DECL_LINK( Left_Impl, Button* );
-    DECL_LINK( Right_Impl, Button* );
-    DECL_LINK( CutHdl_Impl, Button* );
-    DECL_LINK( ContinueHdl_Impl, Button* );
-    DECL_LINK( DeleteHdl_Impl, Button* );
+    DECL_LINK(Left_Impl, void *);
+    DECL_LINK(Right_Impl, void *);
+    DECL_LINK(CutHdl_Impl, void *);
+    DECL_LINK(ContinueHdl_Impl, void *);
+    DECL_LINK(DeleteHdl_Impl, void *);
     DECL_LINK( HyphenateAllHdl_Impl, Button* );
-    DECL_LINK( CancelHdl_Impl, Button* );
-    DECL_LINK( GetFocusHdl_Impl, Edit* );
+    DECL_LINK(CancelHdl_Impl, void *);
+    DECL_LINK(GetFocusHdl_Impl, void *);
 
 
     SvxHyphenWordDialog_Impl(
@@ -489,7 +489,7 @@ void SvxHyphenWordDialog_Impl::SelRight_Impl()
 }
 
 
-IMPL_LINK( SvxHyphenWordDialog_Impl, CutHdl_Impl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, CutHdl_Impl)
 {
     if( !bBusy )
     {
@@ -531,7 +531,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, HyphenateAllHdl_Impl, Button *, EMPTYARG /*
 }
 
 
-IMPL_LINK( SvxHyphenWordDialog_Impl, DeleteHdl_Impl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, DeleteHdl_Impl)
 {
     if( !bBusy )
     {
@@ -543,7 +543,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, DeleteHdl_Impl, Button *, EMPTYARG )
 }
 
 
-IMPL_LINK( SvxHyphenWordDialog_Impl, ContinueHdl_Impl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, ContinueHdl_Impl)
 {
     if( !bBusy )
     {
@@ -555,7 +555,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, ContinueHdl_Impl, Button *, EMPTYARG )
 }
 
 
-IMPL_LINK( SvxHyphenWordDialog_Impl, CancelHdl_Impl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, CancelHdl_Impl)
 {
     if( !bBusy )
     {
@@ -568,7 +568,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, CancelHdl_Impl, Button *, EMPTYARG )
 }
 
 
-IMPL_LINK( SvxHyphenWordDialog_Impl, Left_Impl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, Left_Impl)
 {
     if( !bBusy )
     {
@@ -580,7 +580,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, Left_Impl, Button *, EMPTYARG )
 }
 
 
-IMPL_LINK( SvxHyphenWordDialog_Impl, Right_Impl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, Right_Impl)
 {
     if( !bBusy )
     {
@@ -592,7 +592,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, Right_Impl, Button *, EMPTYARG )
 }
 
 
-IMPL_LINK( SvxHyphenWordDialog_Impl, GetFocusHdl_Impl, Edit *, EMPTYARG )
+IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, GetFocusHdl_Impl)
 {
     aWordEdit.SetSelection( Selection( nOldPos, nOldPos + 1 ) );
     return 0;
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 6774c98..db3fe8b 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -638,7 +638,7 @@ void IconChoiceDialog::SetPosSizePages ( sal_uInt16 nId )
 |
 \**********************************************************************/
 
-IMPL_LINK ( IconChoiceDialog , ChosePageHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(IconChoiceDialog , ChosePageHdl_Impl)
 {
     sal_uLong nPos;
 
@@ -669,7 +669,7 @@ IMPL_LINK ( IconChoiceDialog , ChosePageHdl_Impl, void *, EMPTYARG )
 |
 \**********************************************************************/
 
-IMPL_LINK( IconChoiceDialog, OkHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(IconChoiceDialog, OkHdl)
 {
     bInOK = sal_True;
 
@@ -688,7 +688,7 @@ IMPL_LINK( IconChoiceDialog, OkHdl, Button *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( IconChoiceDialog, ResetHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(IconChoiceDialog, ResetHdl)
 {
     ResetPageImpl ();
 
@@ -710,7 +710,7 @@ IMPL_LINK( IconChoiceDialog, ResetHdl, Button *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( IconChoiceDialog, CancelHdl, Button*, EMPTYARG )
+IMPL_LINK_NOARG(IconChoiceDialog, CancelHdl)
 {
     Close();
 
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 2ff622b..c85443f 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -110,7 +110,7 @@ InsertObjectDialog_Impl::InsertObjectDialog_Impl( Window * pParent, const ResId
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK_INLINE_START( SvInsertOleDlg, DoubleClickHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SvInsertOleDlg, DoubleClickHdl)
 {
     EndDialog( RET_OK );
     return 0;
@@ -119,7 +119,7 @@ IMPL_LINK_INLINE_END( SvInsertOleDlg, DoubleClickHdl, ListBox *, pListBox )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvInsertOleDlg, BrowseHdl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl)
 {
     Reference< XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
     if( xFactory.is() )
@@ -162,7 +162,7 @@ IMPL_LINK( SvInsertOleDlg, BrowseHdl, PushButton *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvInsertOleDlg, RadioHdl, RadioButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvInsertOleDlg, RadioHdl)
 {
     if ( aRbNewObject.IsChecked() )
     {
@@ -396,7 +396,7 @@ uno::Reference< io::XInputStream > SvInsertOleDlg::GetIconIfIconified( ::rtl::OU
     return uno::Reference< io::XInputStream >();
 }
 
-IMPL_LINK( SvInsertPlugInDialog, BrowseHdl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvInsertPlugInDialog, BrowseHdl)
 {
     Sequence< OUString > aFilterNames, aFilterTypes;
     void fillNetscapePluginFilters( Sequence< OUString >& rNames, Sequence< OUString >& rTypes );
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 42b9080..e6d4e5e 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -259,7 +259,7 @@ IMPL_LINK_INLINE_START( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioBut
 }
 IMPL_LINK_INLINE_END( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioButton )
 
-IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl)
 {
     SvTabListBox& rListBox = Links();
     sal_uInt16 nSelCnt = (sal_uInt16)rListBox.GetSelectionCount();
diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx
index cc76430..6de3daa 100644
--- a/cui/source/dialogs/multifil.cxx
+++ b/cui/source/dialogs/multifil.cxx
@@ -142,7 +142,7 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxMultiFileDialog, DelHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxMultiFileDialog, DelHdl_Impl)
 {
     sal_uInt16 nPos = aPathLB.GetSelectEntryPos();
     aPathLB.RemoveEntry( nPos );
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 1f05268..eee534e 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -63,7 +63,7 @@ struct MultiPath_Impl
 
 // class SvxMultiPathDialog ----------------------------------------------
 
-IMPL_LINK( SvxMultiPathDialog, SelectHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(SvxMultiPathDialog, SelectHdl_Impl)
 {
     sal_uLong nCount = pImpl->bIsRadioButtonMode ? aRadioLB.GetEntryCount() : aPathLB.GetEntryCount();
     bool bIsSelected = pImpl->bIsRadioButtonMode
@@ -87,7 +87,7 @@ IMPL_LINK( SvxMultiPathDialog, CheckHdl_Impl, svx::SvxRadioButtonListBox *, pBox
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxMultiPathDialog, AddHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl)
 {
     rtl::OUString aService( RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_SERVICE_NAME ) );
     Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
@@ -140,7 +140,7 @@ IMPL_LINK( SvxMultiPathDialog, AddHdl_Impl, PushButton *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxMultiPathDialog, DelHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SvxMultiPathDialog, DelHdl_Impl)
 {
     if ( pImpl->bIsRadioButtonMode )
     {
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 0bb2a3e..329d876 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -199,25 +199,25 @@ void SvxPostItDialog::EnableTravel(sal_Bool bNext, sal_Bool bPrev)
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK_INLINE_START( SvxPostItDialog, PrevHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SvxPostItDialog, PrevHdl)
 {
     aPrevHdlLink.Call( this );
     return 0;
 }
-IMPL_LINK_INLINE_END( SvxPostItDialog, PrevHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(SvxPostItDialog, PrevHdl)
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK_INLINE_START( SvxPostItDialog, NextHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(SvxPostItDialog, NextHdl)
 {
     aNextHdlLink.Call( this );
     return 0;
 }
-IMPL_LINK_INLINE_END( SvxPostItDialog, NextHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(SvxPostItDialog, NextHdl)
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxPostItDialog, Stamp, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxPostItDialog, Stamp)
 {
     Date aDate( Date::SYSTEM );
     Time aTime( Time::SYSTEM );
@@ -247,7 +247,7 @@ IMPL_LINK( SvxPostItDialog, Stamp, Button *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxPostItDialog, OKHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxPostItDialog, OKHdl)
 {
     LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
     pOutSet = new SfxItemSet( rSet );
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index f5b9aff..41152a3 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -65,7 +65,7 @@ FmShowColsDialog::~FmShowColsDialog()
 }
 
 //--------------------------------------------------------------------------
-IMPL_LINK( FmShowColsDialog, OnClickedOk, Button*, EMPTYARG )
+IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk)
 {
     DBG_ASSERT(m_xColumns.is(), "FmShowColsDialog::OnClickedOk : you should call SetColumns before executing the dialog !");
     if (m_xColumns.is())
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 2013e69..531c335 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -203,7 +203,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent,
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxSearchAttributeDialog, OKHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl)
 {
     SearchAttrItem aInvalidItem;
     aInvalidItem.pItem = (SfxPoolItem*)-1;
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index fbaecd0..2fd600c 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -344,7 +344,7 @@ IMPL_LINK( SvxZoomDialog, UserHdl, RadioButton *, pBtn )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxZoomDialog, SpinHdl, MetricField *, EMPTYARG )
+IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl)
 {
     if ( !aUserBtn.IsChecked() )
         return 0;
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 5825421..f4c570b 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -733,7 +733,7 @@ void AbstractSvxNameDialog_Impl::SetText( const XubString& rStr )
 {
     pDlg->SetText( rStr );
 }
-IMPL_LINK( AbstractSvxNameDialog_Impl, CheckNameHdl, Window*, EMPTYARG )
+IMPL_LINK_NOARG(AbstractSvxNameDialog_Impl, CheckNameHdl)
 {
     if( aCheckNameHdl.IsSet() )
         return aCheckNameHdl.Call(this);
@@ -759,7 +759,7 @@ void AbstractSvxObjectNameDialog_Impl::SetCheckNameHdl(const Link& rLink, bool b
     }
 }
 
-IMPL_LINK(AbstractSvxObjectNameDialog_Impl, CheckNameHdl, Window*, EMPTYARG)
+IMPL_LINK_NOARG(AbstractSvxObjectNameDialog_Impl, CheckNameHdl)
 {
     if(aCheckNameHdl.IsSet())
     {
@@ -959,13 +959,13 @@ void AbstractSvxPostItDialog_Impl::SetPrevHdl( const Link& rLink )
     else
         pDlg->SetPrevHdl( Link() );
 }
-IMPL_LINK( AbstractSvxPostItDialog_Impl, NextHdl, Window*, EMPTYARG )
+IMPL_LINK_NOARG(AbstractSvxPostItDialog_Impl, NextHdl)
 {
     if( aNextHdl.IsSet() )
         aNextHdl.Call(this);
     return 0;
 }
-IMPL_LINK( AbstractSvxPostItDialog_Impl, PrevHdl, Window*, EMPTYARG )
+IMPL_LINK_NOARG(AbstractSvxPostItDialog_Impl, PrevHdl)
 {
     if( aPrevHdl.IsSet() )
         aPrevHdl.Call(this);
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index a5a5433..0f25c25 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -402,7 +402,7 @@ class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog
     virtual void    SetText( const XubString& rStr ) ;
 private:
     Link aCheckNameHdl;
-    DECL_LINK( CheckNameHdl, Window*);
+    DECL_LINK(CheckNameHdl, void *);
 };
 //for SvxNameDialog end
 
@@ -421,7 +421,7 @@ class AbstractSvxObjectNameDialog_Impl :public AbstractSvxObjectNameDialog
 
 private:
     Link aCheckNameHdl;
-    DECL_LINK(CheckNameHdl, Window*);
+    DECL_LINK(CheckNameHdl, void *);
 };
 
 class AbstractSvxObjectTitleDescDialog_Impl :public AbstractSvxObjectTitleDescDialog
@@ -565,8 +565,8 @@ class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog
 private:
     Link aNextHdl;
     Link aPrevHdl;
-    DECL_LINK( NextHdl, Window*);
-    DECL_LINK( PrevHdl, Window*);
+    DECL_LINK(NextHdl, void *);
+    DECL_LINK(PrevHdl, void *);
 };
 //add for SvxPostItDialog end
 
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 71d502c..2d9383b 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -203,15 +203,15 @@ private:
         ::com::sun::star::linguistic2::XSpellChecker1 >     xSpell;
     LanguageType        nOldLang;
 
-    DECL_LINK( ChangeHdl, Button * );
-    DECL_LINK( ChangeAllHdl, Button * );
+    DECL_LINK(ChangeHdl, void *);
+    DECL_LINK(ChangeAllHdl, void *);
     DECL_LINK( IgnoreAllHdl, Button * );
-    DECL_LINK( IgnoreHdl, Button * );
+    DECL_LINK(IgnoreHdl, void *);
     DECL_LINK( CheckGrammarHdl, CheckBox* );
     DECL_LINK( ExtClickHdl, Button * );
-    DECL_LINK( CancelHdl, Button * );
+    DECL_LINK(CancelHdl, void *);
     DECL_LINK( ModifyHdl, SentenceEditWindow_Impl *);
-    DECL_LINK( UndoHdl, Button * );
+    DECL_LINK(UndoHdl, void *);
     DECL_LINK( AddToDictionaryHdl, MenuButton* );
     DECL_LINK( LanguageSelectHdl, SvxLanguageBox* );
     DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl* );
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 7a6eb25..ec03c4a 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -162,16 +162,16 @@ private:
     ::rtl::OUString m_sModuleShortName;
     ::rtl::OUString m_sModuleUIName;
 
-    DECL_LINK(                  ChangeHdl, Button * );
-    DECL_LINK(                  RemoveHdl, Button * );
+    DECL_LINK(ChangeHdl, void *);
+    DECL_LINK(RemoveHdl, void *);
     DECL_LINK(                  SelectHdl, Control * );
-    DECL_LINK(                  Save, Button * );
-    DECL_LINK(                  Load, Button * );
-    DECL_LINK(                  Default, PushButton * );
-    DECL_LINK(                  RadioHdl, RadioButton* );
+    DECL_LINK(Save, void *);
+    DECL_LINK(Load, void *);
+    DECL_LINK(Default, void *);
+    DECL_LINK(RadioHdl, void *);
 
-    DECL_LINK(                  LoadHdl, sfx2::FileDialogHelper* );
-    DECL_LINK(                  SaveHdl, sfx2::FileDialogHelper* );
+    DECL_LINK(LoadHdl, void *);
+    DECL_LINK(SaveHdl, void *);
 
     String                      GetLabel4Command(const String& sCommand);
     void                        InitAccCfg();
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 3043739..99e1115 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -178,7 +178,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
     SvLBoxButtonData*   pCheckButtonData;
 
         DECL_LINK(SelectHdl, OfaACorrCheckListBox*);
-        DECL_LINK(EditHdl, PushButton*);
+        DECL_LINK(EditHdl, void *);
         SvLBoxEntry* CreateEntry(String& rTxt, sal_uInt16 nCol);
 
 
@@ -446,7 +446,7 @@ public:
     virtual void        ActivatePage( const SfxItemSet& );
 
     void CopyToClipboard() const;
-    DECL_LINK( DeleteHdl, PushButton* );
+    DECL_LINK(DeleteHdl, void *);
 };
 
 // class OfaSmartTagOptionsTabPage ---------------------------------------------
@@ -486,21 +486,21 @@ private:
         Enables/disables all controls in the tab page (except from the
         check box.
     */
-    DECL_LINK( CheckHdl, CheckBox* );
+    DECL_LINK(CheckHdl, void *);
 
     /** Handler for the push button
 
         Calls the displayPropertyPage function of the smart tag recognizer
         associated with the currently selected smart tag type.
     */
-    DECL_LINK( ClickHdl, PushButton* );
+    DECL_LINK(ClickHdl, void *);
 
     /** Handler for the list box
 
         Enables/disables the properties push button if selection in the
         smart tag types list box changes.
     */
-    DECL_LINK( SelectHdl, SvxCheckListBox* );
+    DECL_LINK(SelectHdl, void *);
 
 public:
 
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index d3cc4e5..148248a 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -148,11 +148,11 @@ private:
     void                ResetFromWallpaperItem( const SfxItemSet& rSet );
 
     DECL_LINK( LoadTimerHdl_Impl, Timer* );
-    DECL_LINK( SelectHdl_Impl, ListBox* );
-    DECL_LINK( BrowseHdl_Impl, PushButton* );
+    DECL_LINK(SelectHdl_Impl, void *);
+    DECL_LINK(BrowseHdl_Impl, void *);
     DECL_LINK( RadioClickHdl_Impl, RadioButton* );
     DECL_LINK( FileClickHdl_Impl, CheckBox* );
-    DECL_LINK( BackgroundColorHdl_Impl, ValueSet* );
+    DECL_LINK(BackgroundColorHdl_Impl, void *);
     DECL_LINK( TblDestinationHdl_Impl, ListBox* );
     DECL_LINK( ParaDestinationHdl_Impl, ListBox* );
 #endif
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index f6a6a63..99274bd 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -152,7 +152,7 @@ private:
     sal_Bool                FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp );
     void                ResetColor_Impl( const SfxItemSet& rSet );
 
-    DECL_LINK(          UpdateHdl_Impl, Timer* );
+    DECL_LINK(UpdateHdl_Impl, void *);
     DECL_LINK(          FontModifyHdl_Impl, void* );
     DECL_LINK(          ColorBoxSelectHdl_Impl, ColorListBox* );
 
@@ -242,9 +242,9 @@ private:
     sal_Bool                FillItemSetColor_Impl( SfxItemSet& rSet );
 
     DECL_LINK(          SelectHdl_Impl, ListBox* );
-    DECL_LINK(          CbClickHdl_Impl, CheckBox* );
-    DECL_LINK(          TristClickHdl_Impl, TriStateBox* );
-    DECL_LINK(          UpdatePreview_Impl, ListBox* );
+    DECL_LINK(CbClickHdl_Impl, void *);
+    DECL_LINK(TristClickHdl_Impl, void *);
+    DECL_LINK(UpdatePreview_Impl, void *);
     DECL_LINK(          ColorBoxSelectHdl_Impl, ColorListBox* );
 
 public:
@@ -313,14 +313,14 @@ private:
 
     DECL_LINK(          PositionHdl_Impl, RadioButton* );
     DECL_LINK(          RotationHdl_Impl, RadioButton* );
-    DECL_LINK(          FontModifyHdl_Impl, MetricField* );
+    DECL_LINK(FontModifyHdl_Impl, void *);
     DECL_LINK(          AutoPositionHdl_Impl, CheckBox* );
     DECL_LINK(          FitToLineHdl_Impl, CheckBox* );
-    DECL_LINK(          KerningSelectHdl_Impl, ListBox* );
-    DECL_LINK(          KerningModifyHdl_Impl, MetricField* );
-    DECL_LINK(          PairKerningHdl_Impl, CheckBox* );
+    DECL_LINK(KerningSelectHdl_Impl, void *);
+    DECL_LINK(KerningModifyHdl_Impl, void *);
+    DECL_LINK(PairKerningHdl_Impl, void *);
     DECL_LINK(          LoseFocusHdl_Impl, MetricField* );
-    DECL_LINK(          ScaleWidthModifyHdl_Impl, MetricField* );
+    DECL_LINK(ScaleWidthModifyHdl_Impl, void *);
 
 public:
     using SfxTabPage::ActivatePage;
@@ -365,7 +365,7 @@ private:
     void                SelectCharacter( ListBox* pBox );
     void                SetBracket( sal_Unicode cBracket, sal_Bool bStart );
 
-    DECL_LINK(          TwoLinesHdl_Impl, CheckBox* );
+    DECL_LINK(TwoLinesHdl_Impl, void *);
     DECL_LINK(          CharacterMapHdl_Impl, ListBox* );
 
 public:
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index a7f6370..070c749 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -104,14 +104,14 @@ friend class SvxCharacterMap;
     sal_Bool            bOne;
     const SubsetMap* pSubsetMap;
 
-    DECL_LINK( OKHdl, OKButton* );
-    DECL_LINK( FontSelectHdl, ListBox* );
-    DECL_LINK( SubsetSelectHdl, ListBox* );
-    DECL_LINK( CharDoubleClickHdl, Control* pControl );
-    DECL_LINK( CharSelectHdl, Control* pControl );
-    DECL_LINK( CharHighlightHdl, Control* pControl );
-    DECL_LINK( CharPreSelectHdl, Control* pControl );
-    DECL_LINK( DeleteHdl, PushButton* pBtn );
+    DECL_LINK(OKHdl, void *);
+    DECL_LINK(FontSelectHdl, void *);
+    DECL_LINK(SubsetSelectHdl, void *);
+    DECL_LINK(CharDoubleClickHdl, void *);
+    DECL_LINK(CharSelectHdl, void *);
+    DECL_LINK(CharHighlightHdl, void *);
+    DECL_LINK(CharPreSelectHdl, void *);
+    DECL_LINK(DeleteHdl, void *);
 };
 
 class SvxCharacterMap : public SfxModalDialog
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index 218a56f..04c9d13 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -179,10 +179,10 @@ protected:
 private:
     // Handler for the Controls
     DECL_LINK( OnClickedFieldRadios, Button* );
-    DECL_LINK( OnClickedSearchAgain, Button* );
+    DECL_LINK(OnClickedSearchAgain, void *);
     DECL_LINK( OnClickedSpecialSettings, Button* );
 
-    DECL_LINK( OnSearchTextModified, ComboBox* );
+    DECL_LINK(OnSearchTextModified, void *);
 
     DECL_LINK( OnPositionSelected, ListBox* );
     DECL_LINK( OnFieldSelected, ListBox* );
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 15742ac..77e94a9 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -365,7 +365,7 @@ class TPGalleryThemeProperties : public SfxTabPage
                         DECL_LINK( SelectFileTypeHdl, void* );
                         DECL_LINK( DClickFoundHdl, void* );
                         DECL_LINK( PreviewTimerHdl, void* );
-                        DECL_LINK( EndSearchProgressHdl, SearchProgress* );
+                        DECL_LINK(EndSearchProgressHdl, void *);
                         DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* );
 
 public:
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 0c60610..05b0eec 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -74,7 +74,7 @@ private:
     double          mfScaleY;
     Size            maSizePixel;
 
-                    DECL_LINK( ImplPreviewTimeoutHdl, Timer* pTimer );
+                    DECL_LINK(ImplPreviewTimeoutHdl, void *);
                     DECL_LINK( ImplModifyHdl, void* p );
 
 protected:
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 0f7c2e5..5c1d3dd 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -262,7 +262,7 @@ private:
     FieldUnit           eFUnit;
 
 #ifdef _SVX_TPAREA_CXX
-    DECL_LINK( SelectDialogTypeHdl_Impl, ListBox * );
+    DECL_LINK(SelectDialogTypeHdl_Impl, void *);
     DECL_LINK( ClickInvisibleHdl_Impl, void * );
     DECL_LINK( ClickColorHdl_Impl, void * );
     DECL_LINK( ModifyColorHdl_Impl, void * );
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 65ebd94..a7c31ea 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -71,7 +71,7 @@ namespace svx
         DECL_LINK( EditHdl, void * );
         DECL_LINK( DeleteHdl, void * );
 
-        DECL_LINK( PathSelect_Impl, SvTabListBox* );
+        DECL_LINK(PathSelect_Impl, void *);
 
         DECL_LINK( HeaderSelect_Impl, HeaderBar * );
         DECL_LINK( HeaderEndDrag_Impl, HeaderBar * );
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index 835fecc..77b175d 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -53,7 +53,7 @@ private:
 
     Link            aCheckNameHdl;
 #if _SOLAR__PRIVATE
-    DECL_LINK(ModifyHdl, Edit*);
+    DECL_LINK(ModifyHdl, void *);
 #endif
 
 public:
@@ -109,7 +109,7 @@ private:
     // callback link for name uniqueness
     Link            aCheckNameHdl;
 #if _SOLAR__PRIVATE
-    DECL_LINK(ModifyHdl, Edit*);
+    DECL_LINK(ModifyHdl, void *);
 #endif
 
 public:
@@ -180,8 +180,8 @@ private:
     FixedImage      aFtImage;
     Image*          pImage;
 #if _SOLAR__PRIVATE
-    DECL_LINK( Button1Hdl, Button * );
-    DECL_LINK( Button2Hdl, Button * );
+    DECL_LINK(Button1Hdl, void *);
+    DECL_LINK(Button2Hdl, void *);
 #endif
 public:
     SvxMessDialog( Window* pWindow, const String& rText, const String& rDesc, Image* pImg = NULL );
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 4840442..7be560c 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -115,8 +115,8 @@ class SvxGrfCropPage : public SfxTabPage
     DECL_LINK( CropHdl, const MetricField * );
     DECL_LINK( CropLoseFocusHdl, MetricField * );
     DECL_LINK( CropModifyHdl, MetricField * );
-    DECL_LINK( OrigSizeHdl, PushButton * );
-    DECL_LINK( Timeout, Timer * );
+    DECL_LINK(OrigSizeHdl, void *);
+    DECL_LINK(Timeout, void *);
 
     void            CalcZoom();
     void            CalcMinMaxBorder();
diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx
index 1c7a7a1..0f3f060 100644
--- a/cui/source/inc/hldoctp.hxx
+++ b/cui/source/inc/hldoctp.hxx
@@ -63,7 +63,7 @@ private:
 
     DECL_LINK (LostFocusPathHdl_Impl,  void * ); // Combobox "path" lost its focus
 
-    DECL_LINK (TimeoutHdl_Impl      ,  Timer * );   // Handler for timer -timeout
+    DECL_LINK(TimeoutHdl_Impl      , void *);   // Handler for timer -timeout
 
     enum EPathType { Type_Unknown, Type_Invalid,
                      Type_ExistsFile, Type_File,
diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index b4cd859..d0e4f7d 100644
--- a/cui/source/inc/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -67,7 +67,7 @@ private:
     DECL_LINK (LostFocusTargetHdl_Impl   , void * );        // Combobox "Target" lost its focus
     DECL_LINK (ModifiedTargetHdl_Impl    , void * );        // Contens of editfield "Target" modified
 

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list