[Libreoffice-commits] core.git: basctl/source basic/source chart2/source cui/source dbaccess/source desktop/source editeng/source extensions/source filter/source formula/source fpicker/source include/editeng include/sfx2 include/svtools include/svx include/vcl reportdesign/source sc/source sd/source sfx2/inc sfx2/source starmath/inc starmath/source svtools/source svx/source sw/inc sw/source uui/source vcl/generic vcl/inc vcl/source vcl/workben writerperfect/inc writerperfect/source xmlsecurity/inc xmlsecurity/source
Noel Grandin
noel at peralex.com
Wed Aug 26 02:17:03 PDT 2015
basctl/source/basicide/baside2.hxx | 2
basctl/source/basicide/baside2b.cxx | 3
basctl/source/basicide/brkdlg.cxx | 9
basctl/source/basicide/brkdlg.hxx | 4
basctl/source/basicide/macrodlg.cxx | 17 -
basctl/source/basicide/macrodlg.hxx | 2
basctl/source/basicide/moduldl2.cxx | 14 -
basctl/source/basicide/moduldlg.cxx | 4
basctl/source/basicide/moduldlg.hxx | 10 -
basctl/source/dlged/managelang.cxx | 10 -
basctl/source/inc/managelang.hxx | 6
basic/source/runtime/inputbox.cxx | 14 -
basic/source/runtime/iosys.cxx | 14 -
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | 4
chart2/source/controller/dialogs/res_DataLabel.cxx | 10 -
chart2/source/controller/dialogs/res_DataLabel.hxx | 4
chart2/source/controller/dialogs/res_ErrorBar.cxx | 20 +-
chart2/source/controller/dialogs/res_Trendline.cxx | 14 -
chart2/source/controller/dialogs/res_Trendline.hxx | 2
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 9
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx | 4
chart2/source/controller/dialogs/tp_AxisLabel.cxx | 4
chart2/source/controller/dialogs/tp_AxisLabel.hxx | 2
chart2/source/controller/dialogs/tp_ChartType.cxx | 10 -
chart2/source/controller/dialogs/tp_DataSource.cxx | 27 --
chart2/source/controller/dialogs/tp_DataSource.hxx | 12 -
chart2/source/controller/dialogs/tp_RangeChooser.cxx | 4
chart2/source/controller/dialogs/tp_RangeChooser.hxx | 2
chart2/source/controller/dialogs/tp_Scale.cxx | 4
chart2/source/controller/dialogs/tp_Scale.hxx | 2
chart2/source/controller/dialogs/tp_SeriesToAxis.cxx | 4
chart2/source/controller/dialogs/tp_SeriesToAxis.hxx | 2
chart2/source/controller/inc/dlg_ObjectProperties.hxx | 4
chart2/source/controller/inc/res_ErrorBar.hxx | 7
chart2/source/controller/sidebar/ChartAxisPanel.cxx | 7
chart2/source/controller/sidebar/ChartAxisPanel.hxx | 2
chart2/source/controller/sidebar/ChartElementsPanel.cxx | 7
chart2/source/controller/sidebar/ChartElementsPanel.hxx | 2
chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 13 -
chart2/source/controller/sidebar/ChartSeriesPanel.hxx | 2
cui/source/customize/acccfg.cxx | 21 --
cui/source/customize/cfg.cxx | 45 +---
cui/source/customize/macropg.cxx | 15 -
cui/source/customize/macropg_impl.hxx | 2
cui/source/customize/selector.cxx | 6
cui/source/dialogs/SpellDialog.cxx | 38 +---
cui/source/dialogs/about.cxx | 6
cui/source/dialogs/cuicharmap.cxx | 3
cui/source/dialogs/cuifmsearch.cxx | 11 -
cui/source/dialogs/cuigaldlg.cxx | 37 +---
cui/source/dialogs/cuihyperdlg.cxx | 12 -
cui/source/dialogs/dlgname.cxx | 6
cui/source/dialogs/hangulhanjadlg.cxx | 50 +----
cui/source/dialogs/hldocntp.cxx | 3
cui/source/dialogs/hldoctp.cxx | 8
cui/source/dialogs/hlinettp.cxx | 13 -
cui/source/dialogs/hlmailtp.cxx | 5
cui/source/dialogs/hlmarkwn.cxx | 16 -
cui/source/dialogs/hltpbase.cxx | 4
cui/source/dialogs/hyphen.cxx | 21 --
cui/source/dialogs/iconcdlg.cxx | 15 -
cui/source/dialogs/insdlg.cxx | 23 --
cui/source/dialogs/linkdlg.cxx | 25 --
cui/source/dialogs/multipat.cxx | 12 -
cui/source/dialogs/passwdomdlg.cxx | 6
cui/source/dialogs/postdlg.cxx | 12 -
cui/source/dialogs/scriptdlg.cxx | 13 -
cui/source/dialogs/showcols.cxx | 3
cui/source/dialogs/splitcelldlg.cxx | 3
cui/source/dialogs/srchxtra.cxx | 3
cui/source/dialogs/thesdlg.cxx | 6
cui/source/dialogs/zoom.cxx | 25 --
cui/source/factory/dlgfact.cxx | 12 -
cui/source/factory/dlgfact.hxx | 12 -
cui/source/inc/SpellDialog.hxx | 19 +-
cui/source/inc/about.hxx | 2
cui/source/inc/acccfg.hxx | 12 -
cui/source/inc/align.hxx | 1
cui/source/inc/autocdlg.hxx | 17 +
cui/source/inc/backgrnd.hxx | 6
cui/source/inc/border.hxx | 2
cui/source/inc/cfg.hxx | 18 -
cui/source/inc/chardlg.hxx | 14 -
cui/source/inc/cuicharmap.hxx | 2
cui/source/inc/cuifmsearch.hxx | 6
cui/source/inc/cuigaldlg.hxx | 16 -
cui/source/inc/cuihyperdlg.hxx | 6
cui/source/inc/cuitabarea.hxx | 62 +++---
cui/source/inc/cuitabline.hxx | 28 +--
cui/source/inc/dbregister.hxx | 7
cui/source/inc/dlgname.hxx | 4
cui/source/inc/grfpage.hxx | 2
cui/source/inc/hangulhanjadlg.hxx | 32 +--
cui/source/inc/hldocntp.hxx | 4
cui/source/inc/hldoctp.hxx | 4
cui/source/inc/hlinettp.hxx | 6
cui/source/inc/hlmailtp.hxx | 2
cui/source/inc/hlmarkwn.hxx | 5
cui/source/inc/hltpbase.hxx | 2
cui/source/inc/hyphen.hxx | 14 -
cui/source/inc/iconcdlg.hxx | 8
cui/source/inc/insdlg.hxx | 10 -
cui/source/inc/labdlg.hxx | 2
cui/source/inc/linkdlg.hxx | 10 -
cui/source/inc/macroass.hxx | 1
cui/source/inc/macropg.hxx | 4
cui/source/inc/measure.hxx | 3
cui/source/inc/multipat.hxx | 8
cui/source/inc/numfmt.hxx | 5
cui/source/inc/numpages.hxx | 20 +-
cui/source/inc/optasian.hxx | 2
cui/source/inc/optdict.hxx | 5
cui/source/inc/optlingu.hxx | 8
cui/source/inc/optpath.hxx | 5
cui/source/inc/page.hxx | 6
cui/source/inc/paragrph.hxx | 22 +-
cui/source/inc/postdlg.hxx | 8
cui/source/inc/scriptdlg.hxx | 2
cui/source/inc/selector.hxx | 2
cui/source/inc/showcols.hxx | 2
cui/source/inc/splitcelldlg.hxx | 2
cui/source/inc/srchxtra.hxx | 2
cui/source/inc/swpossizetabpage.hxx | 7
cui/source/inc/tabstpge.hxx | 10 -
cui/source/inc/textanim.hxx | 8
cui/source/inc/textattr.hxx | 4
cui/source/inc/thesdlg.hxx | 4
cui/source/inc/transfrm.hxx | 8
cui/source/inc/treeopt.hxx | 4
cui/source/inc/zoom.hxx | 8
cui/source/options/certpath.cxx | 8
cui/source/options/certpath.hxx | 4
cui/source/options/connpooloptions.cxx | 4
cui/source/options/connpooloptions.hxx | 2
cui/source/options/dbregister.cxx | 21 +-
cui/source/options/doclinkdialog.cxx | 14 -
cui/source/options/doclinkdialog.hxx | 4
cui/source/options/fontsubs.cxx | 17 +
cui/source/options/fontsubs.hxx | 3
cui/source/options/optaboutconfig.cxx | 18 +
cui/source/options/optaboutconfig.hxx | 7
cui/source/options/optasian.cxx | 5
cui/source/options/optchart.cxx | 14 -
cui/source/options/optchart.hxx | 6
cui/source/options/optcolor.cxx | 22 +-
cui/source/options/optcolor.hxx | 2
cui/source/options/optctl.cxx | 3
cui/source/options/optctl.hxx | 2
cui/source/options/optdict.cxx | 16 +
cui/source/options/optfltr.cxx | 6
cui/source/options/optfltr.hxx | 4
cui/source/options/optgdlg.cxx | 8
cui/source/options/optgdlg.hxx | 2
cui/source/options/opthtml.cxx | 5
cui/source/options/opthtml.hxx | 2
cui/source/options/optinet2.cxx | 32 ---
cui/source/options/optinet2.hxx | 18 -
cui/source/options/optjava.cxx | 33 +--
cui/source/options/optjava.hxx | 20 +-
cui/source/options/optlingu.cxx | 15 -
cui/source/options/optopencl.cxx | 27 +-
cui/source/options/optopencl.hxx | 14 -
cui/source/options/optpath.cxx | 21 +-
cui/source/options/optsave.cxx | 8
cui/source/options/optsave.hxx | 2
cui/source/options/optupdt.cxx | 14 -
cui/source/options/optupdt.hxx | 6
cui/source/options/personalization.cxx | 26 --
cui/source/options/personalization.hxx | 14 -
cui/source/options/treeopt.cxx | 8
cui/source/options/tsaurls.cxx | 14 -
cui/source/options/tsaurls.hxx | 6
cui/source/options/webconninfo.cxx | 12 -
cui/source/options/webconninfo.hxx | 6
cui/source/tabpages/align.cxx | 7
cui/source/tabpages/autocdlg.cxx | 47 +++--
cui/source/tabpages/backgrnd.cxx | 11 -
cui/source/tabpages/border.cxx | 5
cui/source/tabpages/chardlg.cxx | 51 ++---
cui/source/tabpages/grfpage.cxx | 6
cui/source/tabpages/labdlg.cxx | 3
cui/source/tabpages/macroass.cxx | 9
cui/source/tabpages/measure.cxx | 14 -
cui/source/tabpages/numfmt.cxx | 24 +-
cui/source/tabpages/numpages.cxx | 26 +-
cui/source/tabpages/page.cxx | 11 -
cui/source/tabpages/paragrph.cxx | 37 +---
cui/source/tabpages/swpossizetabpage.cxx | 28 +--
cui/source/tabpages/tabarea.cxx | 3
cui/source/tabpages/tabline.cxx | 3
cui/source/tabpages/tabstpge.cxx | 23 --
cui/source/tabpages/textanim.cxx | 17 -
cui/source/tabpages/textattr.cxx | 9
cui/source/tabpages/tparea.cxx | 41 ++--
cui/source/tabpages/tpbitmap.cxx | 24 --
cui/source/tabpages/tpcolor.cxx | 26 --
cui/source/tabpages/tpgradnt.cxx | 20 --
cui/source/tabpages/tphatch.cxx | 20 --
cui/source/tabpages/tpline.cxx | 17 +
cui/source/tabpages/tplnedef.cxx | 24 --
cui/source/tabpages/tplneend.cxx | 21 --
cui/source/tabpages/tpshadow.cxx | 4
cui/source/tabpages/transfrm.cxx | 18 -
dbaccess/source/ui/control/FieldDescControl.cxx | 7
dbaccess/source/ui/dlg/CollectionView.cxx | 15 -
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 16 -
dbaccess/source/ui/dlg/ConnectionHelper.hxx | 4
dbaccess/source/ui/dlg/ConnectionPage.cxx | 5
dbaccess/source/ui/dlg/ConnectionPage.hxx | 2
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 23 --
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 8
dbaccess/source/ui/dlg/RelationDlg.cxx | 6
dbaccess/source/ui/dlg/UserAdmin.cxx | 11 -
dbaccess/source/ui/dlg/UserAdmin.hxx | 2
dbaccess/source/ui/dlg/adminpages.cxx | 11 -
dbaccess/source/ui/dlg/adminpages.hxx | 8
dbaccess/source/ui/dlg/adtabdlg.cxx | 10 -
dbaccess/source/ui/dlg/advancedsettings.cxx | 4
dbaccess/source/ui/dlg/advancedsettings.hxx | 1
dbaccess/source/ui/dlg/dbfindex.cxx | 15 -
dbaccess/source/ui/dlg/dbfindex.hxx | 10 -
dbaccess/source/ui/dlg/detailpages.cxx | 10 -
dbaccess/source/ui/dlg/detailpages.hxx | 6
dbaccess/source/ui/dlg/directsql.cxx | 9
dbaccess/source/ui/dlg/dlgsave.cxx | 3
dbaccess/source/ui/dlg/dlgsize.cxx | 4
dbaccess/source/ui/dlg/generalpage.cxx | 13 -
dbaccess/source/ui/dlg/generalpage.hxx | 6
dbaccess/source/ui/dlg/indexdialog.cxx | 16 -
dbaccess/source/ui/dlg/paramdialog.cxx | 10 -
dbaccess/source/ui/dlg/sqlmessage.cxx | 3
dbaccess/source/ui/dlg/tablespage.cxx | 2
dbaccess/source/ui/dlg/textconnectionsettings.cxx | 5
dbaccess/source/ui/inc/CollectionView.hxx | 6
dbaccess/source/ui/inc/FieldDescControl.hxx | 2
dbaccess/source/ui/inc/RelationDlg.hxx | 2
dbaccess/source/ui/inc/WCPage.hxx | 6
dbaccess/source/ui/inc/WColumnSelect.hxx | 2
dbaccess/source/ui/inc/WCopyTable.hxx | 6
dbaccess/source/ui/inc/WNameMatch.hxx | 6
dbaccess/source/ui/inc/WTypeSelect.hxx | 2
dbaccess/source/ui/inc/adtabdlg.hxx | 6
dbaccess/source/ui/inc/directsql.hxx | 3
dbaccess/source/ui/inc/dlgsave.hxx | 2
dbaccess/source/ui/inc/dlgsize.hxx | 2
dbaccess/source/ui/inc/indexdialog.hxx | 3
dbaccess/source/ui/inc/paramdialog.hxx | 2
dbaccess/source/ui/inc/sqlmessage.hxx | 2
dbaccess/source/ui/inc/textconnectionsettings.hxx | 2
dbaccess/source/ui/misc/WCPage.cxx | 11 -
dbaccess/source/ui/misc/WColumnSelect.cxx | 6
dbaccess/source/ui/misc/WCopyTable.cxx | 13 -
dbaccess/source/ui/misc/WNameMatch.cxx | 11 -
dbaccess/source/ui/misc/WTypeSelect.cxx | 4
dbaccess/source/ui/querydesign/querydlg.cxx | 4
dbaccess/source/ui/querydesign/querydlg.hxx | 2
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 44 +---
desktop/source/deployment/gui/dp_gui_dialog2.hxx | 16 -
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 7
desktop/source/deployment/gui/dp_gui_updatedialog.hxx | 4
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 3
desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx | 2
desktop/source/deployment/gui/license_dialog.cxx | 15 -
editeng/source/misc/hangulhanja.cxx | 33 +--
extensions/source/abpilot/abpfinalpage.cxx | 6
extensions/source/abpilot/abpfinalpage.hxx | 4
extensions/source/abpilot/abspilot.cxx | 6
extensions/source/abpilot/abspilot.hxx | 2
extensions/source/abpilot/admininvokationpage.cxx | 4
extensions/source/abpilot/admininvokationpage.hxx | 2
extensions/source/abpilot/fieldmappingpage.cxx | 4
extensions/source/abpilot/fieldmappingpage.hxx | 2
extensions/source/abpilot/typeselectionpage.cxx | 5
extensions/source/abpilot/typeselectionpage.hxx | 2
extensions/source/bibliography/datman.cxx | 5
extensions/source/dbpilots/commonpagesdbp.cxx | 9
extensions/source/dbpilots/commonpagesdbp.hxx | 4
extensions/source/dbpilots/gridwizard.cxx | 11 -
extensions/source/dbpilots/gridwizard.hxx | 4
extensions/source/dbpilots/groupboxwiz.cxx | 3
extensions/source/dbpilots/groupboxwiz.hxx | 2
extensions/source/propctrlr/browserline.cxx | 4
extensions/source/propctrlr/browserline.hxx | 2
extensions/source/propctrlr/formlinkdialog.cxx | 3
extensions/source/propctrlr/formlinkdialog.hxx | 2
extensions/source/propctrlr/selectlabeldialog.cxx | 6
extensions/source/propctrlr/selectlabeldialog.hxx | 2
extensions/source/propctrlr/standardcontrol.cxx | 3
extensions/source/propctrlr/standardcontrol.hxx | 2
extensions/source/propctrlr/taborder.cxx | 13 -
extensions/source/propctrlr/taborder.hxx | 8
extensions/source/scanner/grid.cxx | 3
extensions/source/scanner/grid.hxx | 2
extensions/source/scanner/sanedlg.cxx | 3
extensions/source/scanner/sanedlg.hxx | 2
filter/source/pdf/impdialog.cxx | 20 --
filter/source/pdf/impdialog.hxx | 26 +-
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 3
filter/source/xsltdialog/xmlfiltersettingsdialog.hxx | 2
filter/source/xsltdialog/xmlfiltertabdialog.cxx | 4
filter/source/xsltdialog/xmlfiltertabdialog.hxx | 2
filter/source/xsltdialog/xmlfiltertabpagexslt.cxx | 4
filter/source/xsltdialog/xmlfiltertabpagexslt.hxx | 2
filter/source/xsltdialog/xmlfiltertestdialog.cxx | 4
filter/source/xsltdialog/xmlfiltertestdialog.hxx | 2
formula/source/ui/dlg/ControlHelper.hxx | 4
formula/source/ui/dlg/formula.cxx | 12 -
formula/source/ui/dlg/funcutl.cxx | 8
fpicker/source/office/PlacesListBox.cxx | 4
fpicker/source/office/PlacesListBox.hxx | 4
fpicker/source/office/QueryFolderName.hxx | 2
fpicker/source/office/RemoteFilesDialog.cxx | 20 --
fpicker/source/office/RemoteFilesDialog.hxx | 8
fpicker/source/office/iodlg.cxx | 40 +---
fpicker/source/office/iodlg.hxx | 19 +-
include/editeng/edtdlg.hxx | 13 -
include/sfx2/basedlgs.hxx | 2
include/sfx2/checkin.hxx | 2
include/sfx2/dinfdlg.hxx | 12 -
include/sfx2/infobar.hxx | 2
include/sfx2/mgetempl.hxx | 4
include/sfx2/newstyle.hxx | 1
include/sfx2/passwd.hxx | 2
include/sfx2/printopt.hxx | 6
include/sfx2/sfxbasecontroller.hxx | 8
include/sfx2/sidebar/TabBar.hxx | 6
include/sfx2/styledlg.hxx | 2
include/sfx2/tabdlg.hxx | 16 -
include/sfx2/templateabstractview.hxx | 2
include/sfx2/templateinfodlg.hxx | 2
include/sfx2/viewfrm.hxx | 2
include/svtools/PlaceEditDialog.hxx | 4
include/svtools/ServerDetailsControls.hxx | 2
include/svtools/addresstemplate.hxx | 4
include/svtools/calendar.hxx | 3
include/svtools/editbrowsebox.hxx | 2
include/svtools/filectrl.hxx | 2
include/svtools/prnsetup.hxx | 4
include/svtools/tabbar.hxx | 5
include/svtools/wizardmachine.hxx | 6
include/svx/compressgraphicdialog.hxx | 2
include/svx/ctredlin.hxx | 8
include/svx/dlgctl3d.hxx | 2
include/svx/float3d.hxx | 10 -
include/svx/fontworkgallery.hxx | 2
include/svx/gridctrl.hxx | 2
include/svx/hdft.hxx | 4
include/svx/optgrid.hxx | 4
include/svx/passwd.hxx | 2
include/svx/rubydialog.hxx | 6
include/svx/srchdlg.hxx | 14 -
include/vcl/btndlg.hxx | 3
include/vcl/button.hxx | 8
include/vcl/layout.hxx | 2
reportdesign/source/ui/dlg/AddField.cxx | 7
reportdesign/source/ui/dlg/Condition.cxx | 6
reportdesign/source/ui/dlg/Condition.hxx | 4
reportdesign/source/ui/dlg/DateTime.cxx | 11 -
reportdesign/source/ui/inc/AddField.hxx | 3
reportdesign/source/ui/inc/DateTime.hxx | 2
sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx | 9
sc/source/ui/StatisticsDialogs/SamplingDialog.cxx | 3
sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx | 3
sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx | 3
sc/source/ui/app/inputwin.cxx | 5
sc/source/ui/attrdlg/tabpages.cxx | 6
sc/source/ui/cctrl/checklistmenu.cxx | 6
sc/source/ui/condformat/colorformat.cxx | 3
sc/source/ui/condformat/condformatdlg.cxx | 9
sc/source/ui/condformat/condformatdlgentry.cxx | 3
sc/source/ui/condformat/condformatmgr.cxx | 13 -
sc/source/ui/dbgui/PivotLayoutDialog.cxx | 6
sc/source/ui/dbgui/consdlg.cxx | 6
sc/source/ui/dbgui/dapitype.cxx | 3
sc/source/ui/dbgui/dbnamdlg.cxx | 12 -
sc/source/ui/dbgui/dpgroupdlg.cxx | 6
sc/source/ui/dbgui/filtdlg.cxx | 8
sc/source/ui/dbgui/pfiltdlg.cxx | 4
sc/source/ui/dbgui/pvfundlg.cxx | 12 -
sc/source/ui/dbgui/scendlg.cxx | 6
sc/source/ui/dbgui/scuiasciiopt.cxx | 24 +-
sc/source/ui/dbgui/scuiimoptdlg.cxx | 3
sc/source/ui/dbgui/sfiltdlg.cxx | 3
sc/source/ui/dbgui/sortdlg.cxx | 3
sc/source/ui/dbgui/subtdlg.cxx | 3
sc/source/ui/dbgui/textimportoptions.cxx | 8
sc/source/ui/dbgui/tpsort.cxx | 7
sc/source/ui/dbgui/tpsubt.cxx | 4
sc/source/ui/dbgui/validate.cxx | 7
sc/source/ui/formdlg/dwfunctr.cxx | 6
sc/source/ui/inc/PivotLayoutDialog.hxx | 4
sc/source/ui/inc/RandomNumberGeneratorDialog.hxx | 6
sc/source/ui/inc/SamplingDialog.hxx | 2
sc/source/ui/inc/StatisticsInputOutputDialog.hxx | 2
sc/source/ui/inc/StatisticsTwoVariableDialog.hxx | 2
sc/source/ui/inc/areasdlg.hxx | 2
sc/source/ui/inc/checklistmenu.hxx | 4
sc/source/ui/inc/colorformat.hxx | 2
sc/source/ui/inc/condformatdlg.hxx | 6
sc/source/ui/inc/condformatdlgentry.hxx | 2
sc/source/ui/inc/condformatmgr.hxx | 5
sc/source/ui/inc/conflictsdlg.hxx | 8
sc/source/ui/inc/consdlg.hxx | 4
sc/source/ui/inc/crdlg.hxx | 2
sc/source/ui/inc/crnrdlg.hxx | 12 -
sc/source/ui/inc/dapitype.hxx | 2
sc/source/ui/inc/datafdlg.hxx | 12 -
sc/source/ui/inc/datastreamdlg.hxx | 3
sc/source/ui/inc/dbnamdlg.hxx | 8
sc/source/ui/inc/delcodlg.hxx | 2
sc/source/ui/inc/dpgroupdlg.hxx | 4
sc/source/ui/inc/dwfunctr.hxx | 1
sc/source/ui/inc/filldlg.hxx | 4
sc/source/ui/inc/filtdlg.hxx | 6
sc/source/ui/inc/highred.hxx | 4
sc/source/ui/inc/inputwin.hxx | 2
sc/source/ui/inc/inscodlg.hxx | 6
sc/source/ui/inc/instbdlg.hxx | 6
sc/source/ui/inc/linkarea.hxx | 4
sc/source/ui/inc/mtrindlg.hxx | 2
sc/source/ui/inc/mvtabdlg.hxx | 2
sc/source/ui/inc/namedefdlg.hxx | 4
sc/source/ui/inc/namedlg.hxx | 8
sc/source/ui/inc/namepast.hxx | 2
sc/source/ui/inc/optsolver.hxx | 8
sc/source/ui/inc/pfiltdlg.hxx | 2
sc/source/ui/inc/protectiondlg.hxx | 4
sc/source/ui/inc/pvfundlg.hxx | 8
sc/source/ui/inc/retypepassdlg.hxx | 10 -
sc/source/ui/inc/scendlg.hxx | 4
sc/source/ui/inc/scuiasciiopt.hxx | 3
sc/source/ui/inc/scuiautofmt.hxx | 10 -
sc/source/ui/inc/scuiimoptdlg.hxx | 2
sc/source/ui/inc/scuitphfedit.hxx | 2
sc/source/ui/inc/simpref.hxx | 4
sc/source/ui/inc/solveroptions.hxx | 2
sc/source/ui/inc/solvrdlg.hxx | 2
sc/source/ui/inc/sortdlg.hxx | 2
sc/source/ui/inc/subtdlg.hxx | 2
sc/source/ui/inc/tabbgcolordlg.hxx | 2
sc/source/ui/inc/tabopdlg.hxx | 2
sc/source/ui/inc/tabpages.hxx | 2
sc/source/ui/inc/textimportoptions.hxx | 4
sc/source/ui/inc/tpcalc.hxx | 10 -
sc/source/ui/inc/tpformula.hxx | 2
sc/source/ui/inc/tphf.hxx | 4
sc/source/ui/inc/tpsort.hxx | 4
sc/source/ui/inc/tpsubt.hxx | 2
sc/source/ui/inc/tptable.hxx | 4
sc/source/ui/inc/tpusrlst.hxx | 2
sc/source/ui/inc/tpview.hxx | 4
sc/source/ui/inc/validate.hxx | 4
sc/source/ui/inc/xmlsourcedlg.hxx | 2
sc/source/ui/miscdlgs/conflictsdlg.cxx | 16 -
sc/source/ui/miscdlgs/crdlg.cxx | 3
sc/source/ui/miscdlgs/crnrdlg.cxx | 20 --
sc/source/ui/miscdlgs/datafdlg.cxx | 18 -
sc/source/ui/miscdlgs/datastreamdlg.cxx | 13 -
sc/source/ui/miscdlgs/delcodlg.cxx | 4
sc/source/ui/miscdlgs/filldlg.cxx | 7
sc/source/ui/miscdlgs/highred.cxx | 6
sc/source/ui/miscdlgs/inscodlg.cxx | 11 -
sc/source/ui/miscdlgs/instbdlg.cxx | 9
sc/source/ui/miscdlgs/linkarea.cxx | 6
sc/source/ui/miscdlgs/mtrindlg.cxx | 3
sc/source/ui/miscdlgs/mvtabdlg.cxx | 4
sc/source/ui/miscdlgs/optsolver.cxx | 11 -
sc/source/ui/miscdlgs/protectiondlg.cxx | 15 -
sc/source/ui/miscdlgs/retypepassdlg.cxx | 28 +--
sc/source/ui/miscdlgs/scuiautofmt.cxx | 19 --
sc/source/ui/miscdlgs/simpref.cxx | 6
sc/source/ui/miscdlgs/solveroptions.cxx | 4
sc/source/ui/miscdlgs/solvrdlg.cxx | 4
sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 7
sc/source/ui/miscdlgs/tabopdlg.cxx | 4
sc/source/ui/namedlg/namedefdlg.cxx | 6
sc/source/ui/namedlg/namedlg.cxx | 13 -
sc/source/ui/namedlg/namepast.cxx | 3
sc/source/ui/optdlg/calcoptionsdlg.cxx | 15 -
sc/source/ui/optdlg/calcoptionsdlg.hxx | 6
sc/source/ui/optdlg/tpcalc.cxx | 9
sc/source/ui/optdlg/tpformula.cxx | 16 -
sc/source/ui/optdlg/tpusrlst.cxx | 6
sc/source/ui/optdlg/tpview.cxx | 13 -
sc/source/ui/pagedlg/areasdlg.cxx | 4
sc/source/ui/pagedlg/scuitphfedit.cxx | 6
sc/source/ui/pagedlg/tphf.cxx | 7
sc/source/ui/pagedlg/tptable.cxx | 7
sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 27 +-
sc/source/ui/sidebar/AlignmentPropertyPanel.hxx | 8
sc/source/ui/sidebar/CellLineStyleControl.cxx | 9
sc/source/ui/sidebar/CellLineStyleControl.hxx | 2
sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 8
sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx | 1
sc/source/ui/xmlsource/xmlsourcedlg.cxx | 5
sd/source/filter/html/pubdlg.cxx | 41 +---
sd/source/ui/animations/CustomAnimationDialog.cxx | 16 +
sd/source/ui/animations/CustomAnimationPane.cxx | 21 +-
sd/source/ui/animations/CustomAnimationPane.hxx | 1
sd/source/ui/animations/SlideTransitionPane.cxx | 15 -
sd/source/ui/animations/SlideTransitionPane.hxx | 8
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 19 --
sd/source/ui/dlg/PhotoAlbumDialog.hxx | 12 -
sd/source/ui/dlg/RemoteDialog.cxx | 18 -
sd/source/ui/dlg/RemoteDialog.hxx | 5
sd/source/ui/dlg/RemoteDialogClientBox.cxx | 5
sd/source/ui/dlg/RemoteDialogClientBox.hxx | 2
sd/source/ui/dlg/animobjs.cxx | 31 ---
sd/source/ui/dlg/brkdlg.cxx | 7
sd/source/ui/dlg/copydlg.cxx | 8
sd/source/ui/dlg/custsdlg.cxx | 33 ++-
sd/source/ui/dlg/dlgass.cxx | 48 ++---
sd/source/ui/dlg/dlgsnap.cxx | 4
sd/source/ui/dlg/headerfooterdlg.cxx | 15 -
sd/source/ui/dlg/paragr.cxx | 5
sd/source/ui/dlg/present.cxx | 12 -
sd/source/ui/dlg/prntopts.cxx | 10 -
sd/source/ui/dlg/sdpreslt.cxx | 6
sd/source/ui/dlg/tpaction.cxx | 4
sd/source/ui/dlg/vectdlg.cxx | 8
sd/source/ui/inc/BreakDlg.hxx | 2
sd/source/ui/inc/animobjs.hxx | 16 -
sd/source/ui/inc/copydlg.hxx | 4
sd/source/ui/inc/custsdlg.hxx | 10 -
sd/source/ui/inc/dlgass.hxx | 3
sd/source/ui/inc/dlgsnap.hxx | 2
sd/source/ui/inc/headerfooterdlg.hxx | 6
sd/source/ui/inc/present.hxx | 4
sd/source/ui/inc/prntopts.hxx | 4
sd/source/ui/inc/pubdlg.hxx | 24 +-
sd/source/ui/inc/sdpreslt.hxx | 2
sd/source/ui/inc/tpaction.hxx | 2
sd/source/ui/inc/vectdlg.hxx | 4
sd/source/ui/table/TableDesignPane.cxx | 3
sd/source/ui/table/TableDesignPane.hxx | 2
sfx2/inc/srchdlg.hxx | 2
sfx2/source/appl/appserv.cxx | 5
sfx2/source/appl/newhelp.cxx | 24 +-
sfx2/source/appl/newhelp.hxx | 11 -
sfx2/source/control/templateabstractview.cxx | 3
sfx2/source/dialog/backingwindow.cxx | 6
sfx2/source/dialog/backingwindow.hxx | 4
sfx2/source/dialog/basedlgs.cxx | 8
sfx2/source/dialog/checkin.cxx | 3
sfx2/source/dialog/dinfdlg.cxx | 20 --
sfx2/source/dialog/infobar.cxx | 3
sfx2/source/dialog/inputdlg.cxx | 3
sfx2/source/dialog/mgetempl.cxx | 9
sfx2/source/dialog/newstyle.cxx | 9
sfx2/source/dialog/passwd.cxx | 6
sfx2/source/dialog/printopt.cxx | 15 -
sfx2/source/dialog/securitypage.cxx | 12 -
sfx2/source/dialog/srchdlg.cxx | 3
sfx2/source/dialog/styledlg.cxx | 4
sfx2/source/dialog/tabdlg.cxx | 17 -
sfx2/source/dialog/templateinfodlg.cxx | 3
sfx2/source/dialog/versdlg.cxx | 9
sfx2/source/doc/new.cxx | 5
sfx2/source/inc/inputdlg.hxx | 3
sfx2/source/inc/versdlg.hxx | 4
sfx2/source/sidebar/TabBar.cxx | 10 -
sfx2/source/view/sfxbasecontroller.cxx | 3
sfx2/source/view/viewfrm.cxx | 3
sfx2/source/view/viewprn.cxx | 10 -
starmath/inc/dialog.hxx | 24 +-
starmath/source/dialog.cxx | 41 +---
svtools/source/brwbox/ebbcontrols.cxx | 4
svtools/source/control/calendar.cxx | 5
svtools/source/control/filectrl.cxx | 4
svtools/source/control/tabbar.cxx | 14 -
svtools/source/dialogs/PlaceEditDialog.cxx | 7
svtools/source/dialogs/ServerDetailsControls.cxx | 4
svtools/source/dialogs/addresstemplate.cxx | 9
svtools/source/dialogs/prnsetup.cxx | 6
svtools/source/dialogs/restartdialog.cxx | 12 -
svtools/source/dialogs/wizardmachine.cxx | 22 +-
svtools/source/filter/exportdialog.cxx | 21 +-
svtools/source/filter/exportdialog.hxx | 5
svtools/source/toolpanel/paneltabbar.cxx | 7
svx/source/dialog/_bmpmask.cxx | 20 --
svx/source/dialog/compressgraphicdialog.cxx | 3
svx/source/dialog/ctredlin.cxx | 20 --
svx/source/dialog/dlgctl3d.cxx | 4
svx/source/dialog/docrecovery.cxx | 22 --
svx/source/dialog/hdft.cxx | 8
svx/source/dialog/optgrid.cxx | 9
svx/source/dialog/orienthelper.cxx | 5
svx/source/dialog/passwd.cxx | 4
svx/source/dialog/rubydialog.cxx | 9
svx/source/dialog/srchdlg.cxx | 92 +++++-----
svx/source/engine3d/float3d.cxx | 68 +++----
svx/source/fmcomp/gridctrl.cxx | 5
svx/source/form/datanavi.cxx | 49 ++---
svx/source/gallery2/galbrws1.cxx | 4
svx/source/gallery2/galbrws1.hxx | 2
svx/source/inc/datanavi.hxx | 22 +-
svx/source/inc/docrecovery.hxx | 12 -
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 16 -
svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx | 3
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 4
svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 2
svx/source/sidebar/shadow/ShadowPropertyPanel.cxx | 8
svx/source/sidebar/shadow/ShadowPropertyPanel.hxx | 2
svx/source/sidebar/text/TextUnderlineControl.cxx | 9
svx/source/sidebar/text/TextUnderlineControl.hxx | 2
svx/source/tbxctrls/colorwindow.hxx | 4
svx/source/tbxctrls/fontworkgallery.cxx | 3
svx/source/tbxctrls/layctrl.cxx | 5
svx/source/tbxctrls/tbcontrl.cxx | 6
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 17 -
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx | 8
svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx | 6
svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx | 4
sw/inc/dbmgr.hxx | 2
sw/source/ui/chrdlg/break.cxx | 21 +-
sw/source/ui/chrdlg/chardlg.cxx | 6
sw/source/ui/chrdlg/drpcps.cxx | 8
sw/source/ui/chrdlg/numpara.cxx | 10 -
sw/source/ui/chrdlg/swuiccoll.cxx | 13 -
sw/source/ui/config/mailconfigpage.cxx | 37 +---
sw/source/ui/config/optcomp.cxx | 4
sw/source/ui/config/optload.cxx | 5
sw/source/ui/config/optpage.cxx | 32 +--
sw/source/ui/dbui/addresslistdialog.cxx | 21 --
sw/source/ui/dbui/addresslistdialog.hxx | 12 -
sw/source/ui/dbui/createaddresslistdialog.cxx | 27 --
sw/source/ui/dbui/createaddresslistdialog.hxx | 16 -
sw/source/ui/dbui/customizeaddresslistdialog.cxx | 13 -
sw/source/ui/dbui/customizeaddresslistdialog.hxx | 6
sw/source/ui/dbui/dbinsdlg.cxx | 22 --
sw/source/ui/dbui/mmaddressblockpage.cxx | 48 +----
sw/source/ui/dbui/mmaddressblockpage.hxx | 24 +-
sw/source/ui/dbui/mmdocselectpage.cxx | 12 -
sw/source/ui/dbui/mmdocselectpage.hxx | 4
sw/source/ui/dbui/mmgreetingspage.cxx | 34 +--
sw/source/ui/dbui/mmgreetingspage.hxx | 14 -
sw/source/ui/dbui/mmlayoutpage.cxx | 11 -
sw/source/ui/dbui/mmlayoutpage.hxx | 4
sw/source/ui/dbui/mmmergepage.cxx | 7
sw/source/ui/dbui/mmmergepage.hxx | 4
sw/source/ui/dbui/mmoutputpage.cxx | 56 ++----
sw/source/ui/dbui/mmoutputpage.hxx | 24 +-
sw/source/ui/dbui/mmoutputtypepage.cxx | 11 -
sw/source/ui/dbui/mmoutputtypepage.hxx | 2
sw/source/ui/dbui/mmpreparemergepage.cxx | 18 +
sw/source/ui/dbui/mmpreparemergepage.hxx | 5
sw/source/ui/dbui/selectdbtabledialog.cxx | 4
sw/source/ui/dbui/selectdbtabledialog.hxx | 2
sw/source/ui/dialog/docstdlg.cxx | 3
sw/source/ui/dialog/swdlgfact.cxx | 3
sw/source/ui/dialog/swdlgfact.hxx | 2
sw/source/ui/dialog/uiregionsw.cxx | 86 +++------
sw/source/ui/dialog/wordcountdialog.cxx | 3
sw/source/ui/envelp/envlop1.cxx | 6
sw/source/ui/envelp/envprt.cxx | 6
sw/source/ui/envelp/envprt.hxx | 4
sw/source/ui/envelp/label1.cxx | 9
sw/source/ui/envelp/labfmt.cxx | 10 -
sw/source/ui/envelp/labfmt.hxx | 4
sw/source/ui/envelp/labprt.cxx | 7
sw/source/ui/envelp/labprt.hxx | 2
sw/source/ui/envelp/mailmrge.cxx | 26 +-
sw/source/ui/envelp/swuilabimp.hxx | 8
sw/source/ui/fldui/DropDownFieldDialog.cxx | 5
sw/source/ui/fldui/changedb.cxx | 7
sw/source/ui/fldui/flddb.cxx | 3
sw/source/ui/fldui/flddb.hxx | 2
sw/source/ui/fldui/fldedt.cxx | 11 -
sw/source/ui/fldui/fldfunc.cxx | 18 +
sw/source/ui/fldui/fldfunc.hxx | 9
sw/source/ui/fldui/fldtdlg.cxx | 7
sw/source/ui/fldui/inpdlg.cxx | 3
sw/source/ui/fldui/javaedit.cxx | 19 --
sw/source/ui/frmdlg/column.cxx | 13 -
sw/source/ui/frmdlg/cption.cxx | 7
sw/source/ui/frmdlg/frmpage.cxx | 57 ++----
sw/source/ui/frmdlg/wrap.cxx | 21 --
sw/source/ui/index/cnttab.cxx | 78 +++-----
sw/source/ui/index/swuiidxmrk.cxx | 44 +---
sw/source/ui/misc/bookmark.cxx | 3
sw/source/ui/misc/docfnote.cxx | 10 -
sw/source/ui/misc/glosbib.cxx | 12 -
sw/source/ui/misc/glossary.cxx | 19 --
sw/source/ui/misc/impfnote.hxx | 4
sw/source/ui/misc/insfnote.cxx | 14 -
sw/source/ui/misc/linenum.cxx | 7
sw/source/ui/misc/num.cxx | 11 -
sw/source/ui/misc/outline.cxx | 7
sw/source/ui/misc/pgfnote.cxx | 6
sw/source/ui/misc/pggrid.cxx | 19 +-
sw/source/ui/misc/srtdlg.cxx | 11 -
sw/source/ui/misc/titlepage.cxx | 18 -
sw/source/ui/table/convert.cxx | 15 -
sw/source/ui/table/instable.cxx | 14 -
sw/source/ui/table/tabledlg.cxx | 64 ++----
sw/source/ui/table/tautofmt.cxx | 18 -
sw/source/ui/utlui/swrenamexnameddlg.cxx | 3
sw/source/uibase/dbui/dbmgr.cxx | 3
sw/source/uibase/dbui/dbui.cxx | 2
sw/source/uibase/envelp/syncbtn.cxx | 3
sw/source/uibase/inc/DropDownFieldDialog.hxx | 2
sw/source/uibase/inc/bookmark.hxx | 2
sw/source/uibase/inc/break.hxx | 7
sw/source/uibase/inc/changedb.hxx | 4
sw/source/uibase/inc/chrdlg.hxx | 4
sw/source/uibase/inc/column.hxx | 8
sw/source/uibase/inc/convert.hxx | 8
sw/source/uibase/inc/cption.hxx | 4
sw/source/uibase/inc/dbinsdlg.hxx | 12 -
sw/source/uibase/inc/dbui.hxx | 2
sw/source/uibase/inc/docfnote.hxx | 4
sw/source/uibase/inc/docstdlg.hxx | 2
sw/source/uibase/inc/drpcps.hxx | 4
sw/source/uibase/inc/envlop.hxx | 4
sw/source/uibase/inc/fldedt.hxx | 6
sw/source/uibase/inc/fldtdlg.hxx | 4
sw/source/uibase/inc/frmpage.hxx | 19 +-
sw/source/uibase/inc/glosbib.hxx | 6
sw/source/uibase/inc/glossary.hxx | 8
sw/source/uibase/inc/inpdlg.hxx | 2
sw/source/uibase/inc/insfnote.hxx | 8
sw/source/uibase/inc/instable.hxx | 12 -
sw/source/uibase/inc/javaedit.hxx | 10 -
sw/source/uibase/inc/linenum.hxx | 4
sw/source/uibase/inc/mailconfigpage.hxx | 6
sw/source/uibase/inc/mailmrge.hxx | 10 -
sw/source/uibase/inc/num.hxx | 6
sw/source/uibase/inc/numpara.hxx | 6
sw/source/uibase/inc/optcomp.hxx | 2
sw/source/uibase/inc/optload.hxx | 2
sw/source/uibase/inc/optpage.hxx | 14 -
sw/source/uibase/inc/outline.hxx | 4
sw/source/uibase/inc/pgfnote.hxx | 4
sw/source/uibase/inc/pggrid.hxx | 5
sw/source/uibase/inc/regionsw.hxx | 34 +--
sw/source/uibase/inc/srtdlg.hxx | 6
sw/source/uibase/inc/swrenamexnameddlg.hxx | 2
sw/source/uibase/inc/swuiccoll.hxx | 3
sw/source/uibase/inc/swuicnttab.hxx | 29 +--
sw/source/uibase/inc/swuiidxmrk.hxx | 28 +--
sw/source/uibase/inc/syncbtn.hxx | 2
sw/source/uibase/inc/tautofmt.hxx | 10 -
sw/source/uibase/inc/titlepage.hxx | 10 -
sw/source/uibase/inc/wordcountdialog.hxx | 2
sw/source/uibase/inc/wrap.hxx | 4
sw/source/uibase/sidebar/PageColumnControl.cxx | 3
sw/source/uibase/sidebar/PageColumnControl.hxx | 2
sw/source/uibase/sidebar/PageSizeControl.cxx | 3
sw/source/uibase/sidebar/PageSizeControl.hxx | 2
sw/source/uibase/sidebar/ThemePanel.cxx | 10 -
sw/source/uibase/sidebar/ThemePanel.hxx | 3
sw/source/uibase/sidebar/WrapPropertyPanel.cxx | 6
sw/source/uibase/sidebar/WrapPropertyPanel.hxx | 2
sw/source/uibase/table/tablepg.hxx | 22 +-
uui/source/authfallbackdlg.cxx | 6
uui/source/authfallbackdlg.hxx | 4
uui/source/logindlg.cxx | 10 -
uui/source/logindlg.hxx | 6
uui/source/masterpasscrtdlg.cxx | 3
uui/source/masterpasscrtdlg.hxx | 2
uui/source/masterpassworddlg.cxx | 3
uui/source/masterpassworddlg.hxx | 2
uui/source/nameclashdlg.cxx | 8
uui/source/nameclashdlg.hxx | 2
uui/source/passworddlg.cxx | 4
uui/source/passworddlg.hxx | 2
uui/source/secmacrowarnings.cxx | 14 -
uui/source/secmacrowarnings.hxx | 8
uui/source/unknownauthdlg.cxx | 8
uui/source/unknownauthdlg.hxx | 4
vcl/generic/print/genprnpsp.cxx | 5
vcl/generic/print/prtsetup.cxx | 4
vcl/generic/print/prtsetup.hxx | 2
vcl/inc/printdlg.hxx | 5
vcl/source/control/button.cxx | 12 -
vcl/source/window/btndlg.cxx | 4
vcl/source/window/layout.cxx | 3
vcl/source/window/menubarwindow.cxx | 10 -
vcl/source/window/menubarwindow.hxx | 8
vcl/source/window/printdlg.cxx | 27 +-
vcl/workben/svpclient.cxx | 10 -
vcl/workben/vcldemo.cxx | 6
writerperfect/inc/WPFTEncodingDialog.hxx | 2
writerperfect/source/common/WPFTEncodingDialog.cxx | 3
xmlsecurity/inc/xmlsecurity/certificatechooser.hxx | 2
xmlsecurity/inc/xmlsecurity/certificateviewer.hxx | 2
xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx | 8
xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 12 -
xmlsecurity/source/dialogs/certificatechooser.cxx | 3
xmlsecurity/source/dialogs/certificateviewer.cxx | 4
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 22 --
xmlsecurity/source/dialogs/macrosecurity.cxx | 25 --
792 files changed, 3146 insertions(+), 4256 deletions(-)
New commits:
commit 167bc621ef825ed5b961502fe9324a675ee34e42
Author: Noel Grandin <noel at peralex.com>
Date: Wed Aug 19 09:11:34 2015 +0200
Convert vcl Button Link<> click handler to typed Link<Button*,void>
Change-Id: Ie80dfb003118d40741549c41ebcc7eda4819f05b
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index f3d22e7..bf2fc8f8 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -233,7 +233,7 @@ protected:
virtual void Resize() SAL_OVERRIDE;
virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
- DECL_LINK( ButtonHdl, ImageButton * );
+ DECL_LINK_TYPED( ButtonHdl, Button *, void );
DECL_LINK(TreeListHdl, void *);
DECL_LINK( implEndDragHdl, HeaderBar * );
DECL_LINK_TYPED( EditAccHdl, Accelerator *, void );
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index ca9009c..786f6d7 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1783,12 +1783,11 @@ bool WatchWindow::RemoveSelectedWatch()
}
-IMPL_LINK( WatchWindow, ButtonHdl, ImageButton *, pButton )
+IMPL_LINK_TYPED( WatchWindow, ButtonHdl, Button *, pButton, void )
{
if (pButton == aRemoveWatchButton.get())
if (SfxDispatcher* pDispatcher = GetDispatcher())
pDispatcher->Execute(SID_BASICIDE_REMOVEWATCH);
- return 0;
}
IMPL_LINK_NOARG(WatchWindow, TreeListHdl)
diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index 084d15e..b249c6c 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -150,13 +150,12 @@ void BreakPointDialog::CheckButtons()
}
}
-IMPL_LINK( BreakPointDialog, CheckBoxHdl, ::CheckBox *, pChkBx )
+IMPL_LINK_TYPED( BreakPointDialog, CheckBoxHdl, Button *, pButton, void )
{
+ ::CheckBox * pChkBx = static_cast<::CheckBox*>(pButton);
BreakPoint* pBrk = GetSelectedBreakPoint();
if ( pBrk )
pBrk->bEnabled = pChkBx->IsChecked();
-
- return 0;
}
IMPL_LINK( BreakPointDialog, ComboBoxHighlightHdl, ComboBox *, pBox )
@@ -190,7 +189,7 @@ IMPL_LINK( BreakPointDialog, EditModifyHdl, Edit *, pEdit )
-IMPL_LINK( BreakPointDialog, ButtonHdl, Button *, pButton )
+IMPL_LINK_TYPED( BreakPointDialog, ButtonHdl, Button *, pButton, void )
{
if (pButton == m_pOKButton)
{
@@ -237,8 +236,6 @@ IMPL_LINK( BreakPointDialog, ButtonHdl, Button *, pButton )
}
CheckButtons();
}
-
- return 0;
}
diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx
index 50d1854..9d032b6 100644
--- a/basctl/source/basicide/brkdlg.hxx
+++ b/basctl/source/basicide/brkdlg.hxx
@@ -43,10 +43,10 @@ private:
protected:
void CheckButtons();
- DECL_LINK( CheckBoxHdl, ::CheckBox * );
+ DECL_LINK_TYPED( CheckBoxHdl, Button*, void );
DECL_LINK( ComboBoxHighlightHdl, ComboBox * );
DECL_LINK( EditModifyHdl, Edit * );
- DECL_LINK( ButtonHdl, Button * );
+ DECL_LINK_TYPED( ButtonHdl, Button*, void );
void UpdateFields( BreakPoint* pBrk );
BreakPoint* GetSelectedBreakPoint();
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 1d06e96..6d83133 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -613,7 +613,7 @@ IMPL_LINK( MacroChooser, EditModifyHdl, Edit *, pEdit )
-IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
+IMPL_LINK_TYPED( MacroChooser, ButtonHdl, Button *, pButton, void )
{
// apart from New/Record the Description is done by LoseFocus
if (pButton == m_pRunButton)
@@ -633,7 +633,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
if ( aDocument.isDocument() && !aDocument.allowMacros() )
{
ScopedVclPtrInstance<MessageDialog>::Create(this, IDEResId(RID_STR_CANNOTRUNMACRO), VCL_MESSAGE_WARNING)->Execute();
- return 0;
+ return;
}
}
}
@@ -644,12 +644,12 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
ScopedVclPtrInstance<MessageDialog>::Create(this, IDEResId(RID_STR_BADSBXNAME))->Execute();
m_pMacroNameEdit->SetSelection( Selection( 0, m_pMacroNameEdit->GetText().getLength() ) );
m_pMacroNameEdit->GrabFocus();
- return 0;
+ return;
}
SbMethod* pMethod = GetMacro();
if ( pMethod && !QueryReplaceMacro( pMethod->GetName(), this ) )
- return 0;
+ return;
}
EndDialog(Macro_OkRun);
@@ -666,7 +666,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
ScriptDocument aDocument( aDesc.GetDocument() );
DBG_ASSERT( aDocument.isAlive(), "MacroChooser::ButtonHdl: no document, or document is dead!" );
if ( !aDocument.isAlive() )
- return 0;
+ return;
BasicManager* pBasMgr = aDocument.getBasicManager();
OUString aLib( aDesc.GetLibName() );
OUString aMod( aDesc.GetName() );
@@ -712,7 +712,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
ScopedVclPtrInstance<MessageDialog>::Create(this, IDEResId(RID_STR_BADSBXNAME))->Execute();
m_pMacroNameEdit->SetSelection( Selection( 0, m_pMacroNameEdit->GetText().getLength() ) );
m_pMacroNameEdit->GrabFocus();
- return 1;
+ return;
}
SbMethod* pMethod = CreateMacro();
if ( pMethod )
@@ -739,7 +739,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
ScriptDocument aDocument( aDesc.GetDocument() );
DBG_ASSERT( aDocument.isAlive(), "MacroChooser::ButtonHdl: no document, or document is dead!" );
if ( !aDocument.isAlive() )
- return 0;
+ return;
BasicManager* pBasMgr = aDocument.getBasicManager();
OUString aLib( aDesc.GetLibName() );
OUString aMod( aDesc.GetName() );
@@ -783,7 +783,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
if ( nRet ) // not only closed
{
EndDialog(Macro_Edit);
- return 0;
+ return;
}
Shell* pShell = GetShell();
@@ -792,7 +792,6 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
m_pBasicBox->UpdateEntries();
}
- return 0;
}
diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx
index c9c36ce..bbb4e28 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -71,7 +71,7 @@ private:
DECL_LINK(MacroDoubleClickHdl, void *);
DECL_LINK( BasicSelectHdl, SvTreeListBox * );
DECL_LINK( EditModifyHdl, Edit * );
- DECL_LINK( ButtonHdl, Button * );
+ DECL_LINK_TYPED( ButtonHdl, Button *, void );
void CheckButtons();
void SaveSetCurEntry( SvTreeListBox& rBox, SvTreeListEntry* pEntry );
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index ad49d7a..4f56a1a 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -351,7 +351,7 @@ bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewName )
}
// NewObjectDialog
-IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler)
+IMPL_LINK_NOARG_TYPED(NewObjectDialog, OkButtonHandler, Button*, void)
{
if (IsValidSbxName(m_pEdit->GetText()))
EndDialog(1);
@@ -360,7 +360,6 @@ IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler)
ScopedVclPtrInstance<MessageDialog>::Create(this, IDE_RESSTR(RID_STR_BADSBXNAME))->Execute();
m_pEdit->GrabFocus();
}
- return 0;
}
NewObjectDialog::NewObjectDialog(vcl::Window * pParent, ObjectMode::Mode eMode,
@@ -434,21 +433,19 @@ sal_Int32 GotoLineDialog::GetLineNumber() const
return m_pEdit->GetText().toInt32();
}
-IMPL_LINK_NOARG(GotoLineDialog, OkButtonHandler)
+IMPL_LINK_NOARG_TYPED(GotoLineDialog, OkButtonHandler, Button*, void)
{
if ( GetLineNumber() )
EndDialog(1);
else
m_pEdit->SetText(m_pEdit->GetText(), Selection(0, m_pEdit->GetText().getLength()));
- return 0;
}
// ExportDialog
-IMPL_LINK_NOARG(ExportDialog, OkButtonHandler)
+IMPL_LINK_NOARG_TYPED(ExportDialog, OkButtonHandler, Button*, void)
{
mbExportAsPackage = m_pExportAsPackageButton->IsChecked();
EndDialog(1);
- return 0;
}
ExportDialog::ExportDialog(vcl::Window * pParent)
@@ -623,7 +620,7 @@ IMPL_LINK( LibPage, BasicSelectHdl, ListBox *, pBox )
return 0;
}
-IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
+IMPL_LINK_TYPED( LibPage, ButtonHdl, Button *, pButton, void )
{
if (pButton == m_pEditButton)
{
@@ -640,7 +637,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
pDispatcher->Execute( SID_BASICIDE_LIBSELECTED,
SfxCallMode::ASYNCHRON, &aDocItem, &aLibNameItem, 0L );
EndTabDialog( 1 );
- return 0;
+ return;
}
else if (pButton == m_pNewLibButton)
NewLib();
@@ -709,7 +706,6 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
}
}
CheckButtons();
- return 0;
}
IMPL_LINK( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg )
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 0da8cdb..d82e4c1 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -694,7 +694,7 @@ IMPL_LINK( ObjectPage, BasicBoxHighlightHdl, TreeListBox *, pBox )
return 0;
}
-IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton )
+IMPL_LINK_TYPED( ObjectPage, ButtonHdl, Button *, pButton, void )
{
if (pButton == m_pEditButton)
{
@@ -749,8 +749,6 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton )
NewDialog();
else if (pButton == m_pDelButton)
DeleteCurrent();
-
- return 0;
}
bool ObjectPage::GetSelection( ScriptDocument& rDocument, OUString& rLibName )
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index c70e8b7..61400d2 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -51,7 +51,7 @@ private:
VclPtr<Edit> m_pEdit;
VclPtr<OKButton> m_pOKButton;
- DECL_LINK(OkButtonHandler, void *);
+ DECL_LINK_TYPED(OkButtonHandler, Button*, void);
public:
NewObjectDialog (vcl::Window* pParent, ObjectMode::Mode, bool bCheckName = false);
virtual ~NewObjectDialog();
@@ -68,7 +68,7 @@ class GotoLineDialog : public ModalDialog
{
VclPtr<Edit> m_pEdit;
VclPtr<OKButton> m_pOKButton;
- DECL_LINK(OkButtonHandler, void *);
+ DECL_LINK_TYPED(OkButtonHandler, Button*, void);
public:
explicit GotoLineDialog(vcl::Window * pParent);
virtual ~GotoLineDialog();
@@ -84,7 +84,7 @@ private:
bool mbExportAsPackage;
- DECL_LINK(OkButtonHandler, void *);
+ DECL_LINK_TYPED(OkButtonHandler, Button*, void);
public:
explicit ExportDialog( vcl::Window * pParent );
@@ -191,7 +191,7 @@ protected:
VclPtr<PushButton> m_pDelButton;
DECL_LINK( BasicBoxHighlightHdl, TreeListBox * );
- DECL_LINK( ButtonHdl, Button * );
+ DECL_LINK_TYPED( ButtonHdl, Button *, void );
void CheckButtons();
bool GetSelection( ScriptDocument& rDocument, OUString& rLibName );
void DeleteCurrent();
@@ -231,7 +231,7 @@ protected:
DECL_LINK( TreeListHighlightHdl, SvTreeListBox * );
DECL_LINK( BasicSelectHdl, ListBox * );
- DECL_LINK( ButtonHdl, Button * );
+ DECL_LINK_TYPED( ButtonHdl, Button *, void );
DECL_LINK( CheckPasswordHdl, SvxPasswordDialog * );
void CheckButtons();
void DeleteCurrent();
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index bde64e2..b1b7f8b 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -144,7 +144,7 @@ void ManageLanguageDialog::ClearLanguageBox()
m_pLanguageLB->Clear();
}
-IMPL_LINK_NOARG(ManageLanguageDialog, AddHdl)
+IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, AddHdl, Button*, void)
{
ScopedVclPtrInstance< SetDefaultLanguageDialog > aDlg( this, m_xLocalizationMgr );
if ( RET_OK == aDlg->Execute() )
@@ -166,10 +166,9 @@ IMPL_LINK_NOARG(ManageLanguageDialog, AddHdl)
if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate( SID_BASICIDE_CURRENT_LANG );
}
- return 1;
}
-IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl)
+IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, DeleteHdl, Button*, void)
{
ScopedVclPtrInstance< MessageDialog > aQBox(this, "DeleteLangDialog", "modules/BasicIDE/ui/deletelangdialog.ui");
if ( aQBox->Execute() == RET_OK )
@@ -196,10 +195,9 @@ IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl)
m_pLanguageLB->SelectEntryPos( nPos );
SelectHdl( NULL );
}
- return 1;
}
-IMPL_LINK_NOARG(ManageLanguageDialog, MakeDefHdl)
+IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, MakeDefHdl, Button*, void)
{
sal_uInt16 nPos = m_pLanguageLB->GetSelectEntryPos();
LanguageEntry* pSelectEntry = static_cast<LanguageEntry*>(m_pLanguageLB->GetEntryData( nPos ));
@@ -214,8 +212,6 @@ IMPL_LINK_NOARG(ManageLanguageDialog, MakeDefHdl)
m_pLanguageLB->SelectEntryPos( nPos );
SelectHdl( NULL );
}
-
- return 1;
}
IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl)
diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx
index f7ffc6e..0bd64d7 100644
--- a/basctl/source/inc/managelang.hxx
+++ b/basctl/source/inc/managelang.hxx
@@ -66,9 +66,9 @@ private:
void FillLanguageBox();
void ClearLanguageBox();
- DECL_LINK(AddHdl, void *);
- DECL_LINK(DeleteHdl, void *);
- DECL_LINK(MakeDefHdl, void *);
+ DECL_LINK_TYPED(AddHdl, Button*, void);
+ DECL_LINK_TYPED(DeleteHdl, Button*, void);
+ DECL_LINK_TYPED(MakeDefHdl, Button*, void);
DECL_LINK(SelectHdl, void *);
public:
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index 6f62e49..b925c6c 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -40,8 +40,8 @@ class SvRTLInputBox : public ModalDialog
void InitButtons( const Size& rDlgSize );
void PositionEdit( const Size& rDlgSize );
void PositionPrompt( const OUString& rPrompt, const Size& rDlgSize );
- DECL_LINK( OkHdl, Button * );
- DECL_LINK( CancelHdl, Button * );
+ DECL_LINK_TYPED( OkHdl, Button *, void );
+ DECL_LINK_TYPED( CancelHdl, Button *, void );
public:
SvRTLInputBox( vcl::Window* pParent, const OUString& rPrompt, const OUString& rTitle,
@@ -129,22 +129,16 @@ void SvRTLInputBox::PositionPrompt(const OUString& rPrompt,const Size& rDlgSize)
}
-IMPL_LINK( SvRTLInputBox, OkHdl, Button *, pButton )
+IMPL_LINK_NOARG_TYPED( SvRTLInputBox, OkHdl, Button *, void )
{
- (void)pButton;
-
aText = aEdit->GetText();
EndDialog( 1 );
- return 0;
}
-IMPL_LINK( SvRTLInputBox, CancelHdl, Button *, pButton )
+IMPL_LINK_NOARG_TYPED( SvRTLInputBox, CancelHdl, Button *, void )
{
- (void)pButton;
-
aText.clear();
EndDialog();
- return 0;
}
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index c069c6f..7be2228 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -70,8 +70,8 @@ class SbiInputDialog : public ModalDialog {
VclPtr<OKButton> aOk;
VclPtr<CancelButton> aCancel;
OUString aText;
- DECL_LINK( Ok, vcl::Window * );
- DECL_LINK( Cancel, vcl::Window * );
+ DECL_LINK_TYPED( Ok, Button *, void );
+ DECL_LINK_TYPED( Cancel, Button *, void );
public:
SbiInputDialog( vcl::Window*, const OUString& );
virtual ~SbiInputDialog() { disposeOnce(); }
@@ -115,21 +115,15 @@ void SbiInputDialog::dispose()
ModalDialog::dispose();
}
-IMPL_LINK( SbiInputDialog, Ok, vcl::Window *, pWindow )
+IMPL_LINK_NOARG_TYPED( SbiInputDialog, Ok, Button *, void )
{
- (void)pWindow;
-
aText = aInput->GetText();
EndDialog( 1 );
- return 0;
}
-IMPL_LINK( SbiInputDialog, Cancel, vcl::Window *, pWindow )
+IMPL_LINK_NOARG_TYPED( SbiInputDialog, Cancel, Button *, void )
{
- (void)pWindow;
-
EndDialog();
- return 0;
}
SbiStream::SbiStream()
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 92c6cb6..946bb70 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -640,10 +640,10 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
}
}
-IMPL_LINK_NOARG(SchAttribTabDlg, OKPressed)
+IMPL_LINK_TYPED(SchAttribTabDlg, OKPressed, Button*, pButton, void)
{
m_bOKPressed = true;
- return m_aOriginalOKClickHdl.Call( this );
+ m_aOriginalOKClickHdl.Call( pButton );
}
} //namespace chart
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 5ee6d2a..0c532e0 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -178,12 +178,12 @@ void DataLabelResources::SetNumberFormatter( SvNumberFormatter* pFormatter )
m_pNumberFormatter = pFormatter;
}
-IMPL_LINK( DataLabelResources, NumberFormatDialogHdl, PushButton *, pButton )
+IMPL_LINK_TYPED( DataLabelResources, NumberFormatDialogHdl, Button *, pButton, void )
{
if( !m_pPool || !m_pNumberFormatter )
{
OSL_FAIL("Missing item pool or number formatter");
- return 1;
+ return;
}
if( pButton == m_pPB_NumberFormatForValue && !m_pCBNumber->IsChecked())
@@ -224,15 +224,13 @@ IMPL_LINK( DataLabelResources, NumberFormatDialogHdl, PushButton *, pButton )
rbMixedState = rbSourceMixedState = true;
}
}
- return 0;
}
-IMPL_LINK( DataLabelResources, CheckHdl, CheckBox*, pBox )
+IMPL_LINK_TYPED( DataLabelResources, CheckHdl, Button*, pBox, void )
{
if( pBox )
- pBox->EnableTriState( false );
+ static_cast<CheckBox*>(pBox)->EnableTriState( false );
EnableControls();
- return 0;
}
void DataLabelResources::EnableControls()
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx
index cfb4758..acfc93a 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -85,8 +85,8 @@ private:
VclPtr<vcl::Window> m_pWindow;
SfxItemPool* m_pPool;
- DECL_LINK(NumberFormatDialogHdl, PushButton * );
- DECL_LINK(CheckHdl, CheckBox* );
+ DECL_LINK_TYPED(NumberFormatDialogHdl, Button *, void );
+ DECL_LINK_TYPED(CheckHdl, Button*, void );
void EnableControls();
};
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 44377b0..e0fc718 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -138,7 +138,7 @@ ErrorBarResources::ErrorBarResources( VclBuilderContainer* pParent, Dialog * pPa
m_pRbPercent->SetClickHdl( LINK( this, ErrorBarResources, CategoryChosen ));
m_pRbFunction->SetClickHdl( LINK( this, ErrorBarResources, CategoryChosen ));
m_pRbRange->SetClickHdl( LINK( this, ErrorBarResources, CategoryChosen ));
- m_pLbFunction->SetSelectHdl( LINK( this, ErrorBarResources, CategoryChosen ));
+ m_pLbFunction->SetSelectHdl( LINK( this, ErrorBarResources, CategoryChosen2 ));
m_pCbSyncPosNeg->Check( false );
m_pCbSyncPosNeg->SetToggleHdl( LINK( this, ErrorBarResources, SynchronizePosAndNeg ));
@@ -340,7 +340,13 @@ void ErrorBarResources::UpdateControlStates()
}
}
-IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen )
+IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen2 )
+{
+ CategoryChosen(NULL);
+ return 0;
+}
+
+IMPL_LINK_NOARG_TYPED( ErrorBarResources, CategoryChosen, Button*, void )
{
m_bErrorKindUnique = true;
SvxChartKindError eOldError = m_eErrorKind;
@@ -396,7 +402,6 @@ IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen )
}
UpdateControlStates();
- return 0;
}
IMPL_LINK_NOARG(ErrorBarResources, SynchronizePosAndNeg)
@@ -422,7 +427,7 @@ IMPL_LINK_NOARG(ErrorBarResources, PosValueChanged)
return 0;
}
-IMPL_LINK_NOARG(ErrorBarResources, IndicatorChanged)
+IMPL_LINK_NOARG_TYPED(ErrorBarResources, IndicatorChanged, Button*, void)
{
m_bIndicatorUnique = true;
if( m_pRbBoth->IsChecked())
@@ -435,14 +440,13 @@ IMPL_LINK_NOARG(ErrorBarResources, IndicatorChanged)
m_bIndicatorUnique = false;
UpdateControlStates();
- return 0;
}
-IMPL_LINK( ErrorBarResources, ChooseRange, PushButton*, pButton )
+IMPL_LINK_TYPED( ErrorBarResources, ChooseRange, Button*, pButton, void )
{
OSL_ASSERT( m_apRangeSelectionHelper.get());
if( ! m_apRangeSelectionHelper.get())
- return 0;
+ return;
OSL_ASSERT( m_pCurrentRangeChoosingField == nullptr );
OUString aUIString;
@@ -468,8 +472,6 @@ IMPL_LINK( ErrorBarResources, ChooseRange, PushButton*, pButton )
}
else
m_pCurrentRangeChoosingField = 0;
-
- return 0;
}
IMPL_LINK( ErrorBarResources, RangeChanged, Edit *, pEdit )
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx
index 98f1641..5862f13 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -69,7 +69,7 @@ TrendlineResources::TrendlineResources( vcl::Window * pParent, const SfxItemSet&
pTabPage->get(m_pFI_MovingAverage,"imageMovingAverage");
FillValueSets();
- Link<> aLink = LINK(this, TrendlineResources, SelectTrendLine );
+ Link<Button*,void> aLink = LINK(this, TrendlineResources, SelectTrendLine );
m_pRB_Linear->SetClickHdl( aLink );
m_pRB_Logarithmic->SetClickHdl( aLink );
m_pRB_Exponential->SetClickHdl( aLink );
@@ -77,10 +77,10 @@ TrendlineResources::TrendlineResources( vcl::Window * pParent, const SfxItemSet&
m_pRB_Polynomial->SetClickHdl( aLink );
m_pRB_MovingAverage->SetClickHdl( aLink );
- aLink = LINK(this, TrendlineResources, ChangeValue );
- m_pNF_Degree->SetModifyHdl( aLink );
- m_pNF_Period->SetModifyHdl( aLink );
- m_pFmtFld_InterceptValue->SetModifyHdl( aLink );
+ Link<> aLink2 = LINK(this, TrendlineResources, ChangeValue );
+ m_pNF_Degree->SetModifyHdl( aLink2 );
+ m_pNF_Period->SetModifyHdl( aLink2 );
+ m_pFmtFld_InterceptValue->SetModifyHdl( aLink2 );
Reset( rInAttrs );
UpdateControlStates();
@@ -89,7 +89,7 @@ TrendlineResources::TrendlineResources( vcl::Window * pParent, const SfxItemSet&
TrendlineResources::~TrendlineResources()
{}
-IMPL_LINK( TrendlineResources, SelectTrendLine, RadioButton *, pRadioButton )
+IMPL_LINK_TYPED( TrendlineResources, SelectTrendLine, Button *, pRadioButton, void )
{
if( pRadioButton == m_pRB_Linear )
m_eTrendLineType = CHREGRESS_LINEAR;
@@ -106,8 +106,6 @@ IMPL_LINK( TrendlineResources, SelectTrendLine, RadioButton *, pRadioButton )
m_bTrendLineUnique = true;
UpdateControlStates();
-
- return 0;
}
void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx
index 03c3ebe..d69581c 100644
--- a/chart2/source/controller/dialogs/res_Trendline.hxx
+++ b/chart2/source/controller/dialogs/res_Trendline.hxx
@@ -78,7 +78,7 @@ private:
sal_Int32 m_nNbPoints;
void UpdateControlStates();
- DECL_LINK( SelectTrendLine, RadioButton * );
+ DECL_LINK_TYPED( SelectTrendLine, Button *, void );
DECL_LINK( ChangeValue, void *);
};
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 04c7254..44f7aca 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -415,7 +415,7 @@ IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, PreviewSelectHdl)
return 0;
}
-IMPL_LINK( ThreeD_SceneIllumination_TabPage, ColorDialogHdl, Button*, pButton )
+IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, ColorDialogHdl, Button*, pButton, void )
{
bool bIsAmbientLight = (pButton==m_pBtn_AmbientLight_Color);
ColorLB* pListBox = ( bIsAmbientLight ? m_pLB_AmbientLight : m_pLB_LightSource);
@@ -449,7 +449,6 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, ColorDialogHdl, Button*, pButton )
}
SelectColorHdl( pListBox );
}
- return 0;
}
IMPL_LINK( ThreeD_SceneIllumination_TabPage, SelectColorHdl, ColorLB*, pListBox )
@@ -482,10 +481,11 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, SelectColorHdl, ColorLB*, pListBox
return 0;
}
-IMPL_LINK( ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl, LightButton*, pButton )
+IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl, Button*, pBtn, void )
{
+ LightButton* pButton = static_cast<LightButton*>(pBtn);
if( !pButton )
- return 0;
+ return;
LightSourceInfo* pInfo = 0;
sal_Int32 nL=0;
@@ -525,7 +525,6 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl, LightBut
lcl_selectColor( *m_pLB_LightSource, pInfo->aLightSource.nDiffuseColor );
}
this->updatePreview();
- return 0;
}
void ThreeD_SceneIllumination_TabPage::updatePreview()
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
index a94f1dc..cb368ca 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
@@ -60,9 +60,9 @@ public:
virtual void dispose() SAL_OVERRIDE;
private:
- DECL_LINK( ClickLightSourceButtonHdl, LightButton* );
+ DECL_LINK_TYPED( ClickLightSourceButtonHdl, Button*, void );
DECL_LINK( SelectColorHdl, ColorLB* );
- DECL_LINK( ColorDialogHdl, Button* );
+ DECL_LINK_TYPED( ColorDialogHdl, Button*, void );
DECL_LINK( PreviewChangeHdl, void* );
DECL_LINK( PreviewSelectHdl, void* );
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 9fac6a5..f478eb0 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -298,7 +298,7 @@ void SchAxisLabelTabPage::SetComplexCategories( bool bComplexCategories )
// event handling routines
-IMPL_LINK_NOARG(SchAxisLabelTabPage, ToggleShowLabel)
+IMPL_LINK_NOARG_TYPED(SchAxisLabelTabPage, ToggleShowLabel, Button*, void)
{
bool bEnable = ( m_pCbShowDescription->GetState() != TRISTATE_FALSE );
@@ -315,8 +315,6 @@ IMPL_LINK_NOARG(SchAxisLabelTabPage, ToggleShowLabel)
m_pFtTextDirection->Enable( bEnable );
m_pLbTextDirection->Enable( bEnable );
-
- return 0L;
}
} //namespace chart
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index ef591d0..96ed45c 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -65,7 +65,7 @@ private:
bool m_bHasInitialStacking; /// false = checkbox in tristate
bool m_bComplexCategories;
- DECL_LINK ( ToggleShowLabel, void* );
+ DECL_LINK_TYPED ( ToggleShowLabel, Button*, void );
public:
SchAxisLabelTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 84b9cc2..0a819d6 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -497,8 +497,8 @@ public:
private:
DECL_LINK( LineTypeChangeHdl, void* );
- DECL_LINK( SplineDetailsDialogHdl, void* );
- DECL_LINK( SteppedDetailsDialogHdl, void* );
+ DECL_LINK_TYPED( SplineDetailsDialogHdl, Button*, void );
+ DECL_LINK_TYPED( SteppedDetailsDialogHdl, Button*, void );
SplinePropertiesDialog& getSplinePropertiesDialog();
SteppedPropertiesDialog& getSteppedPropertiesDialog();
@@ -595,7 +595,7 @@ IMPL_LINK_NOARG(SplineResourceGroup, LineTypeChangeHdl)
m_pChangeListener->stateChanged(this);
return 0;
}
-IMPL_LINK_NOARG(SplineResourceGroup, SplineDetailsDialogHdl)
+IMPL_LINK_NOARG_TYPED(SplineResourceGroup, SplineDetailsDialogHdl, Button*, void)
{
ChartTypeParameter aOldParameter;
@@ -614,9 +614,8 @@ IMPL_LINK_NOARG(SplineResourceGroup, SplineDetailsDialogHdl)
m_pLB_LineType->SelectEntryPos( iOldLineTypePos );
getSplinePropertiesDialog().fillControls( aOldParameter );
}
- return 0;
}
-IMPL_LINK_NOARG(SplineResourceGroup, SteppedDetailsDialogHdl)
+IMPL_LINK_NOARG_TYPED(SplineResourceGroup, SteppedDetailsDialogHdl, Button*, void)
{
ChartTypeParameter aOldParameter;
@@ -635,7 +634,6 @@ IMPL_LINK_NOARG(SplineResourceGroup, SteppedDetailsDialogHdl)
m_pLB_LineType->SelectEntryPos( iOldLineTypePos );
getSteppedPropertiesDialog().fillControls( aOldParameter );
}
- return 0;
}
class GeometryResourceGroup : public ChangingResource
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 66e8944..9c7bc8b 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -572,13 +572,13 @@ IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl)
return 0;
}
-IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl)
+IMPL_LINK_NOARG_TYPED(DataSourceTabPage, MainRangeButtonClickedHdl, Button*, void)
{
OSL_ASSERT( m_pCurrentRangeChoosingField == nullptr );
m_pCurrentRangeChoosingField = m_pEDT_RANGE;
if( !m_pEDT_RANGE->GetText().isEmpty() &&
! updateModelFromControl( m_pCurrentRangeChoosingField ))
- return 0;
+ return;
SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected());
bool bHasSelectedEntry = (pEntry != 0);
@@ -611,26 +611,23 @@ IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl)
}
else
m_pCurrentRangeChoosingField = 0;
-
- return 0;
}
-IMPL_LINK_NOARG(DataSourceTabPage, CategoriesRangeButtonClickedHdl)
+IMPL_LINK_NOARG_TYPED(DataSourceTabPage, CategoriesRangeButtonClickedHdl, Button*, void)
{
OSL_ASSERT( m_pCurrentRangeChoosingField == nullptr );
m_pCurrentRangeChoosingField = m_pEDT_CATEGORIES;
if( !m_pEDT_CATEGORIES->GetText().isEmpty() &&
! updateModelFromControl( m_pCurrentRangeChoosingField ))
- return 0;
+ return;
OUString aStr( SCH_RESSTR( m_pFT_CATEGORIES->IsVisible() ? STR_DATA_SELECT_RANGE_FOR_CATEGORIES : STR_DATA_SELECT_RANGE_FOR_DATALABELS ));
lcl_enableRangeChoosing( true, m_pParentDialog );
m_rDialogModel.getRangeSelectionHelper()->chooseRange(
m_rDialogModel.getCategoriesRange(), aStr, *this );
- return 0;
}
-IMPL_LINK_NOARG(DataSourceTabPage, AddButtonClickedHdl)
+IMPL_LINK_NOARG_TYPED(DataSourceTabPage, AddButtonClickedHdl, Button*, void)
{
m_rDialogModel.startControllerLockTimer();
SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected());
@@ -666,11 +663,9 @@ IMPL_LINK_NOARG(DataSourceTabPage, AddButtonClickedHdl)
m_pLB_SERIES->Select( pNextEntry );
}
SeriesSelectionChangedHdl( 0 );
-
- return 0;
}
-IMPL_LINK_NOARG(DataSourceTabPage, RemoveButtonClickedHdl)
+IMPL_LINK_NOARG_TYPED(DataSourceTabPage, RemoveButtonClickedHdl, Button*, void)
{
m_rDialogModel.startControllerLockTimer();
SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected());
@@ -710,11 +705,9 @@ IMPL_LINK_NOARG(DataSourceTabPage, RemoveButtonClickedHdl)
}
SeriesSelectionChangedHdl( 0 );
}
-
- return 0;
}
-IMPL_LINK_NOARG(DataSourceTabPage, UpButtonClickedHdl)
+IMPL_LINK_NOARG_TYPED(DataSourceTabPage, UpButtonClickedHdl, Button*, void)
{
m_rDialogModel.startControllerLockTimer();
SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected());
@@ -727,11 +720,9 @@ IMPL_LINK_NOARG(DataSourceTabPage, UpButtonClickedHdl)
fillSeriesListBox();
SeriesSelectionChangedHdl(0);
}
-
- return 0;
}
-IMPL_LINK_NOARG(DataSourceTabPage, DownButtonClickedHdl)
+IMPL_LINK_NOARG_TYPED(DataSourceTabPage, DownButtonClickedHdl, Button*, void)
{
m_rDialogModel.startControllerLockTimer();
SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected());
@@ -744,8 +735,6 @@ IMPL_LINK_NOARG(DataSourceTabPage, DownButtonClickedHdl)
fillSeriesListBox();
SeriesSelectionChangedHdl(0);
}
-
- return 0;
}
IMPL_LINK( DataSourceTabPage, RangeModifiedHdl, Edit*, pEdit )
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index b949f81..92f8db4 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -75,14 +75,14 @@ protected:
DECL_LINK( SeriesSelectionChangedHdl, void* );
DECL_LINK( RoleSelectionChangedHdl, void* );
- DECL_LINK( MainRangeButtonClickedHdl, void* );
- DECL_LINK( CategoriesRangeButtonClickedHdl, void* );
- DECL_LINK( AddButtonClickedHdl, void* );
- DECL_LINK( RemoveButtonClickedHdl, void* );
+ DECL_LINK_TYPED( MainRangeButtonClickedHdl, Button*, void );
+ DECL_LINK_TYPED( CategoriesRangeButtonClickedHdl, Button*, void );
+ DECL_LINK_TYPED( AddButtonClickedHdl, Button*, void );
+ DECL_LINK_TYPED( RemoveButtonClickedHdl, Button*, void );
DECL_LINK( RangeModifiedHdl, Edit* );
DECL_LINK( RangeUpdateDataHdl, Edit* );
- DECL_LINK( UpButtonClickedHdl, void* );
- DECL_LINK( DownButtonClickedHdl, void* );
+ DECL_LINK_TYPED( UpButtonClickedHdl, Button*, void );
+ DECL_LINK_TYPED( DownButtonClickedHdl, Button*, void );
// ____ RangeSelectionListenerParent ____
virtual void listeningFinished( const OUString & rNewRange ) SAL_OVERRIDE;
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 2c9cd5d..db5467c 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -366,7 +366,7 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedHdl)
return 0;
}
-IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl)
+IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ChooseRangeHdl, Button*, void)
{
OUString aRange = m_pED_Range->GetText();
// using assignment for broken gcc 3.3
@@ -374,8 +374,6 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl)
lcl_enableRangeChoosing( true, m_pParentDialog );
m_rDialogModel.getRangeSelectionHelper()->chooseRange( aRange, aTitle, *this );
-
- return 0;
}
void RangeChooserTabPage::listeningFinished( const OUString & rNewRange )
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index 8d6ad51..f8ad825 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -71,7 +71,7 @@ protected: //methods
bool isValid();
void setDirty();
- DECL_LINK( ChooseRangeHdl, void* );
+ DECL_LINK_TYPED( ChooseRangeHdl, Button*, void );
DECL_LINK( ControlChangedHdl, void* );
DECL_LINK( ControlEditedHdl, void* );
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 4a430b9..0b9e69e 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -218,8 +218,9 @@ void ScaleTabPage::EnableControls()
EnableValueHdl(m_pCbx_AutoTimeResolution);
}
-IMPL_LINK( ScaleTabPage, EnableValueHdl, CheckBox *, pCbx )
+IMPL_LINK_TYPED( ScaleTabPage, EnableValueHdl, Button *, pButton, void )
{
+ CheckBox * pCbx = static_cast<CheckBox*>(pButton);
bool bEnable = pCbx && !pCbx->IsChecked() && pCbx->IsEnabled();
if (pCbx == m_pCbxAutoMin)
{
@@ -248,7 +249,6 @@ IMPL_LINK( ScaleTabPage, EnableValueHdl, CheckBox *, pCbx )
{
m_pFmtFldOrigin->Enable( bEnable );
}
- return 0;
}
enum AxisTypeListBoxEntry
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index 959e831..c1143af 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -100,7 +100,7 @@ private:
void EnableControls();
DECL_LINK( SelectAxisTypeHdl, void* );
- DECL_LINK( EnableValueHdl, CheckBox* );
+ DECL_LINK_TYPED( EnableValueHdl, Button*, void );
DECL_STATIC_LINK( ScaleTabPage, FmtFieldModifiedHdl, FormattedField* );
/** shows a warning window due to an invalid input.
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index 06a4e5d..a70a4e8 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -87,14 +87,12 @@ void SchOptionTabPage::dispose()
SfxTabPage::dispose();
}
-IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl)
+IMPL_LINK_NOARG_TYPED(SchOptionTabPage, EnableHdl, Button*, void)
{
if( m_nAllSeriesAxisIndex == 0 )
m_pCBAxisSideBySide->Enable( m_pRbtAxis2->IsChecked());
else if( m_nAllSeriesAxisIndex == 1 )
m_pCBAxisSideBySide->Enable( m_pRbtAxis1->IsChecked());
-
- return 0;
}
VclPtr<SfxTabPage> SchOptionTabPage::Create(vcl::Window* pWindow,
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index a6e7eda..5db9629 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -62,7 +62,7 @@ private: //member
VclPtr<CheckBox> m_pCBIncludeHiddenCells;
- DECL_LINK(EnableHdl, void * );
+ DECL_LINK_TYPED(EnableHdl, Button*, void );
sal_Int32 m_nAllSeriesAxisIndex;
diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
index 0119c3d..af82da8 100644
--- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx
+++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
@@ -122,8 +122,8 @@ private:
virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE;
- Link<> m_aOriginalOKClickHdl;
- DECL_LINK( OKPressed, void * );
+ Link<Button*,void> m_aOriginalOKClickHdl;
+ DECL_LINK_TYPED( OKPressed, Button*, void );
public:
SchAttribTabDlg(vcl::Window* pParent, const SfxItemSet* pAttr,
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index 8591780..a2b309d 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -122,11 +122,12 @@ private:
bool m_bHasInternalDataProvider;
bool m_bEnableDataTableDialog;
- DECL_LINK( CategoryChosen, void * );
+ DECL_LINK_TYPED( CategoryChosen, Button*, void );
+ DECL_LINK( CategoryChosen2, void* );
DECL_LINK( SynchronizePosAndNeg, void * );
DECL_LINK( PosValueChanged, void * );
- DECL_LINK( IndicatorChanged, void * );
- DECL_LINK( ChooseRange, PushButton * );
+ DECL_LINK_TYPED( IndicatorChanged, Button *, void );
+ DECL_LINK_TYPED( ChooseRange, Button *, void );
DECL_LINK( RangeChanged, Edit * );
void UpdateControlStates();
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
index 3866b98..572974b 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
@@ -238,7 +238,7 @@ void ChartAxisPanel::Initialize()
updateData();
- Link<> aLink = LINK(this, ChartAxisPanel, CheckBoxHdl);
+ Link<Button*,void> aLink = LINK(this, ChartAxisPanel, CheckBoxHdl);
mpCBShowLabel->SetClickHdl(aLink);
mpCBReverse->SetClickHdl(aLink);
@@ -328,8 +328,9 @@ void ChartAxisPanel::SelectionInvalid()
{
}
-IMPL_LINK(ChartAxisPanel, CheckBoxHdl, CheckBox*, pCheckbox)
+IMPL_LINK_TYPED(ChartAxisPanel, CheckBoxHdl, Button*, pButton, void)
{
+ CheckBox* pCheckbox = static_cast<CheckBox*>(pButton);
OUString aCID = getCID(mxModel);
bool bChecked = pCheckbox->IsChecked();
@@ -340,8 +341,6 @@ IMPL_LINK(ChartAxisPanel, CheckBoxHdl, CheckBox*, pCheckbox)
}
else if (pCheckbox == mpCBReverse.get())
setReverse(mxModel, aCID, bChecked);
-
- return 0;
}
IMPL_LINK_NOARG(ChartAxisPanel, ListBoxHdl)
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
index b38a32f..50c0021 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
@@ -92,7 +92,7 @@ private:
void Initialize();
- DECL_LINK(CheckBoxHdl, CheckBox*);
+ DECL_LINK_TYPED(CheckBoxHdl, Button*, void);
DECL_LINK(ListBoxHdl, void*);
};
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index 2545e49..2cbb42c 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -356,7 +356,7 @@ void ChartElementsPanel::Initialize()
xBroadcaster->addModifyListener(mxListener);
updateData();
- Link<> aLink = LINK(this, ChartElementsPanel, CheckBoxHdl);
+ Link<Button*,void> aLink = LINK(this, ChartElementsPanel, CheckBoxHdl);
mpCBTitle->SetClickHdl(aLink);
mpCBSubtitle->SetClickHdl(aLink);
mpCBXAxis->SetClickHdl(aLink);
@@ -475,8 +475,9 @@ void ChartElementsPanel::updateModel(
xBroadcasterNew->addModifyListener(mxListener);
}
-IMPL_LINK(ChartElementsPanel, CheckBoxHdl, CheckBox*, pCheckBox)
+IMPL_LINK_TYPED(ChartElementsPanel, CheckBoxHdl, Button*, pButton, void)
{
+ CheckBox* pCheckBox = static_cast<CheckBox*>(pButton);
bool bChecked = pCheckBox->IsChecked();
if (pCheckBox == mpCBTitle.get())
setTitleVisible(mxModel, TitleHelper::MAIN_TITLE, bChecked);
@@ -515,8 +516,6 @@ IMPL_LINK(ChartElementsPanel, CheckBoxHdl, CheckBox*, pCheckBox)
setGridVisible(mxModel, GridType::VERT_MINOR, bChecked);
else if (pCheckBox == mpCBGridHorizontalMinor.get())
setGridVisible(mxModel, GridType::HOR_MINOR, bChecked);
-
- return 0;
}
IMPL_LINK_NOARG(ChartElementsPanel, LegendPosHdl)
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
index 50ceb72..99553a1 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
@@ -108,7 +108,7 @@ private:
void Initialize();
- DECL_LINK(CheckBoxHdl, CheckBox*);
+ DECL_LINK_TYPED(CheckBoxHdl, Button*, void);
DECL_LINK(LegendPosHdl, void*);
};
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index 7632620..f2c82e1 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -352,15 +352,15 @@ void ChartSeriesPanel::Initialize()
updateData();
- Link<> aLink = LINK(this, ChartSeriesPanel, CheckBoxHdl);
+ Link<Button*,void> aLink = LINK(this, ChartSeriesPanel, CheckBoxHdl);
mpCBLabel->SetClickHdl(aLink);
mpCBTrendline->SetClickHdl(aLink);
mpCBXError->SetClickHdl(aLink);
mpCBYError->SetClickHdl(aLink);
- aLink = LINK(this, ChartSeriesPanel, RadioBtnHdl);
- mpRBPrimaryAxis->SetToggleHdl(aLink);
- mpRBSecondaryAxis->SetToggleHdl(aLink);
+ Link<> aLink2 = LINK(this, ChartSeriesPanel, RadioBtnHdl);
+ mpRBPrimaryAxis->SetToggleHdl(aLink2);
+ mpRBSecondaryAxis->SetToggleHdl(aLink2);
mpLBLabelPlacement->SetSelectHdl(LINK(this, ChartSeriesPanel, ListBoxHdl));
}
@@ -459,8 +459,9 @@ void ChartSeriesPanel::SelectionInvalid()
{
}
-IMPL_LINK(ChartSeriesPanel, CheckBoxHdl, CheckBox*, pCheckBox)
+IMPL_LINK_TYPED(ChartSeriesPanel, CheckBoxHdl, Button*, pButton, void)
{
+ CheckBox* pCheckBox = static_cast<CheckBox*>(pButton);
bool bChecked = pCheckBox->IsChecked();
OUString aCID = getCID(mxModel);
if (pCheckBox == mpCBLabel.get())
@@ -471,8 +472,6 @@ IMPL_LINK(ChartSeriesPanel, CheckBoxHdl, CheckBox*, pCheckBox)
setErrorBarVisible(mxModel, aCID, false, bChecked);
else if (pCheckBox == mpCBYError.get())
setErrorBarVisible(mxModel, aCID, true, bChecked);
-
- return 0;
}
IMPL_LINK_NOARG(ChartSeriesPanel, RadioBtnHdl)
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
index be580cb..947fb90 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
@@ -108,7 +108,7 @@ private:
void Initialize();
- DECL_LINK(CheckBoxHdl, CheckBox*);
+ DECL_LINK_TYPED(CheckBoxHdl, Button*, void);
DECL_LINK(RadioBtnHdl, void*);
DECL_LINK(ListBoxHdl, void*);
};
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index aed9133..5633b85 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1050,20 +1050,18 @@ void SfxAcceleratorConfigPage::ResetConfig()
m_pEntriesBox->Clear();
}
-IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Load)
+IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, Load, Button*, void)
{
// ask for filename, where we should load the new config data from
StartFileDialog( 0, aLoadAccelConfigStr );
- return 0;
}
-IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Save)
+IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, Save, Button*, void)
{
StartFileDialog( WB_SAVEAS, aSaveAccelConfigStr );
- return 0;
}
-IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Default)
+IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, Default, Button*, void)
{
uno::Reference<form::XReset> xReset(m_xAct, uno::UNO_QUERY);
if (xReset.is())
@@ -1075,11 +1073,9 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Default)
m_pEntriesBox->SetUpdateMode(true);
m_pEntriesBox->Invalidate();
m_pEntriesBox->Select(m_pEntriesBox->GetEntry(0, 0));
-
- return 0;
}
-IMPL_LINK_NOARG(SfxAcceleratorConfigPage, ChangeHdl)
+IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, ChangeHdl, Button*, void)
{
sal_uLong nPos = SvTreeList::GetRelPos( m_pEntriesBox->FirstSelected() );
TAccInfo* pEntry = static_cast<TAccInfo*>(m_pEntriesBox->GetEntry(0, nPos)->GetUserData());
@@ -1093,10 +1089,9 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, ChangeHdl)
m_pEntriesBox->SetEntryText(sLabel, nPos, nCol);
((Link<> &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
- return 0;
}
-IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl)
+IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RemoveHdl, Button*, void)
{
// get selected entry
sal_uLong nPos = SvTreeList::GetRelPos( m_pEntriesBox->FirstSelected() );
@@ -1108,7 +1103,6 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl)
(pEntry->m_sCommand).clear();
((Link<> &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
- return 0;
}
IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
@@ -1199,7 +1193,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
return 0;
}
-IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl)
+IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RadioHdl, Button*, void)
{
uno::Reference<ui::XAcceleratorConfiguration> xOld = m_xAct;
@@ -1210,7 +1204,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl)
// nothing changed? => do nothing!
if ( m_xAct.is() && ( xOld == m_xAct ) )
- return 0;
+ return;
m_pEntriesBox->SetUpdateMode( false );
ResetConfig();
@@ -1229,7 +1223,6 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl)
m_pGroupLBox->Select( pEntry );
((Link<> &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
- return 1L;
}
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index e3ce1d4..fca6544 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2125,10 +2125,9 @@ IMPL_LINK( SvxConfigPage, AsyncInfoMsg, OUString*, pMsg )
return 0;
}
-IMPL_LINK( SvxConfigPage, MoveHdl, Button *, pButton )
+IMPL_LINK_TYPED( SvxConfigPage, MoveHdl, Button *, pButton, void )
{
MoveEntry(pButton == m_pMoveUpButton);
- return 0;
}
void SvxConfigPage::MoveEntry( bool bMoveUp )
@@ -2554,10 +2553,8 @@ IMPL_LINK( SvxMenuConfigPage, AddFunctionHdl,
return 0;
}
-IMPL_LINK( SvxMenuConfigPage, NewMenuHdl, Button *, pButton )
+IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, NewMenuHdl, Button *, void )
{
- (void)pButton;
-
VclPtrInstance<SvxMainMenuOrganizerDialog> pDialog(
nullptr, GetSaveInData()->GetEntries(), nullptr, true );
@@ -2567,14 +2564,10 @@ IMPL_LINK( SvxMenuConfigPage, NewMenuHdl, Button *, pButton )
ReloadTopLevelListBox( pDialog->GetSelectedEntry() );
GetSaveInData()->SetModified();
}
-
- return 0;
}
-IMPL_LINK( SvxMenuConfigPage, AddCommandsHdl, Button *, pButton )
+IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, AddCommandsHdl, Button *, void )
{
- (void)pButton;
-
if ( m_pSelectorDlg == nullptr )
{
// Create Script Selector which also shows builtin commands
@@ -2593,7 +2586,6 @@ IMPL_LINK( SvxMenuConfigPage, AddCommandsHdl, Button *, pButton )
m_pSelectorDlg->SetImageProvider( GetSaveInData() );
m_pSelectorDlg->Show();
- return 1;
}
SaveInData* SvxMenuConfigPage::CreateSaveInData(
@@ -2740,14 +2732,14 @@ void SvxMainMenuOrganizerDialog::UpdateButtonStates()
m_pMoveDownButton->Enable( selection != last );
}
-IMPL_LINK( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton )
+IMPL_LINK_TYPED( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton, void )
{
SvTreeListEntry *pSourceEntry = m_pMenuListBox->FirstSelected();
SvTreeListEntry *pTargetEntry = NULL;
if ( !pSourceEntry )
{
- return 0;
+ return;
}
if (pButton == m_pMoveDownButton)
@@ -2791,8 +2783,6 @@ IMPL_LINK( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton )
{
UpdateButtonStates();
}
-
- return 0;
}
@@ -3051,10 +3041,9 @@ bool SvxToolbarConfigPage::DeleteSelectedContent()
return false;
}
-IMPL_LINK( SvxToolbarConfigPage, MoveHdl, Button *, pButton )
+IMPL_LINK_TYPED( SvxToolbarConfigPage, MoveHdl, Button *, pButton, void )
{
MoveEntry(pButton == m_pMoveUpButton);
- return 0;
}
void SvxToolbarConfigPage::MoveEntry( bool bMoveUp )
@@ -4422,10 +4411,8 @@ IMPL_LINK( SvxToolbarConfigPage, SelectToolbar, ListBox *, pBox )
return 0;
}
-IMPL_LINK( SvxToolbarConfigPage, NewToolbarHdl, Button *, pButton )
+IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, NewToolbarHdl, Button *, void )
{
- (void)pButton;
-
OUString prefix = CUI_RES( RID_SVXSTR_NEW_TOOLBAR );
OUString aNewName =
@@ -4481,14 +4468,10 @@ IMPL_LINK( SvxToolbarConfigPage, NewToolbarHdl, Button *, pButton )
pData->SetModified();
}
-
- return 0;
}
-IMPL_LINK( SvxToolbarConfigPage, AddCommandsHdl, Button *, pButton )
+IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, AddCommandsHdl, Button *, void )
{
- (void)pButton;
-
if ( m_pSelectorDlg == nullptr )
{
// Create Script Selector which shows slot commands
@@ -4505,7 +4488,6 @@ IMPL_LINK( SvxToolbarConfigPage, AddCommandsHdl, Button *, pButton )
m_pSelectorDlg->SetImageProvider( GetSaveInData() );
m_pSelectorDlg->Show();
- return 1;
}
IMPL_LINK( SvxToolbarConfigPage, AddFunctionHdl,
@@ -5032,10 +5014,8 @@ IMPL_LINK_TYPED( SvxIconSelectorDialog, SelectHdl, ToolBox *, pToolBox, void )
}
}
-IMPL_LINK( SvxIconSelectorDialog, ImportHdl, PushButton *, pButton )
+IMPL_LINK_NOARG_TYPED( SvxIconSelectorDialog, ImportHdl, Button *, void)
{
- (void)pButton;
-
sfx2::FileDialogHelper aImportDialog(
css::ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW,
SFXWB_GRAPHIC | SFXWB_MULTISELECTION );
@@ -5058,14 +5038,10 @@ IMPL_LINK( SvxIconSelectorDialog, ImportHdl, PushButton *, pButton )
uno::Sequence< OUString > paths = aImportDialog.GetMPath();
ImportGraphics ( paths );
}
-
- return 0;
}
-IMPL_LINK( SvxIconSelectorDialog, DeleteHdl, PushButton *, pButton )
+IMPL_LINK_NOARG_TYPED( SvxIconSelectorDialog, DeleteHdl, Button *, void )
{
- (void)pButton;
-
OUString message = CUI_RES( RID_SVXSTR_DELETE_ICON_CONFIRM );
if ( ScopedVclPtr<WarningBox>::Create( this, WinBits(WB_OK_CANCEL), message )->Execute() == RET_OK )
{
@@ -5092,7 +5068,6 @@ IMPL_LINK( SvxIconSelectorDialog, DeleteHdl, PushButton *, pButton )
}
}
}
- return 0;
}
bool SvxIconSelectorDialog::ReplaceGraphicItem(
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 812f5fd..6f58102 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -591,9 +591,9 @@ IMPL_LINK( _SvxMacroTabPage, SelectEvent_Impl, SvTabListBox*, )
return 0;
}
-IMPL_LINK( _SvxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn )
+IMPL_LINK_TYPED( _SvxMacroTabPage, AssignDeleteHdl_Impl, Button*, pBtn, void )
{
- return GenericHandler_Impl( this, pBtn );
+ GenericHandler_Impl( this, static_cast<PushButton*>(pBtn) );
}
IMPL_LINK( _SvxMacroTabPage, DoubleClickHdl_Impl, SvTabListBox *, )
@@ -723,8 +723,8 @@ void _SvxMacroTabPage::InitAndSetHandler( Reference< container::XNameReplace> xA
m_xDocEvents = xDocEvents;
m_xModifiable = xModifiable;
SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
- HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar();
- Link<> aLnk(LINK(this, _SvxMacroTabPage, AssignDeleteHdl_Impl ));
+ HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar();
+ Link<Button*,void> aLnk(LINK(this, _SvxMacroTabPage, AssignDeleteHdl_Impl ));
mpImpl->pDeletePB->SetClickHdl( aLnk );
mpImpl->pAssignPB->SetClickHdl( aLnk );
if( mpImpl->pAssignComponentPB )
@@ -860,7 +860,7 @@ SvxMacroAssignDlg::SvxMacroAssignDlg( vcl::Window* pParent, const Reference< fra
-IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler)
+IMPL_LINK_NOARG_TYPED(AssignComponentDialog, ButtonHandler, Button*, void)
{
OUString aMethodName = mpMethodEdit->GetText();
maURL.clear();
@@ -870,7 +870,6 @@ IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler)
maURL += aMethodName;
}
EndDialog(1);
- return 0;
}
AssignComponentDialog::AssignComponentDialog( vcl::Window * pParent, const OUString& rURL )
@@ -901,12 +900,10 @@ void AssignComponentDialog::dispose()
ModalDialog::dispose();
}
-IMPL_LINK( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, pButton )
+IMPL_LINK_NOARG_TYPED( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, void )
{
- (void)pButton; //unused
GetTabPage()->FillItemSet( 0 );
EndDialog( RET_OK );
- return 0;
}
diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx
index 36a52f8..f5c183c 100644
--- a/cui/source/customize/macropg_impl.hxx
+++ b/cui/source/customize/macropg_impl.hxx
@@ -45,7 +45,7 @@ private:
OUString maURL;
- DECL_LINK(ButtonHandler, void *);
+ DECL_LINK_TYPED(ButtonHandler, Button*, void);
public:
AssignComponentDialog( vcl::Window * pParent, const OUString& rURL );
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 8a5f269..3aacad8 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -954,7 +954,7 @@ IMPL_LINK( SvxScriptSelectorDialog, FunctionDoubleClickHdl, Control*, pCtrl )
{
(void)pCtrl;
if (m_pOKButton->IsEnabled())
- return ClickHdl(m_pOKButton);
+ ClickHdl(m_pOKButton);
return 0;
}
@@ -979,7 +979,7 @@ SvxScriptSelectorDialog::UpdateUI()
}
}
-IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton )
+IMPL_LINK_TYPED( SvxScriptSelectorDialog, ClickHdl, Button *, pButton, void )
{
if (pButton == m_pCancelButton)
{
@@ -1016,8 +1016,6 @@ IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton )
}
}
}
-
- return 0;
}
void
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 9dbd044..420e644 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -300,7 +300,7 @@ void SpellDialog::Init_Impl()
m_pCheckGrammarCB->SetClickHdl( LINK( this, SpellDialog, CheckGrammarHdl ));
m_pOptionsPB->SetClickHdl( LINK( this, SpellDialog, ExtClickHdl ) );
- m_pSuggestionLB->SetDoubleClickHdl( LINK( this, SpellDialog, ChangeHdl ) );
+ m_pSuggestionLB->SetDoubleClickHdl( LINK( this, SpellDialog, DoubleClickChangeHdl ) );
m_pSentenceED->SetModifyHdl(LINK ( this, SpellDialog, ModifyHdl) );
@@ -473,7 +473,7 @@ IMPL_LINK( SpellDialog, InitHdl, SpellDialog *, )
-IMPL_LINK( SpellDialog, ExtClickHdl, Button *, pBtn )
+IMPL_LINK_TYPED( SpellDialog, ExtClickHdl, Button *, pBtn, void )
{
if (m_pOptionsPB == pBtn)
StartSpellOptDlg_Impl();
@@ -503,14 +503,12 @@ IMPL_LINK( SpellDialog, ExtClickHdl, Button *, pBtn )
}
}
}
- return 0;
}
-IMPL_LINK( SpellDialog, CheckGrammarHdl, CheckBox*, pBox )
+IMPL_LINK_TYPED( SpellDialog, CheckGrammarHdl, Button*, pBox, void )
{
- rParent.SetGrammarChecking( pBox->IsChecked() );
+ rParent.SetGrammarChecking( static_cast<CheckBox*>(pBox)->IsChecked() );
Impl_Restore();
- return 0;
}
void SpellDialog::StartSpellOptDlg_Impl()
@@ -573,7 +571,13 @@ OUString SpellDialog::getReplacementString() const
-IMPL_LINK_NOARG(SpellDialog, ChangeHdl)
+IMPL_LINK_NOARG(SpellDialog, DoubleClickChangeHdl)
+{
+ ChangeHdl(NULL);
+ return 0;
+}
+
+IMPL_LINK_NOARG_TYPED(SpellDialog, ChangeHdl, Button*, void)
{
if(m_pSentenceED->IsUndoEditMode())
{
@@ -590,12 +594,11 @@ IMPL_LINK_NOARG(SpellDialog, ChangeHdl)
}
if(!m_pChangePB->IsEnabled())
m_pIgnorePB->GrabFocus();
- return 1;
}
-IMPL_LINK_NOARG(SpellDialog, ChangeAllHdl)
+IMPL_LINK_NOARG_TYPED(SpellDialog, ChangeAllHdl, Button*, void)
{
m_pSentenceED->UndoActionStart( SPELLUNDO_CHANGE_GROUP );
OUString aString = getReplacementString();
@@ -622,11 +625,10 @@ IMPL_LINK_NOARG(SpellDialog, ChangeAllHdl)
SpellContinue_Impl();
bModified = false;
m_pSentenceED->UndoActionEnd();
- return 1;
}
-IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton )
+IMPL_LINK_TYPED( SpellDialog, IgnoreAllHdl, Button *, pButton, void )
{
m_pSentenceED->UndoActionStart( SPELLUNDO_CHANGE_GROUP );
// add word to IgnoreAll list
@@ -670,16 +672,14 @@ IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton )
SpellContinue_Impl();
bModified = false;
m_pSentenceED->UndoActionEnd();
- return 1;
}
-IMPL_LINK_NOARG(SpellDialog, UndoHdl)
+IMPL_LINK_NOARG_TYPED(SpellDialog, UndoHdl, Button*, void)
{
m_pSentenceED->Undo();
if(!m_pSentenceED->GetUndoActionCount())
m_pUndoPB->Enable(false);
- return 0;
}
@@ -742,7 +742,7 @@ void SpellDialog::Impl_Restore()
m_pIgnorePB->SetText(m_sIgnoreOnceST);
}
-IMPL_LINK_NOARG(SpellDialog, IgnoreHdl)
+IMPL_LINK_NOARG_TYPED(SpellDialog, IgnoreHdl, Button*, void)
{
if (m_sResumeST.equals(m_pIgnorePB->GetText()))
{
@@ -757,7 +757,6 @@ IMPL_LINK_NOARG(SpellDialog, IgnoreHdl)
// the word is being ignored
SpellContinue_Impl( false, true );
}
- return 1;
}
@@ -900,9 +899,9 @@ int SpellDialog::InitUserDicts()
}
-IMPL_LINK(SpellDialog, AddToDictClickHdl, PushButton*, )
+IMPL_LINK_NOARG_TYPED(SpellDialog, AddToDictClickHdl, Button*, void)
{
- return AddToDictionaryExecute(1, m_pAddToDictMB->GetPopupMenu());
+ AddToDictionaryExecute(1, m_pAddToDictMB->GetPopupMenu());
}
@@ -987,12 +986,11 @@ IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd)
};
-IMPL_LINK_NOARG(SpellDialog, CancelHdl)
+IMPL_LINK_NOARG_TYPED(SpellDialog, CancelHdl, Button*, void)
{
//apply changes and ignored text parts first - if there are any
rParent.ApplyChangedSentence(m_pSentenceED->CreateSpellPortions(true), false);
Close();
- return 0;
}
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index eeeadd1..310082c 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -115,7 +115,7 @@ void AboutDialog::dispose()
SfxModalDialog::dispose();
}
-IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton )
+IMPL_LINK_TYPED( AboutDialog, HandleClick, Button*, pButton, void )
{
OUString sURL = "";
@@ -131,7 +131,7 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton )
// If the URL is empty, don't do anything
if ( sURL.isEmpty() )
- return 1;
+ return;
try
{
Reference< css::system::XSystemShellExecute > xSystemShellExecute(
@@ -147,8 +147,6 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton )
aErrorBox->SetText( GetText() );
aErrorBox->Execute();
}
-
- return 1;
}
void AboutDialog::StyleControls()
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 02e8fbc..c2329e5 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -396,7 +396,7 @@ void SvxCharacterMap::SetCharFont( const vcl::Font& rFont )
-IMPL_LINK_NOARG(SvxCharacterMap, OKHdl)
+IMPL_LINK_NOARG_TYPED(SvxCharacterMap, OKHdl, Button*, void)
{
OUString aStr = m_pShowText->GetText();
@@ -408,7 +408,6 @@ IMPL_LINK_NOARG(SvxCharacterMap, OKHdl)
m_pShowText->SetText( aOUStr );
}
EndDialog( RET_OK );
- return 0;
}
void SvxCharacterMap::fillAllSubsets(ListBox &rListBox)
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 1499411..7cc2288 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -288,7 +288,7 @@ bool FmSearchDialog::Close()
return ModalDialog::Close();
}
-IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton)
+IMPL_LINK_TYPED(FmSearchDialog, OnClickedFieldRadios, Button*, pButton, void)
{
if ((pButton == m_prbSearchForText) || (pButton == m_prbSearchForNull) || (pButton == m_prbSearchForNotNull))
{
@@ -306,11 +306,9 @@ IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton)
m_plbField->Disable();
m_pSearchEngine->RebuildUsedFields(-1);
}
-
- return 0;
}
-IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain)
+IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnClickedSearchAgain, Button*, void)
{
if (m_pbClose->IsEnabled())
{ // the button has the function 'search'
@@ -352,10 +350,9 @@ IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain)
m_pSearchEngine->CancelSearch();
// the ProgressHandler is called when it's really finished, here it's only a demand
}
- return 0;
}
-IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton )
+IMPL_LINK_TYPED(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton, void )
{
if (m_ppbApproxSettings == pButton)
{
@@ -395,8 +392,6 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton )
OnCheckBoxToggled( m_pHalfFullFormsCJK );
}
}
-
- return 0;
}
IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified)
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 387ee3c..f5c6db0 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -238,10 +238,9 @@ void SearchProgress::Terminate()
-IMPL_LINK_NOARG(SearchProgress, ClickCancelBtn)
+IMPL_LINK_NOARG_TYPED(SearchProgress, ClickCancelBtn, Button*, void)
{
Terminate();
- return 0L;
}
@@ -377,10 +376,9 @@ void TakeProgress::Terminate()
maTakeThread->terminate();
}
-IMPL_LINK_NOARG(TakeProgress, ClickCancelBtn)
+IMPL_LINK_NOARG_TYPED(TakeProgress, ClickCancelBtn, Button*, void)
{
Terminate();
- return 0L;
}
IMPL_LINK_NOARG(TakeProgress, CleanUpHdl)
@@ -497,12 +495,10 @@ short ActualizeProgress::Execute()
-IMPL_LINK_NOARG(ActualizeProgress, ClickCancelBtn)
+IMPL_LINK_NOARG_TYPED(ActualizeProgress, ClickCancelBtn, Button*, void)
{
pTheme->AbortActualize();
EndDialog( RET_OK );
-
- return 0L;
}
@@ -591,7 +587,7 @@ void GalleryIdDialog::dispose()
ModalDialog::dispose();
}
-IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl)
+IMPL_LINK_NOARG_TYPED(GalleryIdDialog, ClickOkHdl, Button*, void)
{
Gallery* pGal = pThm->GetParent();
const sal_uLong nId = GetId();
@@ -618,8 +614,6 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl)
if( !bDifferentThemeExists )
EndDialog( RET_OK );
-
- return 0L;
}
@@ -1049,7 +1043,7 @@ void TPGalleryThemeProperties::SearchFiles()
-IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl)
+IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickSearchHdl, Button*, void)
{
if( bInputAllowed )
{
@@ -1084,8 +1078,6 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl)
OSL_FAIL( "Folder picker failed with illegal arguments" );
}
}
-
- return 0L;
}
@@ -1105,7 +1097,7 @@ void TPGalleryThemeProperties::TakeFiles()
-IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickPreviewHdl)
+IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickPreviewHdl, Button*, void)
{
if ( bInputAllowed )
{
@@ -1121,8 +1113,6 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickPreviewHdl)
else
DoPreview();
}
-
- return 0;
}
@@ -1156,7 +1146,7 @@ void TPGalleryThemeProperties::DoPreview()
-IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl)
+IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickTakeHdl, Button*, void)
{
if( bInputAllowed )
{
@@ -1177,13 +1167,11 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl)
TakeFiles();
}
}
-
- return 0L;
}
-IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeAllHdl)
+IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickTakeAllHdl, Button*, void)
{
if( bInputAllowed )
{
@@ -1191,8 +1179,6 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeAllHdl)
bTakeAll = true;
TakeFiles();
}
-
- return 0L;
}
@@ -1236,11 +1222,10 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, DClickFoundHdl)
{
aPreviewTimer.Stop();
- return (m_pLbxFound->GetSelectEntryCount() == 1 && bEntriesFound) ?
- ClickTakeHdl(NULL) : 0;
+ if (m_pLbxFound->GetSelectEntryCount() == 1 && bEntriesFound)
+ ClickTakeHdl(NULL);
}
- else
- return 0;
+ return 0;
}
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 1fbe4cd..b360c6f 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -271,12 +271,10 @@ void SvxHpLinkDlg::Move()
}
/// Click on OK button
-IMPL_LINK_NOARG(SvxHpLinkDlg, ClickOkHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHpLinkDlg, ClickOkHdl_Impl, Button*, void)
{
Apply();
Close();
-
- return 0L;
}
/*************************************************************************
@@ -285,11 +283,9 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickOkHdl_Impl)
|*
|************************************************************************/
-IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHpLinkDlg, ClickApplyHdl_Impl, Button*, void)
{
Apply();
-
- return 0L;
}
/*************************************************************************
@@ -298,11 +294,9 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl)
|*
|************************************************************************/
-IMPL_LINK_NOARG(SvxHpLinkDlg, ClickCloseHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHpLinkDlg, ClickCloseHdl_Impl, Button*, void)
{
Close();
-
- return 0L;
}
/*************************************************************************
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index b16f852..c0f4ce6 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -191,18 +191,16 @@ void SvxMessDialog::dispose()
/*************************************************************************/
-IMPL_LINK_NOARG(SvxMessDialog, Button1Hdl)
+IMPL_LINK_NOARG_TYPED(SvxMessDialog, Button1Hdl, Button*, void)
{
EndDialog( RET_BTN_1 );
- return 0;
}
/*************************************************************************/
-IMPL_LINK_NOARG(SvxMessDialog, Button2Hdl)
+IMPL_LINK_NOARG_TYPED(SvxMessDialog, Button2Hdl, Button*, void)
{
EndDialog( RET_BTN_2 );
- return 0;
}
/*************************************************************************/
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 2ab8c27..fbcb8ea 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -660,37 +660,37 @@ namespace svx
}
- void HangulHanjaConversionDialog::SetIgnoreHdl( const Link<>& _rHdl )
+ void HangulHanjaConversionDialog::SetIgnoreHdl( const Link<Button*,void>& _rHdl )
{
m_pIgnore->SetClickHdl( _rHdl );
}
- void HangulHanjaConversionDialog::SetIgnoreAllHdl( const Link<>& _rHdl )
+ void HangulHanjaConversionDialog::SetIgnoreAllHdl( const Link<Button*,void>& _rHdl )
{
m_pIgnoreAll->SetClickHdl( _rHdl );
}
- void HangulHanjaConversionDialog::SetChangeHdl( const Link<>& _rHdl )
+ void HangulHanjaConversionDialog::SetChangeHdl( const Link<Button*,void>& _rHdl )
{
m_pReplace->SetClickHdl( _rHdl );
}
- void HangulHanjaConversionDialog::SetChangeAllHdl( const Link<>& _rHdl )
+ void HangulHanjaConversionDialog::SetChangeAllHdl( const Link<Button*,void>& _rHdl )
{
m_pReplaceAll->SetClickHdl( _rHdl );
}
- void HangulHanjaConversionDialog::SetFindHdl( const Link<>& _rHdl )
+ void HangulHanjaConversionDialog::SetFindHdl( const Link<Button*,void>& _rHdl )
{
m_pFind->SetClickHdl( _rHdl );
}
- void HangulHanjaConversionDialog::SetConversionFormatChangedHdl( const Link<>& _rHdl )
+ void HangulHanjaConversionDialog::SetConversionFormatChangedHdl( const Link<Button*,void>& _rHdl )
{
m_pSimpleConversion->SetClickHdl( _rHdl );
m_pHangulBracketed->SetClickHdl( _rHdl );
@@ -728,18 +728,16 @@ namespace svx
}
- IMPL_LINK( HangulHanjaConversionDialog, ClickByCharacterHdl, CheckBox *, pBox )
+ IMPL_LINK_TYPED( HangulHanjaConversionDialog, ClickByCharacterHdl, Button*, pBox, void )
{
m_aClickByCharacterLink.Call( pBox );
- bool bByCharacter = pBox->IsChecked();
+ bool bByCharacter = static_cast<CheckBox*>(pBox)->IsChecked();
m_pSuggestions->DisplayListBox( !bByCharacter );
-
- return 0L;
}
- IMPL_LINK( HangulHanjaConversionDialog, OnConversionDirectionClicked, CheckBox *, pBox )
+ IMPL_LINK_TYPED( HangulHanjaConversionDialog, OnConversionDirectionClicked, Button *, pBox, void )
{
CheckBox *pOtherBox = 0;
if ( pBox == m_pHangulOnly )
@@ -748,21 +746,18 @@ namespace svx
pOtherBox = m_pHangulOnly;
if ( pBox && pOtherBox )
{
- bool bBoxChecked = pBox->IsChecked();
+ bool bBoxChecked = static_cast<CheckBox*>(pBox)->IsChecked();
if ( bBoxChecked )
pOtherBox->Check( false );
pOtherBox->Enable( !bBoxChecked );
}
-
- return 0L;
}
- IMPL_LINK_NOARG( HangulHanjaConversionDialog, OnOption )
+ IMPL_LINK_NOARG_TYPED( HangulHanjaConversionDialog, OnOption, Button*, void )
{
ScopedVclPtrInstance< HangulHanjaOptionsDialog > aOptDlg(this);
aOptDlg->Execute();
m_aOptionsChangedLink.Call( this );
- return 0L;
}
@@ -967,7 +962,7 @@ namespace svx
}
}
- IMPL_LINK_NOARG(HangulHanjaOptionsDialog, OkHdl)
+ IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, OkHdl, Button*, void)
{
sal_uInt32 nCnt = m_aDictList.size();
sal_uInt32 n = 0;
@@ -1018,7 +1013,6 @@ namespace svx
aLngCfg.SetProperty( UPH_IS_AUTO_REPLACE_UNIQUE_ENTRIES, aTmp );
EndDialog( RET_OK );
- return 0;
}
IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DictsLB_SelectHdl)
@@ -1031,7 +1025,7 @@ namespace svx
return 0;
}
- IMPL_LINK_NOARG(HangulHanjaOptionsDialog, NewDictHdl)
+ IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, NewDictHdl, Button*, void)
{
OUString aName;
ScopedVclPtrInstance< HangulHanjaNewDictDialog > aNewDlg(this);
@@ -1060,11 +1054,9 @@ namespace svx
}
}
}
-
- return 0L;
}
- IMPL_LINK_NOARG(HangulHanjaOptionsDialog, EditDictHdl)
+ IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, EditDictHdl, Button*, void)
{
SvTreeListEntry* pEntry = m_pDictsLB->FirstSelected();
DBG_ASSERT( pEntry, "+HangulHanjaEditDictDialog::EditDictHdl(): call of edit should not be possible with no selection!" );
@@ -1073,10 +1065,9 @@ namespace svx
ScopedVclPtrInstance< HangulHanjaEditDictDialog > aEdDlg(this, m_aDictList, m_pDictsLB->GetSelectEntryPos());
aEdDlg->Execute();
}
- return 0L;
}
- IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DeleteDictHdl)
+ IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, DeleteDictHdl, Button*, void)
{
sal_uLong nSelPos = m_pDictsLB->GetSelectEntryPos();
if( nSelPos != TREELIST_ENTRY_NOTFOUND )
@@ -1104,8 +1095,6 @@ namespace svx
}
}
}
-
- return 0L;
}
HangulHanjaOptionsDialog::HangulHanjaOptionsDialog(vcl::Window* _pParent)
@@ -1193,7 +1182,7 @@ namespace svx
pEntry->SetUserData( new OUString( _rName ) );
}
- IMPL_LINK_NOARG(HangulHanjaNewDictDialog, OKHdl)
+ IMPL_LINK_NOARG_TYPED(HangulHanjaNewDictDialog, OKHdl, Button*, void)
{
OUString aName(comphelper::string::stripEnd(m_pDictNameED->GetText(), ' '));
@@ -1202,7 +1191,6 @@ namespace svx
m_pDictNameED->SetText( aName ); // do this in case of trailing chars have been deleted
EndDialog( RET_OK );
- return 0;
}
IMPL_LINK_NOARG(HangulHanjaNewDictDialog, ModifyHdl)
@@ -1554,7 +1542,7 @@ namespace svx
return 0;
}
- IMPL_LINK_NOARG( HangulHanjaEditDictDialog, NewPBPushHdl )
+ IMPL_LINK_NOARG_TYPED( HangulHanjaEditDictDialog, NewPBPushHdl, Button*, void )
{
DBG_ASSERT( m_pSuggestions, "-HangulHanjaEditDictDialog::NewPBPushHdl(): no suggestions... search in hell..." );
Reference< XConversionDictionary > xDict = m_rDictList[ m_nCurrentDict ];
@@ -1591,7 +1579,6 @@ namespace svx
{
DBG_WARNING( "+HangulHanjaEditDictDialog::NewPBPushHdl(): dictionary faded away..." );
}
- return 0;
}
bool HangulHanjaEditDictDialog::DeleteEntryFromDictionary( const OUString&, const Reference< XConversionDictionary >& xDict )
@@ -1623,7 +1610,7 @@ namespace svx
return bRemovedSomething;
}
- IMPL_LINK_NOARG( HangulHanjaEditDictDialog, DeletePBPushHdl )
+ IMPL_LINK_NOARG_TYPED( HangulHanjaEditDictDialog, DeletePBPushHdl, Button*, void )
{
if( DeleteEntryFromDictionary( m_aOriginal, m_rDictList[ m_nCurrentDict ] ) )
{
@@ -1631,7 +1618,6 @@ namespace svx
m_bModifiedOriginal = true;
InitEditDictDialog( m_nCurrentDict );
}
- return 0;
}
void HangulHanjaEditDictDialog::InitEditDictDialog( sal_uInt32 _nSelDict )
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index d0aba8f..55ff366 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -400,7 +400,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
|*
|************************************************************************/
-IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHyperlinkNewDocTp, ClickNewHdl_Impl, Button*, void)
{
uno::Reference < XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
uno::Reference < XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext);
@@ -463,7 +463,6 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl)
m_pCbbPath->SetText ( aStrTmp );
}
- return 0L;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index c1125c6..5eb75ed 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -189,7 +189,7 @@ void SvxHyperlinkDocTp::SetInitFocus()
|*
|************************************************************************/
-IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ClickFileopenHdl_Impl, Button*, void)
{
// Open Fileopen-Dialog
::sfx2::FileDialogHelper aDlg(
@@ -218,8 +218,6 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl)
if ( aOldURL != GetCurrentURL() )
ModifiedPathHdl_Impl (NULL);
}
-
- return 0L;
}
/*************************************************************************
@@ -228,7 +226,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl)
|*
|************************************************************************/
-IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickTargetHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ClickTargetHdl_Impl, Button*, void)
{
if ( GetPathType ( maStrURL ) == Type_ExistsFile ||
maStrURL.isEmpty() ||
@@ -250,8 +248,6 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickTargetHdl_Impl)
mpMarkWnd->SetError( LERR_DOCNOTOPEN );
ShowMarkWnd ();
-
- return 0L;
}
/*************************************************************************
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 465e6a1..a967710 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -70,7 +70,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( vcl::Window *pParent,
// set handlers
- Link<> aLink( LINK ( this, SvxHyperlinkInternetTp, Click_SmartProtocol_Impl ) );
+ Link<Button*, void> aLink( LINK ( this, SvxHyperlinkInternetTp, Click_SmartProtocol_Impl ) );
m_pRbtLinktypInternet->SetClickHdl( aLink );
m_pRbtLinktypFTP->SetClickHdl ( aLink );
m_pCbAnonymous->SetClickHdl ( LINK ( this, SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl ) );
@@ -343,11 +343,10 @@ INetProtocol SvxHyperlinkInternetTp::GetSmartProtocolFromButtons() const
|*
|************************************************************************/
-IMPL_LINK_NOARG(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl, Button*, void)
{
OUString aScheme = GetSchemeFromButtons();
SetScheme(aScheme);
- return 0L;
}
/*************************************************************************
@@ -356,7 +355,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl)
|*
|************************************************************************/
-IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, Button*, void)
{
// disable login-editfields if checked
if ( m_pCbAnonymous->IsChecked() )
@@ -376,8 +375,6 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl)
}
else
setFTPUser(maStrOldUser, maStrOldPassword);
-
- return 0L;
}
/*************************************************************************
@@ -398,7 +395,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl)
|*
|************************************************************************/
-IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl, Button*, void)
{
// Open URL if available
@@ -413,8 +410,6 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl)
const SfxPoolItem *ppItems[] = { &aName, &aNewView, &aSilent, &aReadOnly, &aRefererItem, &aBrowse, NULL };
static_cast<SvxHpLinkDlg*>(mpDialog.get())->GetBindings()->Execute( SID_OPENDOC, ppItems, 0, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
-
- return 0L;
}
void SvxHyperlinkInternetTp::RefreshMarkWindow()
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 5c0f79f..7b20fed 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -244,7 +244,7 @@ IMPL_LINK_NOARG(SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl)
|*
|************************************************************************/
-IMPL_STATIC_LINK_NOARG(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl)
+IMPL_STATIC_LINK_NOARG_TYPED(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, Button*, void)
{
SfxViewFrame* pViewFrame = SfxViewFrame::Current();
if( pViewFrame )
@@ -253,9 +253,6 @@ IMPL_STATIC_LINK_NOARG(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl)
SfxRequest aReq(SID_VIEW_DATA_SOURCE_BROWSER, SfxCallMode::SLOT, rPool);
pViewFrame->ExecuteSlot( aReq, true );
}
-
-
- return 0L;
}
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index de23e79..795887c 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -150,7 +150,7 @@ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent )
mpBtApply->SetClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) );
mpBtClose->SetClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl ) );
- mpLbTree->SetDoubleClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) );
+ mpLbTree->SetDoubleClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, DoubleClickApplyHdl_Impl ) );
// add lines to the Tree-ListBox
mpLbTree->SetStyle( mpLbTree->GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES |
@@ -561,7 +561,13 @@ bool SvxHlinkDlgMarkWnd::SelectEntry(const OUString& aStrMark)
|*
|************************************************************************/
-IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl)
+IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, DoubleClickApplyHdl_Impl)
+{
+ ClickApplyHdl_Impl(NULL);
+ return 0;
+}
+
+IMPL_LINK_NOARG_TYPED(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl, Button*, void)
{
SvTreeListEntry* pEntry = mpLbTree->GetCurEntry();
@@ -574,8 +580,6 @@ IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl)
mpParent->SetMarkStr(pData->aUStrLinkname);
}
}
-
- return 0L;
}
/*************************************************************************
@@ -584,7 +588,7 @@ IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl)
|*
|************************************************************************/
-IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl, Button*, void)
{
SvTreeListEntry* pEntry = mpLbTree->GetCurEntry();
if ( pEntry )
@@ -618,8 +622,6 @@ IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl)
}
Close();
-
- return 0L;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 2107a5c..8a51a43 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -307,7 +307,7 @@ SfxDispatcher* SvxHyperlinkTabPageBase::GetDispatcher() const
}
// Click on imagebutton : Script
-IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, Button*, void)
{
SvxHyperlinkItem *pHyperlinkItem = const_cast<SvxHyperlinkItem*>(static_cast<const SvxHyperlinkItem *>(
GetItemSet().GetItem (SID_HYPERLINK_GETLINK)));
@@ -365,8 +365,6 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl)
}
delete pItemSet;
}
-
- return 0L;
}
// Get Macro-Infos
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 82d14bd..1f4185d 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -337,7 +337,7 @@ void SvxHyphenWordDialog::SelRight()
}
-IMPL_LINK_NOARG(SvxHyphenWordDialog, CutHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, CutHdl_Impl, Button*, void)
{
if( !m_bBusy )
{
@@ -345,11 +345,10 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, CutHdl_Impl)
ContinueHyph_Impl( /*m_nHyphPos*/m_nOldPos );
m_bBusy = false;
}
- return 0;
}
-IMPL_LINK( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, void )
{
if( !m_bBusy )
{
@@ -371,11 +370,10 @@ IMPL_LINK( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, /*pButton*/ )
DBG_ASSERT( false, "Hyphenate All failed" );
}
}
- return 0;
}
-IMPL_LINK_NOARG(SvxHyphenWordDialog, DeleteHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, DeleteHdl_Impl, Button*, void)
{
if( !m_bBusy )
{
@@ -383,11 +381,10 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, DeleteHdl_Impl)
ContinueHyph_Impl( 0 );
m_bBusy = false;
}
- return 0;
}
-IMPL_LINK_NOARG(SvxHyphenWordDialog, ContinueHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, ContinueHdl_Impl, Button*, void)
{
if( !m_bBusy )
{
@@ -395,11 +392,10 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, ContinueHdl_Impl)
ContinueHyph_Impl();
m_bBusy = false;
}
- return 0;
}
-IMPL_LINK_NOARG(SvxHyphenWordDialog, CancelHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, CancelHdl_Impl, Button*, void)
{
if( !m_bBusy )
{
@@ -408,11 +404,10 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, CancelHdl_Impl)
EndDialog();
m_bBusy = false;
}
- return 0;
}
-IMPL_LINK_NOARG(SvxHyphenWordDialog, Left_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, Left_Impl, Button*, void)
{
if( !m_bBusy )
{
@@ -420,11 +415,10 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, Left_Impl)
SelLeft();
m_bBusy = false;
}
- return 0;
}
-IMPL_LINK_NOARG(SvxHyphenWordDialog, Right_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, Right_Impl, Button*, void)
{
if( !m_bBusy )
{
@@ -432,7 +426,6 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, Right_Impl)
SelRight();
m_bBusy = false;
}
- return 0;
}
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index d650542..b24807b 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -378,7 +378,7 @@ IMPL_LINK_NOARG(IconChoiceDialog , ChosePageHdl_Impl)
|
\**********************************************************************/
-IMPL_LINK_NOARG(IconChoiceDialog, OkHdl)
+IMPL_LINK_NOARG_TYPED(IconChoiceDialog, OkHdl, Button*, void)
{
bInOK = true;
@@ -392,11 +392,10 @@ IMPL_LINK_NOARG(IconChoiceDialog, OkHdl)
Close();
}
}
- return 0;
}
-IMPL_LINK_NOARG(IconChoiceDialog, ApplyHdl)
+IMPL_LINK_NOARG_TYPED(IconChoiceDialog, ApplyHdl, Button*, void)
{
bInOK = true;
@@ -410,10 +409,9 @@ IMPL_LINK_NOARG(IconChoiceDialog, ApplyHdl)
Close();
}
}
- return 0;
}
-IMPL_LINK_NOARG(IconChoiceDialog, ResetHdl)
+IMPL_LINK_NOARG_TYPED(IconChoiceDialog, ResetHdl, Button*, void)
{
ResetPageImpl ();
@@ -428,18 +426,13 @@ IMPL_LINK_NOARG(IconChoiceDialog, ResetHdl)
}
else
pData->pPage->Reset( *pSet );
-
-
- return 0;
}
-IMPL_LINK_NOARG(IconChoiceDialog, CancelHdl)
+IMPL_LINK_NOARG_TYPED(IconChoiceDialog, CancelHdl, Button*, void)
{
Close();
-
- return 0;
}
/**********************************************************************
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 1a5a0f3..eb59e45 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -107,7 +107,7 @@ IMPL_LINK_NOARG(SvInsertOleDlg, DoubleClickHdl)
return 0;
}
-IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl)
+IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, BrowseHdl, Button*, void)
{
Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
@@ -132,13 +132,11 @@ IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl)
INetURLObject aObj( aPathSeq[0] );
m_pEdFilepath->SetText( aObj.PathToFileName() );
}
-
- return 0;
}
-IMPL_LINK_NOARG(SvInsertOleDlg, RadioHdl)
+IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, RadioHdl, Button*, void)
{
if ( m_pRbNewObject->IsChecked() )
{
@@ -150,7 +148,6 @@ IMPL_LINK_NOARG(SvInsertOleDlg, RadioHdl)
m_pFileFrame->Show();
m_pObjectTypeFrame->Hide();
}
- return 0;
}
@@ -180,7 +177,7 @@ SvInsertOleDlg::SvInsertOleDlg
get(m_pCbFilelink, "linktofile");
m_pLbObjecttype->SetDoubleClickHdl( LINK( this, SvInsertOleDlg, DoubleClickHdl ) );
m_pBtnFilepath->SetClickHdl( LINK( this, SvInsertOleDlg, BrowseHdl ) );
- Link<> aLink( LINK( this, SvInsertOleDlg, RadioHdl ) );
+ Link<Button*,void> aLink( LINK( this, SvInsertOleDlg, RadioHdl ) );
m_pRbNewObject->SetClickHdl( aLink );
m_pRbObjectFromfile->SetClickHdl( aLink );
m_pRbNewObject->Check();
@@ -363,7 +360,7 @@ uno::Reference< io::XInputStream > SvInsertOleDlg::GetIconIfIconified( OUString*
return uno::Reference< io::XInputStream >();
}
-IMPL_LINK_NOARG(SvInsertPlugInDialog, BrowseHdl)
+IMPL_LINK_NOARG_TYPED(SvInsertPlugInDialog, BrowseHdl, Button*, void)
{
Sequence< OUString > aFilterNames, aFilterTypes;
fillNetscapePluginFilters( aFilterNames, aFilterTypes );
@@ -390,8 +387,6 @@ IMPL_LINK_NOARG(SvInsertPlugInDialog, BrowseHdl)
INetURLObject aObj( aPathSeq[0] );
m_pEdFileurl->SetText(aObj.PathToFileName());
}
-
- return 0;
}
@@ -552,7 +547,7 @@ void SfxInsertFloatingFrameDialog::Init()
get(m_pNMMarginHeight, "height");
get(m_pCBMarginHeightDefault, "defaultheight");
- Link<> aLink( LINK( this, SfxInsertFloatingFrameDialog, CheckHdl ) );
+ Link<Button*, void> aLink( LINK( this, SfxInsertFloatingFrameDialog, CheckHdl ) );
m_pCBMarginWidthDefault->SetClickHdl( aLink );
m_pCBMarginHeightDefault->SetClickHdl( aLink );
@@ -738,8 +733,9 @@ short SfxInsertFloatingFrameDialog::Execute()
-IMPL_LINK( SfxInsertFloatingFrameDialog, CheckHdl, CheckBox*, pCB )
+IMPL_LINK_TYPED( SfxInsertFloatingFrameDialog, CheckHdl, Button*, pButton, void )
{
+ CheckBox* pCB = static_cast<CheckBox*>(pButton);
if ( pCB == m_pCBMarginWidthDefault )
{
if ( pCB->IsChecked() )
@@ -755,13 +751,11 @@ IMPL_LINK( SfxInsertFloatingFrameDialog, CheckHdl, CheckBox*, pCB )
m_pFTMarginHeight->Enable( !pCB->IsChecked() );
m_pNMMarginHeight->Enable( !pCB->IsChecked() );
}
-
- return 0L;
}
-IMPL_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, )
+IMPL_LINK_NOARG_TYPED( SfxInsertFloatingFrameDialog, OpenHdl, Button*, void)
{
vcl::Window* pOldParent = Application::GetDefDialogParent();
Application::SetDefDialogParent( this );
@@ -779,7 +773,6 @@ IMPL_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, )
INetURLObject( aFileDlg.GetPath() ).GetMainURL( INetURLObject::DECODE_WITH_CHARSET ) );
Application::SetDefDialogParent( pOldParent );
- return 0L;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 0c01cdc..39a753e 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -256,31 +256,25 @@ IMPL_LINK( SvBaseLinksDlg, LinksDoubleClickHdl, SvTabListBox *, pSvTabListBox )
return 0;
}
-IMPL_LINK( SvBaseLinksDlg, AutomaticClickHdl, RadioButton *, pRadioButton )
+IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, AutomaticClickHdl, Button*, void )
{
- (void)pRadioButton;
-
sal_uLong nPos;
SvBaseLink* pLink = GetSelEntry( &nPos );
if( pLink && !( FILEOBJECT & pLink->GetObjType() ) &&
SfxLinkUpdateMode::ALWAYS != pLink->GetUpdateMode() )
SetType( *pLink, nPos, SfxLinkUpdateMode::ALWAYS );
- return 0;
}
-IMPL_LINK( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioButton )
+IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, ManualClickHdl, Button*, void )
{
- (void)pRadioButton;
-
sal_uLong nPos;
SvBaseLink* pLink = GetSelEntry( &nPos );
if( pLink && !( FILEOBJECT & pLink->GetObjType() ) &&
SfxLinkUpdateMode::ONCALL != pLink->GetUpdateMode())
SetType( *pLink, nPos, SfxLinkUpdateMode::ONCALL );
- return 0;
}
-IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl)
+IMPL_LINK_NOARG_TYPED(SvBaseLinksDlg, UpdateNowClickHdl, Button*, void)
{
SvTabListBox& rListBox = *m_pTbLinks;
sal_uLong nSelCnt = rListBox.GetSelectionCount();
@@ -352,13 +346,10 @@ IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl)
pNewMgr->CloseCachedComps();
}
- return 0;
}
-IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton )
+IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, ChangeSourceClickHdl, Button *, void )
{
- (void)pPushButton;
-
sal_uLong nSelectionCount = m_pTbLinks->GetSelectionCount();
if(nSelectionCount > 1)
{
@@ -424,20 +415,17 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton )
if ( pLink && !pLink->GetLinkSourceName().isEmpty() )
pLink->Edit( this, LINK( this, SvBaseLinksDlg, EndEditHdl ) );
}
- return 0;
}
-IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
+IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, BreakLinkClickHdl, Button*, void )
{
- (void)pPushButton;
-
bool bModified = false;
if(m_pTbLinks->GetSelectionCount() <= 1)
{
sal_uLong nPos;
SvBaseLinkRef xLink = GetSelEntry( &nPos );
if( !xLink.Is() )
- return 0;
+ return;
ScopedVclPtrInstance< QueryBox > aBox( this, WB_YES_NO | WB_DEF_YES, Closelinkmsg() );
@@ -515,7 +503,6 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
if( pLinkMgr && pLinkMgr->GetPersist() )
pLinkMgr->GetPersist()->SetModified();
}
- return 0;
}
IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, UpdateWaitingHdl, Idle*, void )
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index c1d3bd5..446d5d7 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -68,7 +68,7 @@ IMPL_LINK( SvxMultiPathDialog, CheckHdl_Impl, svx::SvxRadioButtonListBox *, pBox
return 0;
}
-IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, AddHdl_Impl, Button*, void)
{
Reference < XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
Reference < XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext);
@@ -99,10 +99,9 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl)
SelectHdl_Impl( NULL );
}
- return 0;
}
-IMPL_LINK_NOARG(SvxPathSelectDialog, AddHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, AddHdl_Impl, Button*, void)
{
Reference < XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
Reference < XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext);
@@ -129,10 +128,9 @@ IMPL_LINK_NOARG(SvxPathSelectDialog, AddHdl_Impl)
SelectHdl_Impl( NULL );
}
- return 0;
}
-IMPL_LINK_NOARG(SvxMultiPathDialog, DelHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, DelHdl_Impl, Button*, void)
{
SvTreeListEntry* pEntry = m_pRadioLB->FirstSelected();
delete static_cast<OUString*>(pEntry->GetUserData());
@@ -156,10 +154,9 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, DelHdl_Impl)
}
SelectHdl_Impl( NULL );
- return 0;
}
-IMPL_LINK_NOARG(SvxPathSelectDialog, DelHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, DelHdl_Impl, Button*, void)
{
sal_uInt16 nPos = m_pPathLB->GetSelectEntryPos();
m_pPathLB->RemoveEntry( nPos );
@@ -175,7 +172,6 @@ IMPL_LINK_NOARG(SvxPathSelectDialog, DelHdl_Impl)
}
SelectHdl_Impl( NULL );
- return 0;
}
SvxMultiPathDialog::SvxMultiPathDialog(vcl::Window* pParent)
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index 88d52d8..ab2285d 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -49,7 +49,7 @@ struct PasswordToOpenModifyDialog_Impl
bool m_bIsPasswordToModify;
- DECL_LINK( OkBtnClickHdl, OKButton * );
+ DECL_LINK_TYPED( OkBtnClickHdl, Button*, void );
PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent,
sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify );
@@ -94,7 +94,7 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl(
m_pOptionsExpander->Hide();
}
-IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, /*pBtn*/ )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list