summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--basctl/source/basicide/baside2.hxx2
-rw-r--r--basctl/source/basicide/baside2b.cxx3
-rw-r--r--basctl/source/basicide/brkdlg.cxx9
-rw-r--r--basctl/source/basicide/brkdlg.hxx4
-rw-r--r--basctl/source/basicide/macrodlg.cxx17
-rw-r--r--basctl/source/basicide/macrodlg.hxx2
-rw-r--r--basctl/source/basicide/moduldl2.cxx14
-rw-r--r--basctl/source/basicide/moduldlg.cxx4
-rw-r--r--basctl/source/basicide/moduldlg.hxx10
-rw-r--r--basctl/source/dlged/managelang.cxx10
-rw-r--r--basctl/source/inc/managelang.hxx6
-rw-r--r--basic/source/runtime/inputbox.cxx14
-rw-r--r--basic/source/runtime/iosys.cxx14
-rw-r--r--chart2/source/controller/dialogs/dlg_ObjectProperties.cxx4
-rw-r--r--chart2/source/controller/dialogs/res_DataLabel.cxx10
-rw-r--r--chart2/source/controller/dialogs/res_DataLabel.hxx4
-rw-r--r--chart2/source/controller/dialogs/res_ErrorBar.cxx20
-rw-r--r--chart2/source/controller/dialogs/res_Trendline.cxx14
-rw-r--r--chart2/source/controller/dialogs/res_Trendline.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx9
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_AxisLabel.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_AxisLabel.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.cxx10
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.cxx27
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.hxx12
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_Scale.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_Scale.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_SeriesToAxis.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_SeriesToAxis.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_ObjectProperties.hxx4
-rw-r--r--chart2/source/controller/inc/res_ErrorBar.hxx7
-rw-r--r--chart2/source/controller/sidebar/ChartAxisPanel.cxx7
-rw-r--r--chart2/source/controller/sidebar/ChartAxisPanel.hxx2
-rw-r--r--chart2/source/controller/sidebar/ChartElementsPanel.cxx7
-rw-r--r--chart2/source/controller/sidebar/ChartElementsPanel.hxx2
-rw-r--r--chart2/source/controller/sidebar/ChartSeriesPanel.cxx13
-rw-r--r--chart2/source/controller/sidebar/ChartSeriesPanel.hxx2
-rw-r--r--cui/source/customize/acccfg.cxx21
-rw-r--r--cui/source/customize/cfg.cxx45
-rw-r--r--cui/source/customize/macropg.cxx15
-rw-r--r--cui/source/customize/macropg_impl.hxx2
-rw-r--r--cui/source/customize/selector.cxx6
-rw-r--r--cui/source/dialogs/SpellDialog.cxx38
-rw-r--r--cui/source/dialogs/about.cxx6
-rw-r--r--cui/source/dialogs/cuicharmap.cxx3
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx11
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx37
-rw-r--r--cui/source/dialogs/cuihyperdlg.cxx12
-rw-r--r--cui/source/dialogs/dlgname.cxx6
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx50
-rw-r--r--cui/source/dialogs/hldocntp.cxx3
-rw-r--r--cui/source/dialogs/hldoctp.cxx8
-rw-r--r--cui/source/dialogs/hlinettp.cxx13
-rw-r--r--cui/source/dialogs/hlmailtp.cxx5
-rw-r--r--cui/source/dialogs/hlmarkwn.cxx16
-rw-r--r--cui/source/dialogs/hltpbase.cxx4
-rw-r--r--cui/source/dialogs/hyphen.cxx21
-rw-r--r--cui/source/dialogs/iconcdlg.cxx15
-rw-r--r--cui/source/dialogs/insdlg.cxx23
-rw-r--r--cui/source/dialogs/linkdlg.cxx25
-rw-r--r--cui/source/dialogs/multipat.cxx12
-rw-r--r--cui/source/dialogs/passwdomdlg.cxx6
-rw-r--r--cui/source/dialogs/postdlg.cxx12
-rw-r--r--cui/source/dialogs/scriptdlg.cxx13
-rw-r--r--cui/source/dialogs/showcols.cxx3
-rw-r--r--cui/source/dialogs/splitcelldlg.cxx3
-rw-r--r--cui/source/dialogs/srchxtra.cxx3
-rw-r--r--cui/source/dialogs/thesdlg.cxx6
-rw-r--r--cui/source/dialogs/zoom.cxx25
-rw-r--r--cui/source/factory/dlgfact.cxx12
-rw-r--r--cui/source/factory/dlgfact.hxx12
-rw-r--r--cui/source/inc/SpellDialog.hxx19
-rw-r--r--cui/source/inc/about.hxx2
-rw-r--r--cui/source/inc/acccfg.hxx12
-rw-r--r--cui/source/inc/align.hxx1
-rw-r--r--cui/source/inc/autocdlg.hxx17
-rw-r--r--cui/source/inc/backgrnd.hxx6
-rw-r--r--cui/source/inc/border.hxx2
-rw-r--r--cui/source/inc/cfg.hxx18
-rw-r--r--cui/source/inc/chardlg.hxx14
-rw-r--r--cui/source/inc/cuicharmap.hxx2
-rw-r--r--cui/source/inc/cuifmsearch.hxx6
-rw-r--r--cui/source/inc/cuigaldlg.hxx16
-rw-r--r--cui/source/inc/cuihyperdlg.hxx6
-rw-r--r--cui/source/inc/cuitabarea.hxx62
-rw-r--r--cui/source/inc/cuitabline.hxx28
-rw-r--r--cui/source/inc/dbregister.hxx7
-rw-r--r--cui/source/inc/dlgname.hxx4
-rw-r--r--cui/source/inc/grfpage.hxx2
-rw-r--r--cui/source/inc/hangulhanjadlg.hxx32
-rw-r--r--cui/source/inc/hldocntp.hxx4
-rw-r--r--cui/source/inc/hldoctp.hxx4
-rw-r--r--cui/source/inc/hlinettp.hxx6
-rw-r--r--cui/source/inc/hlmailtp.hxx2
-rw-r--r--cui/source/inc/hlmarkwn.hxx5
-rw-r--r--cui/source/inc/hltpbase.hxx2
-rw-r--r--cui/source/inc/hyphen.hxx14
-rw-r--r--cui/source/inc/iconcdlg.hxx8
-rw-r--r--cui/source/inc/insdlg.hxx10
-rw-r--r--cui/source/inc/labdlg.hxx2
-rw-r--r--cui/source/inc/linkdlg.hxx10
-rw-r--r--cui/source/inc/macroass.hxx1
-rw-r--r--cui/source/inc/macropg.hxx4
-rw-r--r--cui/source/inc/measure.hxx3
-rw-r--r--cui/source/inc/multipat.hxx8
-rw-r--r--cui/source/inc/numfmt.hxx5
-rw-r--r--cui/source/inc/numpages.hxx20
-rw-r--r--cui/source/inc/optasian.hxx2
-rw-r--r--cui/source/inc/optdict.hxx5
-rw-r--r--cui/source/inc/optlingu.hxx8
-rw-r--r--cui/source/inc/optpath.hxx5
-rw-r--r--cui/source/inc/page.hxx6
-rw-r--r--cui/source/inc/paragrph.hxx22
-rw-r--r--cui/source/inc/postdlg.hxx8
-rw-r--r--cui/source/inc/scriptdlg.hxx2
-rw-r--r--cui/source/inc/selector.hxx2
-rw-r--r--cui/source/inc/showcols.hxx2
-rw-r--r--cui/source/inc/splitcelldlg.hxx2
-rw-r--r--cui/source/inc/srchxtra.hxx2
-rw-r--r--cui/source/inc/swpossizetabpage.hxx7
-rw-r--r--cui/source/inc/tabstpge.hxx10
-rw-r--r--cui/source/inc/textanim.hxx8
-rw-r--r--cui/source/inc/textattr.hxx4
-rw-r--r--cui/source/inc/thesdlg.hxx4
-rw-r--r--cui/source/inc/transfrm.hxx8
-rw-r--r--cui/source/inc/treeopt.hxx4
-rw-r--r--cui/source/inc/zoom.hxx8
-rw-r--r--cui/source/options/certpath.cxx8
-rw-r--r--cui/source/options/certpath.hxx4
-rw-r--r--cui/source/options/connpooloptions.cxx4
-rw-r--r--cui/source/options/connpooloptions.hxx2
-rw-r--r--cui/source/options/dbregister.cxx21
-rw-r--r--cui/source/options/doclinkdialog.cxx14
-rw-r--r--cui/source/options/doclinkdialog.hxx4
-rw-r--r--cui/source/options/fontsubs.cxx17
-rw-r--r--cui/source/options/fontsubs.hxx3
-rw-r--r--cui/source/options/optaboutconfig.cxx18
-rw-r--r--cui/source/options/optaboutconfig.hxx7
-rw-r--r--cui/source/options/optasian.cxx5
-rw-r--r--cui/source/options/optchart.cxx14
-rw-r--r--cui/source/options/optchart.hxx6
-rw-r--r--cui/source/options/optcolor.cxx22
-rw-r--r--cui/source/options/optcolor.hxx2
-rw-r--r--cui/source/options/optctl.cxx3
-rw-r--r--cui/source/options/optctl.hxx2
-rw-r--r--cui/source/options/optdict.cxx16
-rw-r--r--cui/source/options/optfltr.cxx6
-rw-r--r--cui/source/options/optfltr.hxx4
-rw-r--r--cui/source/options/optgdlg.cxx8
-rw-r--r--cui/source/options/optgdlg.hxx2
-rw-r--r--cui/source/options/opthtml.cxx5
-rw-r--r--cui/source/options/opthtml.hxx2
-rw-r--r--cui/source/options/optinet2.cxx32
-rw-r--r--cui/source/options/optinet2.hxx18
-rw-r--r--cui/source/options/optjava.cxx33
-rw-r--r--cui/source/options/optjava.hxx20
-rw-r--r--cui/source/options/optlingu.cxx15
-rw-r--r--cui/source/options/optopencl.cxx27
-rw-r--r--cui/source/options/optopencl.hxx14
-rw-r--r--cui/source/options/optpath.cxx21
-rw-r--r--cui/source/options/optsave.cxx8
-rw-r--r--cui/source/options/optsave.hxx2
-rw-r--r--cui/source/options/optupdt.cxx14
-rw-r--r--cui/source/options/optupdt.hxx6
-rw-r--r--cui/source/options/personalization.cxx26
-rw-r--r--cui/source/options/personalization.hxx14
-rw-r--r--cui/source/options/treeopt.cxx8
-rw-r--r--cui/source/options/tsaurls.cxx14
-rw-r--r--cui/source/options/tsaurls.hxx6
-rw-r--r--cui/source/options/webconninfo.cxx12
-rw-r--r--cui/source/options/webconninfo.hxx6
-rw-r--r--cui/source/tabpages/align.cxx7
-rw-r--r--cui/source/tabpages/autocdlg.cxx47
-rw-r--r--cui/source/tabpages/backgrnd.cxx11
-rw-r--r--cui/source/tabpages/border.cxx5
-rw-r--r--cui/source/tabpages/chardlg.cxx51
-rw-r--r--cui/source/tabpages/grfpage.cxx6
-rw-r--r--cui/source/tabpages/labdlg.cxx3
-rw-r--r--cui/source/tabpages/macroass.cxx9
-rw-r--r--cui/source/tabpages/measure.cxx14
-rw-r--r--cui/source/tabpages/numfmt.cxx24
-rw-r--r--cui/source/tabpages/numpages.cxx26
-rw-r--r--cui/source/tabpages/page.cxx11
-rw-r--r--cui/source/tabpages/paragrph.cxx37
-rw-r--r--cui/source/tabpages/swpossizetabpage.cxx28
-rw-r--r--cui/source/tabpages/tabarea.cxx3
-rw-r--r--cui/source/tabpages/tabline.cxx3
-rw-r--r--cui/source/tabpages/tabstpge.cxx23
-rw-r--r--cui/source/tabpages/textanim.cxx17
-rw-r--r--cui/source/tabpages/textattr.cxx9
-rw-r--r--cui/source/tabpages/tparea.cxx41
-rw-r--r--cui/source/tabpages/tpbitmap.cxx24
-rw-r--r--cui/source/tabpages/tpcolor.cxx26
-rw-r--r--cui/source/tabpages/tpgradnt.cxx20
-rw-r--r--cui/source/tabpages/tphatch.cxx20
-rw-r--r--cui/source/tabpages/tpline.cxx17
-rw-r--r--cui/source/tabpages/tplnedef.cxx24
-rw-r--r--cui/source/tabpages/tplneend.cxx21
-rw-r--r--cui/source/tabpages/tpshadow.cxx4
-rw-r--r--cui/source/tabpages/transfrm.cxx18
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx7
-rw-r--r--dbaccess/source/ui/dlg/CollectionView.cxx15
-rw-r--r--dbaccess/source/ui/dlg/ConnectionHelper.cxx16
-rw-r--r--dbaccess/source/ui/dlg/ConnectionHelper.hxx4
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.cxx5
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.hxx2
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx23
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx8
-rw-r--r--dbaccess/source/ui/dlg/RelationDlg.cxx6
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.cxx11
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.hxx2
-rw-r--r--dbaccess/source/ui/dlg/adminpages.cxx11
-rw-r--r--dbaccess/source/ui/dlg/adminpages.hxx8
-rw-r--r--dbaccess/source/ui/dlg/adtabdlg.cxx10
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.cxx4
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.hxx1
-rw-r--r--dbaccess/source/ui/dlg/dbfindex.cxx15
-rw-r--r--dbaccess/source/ui/dlg/dbfindex.hxx10
-rw-r--r--dbaccess/source/ui/dlg/detailpages.cxx10
-rw-r--r--dbaccess/source/ui/dlg/detailpages.hxx6
-rw-r--r--dbaccess/source/ui/dlg/directsql.cxx9
-rw-r--r--dbaccess/source/ui/dlg/dlgsave.cxx3
-rw-r--r--dbaccess/source/ui/dlg/dlgsize.cxx4
-rw-r--r--dbaccess/source/ui/dlg/generalpage.cxx13
-rw-r--r--dbaccess/source/ui/dlg/generalpage.hxx6
-rw-r--r--dbaccess/source/ui/dlg/indexdialog.cxx16
-rw-r--r--dbaccess/source/ui/dlg/paramdialog.cxx10
-rw-r--r--dbaccess/source/ui/dlg/sqlmessage.cxx3
-rw-r--r--dbaccess/source/ui/dlg/tablespage.cxx2
-rw-r--r--dbaccess/source/ui/dlg/textconnectionsettings.cxx5
-rw-r--r--dbaccess/source/ui/inc/CollectionView.hxx6
-rw-r--r--dbaccess/source/ui/inc/FieldDescControl.hxx2
-rw-r--r--dbaccess/source/ui/inc/RelationDlg.hxx2
-rw-r--r--dbaccess/source/ui/inc/WCPage.hxx6
-rw-r--r--dbaccess/source/ui/inc/WColumnSelect.hxx2
-rw-r--r--dbaccess/source/ui/inc/WCopyTable.hxx6
-rw-r--r--dbaccess/source/ui/inc/WNameMatch.hxx6
-rw-r--r--dbaccess/source/ui/inc/WTypeSelect.hxx2
-rw-r--r--dbaccess/source/ui/inc/adtabdlg.hxx6
-rw-r--r--dbaccess/source/ui/inc/directsql.hxx3
-rw-r--r--dbaccess/source/ui/inc/dlgsave.hxx2
-rw-r--r--dbaccess/source/ui/inc/dlgsize.hxx2
-rw-r--r--dbaccess/source/ui/inc/indexdialog.hxx3
-rw-r--r--dbaccess/source/ui/inc/paramdialog.hxx2
-rw-r--r--dbaccess/source/ui/inc/sqlmessage.hxx2
-rw-r--r--dbaccess/source/ui/inc/textconnectionsettings.hxx2
-rw-r--r--dbaccess/source/ui/misc/WCPage.cxx11
-rw-r--r--dbaccess/source/ui/misc/WColumnSelect.cxx6
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx13
-rw-r--r--dbaccess/source/ui/misc/WNameMatch.cxx11
-rw-r--r--dbaccess/source/ui/misc/WTypeSelect.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/querydlg.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/querydlg.hxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx44
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.hxx16
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx7
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.hxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx3
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx2
-rw-r--r--desktop/source/deployment/gui/license_dialog.cxx15
-rw-r--r--editeng/source/misc/hangulhanja.cxx33
-rw-r--r--extensions/source/abpilot/abpfinalpage.cxx6
-rw-r--r--extensions/source/abpilot/abpfinalpage.hxx4
-rw-r--r--extensions/source/abpilot/abspilot.cxx6
-rw-r--r--extensions/source/abpilot/abspilot.hxx2
-rw-r--r--extensions/source/abpilot/admininvokationpage.cxx4
-rw-r--r--extensions/source/abpilot/admininvokationpage.hxx2
-rw-r--r--extensions/source/abpilot/fieldmappingpage.cxx4
-rw-r--r--extensions/source/abpilot/fieldmappingpage.hxx2
-rw-r--r--extensions/source/abpilot/typeselectionpage.cxx5
-rw-r--r--extensions/source/abpilot/typeselectionpage.hxx2
-rw-r--r--extensions/source/bibliography/datman.cxx5
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.cxx9
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.hxx4
-rw-r--r--extensions/source/dbpilots/gridwizard.cxx11
-rw-r--r--extensions/source/dbpilots/gridwizard.hxx4
-rw-r--r--extensions/source/dbpilots/groupboxwiz.cxx3
-rw-r--r--extensions/source/dbpilots/groupboxwiz.hxx2
-rw-r--r--extensions/source/propctrlr/browserline.cxx4
-rw-r--r--extensions/source/propctrlr/browserline.hxx2
-rw-r--r--extensions/source/propctrlr/formlinkdialog.cxx3
-rw-r--r--extensions/source/propctrlr/formlinkdialog.hxx2
-rw-r--r--extensions/source/propctrlr/selectlabeldialog.cxx6
-rw-r--r--extensions/source/propctrlr/selectlabeldialog.hxx2
-rw-r--r--extensions/source/propctrlr/standardcontrol.cxx3
-rw-r--r--extensions/source/propctrlr/standardcontrol.hxx2
-rw-r--r--extensions/source/propctrlr/taborder.cxx13
-rw-r--r--extensions/source/propctrlr/taborder.hxx8
-rw-r--r--extensions/source/scanner/grid.cxx3
-rw-r--r--extensions/source/scanner/grid.hxx2
-rw-r--r--extensions/source/scanner/sanedlg.cxx3
-rw-r--r--extensions/source/scanner/sanedlg.hxx2
-rw-r--r--filter/source/pdf/impdialog.cxx20
-rw-r--r--filter/source/pdf/impdialog.hxx26
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.cxx3
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.hxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertabdialog.cxx4
-rw-r--r--filter/source/xsltdialog/xmlfiltertabdialog.hxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagexslt.cxx4
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagexslt.hxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.cxx4
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.hxx2
-rw-r--r--formula/source/ui/dlg/ControlHelper.hxx4
-rw-r--r--formula/source/ui/dlg/formula.cxx12
-rw-r--r--formula/source/ui/dlg/funcutl.cxx8
-rw-r--r--fpicker/source/office/PlacesListBox.cxx4
-rw-r--r--fpicker/source/office/PlacesListBox.hxx4
-rw-r--r--fpicker/source/office/QueryFolderName.hxx2
-rw-r--r--fpicker/source/office/RemoteFilesDialog.cxx20
-rw-r--r--fpicker/source/office/RemoteFilesDialog.hxx8
-rw-r--r--fpicker/source/office/iodlg.cxx40
-rw-r--r--fpicker/source/office/iodlg.hxx19
-rw-r--r--include/editeng/edtdlg.hxx13
-rw-r--r--include/sfx2/basedlgs.hxx2
-rw-r--r--include/sfx2/checkin.hxx2
-rw-r--r--include/sfx2/dinfdlg.hxx12
-rw-r--r--include/sfx2/infobar.hxx2
-rw-r--r--include/sfx2/mgetempl.hxx4
-rw-r--r--include/sfx2/newstyle.hxx1
-rw-r--r--include/sfx2/passwd.hxx2
-rw-r--r--include/sfx2/printopt.hxx6
-rw-r--r--include/sfx2/sfxbasecontroller.hxx8
-rw-r--r--include/sfx2/sidebar/TabBar.hxx6
-rw-r--r--include/sfx2/styledlg.hxx2
-rw-r--r--include/sfx2/tabdlg.hxx16
-rw-r--r--include/sfx2/templateabstractview.hxx2
-rw-r--r--include/sfx2/templateinfodlg.hxx2
-rw-r--r--include/sfx2/viewfrm.hxx2
-rw-r--r--include/svtools/PlaceEditDialog.hxx4
-rw-r--r--include/svtools/ServerDetailsControls.hxx2
-rw-r--r--include/svtools/addresstemplate.hxx4
-rw-r--r--include/svtools/calendar.hxx3
-rw-r--r--include/svtools/editbrowsebox.hxx2
-rw-r--r--include/svtools/filectrl.hxx2
-rw-r--r--include/svtools/prnsetup.hxx4
-rw-r--r--include/svtools/tabbar.hxx5
-rw-r--r--include/svtools/wizardmachine.hxx6
-rw-r--r--include/svx/compressgraphicdialog.hxx2
-rw-r--r--include/svx/ctredlin.hxx8
-rw-r--r--include/svx/dlgctl3d.hxx2
-rw-r--r--include/svx/float3d.hxx10
-rw-r--r--include/svx/fontworkgallery.hxx2
-rw-r--r--include/svx/gridctrl.hxx2
-rw-r--r--include/svx/hdft.hxx4
-rw-r--r--include/svx/optgrid.hxx4
-rw-r--r--include/svx/passwd.hxx2
-rw-r--r--include/svx/rubydialog.hxx6
-rw-r--r--include/svx/srchdlg.hxx14
-rw-r--r--include/vcl/btndlg.hxx3
-rw-r--r--include/vcl/button.hxx8
-rw-r--r--include/vcl/layout.hxx2
-rw-r--r--reportdesign/source/ui/dlg/AddField.cxx7
-rw-r--r--reportdesign/source/ui/dlg/Condition.cxx6
-rw-r--r--reportdesign/source/ui/dlg/Condition.hxx4
-rw-r--r--reportdesign/source/ui/dlg/DateTime.cxx11
-rw-r--r--reportdesign/source/ui/inc/AddField.hxx3
-rw-r--r--reportdesign/source/ui/inc/DateTime.hxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx9
-rw-r--r--sc/source/ui/StatisticsDialogs/SamplingDialog.cxx3
-rw-r--r--sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx3
-rw-r--r--sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx3
-rw-r--r--sc/source/ui/app/inputwin.cxx5
-rw-r--r--sc/source/ui/attrdlg/tabpages.cxx6
-rw-r--r--sc/source/ui/cctrl/checklistmenu.cxx6
-rw-r--r--sc/source/ui/condformat/colorformat.cxx3
-rw-r--r--sc/source/ui/condformat/condformatdlg.cxx9
-rw-r--r--sc/source/ui/condformat/condformatdlgentry.cxx3
-rw-r--r--sc/source/ui/condformat/condformatmgr.cxx13
-rw-r--r--sc/source/ui/dbgui/PivotLayoutDialog.cxx6
-rw-r--r--sc/source/ui/dbgui/consdlg.cxx6
-rw-r--r--sc/source/ui/dbgui/dapitype.cxx3
-rw-r--r--sc/source/ui/dbgui/dbnamdlg.cxx12
-rw-r--r--sc/source/ui/dbgui/dpgroupdlg.cxx6
-rw-r--r--sc/source/ui/dbgui/filtdlg.cxx8
-rw-r--r--sc/source/ui/dbgui/pfiltdlg.cxx4
-rw-r--r--sc/source/ui/dbgui/pvfundlg.cxx12
-rw-r--r--sc/source/ui/dbgui/scendlg.cxx6
-rw-r--r--sc/source/ui/dbgui/scuiasciiopt.cxx24
-rw-r--r--sc/source/ui/dbgui/scuiimoptdlg.cxx3
-rw-r--r--sc/source/ui/dbgui/sfiltdlg.cxx3
-rw-r--r--sc/source/ui/dbgui/sortdlg.cxx3
-rw-r--r--sc/source/ui/dbgui/subtdlg.cxx3
-rw-r--r--sc/source/ui/dbgui/textimportoptions.cxx8
-rw-r--r--sc/source/ui/dbgui/tpsort.cxx7
-rw-r--r--sc/source/ui/dbgui/tpsubt.cxx4
-rw-r--r--sc/source/ui/dbgui/validate.cxx7
-rw-r--r--sc/source/ui/formdlg/dwfunctr.cxx6
-rw-r--r--sc/source/ui/inc/PivotLayoutDialog.hxx4
-rw-r--r--sc/source/ui/inc/RandomNumberGeneratorDialog.hxx6
-rw-r--r--sc/source/ui/inc/SamplingDialog.hxx2
-rw-r--r--sc/source/ui/inc/StatisticsInputOutputDialog.hxx2
-rw-r--r--sc/source/ui/inc/StatisticsTwoVariableDialog.hxx2
-rw-r--r--sc/source/ui/inc/areasdlg.hxx2
-rw-r--r--sc/source/ui/inc/checklistmenu.hxx4
-rw-r--r--sc/source/ui/inc/colorformat.hxx2
-rw-r--r--sc/source/ui/inc/condformatdlg.hxx6
-rw-r--r--sc/source/ui/inc/condformatdlgentry.hxx2
-rw-r--r--sc/source/ui/inc/condformatmgr.hxx5
-rw-r--r--sc/source/ui/inc/conflictsdlg.hxx8
-rw-r--r--sc/source/ui/inc/consdlg.hxx4
-rw-r--r--sc/source/ui/inc/crdlg.hxx2
-rw-r--r--sc/source/ui/inc/crnrdlg.hxx12
-rw-r--r--sc/source/ui/inc/dapitype.hxx2
-rw-r--r--sc/source/ui/inc/datafdlg.hxx12
-rw-r--r--sc/source/ui/inc/datastreamdlg.hxx3
-rw-r--r--sc/source/ui/inc/dbnamdlg.hxx8
-rw-r--r--sc/source/ui/inc/delcodlg.hxx2
-rw-r--r--sc/source/ui/inc/dpgroupdlg.hxx4
-rw-r--r--sc/source/ui/inc/dwfunctr.hxx1
-rw-r--r--sc/source/ui/inc/filldlg.hxx4
-rw-r--r--sc/source/ui/inc/filtdlg.hxx6
-rw-r--r--sc/source/ui/inc/highred.hxx4
-rw-r--r--sc/source/ui/inc/inputwin.hxx2
-rw-r--r--sc/source/ui/inc/inscodlg.hxx6
-rw-r--r--sc/source/ui/inc/instbdlg.hxx6
-rw-r--r--sc/source/ui/inc/linkarea.hxx4
-rw-r--r--sc/source/ui/inc/mtrindlg.hxx2
-rw-r--r--sc/source/ui/inc/mvtabdlg.hxx2
-rw-r--r--sc/source/ui/inc/namedefdlg.hxx4
-rw-r--r--sc/source/ui/inc/namedlg.hxx8
-rw-r--r--sc/source/ui/inc/namepast.hxx2
-rw-r--r--sc/source/ui/inc/optsolver.hxx8
-rw-r--r--sc/source/ui/inc/pfiltdlg.hxx2
-rw-r--r--sc/source/ui/inc/protectiondlg.hxx4
-rw-r--r--sc/source/ui/inc/pvfundlg.hxx8
-rw-r--r--sc/source/ui/inc/retypepassdlg.hxx10
-rw-r--r--sc/source/ui/inc/scendlg.hxx4
-rw-r--r--sc/source/ui/inc/scuiasciiopt.hxx3
-rw-r--r--sc/source/ui/inc/scuiautofmt.hxx10
-rw-r--r--sc/source/ui/inc/scuiimoptdlg.hxx2
-rw-r--r--sc/source/ui/inc/scuitphfedit.hxx2
-rw-r--r--sc/source/ui/inc/simpref.hxx4
-rw-r--r--sc/source/ui/inc/solveroptions.hxx2
-rw-r--r--sc/source/ui/inc/solvrdlg.hxx2
-rw-r--r--sc/source/ui/inc/sortdlg.hxx2
-rw-r--r--sc/source/ui/inc/subtdlg.hxx2
-rw-r--r--sc/source/ui/inc/tabbgcolordlg.hxx2
-rw-r--r--sc/source/ui/inc/tabopdlg.hxx2
-rw-r--r--sc/source/ui/inc/tabpages.hxx2
-rw-r--r--sc/source/ui/inc/textimportoptions.hxx4
-rw-r--r--sc/source/ui/inc/tpcalc.hxx10
-rw-r--r--sc/source/ui/inc/tpformula.hxx2
-rw-r--r--sc/source/ui/inc/tphf.hxx4
-rw-r--r--sc/source/ui/inc/tpsort.hxx4
-rw-r--r--sc/source/ui/inc/tpsubt.hxx2
-rw-r--r--sc/source/ui/inc/tptable.hxx4
-rw-r--r--sc/source/ui/inc/tpusrlst.hxx2
-rw-r--r--sc/source/ui/inc/tpview.hxx4
-rw-r--r--sc/source/ui/inc/validate.hxx4
-rw-r--r--sc/source/ui/inc/xmlsourcedlg.hxx2
-rw-r--r--sc/source/ui/miscdlgs/conflictsdlg.cxx16
-rw-r--r--sc/source/ui/miscdlgs/crdlg.cxx3
-rw-r--r--sc/source/ui/miscdlgs/crnrdlg.cxx20
-rw-r--r--sc/source/ui/miscdlgs/datafdlg.cxx18
-rw-r--r--sc/source/ui/miscdlgs/datastreamdlg.cxx13
-rw-r--r--sc/source/ui/miscdlgs/delcodlg.cxx4
-rw-r--r--sc/source/ui/miscdlgs/filldlg.cxx7
-rw-r--r--sc/source/ui/miscdlgs/highred.cxx6
-rw-r--r--sc/source/ui/miscdlgs/inscodlg.cxx11
-rw-r--r--sc/source/ui/miscdlgs/instbdlg.cxx9
-rw-r--r--sc/source/ui/miscdlgs/linkarea.cxx6
-rw-r--r--sc/source/ui/miscdlgs/mtrindlg.cxx3
-rw-r--r--sc/source/ui/miscdlgs/mvtabdlg.cxx4
-rw-r--r--sc/source/ui/miscdlgs/optsolver.cxx11
-rw-r--r--sc/source/ui/miscdlgs/protectiondlg.cxx15
-rw-r--r--sc/source/ui/miscdlgs/retypepassdlg.cxx28
-rw-r--r--sc/source/ui/miscdlgs/scuiautofmt.cxx19
-rw-r--r--sc/source/ui/miscdlgs/simpref.cxx6
-rw-r--r--sc/source/ui/miscdlgs/solveroptions.cxx4
-rw-r--r--sc/source/ui/miscdlgs/solvrdlg.cxx4
-rw-r--r--sc/source/ui/miscdlgs/tabbgcolordlg.cxx7
-rw-r--r--sc/source/ui/miscdlgs/tabopdlg.cxx4
-rw-r--r--sc/source/ui/namedlg/namedefdlg.cxx6
-rw-r--r--sc/source/ui/namedlg/namedlg.cxx13
-rw-r--r--sc/source/ui/namedlg/namepast.cxx3
-rw-r--r--sc/source/ui/optdlg/calcoptionsdlg.cxx15
-rw-r--r--sc/source/ui/optdlg/calcoptionsdlg.hxx6
-rw-r--r--sc/source/ui/optdlg/tpcalc.cxx9
-rw-r--r--sc/source/ui/optdlg/tpformula.cxx16
-rw-r--r--sc/source/ui/optdlg/tpusrlst.cxx6
-rw-r--r--sc/source/ui/optdlg/tpview.cxx13
-rw-r--r--sc/source/ui/pagedlg/areasdlg.cxx4
-rw-r--r--sc/source/ui/pagedlg/scuitphfedit.cxx6
-rw-r--r--sc/source/ui/pagedlg/tphf.cxx7
-rw-r--r--sc/source/ui/pagedlg/tptable.cxx7
-rw-r--r--sc/source/ui/sidebar/AlignmentPropertyPanel.cxx27
-rw-r--r--sc/source/ui/sidebar/AlignmentPropertyPanel.hxx8
-rw-r--r--sc/source/ui/sidebar/CellLineStyleControl.cxx9
-rw-r--r--sc/source/ui/sidebar/CellLineStyleControl.hxx2
-rw-r--r--sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx8
-rw-r--r--sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx1
-rw-r--r--sc/source/ui/xmlsource/xmlsourcedlg.cxx5
-rw-r--r--sd/source/filter/html/pubdlg.cxx41
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx16
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx21
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.hxx1
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx15
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.hxx8
-rw-r--r--sd/source/ui/dlg/PhotoAlbumDialog.cxx19
-rw-r--r--sd/source/ui/dlg/PhotoAlbumDialog.hxx12
-rw-r--r--sd/source/ui/dlg/RemoteDialog.cxx18
-rw-r--r--sd/source/ui/dlg/RemoteDialog.hxx5
-rw-r--r--sd/source/ui/dlg/RemoteDialogClientBox.cxx5
-rw-r--r--sd/source/ui/dlg/RemoteDialogClientBox.hxx2
-rw-r--r--sd/source/ui/dlg/animobjs.cxx31
-rw-r--r--sd/source/ui/dlg/brkdlg.cxx7
-rw-r--r--sd/source/ui/dlg/copydlg.cxx8
-rw-r--r--sd/source/ui/dlg/custsdlg.cxx33
-rw-r--r--sd/source/ui/dlg/dlgass.cxx48
-rw-r--r--sd/source/ui/dlg/dlgsnap.cxx4
-rw-r--r--sd/source/ui/dlg/headerfooterdlg.cxx15
-rw-r--r--sd/source/ui/dlg/paragr.cxx5
-rw-r--r--sd/source/ui/dlg/present.cxx12
-rw-r--r--sd/source/ui/dlg/prntopts.cxx10
-rw-r--r--sd/source/ui/dlg/sdpreslt.cxx6
-rw-r--r--sd/source/ui/dlg/tpaction.cxx4
-rw-r--r--sd/source/ui/dlg/vectdlg.cxx8
-rw-r--r--sd/source/ui/inc/BreakDlg.hxx2
-rw-r--r--sd/source/ui/inc/animobjs.hxx16
-rw-r--r--sd/source/ui/inc/copydlg.hxx4
-rw-r--r--sd/source/ui/inc/custsdlg.hxx10
-rw-r--r--sd/source/ui/inc/dlgass.hxx3
-rw-r--r--sd/source/ui/inc/dlgsnap.hxx2
-rw-r--r--sd/source/ui/inc/headerfooterdlg.hxx6
-rw-r--r--sd/source/ui/inc/present.hxx4
-rw-r--r--sd/source/ui/inc/prntopts.hxx4
-rw-r--r--sd/source/ui/inc/pubdlg.hxx24
-rw-r--r--sd/source/ui/inc/sdpreslt.hxx2
-rw-r--r--sd/source/ui/inc/tpaction.hxx2
-rw-r--r--sd/source/ui/inc/vectdlg.hxx4
-rw-r--r--sd/source/ui/table/TableDesignPane.cxx3
-rw-r--r--sd/source/ui/table/TableDesignPane.hxx2
-rw-r--r--sfx2/inc/srchdlg.hxx2
-rw-r--r--sfx2/source/appl/appserv.cxx5
-rw-r--r--sfx2/source/appl/newhelp.cxx24
-rw-r--r--sfx2/source/appl/newhelp.hxx11
-rw-r--r--sfx2/source/control/templateabstractview.cxx3
-rw-r--r--sfx2/source/dialog/backingwindow.cxx6
-rw-r--r--sfx2/source/dialog/backingwindow.hxx4
-rw-r--r--sfx2/source/dialog/basedlgs.cxx8
-rw-r--r--sfx2/source/dialog/checkin.cxx3
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx20
-rw-r--r--sfx2/source/dialog/infobar.cxx3
-rw-r--r--sfx2/source/dialog/inputdlg.cxx3
-rw-r--r--sfx2/source/dialog/mgetempl.cxx9
-rw-r--r--sfx2/source/dialog/newstyle.cxx9
-rw-r--r--sfx2/source/dialog/passwd.cxx6
-rw-r--r--sfx2/source/dialog/printopt.cxx15
-rw-r--r--sfx2/source/dialog/securitypage.cxx12
-rw-r--r--sfx2/source/dialog/srchdlg.cxx3
-rw-r--r--sfx2/source/dialog/styledlg.cxx4
-rw-r--r--sfx2/source/dialog/tabdlg.cxx17
-rw-r--r--sfx2/source/dialog/templateinfodlg.cxx3
-rw-r--r--sfx2/source/dialog/versdlg.cxx9
-rw-r--r--sfx2/source/doc/new.cxx5
-rw-r--r--sfx2/source/inc/inputdlg.hxx3
-rw-r--r--sfx2/source/inc/versdlg.hxx4
-rw-r--r--sfx2/source/sidebar/TabBar.cxx10
-rw-r--r--sfx2/source/view/sfxbasecontroller.cxx3
-rw-r--r--sfx2/source/view/viewfrm.cxx3
-rw-r--r--sfx2/source/view/viewprn.cxx10
-rw-r--r--starmath/inc/dialog.hxx24
-rw-r--r--starmath/source/dialog.cxx41
-rw-r--r--svtools/source/brwbox/ebbcontrols.cxx4
-rw-r--r--svtools/source/control/calendar.cxx5
-rw-r--r--svtools/source/control/filectrl.cxx4
-rw-r--r--svtools/source/control/tabbar.cxx14
-rw-r--r--svtools/source/dialogs/PlaceEditDialog.cxx7
-rw-r--r--svtools/source/dialogs/ServerDetailsControls.cxx4
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx9
-rw-r--r--svtools/source/dialogs/prnsetup.cxx6
-rw-r--r--svtools/source/dialogs/restartdialog.cxx12
-rw-r--r--svtools/source/dialogs/wizardmachine.cxx22
-rw-r--r--svtools/source/filter/exportdialog.cxx21
-rw-r--r--svtools/source/filter/exportdialog.hxx5
-rw-r--r--svtools/source/toolpanel/paneltabbar.cxx7
-rw-r--r--svx/source/dialog/_bmpmask.cxx20
-rw-r--r--svx/source/dialog/compressgraphicdialog.cxx3
-rw-r--r--svx/source/dialog/ctredlin.cxx20
-rw-r--r--svx/source/dialog/dlgctl3d.cxx4
-rw-r--r--svx/source/dialog/docrecovery.cxx22
-rw-r--r--svx/source/dialog/hdft.cxx8
-rw-r--r--svx/source/dialog/optgrid.cxx9
-rw-r--r--svx/source/dialog/orienthelper.cxx5
-rw-r--r--svx/source/dialog/passwd.cxx4
-rw-r--r--svx/source/dialog/rubydialog.cxx9
-rw-r--r--svx/source/dialog/srchdlg.cxx92
-rw-r--r--svx/source/engine3d/float3d.cxx68
-rw-r--r--svx/source/fmcomp/gridctrl.cxx5
-rw-r--r--svx/source/form/datanavi.cxx49
-rw-r--r--svx/source/gallery2/galbrws1.cxx4
-rw-r--r--svx/source/gallery2/galbrws1.hxx2
-rw-r--r--svx/source/inc/datanavi.hxx22
-rw-r--r--svx/source/inc/docrecovery.hxx12
-rw-r--r--svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx16
-rw-r--r--svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx3
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.cxx4
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.hxx2
-rw-r--r--svx/source/sidebar/shadow/ShadowPropertyPanel.cxx8
-rw-r--r--svx/source/sidebar/shadow/ShadowPropertyPanel.hxx2
-rw-r--r--svx/source/sidebar/text/TextUnderlineControl.cxx9
-rw-r--r--svx/source/sidebar/text/TextUnderlineControl.hxx2
-rw-r--r--svx/source/tbxctrls/colorwindow.hxx4
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx3
-rw-r--r--svx/source/tbxctrls/layctrl.cxx5
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx6
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx17
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx8
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx6
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx4
-rw-r--r--sw/inc/dbmgr.hxx2
-rw-r--r--sw/source/ui/chrdlg/break.cxx21
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx6
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx8
-rw-r--r--sw/source/ui/chrdlg/numpara.cxx10
-rw-r--r--sw/source/ui/chrdlg/swuiccoll.cxx13
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx37
-rw-r--r--sw/source/ui/config/optcomp.cxx4
-rw-r--r--sw/source/ui/config/optload.cxx5
-rw-r--r--sw/source/ui/config/optpage.cxx32
-rw-r--r--sw/source/ui/dbui/addresslistdialog.cxx21
-rw-r--r--sw/source/ui/dbui/addresslistdialog.hxx12
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx27
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.hxx16
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.cxx13
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.hxx6
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx22
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx48
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hxx24
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.cxx12
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.hxx4
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.cxx34
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.hxx14
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx11
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.hxx4
-rw-r--r--sw/source/ui/dbui/mmmergepage.cxx7
-rw-r--r--sw/source/ui/dbui/mmmergepage.hxx4
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx56
-rw-r--r--sw/source/ui/dbui/mmoutputpage.hxx24
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.cxx11
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.hxx2
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.cxx18
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.hxx5
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.cxx4
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.hxx2
-rw-r--r--sw/source/ui/dialog/docstdlg.cxx3
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx3
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx2
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx86
-rw-r--r--sw/source/ui/dialog/wordcountdialog.cxx3
-rw-r--r--sw/source/ui/envelp/envlop1.cxx6
-rw-r--r--sw/source/ui/envelp/envprt.cxx6
-rw-r--r--sw/source/ui/envelp/envprt.hxx4
-rw-r--r--sw/source/ui/envelp/label1.cxx9
-rw-r--r--sw/source/ui/envelp/labfmt.cxx10
-rw-r--r--sw/source/ui/envelp/labfmt.hxx4
-rw-r--r--sw/source/ui/envelp/labprt.cxx7
-rw-r--r--sw/source/ui/envelp/labprt.hxx2
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx26
-rw-r--r--sw/source/ui/envelp/swuilabimp.hxx8
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.cxx5
-rw-r--r--sw/source/ui/fldui/changedb.cxx7
-rw-r--r--sw/source/ui/fldui/flddb.cxx3
-rw-r--r--sw/source/ui/fldui/flddb.hxx2
-rw-r--r--sw/source/ui/fldui/fldedt.cxx11
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx18
-rw-r--r--sw/source/ui/fldui/fldfunc.hxx9
-rw-r--r--sw/source/ui/fldui/fldtdlg.cxx7
-rw-r--r--sw/source/ui/fldui/inpdlg.cxx3
-rw-r--r--sw/source/ui/fldui/javaedit.cxx19
-rw-r--r--sw/source/ui/frmdlg/column.cxx13
-rw-r--r--sw/source/ui/frmdlg/cption.cxx7
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx57
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx21
-rw-r--r--sw/source/ui/index/cnttab.cxx78
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx44
-rw-r--r--sw/source/ui/misc/bookmark.cxx3
-rw-r--r--sw/source/ui/misc/docfnote.cxx10
-rw-r--r--sw/source/ui/misc/glosbib.cxx12
-rw-r--r--sw/source/ui/misc/glossary.cxx19
-rw-r--r--sw/source/ui/misc/impfnote.hxx4
-rw-r--r--sw/source/ui/misc/insfnote.cxx14
-rw-r--r--sw/source/ui/misc/linenum.cxx7
-rw-r--r--sw/source/ui/misc/num.cxx11
-rw-r--r--sw/source/ui/misc/outline.cxx7
-rw-r--r--sw/source/ui/misc/pgfnote.cxx6
-rw-r--r--sw/source/ui/misc/pggrid.cxx19
-rw-r--r--sw/source/ui/misc/srtdlg.cxx11
-rw-r--r--sw/source/ui/misc/titlepage.cxx18
-rw-r--r--sw/source/ui/table/convert.cxx15
-rw-r--r--sw/source/ui/table/instable.cxx14
-rw-r--r--sw/source/ui/table/tabledlg.cxx64
-rw-r--r--sw/source/ui/table/tautofmt.cxx18
-rw-r--r--sw/source/ui/utlui/swrenamexnameddlg.cxx3
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx3
-rw-r--r--sw/source/uibase/dbui/dbui.cxx2
-rw-r--r--sw/source/uibase/envelp/syncbtn.cxx3
-rw-r--r--sw/source/uibase/inc/DropDownFieldDialog.hxx2
-rw-r--r--sw/source/uibase/inc/bookmark.hxx2
-rw-r--r--sw/source/uibase/inc/break.hxx7
-rw-r--r--sw/source/uibase/inc/changedb.hxx4
-rw-r--r--sw/source/uibase/inc/chrdlg.hxx4
-rw-r--r--sw/source/uibase/inc/column.hxx8
-rw-r--r--sw/source/uibase/inc/convert.hxx8
-rw-r--r--sw/source/uibase/inc/cption.hxx4
-rw-r--r--sw/source/uibase/inc/dbinsdlg.hxx12
-rw-r--r--sw/source/uibase/inc/dbui.hxx2
-rw-r--r--sw/source/uibase/inc/docfnote.hxx4
-rw-r--r--sw/source/uibase/inc/docstdlg.hxx2
-rw-r--r--sw/source/uibase/inc/drpcps.hxx4
-rw-r--r--sw/source/uibase/inc/envlop.hxx4
-rw-r--r--sw/source/uibase/inc/fldedt.hxx6
-rw-r--r--sw/source/uibase/inc/fldtdlg.hxx4
-rw-r--r--sw/source/uibase/inc/frmpage.hxx19
-rw-r--r--sw/source/uibase/inc/glosbib.hxx6
-rw-r--r--sw/source/uibase/inc/glossary.hxx8
-rw-r--r--sw/source/uibase/inc/inpdlg.hxx2
-rw-r--r--sw/source/uibase/inc/insfnote.hxx8
-rw-r--r--sw/source/uibase/inc/instable.hxx12
-rw-r--r--sw/source/uibase/inc/javaedit.hxx10
-rw-r--r--sw/source/uibase/inc/linenum.hxx4
-rw-r--r--sw/source/uibase/inc/mailconfigpage.hxx6
-rw-r--r--sw/source/uibase/inc/mailmrge.hxx10
-rw-r--r--sw/source/uibase/inc/num.hxx6
-rw-r--r--sw/source/uibase/inc/numpara.hxx6
-rw-r--r--sw/source/uibase/inc/optcomp.hxx2
-rw-r--r--sw/source/uibase/inc/optload.hxx2
-rw-r--r--sw/source/uibase/inc/optpage.hxx14
-rw-r--r--sw/source/uibase/inc/outline.hxx4
-rw-r--r--sw/source/uibase/inc/pgfnote.hxx4
-rw-r--r--sw/source/uibase/inc/pggrid.hxx5
-rw-r--r--sw/source/uibase/inc/regionsw.hxx34
-rw-r--r--sw/source/uibase/inc/srtdlg.hxx6
-rw-r--r--sw/source/uibase/inc/swrenamexnameddlg.hxx2
-rw-r--r--sw/source/uibase/inc/swuiccoll.hxx3
-rw-r--r--sw/source/uibase/inc/swuicnttab.hxx29
-rw-r--r--sw/source/uibase/inc/swuiidxmrk.hxx28
-rw-r--r--sw/source/uibase/inc/syncbtn.hxx2
-rw-r--r--sw/source/uibase/inc/tautofmt.hxx10
-rw-r--r--sw/source/uibase/inc/titlepage.hxx10
-rw-r--r--sw/source/uibase/inc/wordcountdialog.hxx2
-rw-r--r--sw/source/uibase/inc/wrap.hxx4
-rw-r--r--sw/source/uibase/sidebar/PageColumnControl.cxx3
-rw-r--r--sw/source/uibase/sidebar/PageColumnControl.hxx2
-rw-r--r--sw/source/uibase/sidebar/PageSizeControl.cxx3
-rw-r--r--sw/source/uibase/sidebar/PageSizeControl.hxx2
-rw-r--r--sw/source/uibase/sidebar/ThemePanel.cxx10
-rw-r--r--sw/source/uibase/sidebar/ThemePanel.hxx3
-rw-r--r--sw/source/uibase/sidebar/WrapPropertyPanel.cxx6
-rw-r--r--sw/source/uibase/sidebar/WrapPropertyPanel.hxx2
-rw-r--r--sw/source/uibase/table/tablepg.hxx22
-rw-r--r--uui/source/authfallbackdlg.cxx6
-rw-r--r--uui/source/authfallbackdlg.hxx4
-rw-r--r--uui/source/logindlg.cxx10
-rw-r--r--uui/source/logindlg.hxx6
-rw-r--r--uui/source/masterpasscrtdlg.cxx3
-rw-r--r--uui/source/masterpasscrtdlg.hxx2
-rw-r--r--uui/source/masterpassworddlg.cxx3
-rw-r--r--uui/source/masterpassworddlg.hxx2
-rw-r--r--uui/source/nameclashdlg.cxx8
-rw-r--r--uui/source/nameclashdlg.hxx2
-rw-r--r--uui/source/passworddlg.cxx4
-rw-r--r--uui/source/passworddlg.hxx2
-rw-r--r--uui/source/secmacrowarnings.cxx14
-rw-r--r--uui/source/secmacrowarnings.hxx8
-rw-r--r--uui/source/unknownauthdlg.cxx8
-rw-r--r--uui/source/unknownauthdlg.hxx4
-rw-r--r--vcl/generic/print/genprnpsp.cxx5
-rw-r--r--vcl/generic/print/prtsetup.cxx4
-rw-r--r--vcl/generic/print/prtsetup.hxx2
-rw-r--r--vcl/inc/printdlg.hxx5
-rw-r--r--vcl/source/control/button.cxx12
-rw-r--r--vcl/source/window/btndlg.cxx4
-rw-r--r--vcl/source/window/layout.cxx3
-rw-r--r--vcl/source/window/menubarwindow.cxx10
-rw-r--r--vcl/source/window/menubarwindow.hxx8
-rw-r--r--vcl/source/window/printdlg.cxx27
-rw-r--r--vcl/workben/svpclient.cxx10
-rw-r--r--vcl/workben/vcldemo.cxx6
-rw-r--r--writerperfect/inc/WPFTEncodingDialog.hxx2
-rw-r--r--writerperfect/source/common/WPFTEncodingDialog.cxx3
-rw-r--r--xmlsecurity/inc/xmlsecurity/certificatechooser.hxx2
-rw-r--r--xmlsecurity/inc/xmlsecurity/certificateviewer.hxx2
-rw-r--r--xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx8
-rw-r--r--xmlsecurity/inc/xmlsecurity/macrosecurity.hxx12
-rw-r--r--xmlsecurity/source/dialogs/certificatechooser.cxx3
-rw-r--r--xmlsecurity/source/dialogs/certificateviewer.cxx4
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx22
-rw-r--r--xmlsecurity/source/dialogs/macrosecurity.cxx25
792 files changed, 3146 insertions, 4256 deletions
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index f3d22e797557..bf2fc8f86314 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 ca9009c0c263..786f6d7bcfed 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 084d15eb8f51..b249c6c03b98 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 50d18543d846..9d032b6ca513 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 1d06e969676b..6d831333eb7b 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 c9c36cee13a6..bbb4e2811201 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 ad49d7ab737e..4f56a1a5aaef 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 0da8cdb3d640..d82e4c196ee7 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 c70e8b732a03..61400d2b7e31 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 bde64e28cf6e..b1b7f8b120ac 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 f7ffc6ed9d1e..0bd64d700fbe 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 6f62e49e97f4..b925c6cd4b8f 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 c069c6f92c51..7be2228bba72 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 92c6cb668f56..946bb702cac9 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 5ee6d2afc6b8..0c532e081d9f 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 cfb4758cc29b..acfc93a30dde 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 44377b08f22a..e0fc7181c0ad 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 98f1641c9f06..5862f13eea77 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 03c3ebe3bd87..d69581cbde4e 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 04c725429f83..44f7acae528c 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 a94f1dcb6386..cb368ca33163 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 9fac6a5c3824..f478eb08aa99 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 ef591d0ea028..96ed45c47152 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 84b9cc2d63bb..0a819d64d3e7 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 66e8944d264b..9c7bc8bdff74 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 b949f81f50e2..92f8db40541b 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 2c9cd5d23685..db5467cdcdbf 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 8d6ad51fb28b..f8ad825f7e7d 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 4a430b9efb84..0b9e69e647cf 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 959e831dbe26..c1143afab46b 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 06a4e5d3fbf5..a70a4e8b6ce1 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 a6e7eda853a3..5db962921c8b 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 0119c3d033c6..af82da8fe7a0 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 85917809db48..a2b309dc6ca2 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 3866b98e4d42..572974b38097 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 b38a32f05211..50c0021c2f26 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 2545e49c4b47..2cbb42c2424d 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 50ceb72088ba..99553a196323 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 763262009086..f2c82e10f172 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 be580cbf0c8b..947fb90487cf 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 aed91331eee1..5633b8505db7 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 e3ce1d4808eb..fca6544a212f 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 812f5fd97cad..6f58102bbdc4 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 36a52f8e0b51..f5c183c756ca 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 8a5f26979f2f..3aacad8f595a 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 9dbd04461aa6..420e644f0631 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 eeeadd13e7d9..310082ce1441 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 02e8fbcae34f..c2329e5fda54 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 14994118b9dd..7cc2288f0937 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 387ee3c86a31..f5c6db0d972e 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 1fbe4cd9dbee..b360c6f0ab6d 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 b16f85284b35..c0f4ce69d054 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 2ab8c27021ca..fbcb8ea56c98 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 d0aba8f9cdd7..55ff3660c468 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 c1125c6ba211..5eb75ed38173 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 465e6a102e2d..a967710347bd 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 5c0f79f2043e..7b20fed1ab06 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 de23e79c1021..795887cd3913 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 2107a5c8b234..8a51a43f1ad7 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 82d14bdb9ce6..1f4185d26381 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 d6505423d66d..b24807bea094 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 1a5a0f338d9f..eb59e4594af5 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 0c01cdc3c5bd..39a753e16b74 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 c1d3bd5d72d6..446d5d78a688 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 88d52d832fd0..ab2285d68555 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*/ )
+IMPL_LINK_NOARG_TYPED( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, Button *, void )
{
bool bInvalidState = !m_pOpenReadonlyCB->IsChecked() &&
m_pPasswdToOpenED->GetText().isEmpty() &&
@@ -137,8 +137,6 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, /*pBtn*/
m_pParent->EndDialog( RET_OK );
}
}
-
- return 0;
}
PasswordToOpenModifyDialog::PasswordToOpenModifyDialog(
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 6355f2c78807..14dea85ec193 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -174,19 +174,17 @@ void SvxPostItDialog::EnableTravel(bool bNext, bool bPrev)
-IMPL_LINK_NOARG(SvxPostItDialog, PrevHdl)
+IMPL_LINK_NOARG_TYPED(SvxPostItDialog, PrevHdl, Button*, void)
{
aPrevHdlLink.Call( this );
- return 0;
}
-IMPL_LINK_NOARG(SvxPostItDialog, NextHdl)
+IMPL_LINK_NOARG_TYPED(SvxPostItDialog, NextHdl, Button*, void)
{
aNextHdlLink.Call( this );
- return 0;
}
-IMPL_LINK_NOARG(SvxPostItDialog, Stamp)
+IMPL_LINK_NOARG_TYPED(SvxPostItDialog, Stamp, Button*, void)
{
Date aDate( Date::SYSTEM );
tools::Time aTime( tools::Time::SYSTEM );
@@ -211,12 +209,11 @@ IMPL_LINK_NOARG(SvxPostItDialog, Stamp)
sal_Int32 nLen = aStr.getLength();
m_pEditED->GrabFocus();
m_pEditED->SetSelection( Selection( nLen, nLen ) );
- return 0;
}
-IMPL_LINK_NOARG(SvxPostItDialog, OKHdl)
+IMPL_LINK_NOARG_TYPED(SvxPostItDialog, OKHdl, Button*, void)
{
const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() );
pOutSet = new SfxItemSet( rSet );
@@ -227,7 +224,6 @@ IMPL_LINK_NOARG(SvxPostItDialog, OKHdl)
pOutSet->Put( SvxPostItTextItem( m_pEditED->GetText(),
rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_TEXT ) ) );
EndDialog( RET_OK );
- return 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 971ff3afa2c4..6e5e5096620f 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -650,7 +650,7 @@ IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox )
return 0;
}
-IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
+IMPL_LINK_TYPED( SvxScriptOrgDialog, ButtonHdl, Button *, pButton, void )
{
if ( pButton == m_pCloseButton )
{
@@ -670,7 +670,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
SFEntry* userData = 0;
if ( !pEntry )
{
- return 0;
+ return;
}
userData = static_cast<SFEntry*>(pEntry->GetUserData());
if ( userData )
@@ -683,7 +683,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
if ( !node.is() )
{
- return 0;
+ return;
}
if ( pButton == m_pRunButton )
@@ -693,7 +693,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
Reference< provider::XScriptProvider > mspNode;
if( !xProp.is() )
{
- return 0;
+ return;
}
if ( xModel.is() )
@@ -701,13 +701,13 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
Reference< XEmbeddedScripts > xEmbeddedScripts( xModel, UNO_QUERY);
if( !xEmbeddedScripts.is() )
{
- return 0;
+ return;
}
if (!xEmbeddedScripts->getAllowMacroExecution())
{
// Please FIXME: Show a message box if AllowMacroExecution is false
- return 0;
+ return;
}
}
@@ -796,7 +796,6 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
}
}
}
- return 0;
}
Reference< browse::XBrowseNode > SvxScriptOrgDialog::getBrowseNode( SvTreeListEntry* pEntry )
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index 7af9b3467b93..8f320ade4bc2 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -51,7 +51,7 @@ void FmShowColsDialog::dispose()
ModalDialog::dispose();
}
-IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk)
+IMPL_LINK_NOARG_TYPED(FmShowColsDialog, OnClickedOk, Button*, void)
{
DBG_ASSERT(m_xColumns.is(), "FmShowColsDialog::OnClickedOk : you should call SetColumns before executing the dialog !");
if (m_xColumns.is())
@@ -75,7 +75,6 @@ IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk)
}
EndDialog(RET_OK);
- return 0L;
}
diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx
index 69bfd0ec0051..c6bf6b04d47d 100644
--- a/cui/source/dialogs/splitcelldlg.cxx
+++ b/cui/source/dialogs/splitcelldlg.cxx
@@ -73,13 +73,12 @@ SvxSplitTableDlg::~SvxSplitTableDlg()
m_pDialog.disposeAndClear();
}
-IMPL_LINK( SvxSplitTableDlg, ClickHdl, Button *, pButton )
+IMPL_LINK_TYPED( SvxSplitTableDlg, ClickHdl, Button *, pButton, void )
{
const bool bIsVert = pButton == m_pVertBox ;
long nMax = bIsVert ? mnMaxVertical : mnMaxHorizontal;
m_pPropCB->Enable(!bIsVert);
m_pCountEdit->SetMax( nMax );
- return 0;
}
bool SvxSplitTableDlg::IsHorizontal() const
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index a8e298d08111..b07fa2ab3611 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -193,7 +193,7 @@ void SvxSearchAttributeDialog::dispose()
}
-IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl)
+IMPL_LINK_NOARG_TYPED(SvxSearchAttributeDialog, OKHdl, Button*, void)
{
SearchAttrItem aInvalidItem;
aInvalidItem.pItem = reinterpret_cast<SfxPoolItem*>(-1);
@@ -235,7 +235,6 @@ IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl)
rList.Remove( n );
EndDialog( RET_OK );
- return 0;
}
// class SvxSearchSimilarityDialog ---------------------------------------
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 21c9323c4e27..1448d18022df 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -340,7 +340,7 @@ void SvxThesaurusDialog::LookUp( const OUString &rText )
LookUp_Impl();
}
-IMPL_LINK( SvxThesaurusDialog, LeftBtnHdl_Impl, Button *, pBtn )
+IMPL_LINK_TYPED( SvxThesaurusDialog, LeftBtnHdl_Impl, Button *, pBtn, void )
{
if (pBtn && aLookUpHistory.size() >= 2)
{
@@ -349,7 +349,6 @@ IMPL_LINK( SvxThesaurusDialog, LeftBtnHdl_Impl, Button *, pBtn )
aLookUpHistory.pop();
LookUp_Impl();
}
- return 0;
}
IMPL_LINK( SvxThesaurusDialog, LanguageHdl_Impl, ListBox*, pLB )
@@ -543,10 +542,9 @@ void SvxThesaurusDialog::dispose()
SvxStandardDialog::dispose();
}
-IMPL_LINK( SvxThesaurusDialog, ReplaceBtnHdl_Impl, Button *, /*pBtn*/ )
+IMPL_LINK_NOARG_TYPED( SvxThesaurusDialog, ReplaceBtnHdl_Impl, Button *, void )
{
EndDialog(RET_OK);
- return 0;
}
void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage )
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 059b5624ed93..0e8453296652 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -151,14 +151,14 @@ SvxZoomDialog::SvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet )
get(m_pColumnsEdit, "columnssb");
get(m_pBookModeChk, "bookmode");
get(m_pOKBtn, "ok");
- Link<> aLink = LINK(this, SvxZoomDialog, UserHdl);
+ Link<Button*,void> aLink = LINK(this, SvxZoomDialog, UserHdl);
m_p100Btn->SetClickHdl(aLink);
m_pOptimalBtn->SetClickHdl(aLink);
m_pPageWidthBtn->SetClickHdl(aLink);
m_pWholePageBtn->SetClickHdl(aLink);
m_pUserBtn->SetClickHdl(aLink);
- Link<> aViewLayoutLink = LINK(this, SvxZoomDialog, ViewLayoutUserHdl);
+ Link<Button*,void> aViewLayoutLink = LINK(this, SvxZoomDialog, ViewLayoutUserHdl);
m_pAutomaticBtn->SetClickHdl(aViewLayoutLink);
m_pSingleBtn->SetClickHdl(aViewLayoutLink);
m_pColumnsBtn->SetClickHdl(aViewLayoutLink);
@@ -166,7 +166,7 @@ SvxZoomDialog::SvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet )
Link<> aViewLayoutSpinLink = LINK(this, SvxZoomDialog, ViewLayoutSpinHdl);
m_pColumnsEdit->SetModifyHdl(aViewLayoutSpinLink);
- Link<> aViewLayoutCheckLink = LINK(this, SvxZoomDialog, ViewLayoutCheckHdl);
+ Link<Button*,void> aViewLayoutCheckLink = LINK(this, SvxZoomDialog, ViewLayoutCheckHdl);
m_pBookModeChk->SetClickHdl(aViewLayoutCheckLink);
m_pOKBtn->SetClickHdl(LINK(this, SvxZoomDialog, OKHdl));
@@ -313,7 +313,7 @@ void SvxZoomDialog::dispose()
SfxModalDialog::dispose();
}
-IMPL_LINK(SvxZoomDialog, UserHdl, RadioButton *, pButton)
+IMPL_LINK_TYPED(SvxZoomDialog, UserHdl, Button *, pButton, void)
{
mbModified = true;
@@ -326,7 +326,6 @@ IMPL_LINK(SvxZoomDialog, UserHdl, RadioButton *, pButton)
{
m_pUserEdit->Disable();
}
- return 0;
}
IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl)
@@ -338,7 +337,7 @@ IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl)
return 0;
}
-IMPL_LINK(SvxZoomDialog, ViewLayoutUserHdl, RadioButton*, pButton)
+IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutUserHdl, Button*, pButton, void)
{
mbModified = true;
@@ -362,10 +361,7 @@ IMPL_LINK(SvxZoomDialog, ViewLayoutUserHdl, RadioButton*, pButton)
else
{
OSL_FAIL("Wrong Button");
- return 0;
}
-
- return 0;
}
IMPL_LINK(SvxZoomDialog, ViewLayoutSpinHdl, NumericField*, pEdit)
@@ -388,17 +384,15 @@ IMPL_LINK(SvxZoomDialog, ViewLayoutSpinHdl, NumericField*, pEdit)
return 0;
}
-IMPL_LINK(SvxZoomDialog, ViewLayoutCheckHdl, CheckBox*, pCheckBox)
+IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutCheckHdl, Button*, pCheckBox, void)
{
if (pCheckBox == m_pBookModeChk && !m_pColumnsBtn->IsChecked())
- return 0;
+ return;
mbModified = true;
-
- return 0;
}
-IMPL_LINK(SvxZoomDialog, OKHdl, Button*, pButton)
+IMPL_LINK_TYPED(SvxZoomDialog, OKHdl, Button*, pButton, void)
{
if (mbModified || m_pOKBtn != pButton)
{
@@ -442,7 +436,7 @@ IMPL_LINK(SvxZoomDialog, OKHdl, Button*, pButton)
else
{
OSL_FAIL("Wrong Button");
- return 0;
+ return;
}
mpOutSet.reset(new SfxItemSet(mrSet));
mpOutSet->Put(aZoomItem);
@@ -465,7 +459,6 @@ IMPL_LINK(SvxZoomDialog, OKHdl, Button*, pButton)
{
EndDialog();
}
- return 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index efdc6f1104dc..4493bacd4293 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -266,22 +266,22 @@ void AbstractHangulHanjaConversionDialog_Impl::SetOptionsChangedHdl( const Link<
pDlg->SetOptionsChangedHdl(_rHdl );
}
-void AbstractHangulHanjaConversionDialog_Impl::SetIgnoreHdl( const Link<>& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetIgnoreHdl( const Link<Button*,void>& _rHdl )
{
pDlg->SetIgnoreHdl(_rHdl );
}
-void AbstractHangulHanjaConversionDialog_Impl::SetIgnoreAllHdl( const Link<>& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetIgnoreAllHdl( const Link<Button*,void>& _rHdl )
{
pDlg->SetIgnoreAllHdl(_rHdl );
}
-void AbstractHangulHanjaConversionDialog_Impl::SetChangeHdl( const Link<>& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetChangeHdl( const Link<Button*,void>& _rHdl )
{
pDlg->SetChangeHdl(_rHdl );
}
-void AbstractHangulHanjaConversionDialog_Impl::SetChangeAllHdl( const Link<>& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetChangeAllHdl( const Link<Button*,void>& _rHdl )
{
pDlg->SetChangeAllHdl(_rHdl );
}
@@ -291,11 +291,11 @@ void AbstractHangulHanjaConversionDialog_Impl::SetClickByCharacterHdl( const Lin
pDlg->SetClickByCharacterHdl(_rHdl );
}
-void AbstractHangulHanjaConversionDialog_Impl::SetConversionFormatChangedHdl( const Link<>& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetConversionFormatChangedHdl( const Link<Button*,void>& _rHdl )
{
pDlg->SetConversionFormatChangedHdl(_rHdl );
}
-void AbstractHangulHanjaConversionDialog_Impl::SetFindHdl( const Link<>& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetFindHdl( const Link<Button*,void>& _rHdl )
{
pDlg->SetFindHdl(_rHdl );
}
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index bff3db9066f4..42d96011a067 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -140,13 +140,13 @@ class AbstractHangulHanjaConversionDialog_Impl: public AbstractHangulHanjaConver
virtual void SetConversionDirectionState( bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) SAL_OVERRIDE;
virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ) SAL_OVERRIDE;
virtual void SetOptionsChangedHdl( const Link<>& _rHdl ) SAL_OVERRIDE;
- virtual void SetIgnoreHdl( const Link<>& _rHdl ) SAL_OVERRIDE;
- virtual void SetIgnoreAllHdl( const Link<>& _rHdl ) SAL_OVERRIDE ;
- virtual void SetChangeHdl( const Link<>& _rHdl ) SAL_OVERRIDE ;
- virtual void SetChangeAllHdl( const Link<>& _rHdl ) SAL_OVERRIDE ;
+ virtual void SetIgnoreHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE;
+ virtual void SetIgnoreAllHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE ;
+ virtual void SetChangeHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE ;
+ virtual void SetChangeAllHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE ;
virtual void SetClickByCharacterHdl( const Link<>& _rHdl ) SAL_OVERRIDE ;
- virtual void SetConversionFormatChangedHdl( const Link<>& _rHdl ) SAL_OVERRIDE ;
- virtual void SetFindHdl( const Link<>& _rHdl ) SAL_OVERRIDE;
+ virtual void SetConversionFormatChangedHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE ;
+ virtual void SetFindHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE;
virtual bool GetUseBothDirections( ) const SAL_OVERRIDE;
virtual editeng::HangulHanjaConversion::ConversionDirection
GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const SAL_OVERRIDE;
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index c2f0d59e16b0..3f676d8e23f6 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -171,17 +171,18 @@ private:
css::uno::Reference<
css::linguistic2::XSpellChecker1 > xSpell;
- DECL_LINK(ChangeHdl, void *);
- DECL_LINK(ChangeAllHdl, void *);
- DECL_LINK( IgnoreAllHdl, Button * );
- DECL_LINK(IgnoreHdl, void *);
- DECL_LINK( CheckGrammarHdl, CheckBox* );
- DECL_LINK( ExtClickHdl, Button * );
- DECL_LINK(CancelHdl, void *);
+ DECL_LINK_TYPED(ChangeHdl, Button*, void);
+ DECL_LINK(DoubleClickChangeHdl, void*);
+ DECL_LINK_TYPED(ChangeAllHdl, Button*, void);
+ DECL_LINK_TYPED( IgnoreAllHdl, Button*, void );
+ DECL_LINK_TYPED(IgnoreHdl, Button*, void);
+ DECL_LINK_TYPED( CheckGrammarHdl, Button*, void );
+ DECL_LINK_TYPED( ExtClickHdl, Button*, void );
+ DECL_LINK_TYPED(CancelHdl, Button*, void);
DECL_LINK( ModifyHdl, SentenceEditWindow_Impl *);
- DECL_LINK(UndoHdl, void *);
+ DECL_LINK_TYPED(UndoHdl, Button*, void);
DECL_LINK_TYPED( AddToDictSelectHdl, MenuButton*, void );
- DECL_LINK( AddToDictClickHdl, PushButton* );
+ DECL_LINK_TYPED( AddToDictClickHdl, Button*, void );
DECL_LINK( LanguageSelectHdl, SvxLanguageBox* );
DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl* );
DECL_LINK( HandleHyperlink, FixedHyperlink * );
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index 1ffabdced0ff..3928056c88a1 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -69,7 +69,7 @@ public:
virtual ~AboutDialog();
virtual void dispose() SAL_OVERRIDE;
- DECL_LINK( HandleClick, PushButton* );
+ DECL_LINK_TYPED( HandleClick, Button*, void );
};
#endif // INCLUDED_CUI_SOURCE_INC_ABOUT_HXX
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 9f05168476d0..ba7fc27e559f 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -147,13 +147,13 @@ private:
OUString m_sModuleShortName;
OUString m_sModuleUIName;
- DECL_LINK(ChangeHdl, void *);
- DECL_LINK(RemoveHdl, void *);
+ DECL_LINK_TYPED(ChangeHdl, Button *, void);
+ DECL_LINK_TYPED(RemoveHdl, Button *, void);
DECL_LINK( SelectHdl, Control * );
- DECL_LINK(Save, void *);
- DECL_LINK(Load, void *);
- DECL_LINK(Default, void *);
- DECL_LINK(RadioHdl, void *);
+ DECL_LINK_TYPED(Save, Button *, void);
+ DECL_LINK_TYPED(Load, Button *, void);
+ DECL_LINK_TYPED(Default, Button *, void);
+ DECL_LINK_TYPED(RadioHdl, Button *, void);
DECL_LINK_TYPED(LoadHdl, sfx2::FileDialogHelper *, void);
DECL_LINK_TYPED(SaveHdl, sfx2::FileDialogHelper *, void);
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index a667eb9a902b..b520e48bc031 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -78,6 +78,7 @@ private:
bool HasAlignmentChanged( const SfxItemSet& rNew, sal_uInt16 nWhich ) const;
DECL_LINK( UpdateEnableHdl, void* );
+ DECL_LINK_TYPED( UpdateEnableClickHdl, Button*, void );
private:
VclPtr<ListBox> m_pLbHorAlign;
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 50bd18daae62..2261a5824cfa 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -161,7 +161,8 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
SvLBoxButtonData* pCheckButtonData;
DECL_LINK(SelectHdl, OfaACorrCheckListBox*);
- DECL_LINK(EditHdl, void *);
+ DECL_LINK_TYPED(EditHdl, Button*, void);
+ DECL_LINK(DoubleClickEditHdl, void*);
SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol);
@@ -252,7 +253,8 @@ private:
bool bSWriter:1;
DECL_LINK(SelectHdl, SvTabListBox*);
- DECL_LINK(NewDelHdl, PushButton*);
+ DECL_LINK_TYPED(NewDelHdl, Button*, void);
+ DECL_LINK(NewDelActionHdl, PushButton*);
DECL_LINK(ModifyHdl, Edit*);
void RefillReplaceBox( bool bFromReset,
@@ -312,7 +314,8 @@ private:
CollatorWrapper* pCompareClass;
LanguageType eLang;
- DECL_LINK(NewDelHdl, void*);
+ DECL_LINK_TYPED(NewDelHdl, Button*, void);
+ DECL_LINK(NewDelActionHdl, void*);
DECL_LINK(SelectHdl, ListBox*);
DECL_LINK(ModifyHdl, Edit*);
/// Box filled with new language
@@ -380,8 +383,8 @@ private:
sal_UCS4 cStartQuote;
sal_UCS4 cEndQuote;
- DECL_LINK( QuoteHdl, PushButton* );
- DECL_LINK( StdQuoteHdl, PushButton* );
+ DECL_LINK_TYPED( QuoteHdl, Button*, void );
+ DECL_LINK_TYPED( StdQuoteHdl, Button*, void );
OUString ChangeStringExt_Impl( sal_UCS4 );
@@ -453,7 +456,7 @@ public:
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
void CopyToClipboard() const;
- DECL_LINK(DeleteHdl, void *);
+ DECL_LINK_TYPED(DeleteHdl, Button*, void);
};
// class OfaSmartTagOptionsTabPage ---------------------------------------------
@@ -496,7 +499,7 @@ private:
Calls the displayPropertyPage function of the smart tag recognizer
associated with the currently selected smart tag type.
*/
- DECL_LINK(ClickHdl, void *);
+ DECL_LINK_TYPED(ClickHdl, Button*, void);
/** Handler for the list box
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 98933c9bdf5d..946d9c24a5de 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -134,9 +134,9 @@ private:
DECL_LINK_TYPED( LoadIdleHdl_Impl, Idle*, void );
DECL_LINK(SelectHdl_Impl, void *);
- DECL_LINK(BrowseHdl_Impl, void *);
- DECL_LINK( RadioClickHdl_Impl, RadioButton* );
- DECL_LINK( FileClickHdl_Impl, CheckBox* );
+ DECL_LINK_TYPED(BrowseHdl_Impl, Button*, void);
+ DECL_LINK_TYPED( RadioClickHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( FileClickHdl_Impl, Button*, void );
DECL_LINK(BackgroundColorHdl_Impl, void *);
DECL_LINK( TblDestinationHdl_Impl, ListBox* );
};
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index ff7780403bbb..2fe47b70afd3 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -123,7 +123,7 @@ private:
DECL_LINK( LinesChanged_Impl, void* );
DECL_LINK( ModifyDistanceHdl_Impl, MetricField*);
DECL_LINK( ModifyWidthHdl_Impl, void*);
- DECL_LINK( SyncHdl_Impl, CheckBox*);
+ DECL_LINK_TYPED( SyncHdl_Impl, Button*, void);
sal_uInt16 GetPresetImageId( sal_uInt16 nValueSetIdx ) const;
sal_uInt16 GetPresetStringId( sal_uInt16 nValueSetIdx ) const;
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index c8ac9f6d998d..511040dcead7 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -365,7 +365,7 @@ protected:
SvxConfigPage( vcl::Window*, const SfxItemSet& );
- DECL_LINK( MoveHdl, Button * );
+ DECL_LINK_TYPED( MoveHdl, Button *, void );
virtual SaveInData* CreateSaveInData(
const css::uno::Reference< css::ui::XUIConfigurationManager >&,
@@ -442,10 +442,10 @@ private:
DECL_LINK( SelectMenu, ListBox * );
DECL_LINK( SelectMenuEntry, Control * );
- DECL_LINK( NewMenuHdl, Button * );
+ DECL_LINK_TYPED( NewMenuHdl, Button *, void );
DECL_LINK_TYPED( MenuSelectHdl, MenuButton *, void );
DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void );
- DECL_LINK( AddCommandsHdl, Button * );
+ DECL_LINK_TYPED( AddCommandsHdl, Button *, void );
DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog * );
void Init() SAL_OVERRIDE;
@@ -482,7 +482,7 @@ class SvxMainMenuOrganizerDialog : public ModalDialog
void UpdateButtonStates();
- DECL_LINK( MoveHdl, Button * );
+ DECL_LINK_TYPED( MoveHdl, Button *, void );
DECL_LINK( ModifyHdl, Edit * );
DECL_LINK( SelectHdl, Control* );
@@ -536,10 +536,10 @@ private:
DECL_LINK( SelectToolbarEntry, Control * );
DECL_LINK_TYPED( ToolbarSelectHdl, MenuButton *, void );
DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void );
- DECL_LINK( NewToolbarHdl, Button * );
- DECL_LINK( AddCommandsHdl, Button * );
+ DECL_LINK_TYPED( NewToolbarHdl, Button *, void );
+ DECL_LINK_TYPED( AddCommandsHdl, Button *, void );
DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog * );
- DECL_LINK( MoveHdl, Button * );
+ DECL_LINK_TYPED( MoveHdl, Button *, void );
void UpdateButtonStates() SAL_OVERRIDE;
short QueryReset() SAL_OVERRIDE;
@@ -690,8 +690,8 @@ public:
GetSelectedIcon();
DECL_LINK_TYPED( SelectHdl, ToolBox *, void );
- DECL_LINK( ImportHdl, PushButton * );
- DECL_LINK( DeleteHdl, PushButton * );
+ DECL_LINK_TYPED( ImportHdl, Button *, void );
+ DECL_LINK_TYPED( DeleteHdl, Button *, void );
};
class SvxIconReplacementDialog : public MessBox
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index a023a45d9b1e..42cc172fcb9b 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -215,8 +215,8 @@ private:
bool FillItemSetColor_Impl( SfxItemSet& rSet );
DECL_LINK( SelectHdl_Impl, ListBox* );
- DECL_LINK(CbClickHdl_Impl, void *);
- DECL_LINK(TristClickHdl_Impl, void *);
+ DECL_LINK_TYPED(CbClickHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(TristClickHdl_Impl, Button*, void);
DECL_LINK(UpdatePreview_Impl, void *);
DECL_LINK( ColorBoxSelectHdl_Impl, ColorListBox* );
@@ -290,11 +290,11 @@ private:
void UpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc );
void SetEscapement_Impl( sal_uInt16 nEsc );
- DECL_LINK( PositionHdl_Impl, RadioButton* );
- DECL_LINK( RotationHdl_Impl, RadioButton* );
+ DECL_LINK_TYPED( PositionHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( RotationHdl_Impl, Button*, void );
DECL_LINK( FontModifyHdl_Impl, void *);
- DECL_LINK( AutoPositionHdl_Impl, CheckBox* );
- DECL_LINK( FitToLineHdl_Impl, CheckBox* );
+ DECL_LINK_TYPED( AutoPositionHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( FitToLineHdl_Impl, Button*, void );
DECL_LINK( KerningSelectHdl_Impl, void *);
DECL_LINK( KerningModifyHdl_Impl, void *);
DECL_LINK( LoseFocusHdl_Impl, MetricField* );
@@ -344,7 +344,7 @@ private:
void SelectCharacter( ListBox* pBox );
void SetBracket( sal_Unicode cBracket, bool bStart );
- DECL_LINK(TwoLinesHdl_Impl, void *);
+ DECL_LINK_TYPED(TwoLinesHdl_Impl, Button*, void);
DECL_LINK( CharacterMapHdl_Impl, ListBox* );
public:
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index d06f55a33fd6..fb0a61f49cd8 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -81,7 +81,7 @@ private:
bool bOne;
const SubsetMap* pSubsetMap;
- DECL_LINK(OKHdl, void *);
+ DECL_LINK_TYPED(OKHdl, Button*, void);
DECL_LINK(FontSelectHdl, void *);
DECL_LINK(SubsetSelectHdl, void *);
DECL_LINK(CharDoubleClickHdl, void *);
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index e9840c6a664a..f4d00a7faab6 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -157,9 +157,9 @@ protected:
private:
// Handler for the Controls
- DECL_LINK( OnClickedFieldRadios, Button* );
- DECL_LINK(OnClickedSearchAgain, void *);
- DECL_LINK( OnClickedSpecialSettings, Button* );
+ DECL_LINK_TYPED( OnClickedFieldRadios, Button*, void );
+ DECL_LINK_TYPED(OnClickedSearchAgain, Button *, void);
+ DECL_LINK_TYPED( OnClickedSpecialSettings, Button*, void );
DECL_LINK(OnSearchTextModified, void *);
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 64c92e5c62d4..1883de8d57fe 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -88,7 +88,7 @@ private:
INetURLObject startUrl_;
rtl::Reference< SearchThread > maSearchThread;
- DECL_LINK( ClickCancelBtn, void* );
+ DECL_LINK_TYPED( ClickCancelBtn, Button*, void );
void Terminate();
public:
@@ -133,7 +133,7 @@ private:
rtl::Reference< TakeThread > maTakeThread;
TokenList_impl maTakenList;
- DECL_LINK( ClickCancelBtn, void* );
+ DECL_LINK_TYPED( ClickCancelBtn, Button*, void );
void Terminate();
public:
@@ -158,7 +158,7 @@ private:
GalleryTheme* pTheme;
GalleryProgress aStatusProgress;
- DECL_LINK( ClickCancelBtn, void* );
+ DECL_LINK_TYPED( ClickCancelBtn, Button*, void );
DECL_LINK_TYPED( TimeoutHdl, Idle*, void );
DECL_LINK( ActualizeHdl, INetURLObject* );
@@ -188,7 +188,7 @@ private:
VclPtr<ListBox> m_pLbResName;
GalleryTheme* pThm;
- DECL_LINK( ClickOkHdl, void* );
+ DECL_LINK_TYPED( ClickOkHdl, Button*, void );
public:
GalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm );
virtual ~GalleryIdDialog();
@@ -278,10 +278,10 @@ class TPGalleryThemeProperties : public SfxTabPage
void TakeFiles();
void DoPreview();
- DECL_LINK( ClickPreviewHdl, void* );
- DECL_LINK( ClickSearchHdl, void* );
- DECL_LINK( ClickTakeHdl, void* );
- DECL_LINK( ClickTakeAllHdl, void* );
+ DECL_LINK_TYPED( ClickPreviewHdl, Button*, void );
+ DECL_LINK_TYPED( ClickSearchHdl, Button*, void );
+ DECL_LINK_TYPED( ClickTakeHdl, Button*, void );
+ DECL_LINK_TYPED( ClickTakeAllHdl, Button*, void );
DECL_LINK( SelectFoundHdl, void* );
DECL_LINK( SelectFileTypeHdl, void* );
DECL_LINK( DClickFoundHdl, void* );
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index 22558265a411..0a27c27d347a 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -69,9 +69,9 @@ private:
bool mbReadOnly : 1;
bool mbIsHTMLDoc : 1;
- DECL_LINK (ClickOkHdl_Impl, void * );
- DECL_LINK (ClickApplyHdl_Impl, void * );
- DECL_LINK (ClickCloseHdl_Impl, void * );
+ DECL_LINK_TYPED (ClickOkHdl_Impl, Button *, void );
+ DECL_LINK_TYPED (ClickApplyHdl_Impl, Button *, void );
+ DECL_LINK_TYPED (ClickCloseHdl_Impl, Button *, void );
protected:
virtual bool Close() SAL_OVERRIDE;
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index b48eecb57b84..e87e64ffe31e 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -71,7 +71,7 @@ private:
protected:
virtual short Ok() SAL_OVERRIDE;
- DECL_LINK( CancelHdlImpl, void * );
+ DECL_LINK_TYPED( CancelHdlImpl, Button*, void );
void SavePalettes();
public:
@@ -140,9 +140,9 @@ class SvxTransparenceTabPage : public SvxTabPage
XFillAttrSetItem aXFillAttr;
SfxItemSet& rXFSet;
- DECL_LINK(ClickTransOffHdl_Impl, void * );
- DECL_LINK(ClickTransLinearHdl_Impl, void * );
- DECL_LINK(ClickTransGradientHdl_Impl, void * );
+ DECL_LINK_TYPED(ClickTransOffHdl_Impl, Button*, void );
+ DECL_LINK_TYPED(ClickTransLinearHdl_Impl, Button*, void );
+ DECL_LINK_TYPED(ClickTransGradientHdl_Impl, Button*, void );
DECL_LINK(ModifyTransparentHdl_Impl, void*);
DECL_LINK(ModifiedTrgrHdl_Impl, void*);
@@ -269,13 +269,15 @@ private:
DECL_LINK( ModifyHatchingHdl_Impl, void * );
DECL_LINK( ToggleHatchBckgrdColorHdl_Impl, void * );
DECL_LINK( ModifyBitmapHdl_Impl, void * );
- DECL_LINK( ModifyStepCountHdl_Impl, void * );
+ DECL_LINK( ModifyStepCountHdl_Impl, void* );
+ DECL_LINK_TYPED( ModifyStepCountClickHdl_Impl, Button*, void );
//UUUU
- DECL_LINK( ClickImportHdl_Impl, void * );
+ DECL_LINK_TYPED( ClickImportHdl_Impl, Button*, void );
DECL_LINK( ModifyTileHdl_Impl, void * );
- DECL_LINK( ClickScaleHdl_Impl, void * );
+ DECL_LINK_TYPED( ModifyTileClickHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickScaleHdl_Impl, Button*, void );
void ClickInvisibleHdl_Impl();
void ClickHatchingHdl_Impl();
void ClickGradientHdl_Impl();
@@ -347,7 +349,7 @@ private:
SfxItemSet& m_rXFSet;
SfxMapUnit m_ePoolUnit;
- DECL_LINK( ClickShadowHdl_Impl, void * );
+ DECL_LINK_TYPED( ClickShadowHdl_Impl, Button*, void );
DECL_LINK( ModifyShadowHdl_Impl, void * );
public:
@@ -418,13 +420,13 @@ private:
XFillAttrSetItem m_aXFillAttr;
SfxItemSet& m_rXFSet;
- DECL_LINK( ClickAddHdl_Impl, void * );
- DECL_LINK( ClickModifyHdl_Impl, void * );
- DECL_LINK( ClickDeleteHdl_Impl, void * );
+ DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void );
DECL_LINK( ChangeGradientHdl_Impl, void * );
DECL_LINK( ModifiedHdl_Impl, void * );
- DECL_LINK( ClickLoadHdl_Impl, void * );
- DECL_LINK( ClickSaveHdl_Impl, void * );
+ DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void );
long CheckChanges_Impl();
void SetControlState_Impl( css::awt::GradientStyle eXGS );
@@ -498,11 +500,11 @@ private:
DECL_LINK( ChangeHatchHdl_Impl, void * );
DECL_LINK( ModifiedHdl_Impl, void * );
- DECL_LINK( ClickAddHdl_Impl, void * );
- DECL_LINK( ClickModifyHdl_Impl, void * );
- DECL_LINK( ClickDeleteHdl_Impl, void * );
- DECL_LINK( ClickLoadHdl_Impl, void * );
- DECL_LINK( ClickSaveHdl_Impl, void * );
+ DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void );
long CheckChanges_Impl();
@@ -580,15 +582,15 @@ private:
XFillAttrSetItem aXFillAttr;
SfxItemSet& rXFSet;
- DECL_LINK( ClickAddHdl_Impl, void * );
- DECL_LINK( ClickImportHdl_Impl, void * );
- DECL_LINK( ClickModifyHdl_Impl, void * );
- DECL_LINK( ClickDeleteHdl_Impl, void * );
+ DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickImportHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void );
DECL_LINK( ChangeBitmapHdl_Impl, void * );
DECL_LINK( ChangePixelColorHdl_Impl, void * );
DECL_LINK( ChangeBackgrndColorHdl_Impl, void * );
- DECL_LINK( ClickLoadHdl_Impl, void * );
- DECL_LINK( ClickSaveHdl_Impl, void * );
+ DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void );
long CheckChanges_Impl();
@@ -648,8 +650,8 @@ private:
VclPtr<FixedText> m_pTableName;
DECL_LINK( EmbedToggleHdl_Impl, void * );
- DECL_LINK( ClickLoadHdl_Impl, void * );
- DECL_LINK( ClickSaveHdl_Impl, void * );
+ DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void );
XPropertyListRef GetList();
bool GetEmbed();
@@ -712,10 +714,10 @@ private:
void ImpColorCountChanged();
- DECL_LINK( ClickAddHdl_Impl, void * );
- DECL_LINK( ClickModifyHdl_Impl, void * );
- DECL_LINK( ClickDeleteHdl_Impl, void * );
- DECL_LINK( ClickWorkOnHdl_Impl, void * );
+ DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickWorkOnHdl_Impl, Button*, void );
DECL_LINK( SelectColorLBHdl_Impl, void * );
DECL_LINK( SelectValSetHdl_Impl, void * );
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index f2570fa0d5c8..c5204b9aa682 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -58,7 +58,7 @@ private:
protected:
virtual short Ok() SAL_OVERRIDE;
- DECL_LINK( CancelHdlImpl, void * );
+ DECL_LINK_TYPED( CancelHdlImpl, Button*, void );
void SavePalettes();
public:
@@ -176,11 +176,13 @@ private:
DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void );
DECL_LINK( MenuCreateHdl_Impl, MenuButton * );
DECL_LINK( SizeHdl_Impl, MetricField * );
- DECL_LINK( RatioHdl_Impl, CheckBox * );
+ DECL_LINK_TYPED( RatioHdl_Impl, Button*, void );
DECL_LINK( ClickInvisibleHdl_Impl, void * );
DECL_LINK( ChangeStartHdl_Impl, void * );
+ DECL_LINK_TYPED( ChangeStartClickHdl_Impl, Button*, void );
DECL_LINK( ChangeEndHdl_Impl, void * );
+ DECL_LINK_TYPED( ChangeEndClickHdl_Impl, Button*, void );
DECL_LINK( ChangePreviewHdl_Impl, void * );
DECL_LINK( ChangeTransparentHdl_Impl, void * );
@@ -283,16 +285,16 @@ private:
void FillDash_Impl();
void FillDialog_Impl();
- DECL_LINK( ClickAddHdl_Impl, void * );
- DECL_LINK( ClickModifyHdl_Impl, void * );
- DECL_LINK( ClickDeleteHdl_Impl, void * );
+ DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void );
DECL_LINK( SelectLinestyleHdl_Impl, void * );
DECL_LINK( ChangePreviewHdl_Impl, void * );
DECL_LINK( ChangeNumber1Hdl_Impl, void * );
DECL_LINK( ChangeNumber2Hdl_Impl, void * );
- DECL_LINK( ClickLoadHdl_Impl, void * );
- DECL_LINK( ClickSaveHdl_Impl, void * );
- DECL_LINK( ChangeMetricHdl_Impl, void * );
+ DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ChangeMetricHdl_Impl, Button*, void );
DECL_LINK( SelectTypeHdl_Impl, void * );
void CheckChanges_Impl();
@@ -357,11 +359,11 @@ private:
sal_uInt16 nDlgType;
sal_Int32* pPosLineEndLb;
- DECL_LINK( ClickAddHdl_Impl, void * );
- DECL_LINK( ClickModifyHdl_Impl, void * );
- DECL_LINK( ClickDeleteHdl_Impl, void * );
- DECL_LINK( ClickLoadHdl_Impl, void * );
- DECL_LINK( ClickSaveHdl_Impl, void * );
+ DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void );
DECL_LINK( SelectLineEndHdl_Impl, void * );
long ChangePreviewHdl_Impl( void* p );
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index d093de99cc68..2e0839395b1e 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -52,9 +52,10 @@ namespace svx
bool m_bModified;
#ifdef INCLUDED_CUI_SOURCE_INC_DBREGISTER_HXX
- DECL_LINK( NewHdl, void * );
- DECL_LINK( EditHdl, void * );
- DECL_LINK( DeleteHdl, void * );
+ DECL_LINK_TYPED( NewHdl, Button*, void );
+ DECL_LINK_TYPED( EditHdl, Button*, void );
+ DECL_LINK_TYPED( DeleteHdl, Button*, void );
+ DECL_LINK(PathBoxDoubleClickHdl, void *);
DECL_LINK(PathSelect_Impl, void *);
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index 644b441db613..567988d1680e 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -139,8 +139,8 @@ private:
VclPtr<FixedImage> pFtImage;
Image* pImage;
- DECL_LINK(Button1Hdl, void *);
- DECL_LINK(Button2Hdl, void *);
+ DECL_LINK_TYPED(Button1Hdl, Button*, void);
+ DECL_LINK_TYPED(Button2Hdl, Button*, void);
public:
SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = NULL );
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index b565def29229..f756d374a97c 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -100,7 +100,7 @@ class SvxGrfCropPage : public SfxTabPage
DECL_LINK( CropHdl, const MetricField * );
DECL_LINK( CropLoseFocusHdl, MetricField * );
DECL_LINK( CropModifyHdl, MetricField * );
- DECL_LINK(OrigSizeHdl, void *);
+ DECL_LINK_TYPED(OrigSizeHdl, Button*, void);
DECL_LINK_TYPED(Timeout, Timer *, void);
void CalcZoom();
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index fd317ff5983b..e60d723c3eec 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -142,14 +142,14 @@ namespace svx
public:
void SetOptionsChangedHdl( const Link<>& _rHdl );
- void SetIgnoreHdl( const Link<>& _rHdl );
- void SetIgnoreAllHdl( const Link<>& _rHdl );
- void SetChangeHdl( const Link<>& _rHdl );
- void SetChangeAllHdl( const Link<>& _rHdl );
+ void SetIgnoreHdl( const Link<Button*,void>& _rHdl );
+ void SetIgnoreAllHdl( const Link<Button*,void>& _rHdl );
+ void SetChangeHdl( const Link<Button*,void>& _rHdl );
+ void SetChangeAllHdl( const Link<Button*,void>& _rHdl );
void SetClickByCharacterHdl( const Link<>& _rHdl );
- void SetConversionFormatChangedHdl( const Link<>& _rHdl );
- void SetFindHdl( const Link<>& _rHdl );
+ void SetConversionFormatChangedHdl( const Link<Button*,void>& _rHdl );
+ void SetFindHdl( const Link<Button*,void>& _rHdl );
OUString GetCurrentString( ) const;
void SetCurrentString(
@@ -180,11 +180,11 @@ namespace svx
void EnableRubySupport( bool bVal );
private:
- DECL_LINK( OnOption, void* );
+ DECL_LINK_TYPED( OnOption, Button*, void );
DECL_LINK( OnSuggestionModified, void* );
DECL_LINK( OnSuggestionSelected, void* );
- DECL_LINK( OnConversionDirectionClicked, CheckBox* );
- DECL_LINK( ClickByCharacterHdl, CheckBox* );
+ DECL_LINK_TYPED( OnConversionDirectionClicked, Button*, void );
+ DECL_LINK_TYPED( ClickByCharacterHdl, Button*, void );
/// fill the suggestion list box with suggestions for the actual input
void FillSuggestions( const css::uno::Sequence< OUString >& _rSuggestions );
@@ -210,11 +210,11 @@ namespace svx
HHDictList m_aDictList;
css::uno::Reference< css::linguistic2::XConversionDictionaryList > m_xConversionDictionaryList;
- DECL_LINK( OkHdl, void* );
+ DECL_LINK_TYPED( OkHdl, Button*, void );
DECL_LINK( DictsLB_SelectHdl, void* );
- DECL_LINK( NewDictHdl, void* );
- DECL_LINK( EditDictHdl, void* );
- DECL_LINK( DeleteDictHdl, void* );
+ DECL_LINK_TYPED( NewDictHdl, Button*, void );
+ DECL_LINK_TYPED( EditDictHdl, Button*, void );
+ DECL_LINK_TYPED( DeleteDictHdl, Button*, void );
void Init(); ///< reads settings from core and init controls
public:
@@ -234,7 +234,7 @@ namespace svx
bool m_bEntered;
- DECL_LINK( OKHdl, void* );
+ DECL_LINK_TYPED( OKHdl, Button*, void );
DECL_LINK( ModifyHdl, void* );
public:
HangulHanjaNewDictDialog( vcl::Window* _pParent );
@@ -297,8 +297,8 @@ namespace svx
DECL_LINK( EditModifyHdl4, Edit* );
DECL_LINK( BookLBSelectHdl, void* );
- DECL_LINK( NewPBPushHdl, void* );
- DECL_LINK( DeletePBPushHdl, void* );
+ DECL_LINK_TYPED( NewPBPushHdl, Button*, void );
+ DECL_LINK_TYPED( DeletePBPushHdl, Button*, void );
void InitEditDictDialog( sal_uInt32 _nSelDict );
void UpdateOriginalLB();
diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx
index 1df2992796d3..610c861dd9f0 100644
--- a/cui/source/inc/hldocntp.hxx
+++ b/cui/source/inc/hldocntp.hxx
@@ -36,10 +36,10 @@ private:
VclPtr<PushButton> m_pBtCreate;
VclPtr<ListBox> m_pLbDocTypes;
- bool ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const;
+ bool ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const;
void FillDocumentList ();
- DECL_LINK (ClickNewHdl_Impl , void * );
+ DECL_LINK_TYPED (ClickNewHdl_Impl, Button*, void );
protected:
void FillDlgFields(const OUString& rStrURL) SAL_OVERRIDE;
diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx
index 9214f8024a0f..e65dbaed1748 100644
--- a/cui/source/inc/hldoctp.hxx
+++ b/cui/source/inc/hldoctp.hxx
@@ -41,8 +41,8 @@ private:
bool mbMarkWndOpen;
- DECL_LINK (ClickFileopenHdl_Impl , void * );
- DECL_LINK (ClickTargetHdl_Impl , void * );
+ DECL_LINK_TYPED (ClickFileopenHdl_Impl, Button*, void );
+ DECL_LINK_TYPED (ClickTargetHdl_Impl , Button*, void );
DECL_LINK (ModifiedPathHdl_Impl , void * ); ///< Contens of combobox "Path" modified
DECL_LINK (ModifiedTargetHdl_Impl, void * ); ///< Contens of editfield "Target" modified
diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index a9252e102ed9..60216f581e9a 100644
--- a/cui/source/inc/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -47,9 +47,9 @@ private:
bool mbMarkWndOpen;
- DECL_LINK (Click_SmartProtocol_Impl , void * ); ///< Radiobutton clicked: Type HTTP or FTP
- DECL_LINK (ClickAnonymousHdl_Impl , void * ); ///< Checkbox : Anonymous User
- DECL_LINK (ClickBrowseHdl_Impl , void * ); ///< Button : Browse
+ DECL_LINK_TYPED (Click_SmartProtocol_Impl , Button*, void ); ///< Radiobutton clicked: Type HTTP or FTP
+ DECL_LINK_TYPED (ClickAnonymousHdl_Impl , Button*, void ); ///< Checkbox : Anonymous User
+ DECL_LINK_TYPED (ClickBrowseHdl_Impl , Button*, void ); ///< Button : Browse
DECL_LINK (ModifiedLoginHdl_Impl , void * ); ///< Contens of editfield "Login" modified
DECL_LINK (LostFocusTargetHdl_Impl , void * ); ///< Combobox "Target" lost its focus
DECL_LINK (ModifiedTargetHdl_Impl , void * ); ///< Contens of editfield "Target" modified
diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx
index 6c560279da8b..857e21dd5f8d 100644
--- a/cui/source/inc/hlmailtp.hxx
+++ b/cui/source/inc/hlmailtp.hxx
@@ -35,7 +35,7 @@ private:
VclPtr<FixedText> m_pFtSubject;
VclPtr<Edit> m_pEdSubject;
- DECL_STATIC_LINK(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, void *);
+ DECL_STATIC_LINK_TYPED(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, Button*, void);
///< Button : Address book
DECL_LINK (ModifiedReceiverHdl_Impl, void * ); ///< Combobox "receiver" modified
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index 65b010cf66af..209fe82c6d69 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -86,8 +86,9 @@ protected:
virtual void Move () SAL_OVERRIDE;
- DECL_LINK (ClickApplyHdl_Impl, void * );
- DECL_LINK (ClickCloseHdl_Impl, void * );
+ DECL_LINK_TYPED (ClickApplyHdl_Impl, Button*, void );
+ DECL_LINK (DoubleClickApplyHdl_Impl, void* );
+ DECL_LINK_TYPED (ClickCloseHdl_Impl, Button*, void );
public:
SvxHlinkDlgMarkWnd (SvxHyperlinkTabPageBase *pParent);
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 9933d6c1c439..8683ccb77fad 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -101,7 +101,7 @@ protected:
OUString& aStrIntName, OUString& aStrFrame,
SvxLinkInsertMode& eMode );
- DECL_LINK (ClickScriptHdl_Impl, void * ); ///< Button : Script
+ DECL_LINK_TYPED (ClickScriptHdl_Impl, Button*, void ); ///< Button : Script
OUString aEmptyStr;
diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx
index 421737ea663f..29cc98576e8f 100644
--- a/cui/source/inc/hyphen.hxx
+++ b/cui/source/inc/hyphen.hxx
@@ -70,13 +70,13 @@ class SvxHyphenWordDialog : public SfxModalDialog
void ContinueHyph_Impl( sal_Int32 nInsPos = -1 ); // continue by default
sal_uInt16 GetHyphIndex_Impl();
- DECL_LINK(Left_Impl, void *);
- DECL_LINK(Right_Impl, void *);
- DECL_LINK(CutHdl_Impl, void *);
- DECL_LINK(ContinueHdl_Impl, void *);
- DECL_LINK(DeleteHdl_Impl, void *);
- DECL_LINK( HyphenateAllHdl_Impl, Button* );
- DECL_LINK(CancelHdl_Impl, void *);
+ DECL_LINK_TYPED(Left_Impl, Button*, void);
+ DECL_LINK_TYPED(Right_Impl, Button*, void);
+ DECL_LINK_TYPED(CutHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(ContinueHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(DeleteHdl_Impl, Button*, void);
+ DECL_LINK_TYPED( HyphenateAllHdl_Impl, Button*, void );
+ DECL_LINK_TYPED(CancelHdl_Impl, Button*, void);
DECL_LINK(GetFocusHdl_Impl, void *);
public:
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 3e52b449d281..b34f4e396bde 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -142,10 +142,10 @@ private:
bool bItemsReset;
DECL_LINK ( ChosePageHdl_Impl, void * );
- DECL_LINK(OkHdl, void *);
- DECL_LINK(ApplyHdl, void *);
- DECL_LINK(ResetHdl, void *);
- DECL_LINK(CancelHdl, void *);
+ DECL_LINK_TYPED(OkHdl, Button*, void);
+ DECL_LINK_TYPED(ApplyHdl, Button*, void);
+ DECL_LINK_TYPED(ResetHdl, Button*, void);
+ DECL_LINK_TYPED(CancelHdl, Button*, void);
IconChoicePageData* GetPageData ( sal_uInt16 nId );
void Start_Impl();
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index aa42ba5594ec..29ac1132220a 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -70,8 +70,8 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl
OUString m_aIconMediaType;
DECL_LINK(DoubleClickHdl, void*);
- DECL_LINK(BrowseHdl, void *);
- DECL_LINK(RadioHdl, void *);
+ DECL_LINK_TYPED(BrowseHdl, Button*, void);
+ DECL_LINK_TYPED(RadioHdl, Button*, void);
void SelectDefault();
ListBox& GetObjectTypes()
{ return *m_pLbObjecttype; }
@@ -103,7 +103,7 @@ private:
INetURLObject* m_pURL;
OUString m_aCommands;
- DECL_LINK(BrowseHdl, void *);
+ DECL_LINK_TYPED(BrowseHdl, Button*, void);
OUString GetPlugInFile() const { return m_pEdFileurl->GetText(); }
OUString GetPlugInOptions() const { return m_pEdPluginsOptions->GetText(); }
@@ -136,8 +136,8 @@ private:
VclPtr<NumericField> m_pNMMarginHeight;
VclPtr<CheckBox> m_pCBMarginHeightDefault;
- DECL_LINK(OpenHdl, PushButton* );
- DECL_LINK(CheckHdl, CheckBox* );
+ DECL_LINK_TYPED(OpenHdl, Button*, void );
+ DECL_LINK_TYPED(CheckHdl, Button*, void );
void Init();
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 7995287a00ec..7355781b4482 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -67,7 +67,7 @@ private:
void SetupType_Impl( sal_uInt16 nType );
DECL_LINK( AnsatzSelectHdl_Impl, ListBox * );
DECL_LINK( AnsatzRelSelectHdl_Impl, ListBox * );
- DECL_LINK( LineOptHdl_Impl, Button * );
+ DECL_LINK_TYPED( LineOptHdl_Impl, Button *, void );
DECL_LINK( SelectCaptTypeHdl_Impl, void * );
const SfxItemSet& rOutAttrs;
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 1d32fc2cde74..9af5b0dacb01 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -66,11 +66,11 @@ class SvBaseLinksDlg : public ModalDialog
DECL_LINK( LinksSelectHdl, SvTabListBox * );
DECL_LINK( LinksDoubleClickHdl, SvTabListBox * );
- DECL_LINK( AutomaticClickHdl, RadioButton * );
- DECL_LINK( ManualClickHdl, RadioButton * );
- DECL_LINK(UpdateNowClickHdl, void *);
- DECL_LINK( ChangeSourceClickHdl, PushButton * );
- DECL_LINK( BreakLinkClickHdl, PushButton * );
+ DECL_LINK_TYPED( AutomaticClickHdl, Button *, void );
+ DECL_LINK_TYPED( ManualClickHdl, Button *, void );
+ DECL_LINK_TYPED(UpdateNowClickHdl, Button *, void);
+ DECL_LINK_TYPED( ChangeSourceClickHdl, Button *, void );
+ DECL_LINK_TYPED( BreakLinkClickHdl, Button *, void );
DECL_LINK_TYPED( UpdateWaitingHdl, Idle *, void );
DECL_LINK( EndEditHdl, sfx2::SvBaseLink* );
sfx2::SvBaseLink* GetSelEntry( sal_uLong* pPos );
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index 4edb69f67f02..3fb037e5f0cb 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -40,6 +40,7 @@ class _SfxMacroTabPage : public SfxTabPage
DECL_DLLPRIVATE_LINK( SelectMacro_Impl, ListBox * );
DECL_DLLPRIVATE_LINK( AssignDeleteHdl_Impl, PushButton * );
+ DECL_DLLPRIVATE_LINK_TYPED( AssignDeleteClickHdl_Impl, Button *, void );
DECL_DLLPRIVATE_LINK_TYPED( TimeOut_Impl, Idle*, void );
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index ab7492f4d63b..de7d4a70825d 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -58,7 +58,7 @@ class _SvxMacroTabPage_Impl;
class _SvxMacroTabPage : public SfxTabPage
{
DECL_LINK( SelectEvent_Impl, SvTabListBox * );
- DECL_LINK( AssignDeleteHdl_Impl, PushButton * );
+ DECL_LINK_TYPED( AssignDeleteHdl_Impl, Button *, void );
DECL_LINK( DoubleClickHdl_Impl, SvTabListBox * );
static long GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton* pBtn );
@@ -117,7 +117,7 @@ public:
SvxMacroAssignSingleTabDialog(vcl::Window* pParent, const SfxItemSet& rOptionsSet);
private:
- DECL_DLLPRIVATE_LINK( OKHdl_Impl, Button * );
+ DECL_DLLPRIVATE_LINK_TYPED( OKHdl_Impl, Button *, void );
};
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index 28dbdfdc7c28..81ffca5cb44b 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -60,8 +60,9 @@ private:
void FillUnitLB();
- DECL_LINK( ClickAutoPosHdl_Impl, void * );
+ DECL_LINK_TYPED( ClickAutoPosHdl_Impl, Button*, void );
DECL_LINK( ChangeAttrHdl_Impl, void * );
+ DECL_LINK_TYPED( ChangeAttrClickHdl_Impl, Button*, void );
public:
diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx
index ecc1395f6cad..566974177943 100644
--- a/cui/source/inc/multipat.hxx
+++ b/cui/source/inc/multipat.hxx
@@ -43,8 +43,8 @@ private:
VclPtr<PushButton> m_pAddBtn;
VclPtr<PushButton> m_pDelBtn;
- DECL_LINK(AddHdl_Impl, void *);
- DECL_LINK(DelHdl_Impl, void *);
+ DECL_LINK_TYPED(AddHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(DelHdl_Impl, Button*, void);
DECL_LINK(SelectHdl_Impl, void *);
DECL_LINK(CheckHdl_Impl, svx::SvxRadioButtonListBox*);
@@ -64,8 +64,8 @@ private:
VclPtr<PushButton> m_pAddBtn;
VclPtr<PushButton> m_pDelBtn;
- DECL_LINK(AddHdl_Impl, void *);
- DECL_LINK(DelHdl_Impl, void *);
+ DECL_LINK_TYPED(AddHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(DelHdl_Impl, Button*, void);
DECL_LINK(SelectHdl_Impl, void *);
public:
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index b27347651f68..f2a72c1d7088 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -149,13 +149,16 @@ private:
void MakePreviewText( const OUString& rFormat );
void ChangePreviewText( sal_uInt16 nPos );
void AddAutomaticLanguage_Impl(LanguageType eAutoLang, bool bSelect);
+ bool Click_Impl(PushButton* pIB);
// Handler
DECL_LINK( LostFocusHdl_Impl, Edit* );
DECL_LINK( DoubleClickHdl_Impl, SvxFontListBox* );
DECL_LINK( SelFormatHdl_Impl, void * );
- DECL_LINK( ClickHdl_Impl, PushButton* );
+ DECL_LINK_TYPED( SelFormatClickHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickHdl_Impl, Button*, void );
DECL_LINK( EditHdl_Impl, Edit* );
DECL_LINK( OptHdl_Impl, void * );
+ DECL_LINK_TYPED( OptClickHdl_Impl, Button*, void );
DECL_LINK_TYPED(TimeHdl_Impl, Timer *, void);
};
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 4b51379be685..37453a66a1aa 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -223,7 +223,7 @@ class SvxBitmapPickTabPage : public SfxTabPage
protected:
DECL_LINK(NumSelectHdl_Impl, void *);
DECL_LINK(DoubleClickHdl_Impl, void *);
- DECL_LINK(ClickAddBrowseHdl_Impl, void * );
+ DECL_LINK_TYPED(ClickAddBrowseHdl_Impl, Button*, void );
public:
@@ -321,19 +321,19 @@ class SvxNumOptionsTabPage : public SfxTabPage
DECL_LINK( NumberTypeSelectHdl_Impl, ListBox * );
DECL_LINK( LevelHdl_Impl, ListBox * );
- DECL_LINK_TYPED(PopupActivateHdl_Impl, Menu *, bool);
+ DECL_LINK_TYPED( PopupActivateHdl_Impl, Menu *, bool);
DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void );
- DECL_LINK(BulletHdl_Impl, void *);
+ DECL_LINK_TYPED( BulletHdl_Impl, Button*, void);
DECL_LINK( SizeHdl_Impl, MetricField * );
- DECL_LINK( RatioHdl_Impl, CheckBox * );
- DECL_LINK(CharFmtHdl_Impl, void *);
+ DECL_LINK_TYPED( RatioHdl_Impl, Button*, void );
+ DECL_LINK( CharFmtHdl_Impl, void *);
DECL_LINK( EditModifyHdl_Impl, Edit * );
DECL_LINK( AllLevelHdl_Impl, NumericField * );
DECL_LINK( OrientHdl_Impl, ListBox * );
- DECL_LINK( SameLevelHdl_Impl, CheckBox * );
+ DECL_LINK_TYPED( SameLevelHdl_Impl, Button*, void );
DECL_LINK( BulColorHdl_Impl, ColorListBox* );
DECL_LINK( BulRelSizeHdl_Impl, MetricField *);
- DECL_LINK_TYPED(PreviewInvalidateHdl_Impl, Timer *, void);
+ DECL_LINK_TYPED( PreviewInvalidateHdl_Impl, Timer *, void);
public:
SvxNumOptionsTabPage(vcl::Window* pParent,
@@ -426,10 +426,10 @@ class SvxNumPositionTabPage : public SfxTabPage
void InitControls();
DECL_LINK( LevelHdl_Impl, ListBox * );
- DECL_LINK(EditModifyHdl_Impl, void *);
+ DECL_LINK( EditModifyHdl_Impl, void *);
DECL_LINK( DistanceHdl_Impl, MetricField * );
- DECL_LINK( RelativeHdl_Impl, CheckBox * );
- DECL_LINK(StandardHdl_Impl, void *);
+ DECL_LINK_TYPED( RelativeHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( StandardHdl_Impl, Button*, void);
void InitPosAndSpaceMode();
void ShowControlsDependingOnPosAndSpaceMode();
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index 39d18ef48976..441f311e9919 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -49,7 +49,7 @@ class SvxAsianLayoutPage : public SfxTabPage
SvxAsianLayoutPage_Impl* pImpl;
DECL_LINK(LanguageHdl, void *);
- DECL_LINK(ChangeStandardHdl, CheckBox*);
+ DECL_LINK_TYPED(ChangeStandardHdl, Button*, void);
DECL_LINK(ModifyHdl, Edit*);
public:
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index 7efb70d9e1e7..b8028ca9146a 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -59,7 +59,7 @@ private:
css::uno::Reference<
css::linguistic2::XDictionary > xNewDic;
- DECL_LINK(OKHdl_Impl, void *);
+ DECL_LINK_TYPED(OKHdl_Impl, Button*, void);
DECL_LINK(ModifyHdl_Impl, void *);
public:
@@ -132,7 +132,8 @@ private:
DECL_LINK(SelectBookHdl_Impl, void *);
DECL_LINK(SelectLangHdl_Impl, void *);
DECL_LINK(SelectHdl, SvTabListBox*);
- DECL_LINK(NewDelHdl, PushButton*);
+ DECL_LINK_TYPED(NewDelHdl, Button*, void);
+ DECL_LINK(NewDelActionHdl, PushButton*);
DECL_LINK(ModifyHdl, Edit*);
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index e09b39e277e6..50bce86b2262 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -75,9 +75,9 @@ class SvxEditModulesDlg : public ModalDialog
SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol);
DECL_LINK(SelectHdl_Impl, SvxCheckListBox *);
- DECL_LINK(UpDownHdl_Impl, PushButton *);
- DECL_LINK(ClickHdl_Impl, void *);
- DECL_LINK(BackHdl_Impl, void *);
+ DECL_LINK_TYPED(UpDownHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(ClickHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(BackHdl_Impl, Button*, void);
DECL_LINK( LangSelectHdl_Impl, ListBox* );
DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * );
DECL_LINK(OpenURLHdl_Impl, void *);
@@ -137,7 +137,7 @@ private:
static sal_uLong GetDicUserData( const css::uno::Reference< css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx );
DECL_LINK( SelectHdl_Impl, SvxCheckListBox * );
- DECL_LINK( ClickHdl_Impl, PushButton * );
+ DECL_LINK_TYPED( ClickHdl_Impl, Button *, void );
DECL_LINK( BoxDoubleClickHdl_Impl, SvTreeListBox * );
DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * );
DECL_LINK(PostDblClickHdl_Impl, void *);
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 2b443b4ee6b5..5d23015e74db 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -53,8 +53,9 @@ private:
void ChangeCurrentEntry( const OUString& _rFolder );
- DECL_LINK(PathHdl_Impl, void *);
- DECL_LINK(StandardHdl_Impl, void *);
+ DECL_LINK_TYPED(PathHdl_Impl, Button*, void);
+ DECL_LINK(DoubleClickPathHdl_Impl, void *);
+ DECL_LINK_TYPED(StandardHdl_Impl, Button*, void);
DECL_LINK(PathSelect_Impl, void *);
DECL_LINK( HeaderSelect_Impl, HeaderBar * );
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index c7b6436e551d..0c39b832d57c 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -151,11 +151,11 @@ private:
void Init_Impl();
DECL_LINK(LayoutHdl_Impl, void *);
DECL_LINK(PaperBinHdl_Impl, void *);
- DECL_LINK( SwapOrientation_Impl, RadioButton* );
+ DECL_LINK_TYPED( SwapOrientation_Impl, Button*, void );
void SwapFirstValues_Impl( bool bSet );
DECL_LINK(BorderModify_Impl, void *);
void InitHeadFoot_Impl( const SfxItemSet& rSet );
- DECL_LINK(CenterHdl_Impl, void *);
+ DECL_LINK_TYPED(CenterHdl_Impl, Button*, void);
void UpdateExample_Impl( bool bResetbackground = false );
DECL_LINK( PaperSizeSelect_Impl, ListBox* );
@@ -168,7 +168,7 @@ private:
DECL_LINK(RangeHdl_Impl, void *);
void CalcMargin_Impl();
- DECL_LINK( RegisterModify, CheckBox * );
+ DECL_LINK_TYPED( RegisterModify, Button*, void );
// page direction
/** Disables vertical page direction entries in the text flow listbox. */
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index db939787629c..ee5c1dda81c2 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -83,8 +83,8 @@ private:
long nAbst;
long nWidth;
long nMinFixDist;
- bool bRelativeMode;
- bool bNegativeIndents;
+ bool bRelativeMode;
+ bool bNegativeIndents;
void SetLineSpacing_Impl( const SvxLineSpacingItem& rAttr );
void Init_Impl();
@@ -92,7 +92,7 @@ private:
DECL_LINK( LineDistHdl_Impl, ListBox* );
DECL_LINK(ModifyHdl_Impl, void *);
- DECL_LINK( AutoHdl_Impl, CheckBox* );
+ DECL_LINK_TYPED( AutoHdl_Impl, Button*, void );
protected:
virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
@@ -152,7 +152,7 @@ class SvxParaAlignTabPage : public SfxTabPage
VclPtr<VclFrame> m_pPropertiesFL;
VclPtr<svx::FrameDirectionListBox> m_pTextDirectionLB;
- DECL_LINK(AlignHdl_Impl, void *);
+ DECL_LINK_TYPED(AlignHdl_Impl, Button*, void);
DECL_LINK(LastLineHdl_Impl, void *);
DECL_LINK(TextDirectionHdl_Impl, void *);
@@ -253,12 +253,12 @@ private:
bool bHtmlMode;
sal_uInt16 nStdPos;
- DECL_LINK(PageBreakHdl_Impl, void *);
- DECL_LINK(KeepTogetherHdl_Impl, void *);
- DECL_LINK(WidowHdl_Impl, void *);
- DECL_LINK(OrphanHdl_Impl, void *);
- DECL_LINK(HyphenClickHdl_Impl, void *);
- DECL_LINK(ApplyCollClickHdl_Impl, void *);
+ DECL_LINK_TYPED(PageBreakHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(KeepTogetherHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(WidowHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(OrphanHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(HyphenClickHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(ApplyCollClickHdl_Impl, Button*, void);
DECL_LINK( PageBreakPosHdl_Impl, ListBox* );
DECL_LINK( PageBreakTypeHdl_Impl, ListBox* );
@@ -276,7 +276,7 @@ class SvxAsianTabPage : public SfxTabPage
SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
- DECL_STATIC_LINK( SvxAsianTabPage, ClickHdl_Impl, CheckBox* );
+ DECL_STATIC_LINK_TYPED( SvxAsianTabPage, ClickHdl_Impl, Button*, void );
public:
virtual ~SvxAsianTabPage();
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index b5d6c4cc9706..395190897541 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -94,10 +94,10 @@ private:
Link<> aPrevHdlLink;
Link<> aNextHdlLink;
- DECL_LINK(Stamp, void *);
- DECL_LINK(OKHdl, void *);
- DECL_LINK(PrevHdl, void *);
- DECL_LINK(NextHdl, void *);
+ DECL_LINK_TYPED(Stamp, Button*, void);
+ DECL_LINK_TYPED(OKHdl, Button*, void);
+ DECL_LINK_TYPED(PrevHdl, Button*, void);
+ DECL_LINK_TYPED(NextHdl, Button*, void);
};
#endif
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 9c82f2acd8c7..a60cc4174837 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -157,7 +157,7 @@ protected:
const OUString m_renameErrTitleStr;
DECL_LINK( ScriptSelectHdl, SvTreeListBox * );
- DECL_LINK( ButtonHdl, Button * );
+ DECL_LINK_TYPED( ButtonHdl, Button *, void );
static bool getBoolProperty( css::uno::Reference< css::beans::XPropertySet >& xProps, OUString& propName );
void CheckButtons( css::uno::Reference< css::script::browse::XBrowseNode >& node );
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index 774851451ab0..ff7e5f21a731 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -184,7 +184,7 @@ class SvxScriptSelectorDialog : public ModelessDialog
bool m_bShowSlots;
Link<> m_aAddHdl;
- DECL_LINK( ClickHdl, Button * );
+ DECL_LINK_TYPED( ClickHdl, Button *, void );
DECL_LINK( SelectHdl, Control* );
DECL_LINK( FunctionDoubleClickHdl, Control* );
diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx
index 96c7022d774f..77f6d5023ab5 100644
--- a/cui/source/inc/showcols.hxx
+++ b/cui/source/inc/showcols.hxx
@@ -48,7 +48,7 @@ public:
void SetColumns(const css::uno::Reference< css::container::XIndexContainer>& xCols);
protected:
- DECL_LINK(OnClickedOk, void *);
+ DECL_LINK_TYPED(OnClickedOk, Button*, void);
};
#endif // INCLUDED_CUI_SOURCE_INC_SHOWCOLS_HXX
diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx
index 9d727d1583f1..047feae4b315 100644
--- a/cui/source/inc/splitcelldlg.hxx
+++ b/cui/source/inc/splitcelldlg.hxx
@@ -41,7 +41,7 @@ public:
SvxSplitTableDlg(vcl::Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal );
virtual ~SvxSplitTableDlg();
- DECL_LINK( ClickHdl, Button * );
+ DECL_LINK_TYPED( ClickHdl, Button *, void );
virtual bool IsHorizontal() const SAL_OVERRIDE;
virtual bool IsProportional() const SAL_OVERRIDE;
diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx
index f1c6aefde1a9..87a3eeeb4370 100644
--- a/cui/source/inc/srchxtra.hxx
+++ b/cui/source/inc/srchxtra.hxx
@@ -60,7 +60,7 @@ private:
SearchAttrItemList& rList;
- DECL_LINK(OKHdl, void *);
+ DECL_LINK_TYPED(OKHdl, Button*, void);
};
// class SvxSearchSimilarityDialog ---------------------------------------
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index 67f416ee1c63..5c4245f8c0c0 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -99,12 +99,13 @@ class SvxSwPosSizeTabPage : public SfxTabPage
DECL_LINK(RangeModifyHdl, void *);
- DECL_LINK(AnchorTypeHdl, void *);
+ DECL_LINK_TYPED(RangeModifyClickHdl, Button*, void);
+ DECL_LINK_TYPED(AnchorTypeHdl, Button*, void);
DECL_LINK( PosHdl, ListBox * );
DECL_LINK( RelHdl, ListBox * );
- DECL_LINK(MirrorHdl, void *);
+ DECL_LINK_TYPED(MirrorHdl, Button*, void);
DECL_LINK( ModifyHdl, Edit * );
- DECL_LINK(ProtectHdl, void *);
+ DECL_LINK_TYPED(ProtectHdl, Button*, void);
void InitPos(short nAnchorType, sal_uInt16 nH, sal_uInt16 nHRel,
sal_uInt16 nV, sal_uInt16 nVRel,
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index d73e9635a813..c415eab9aaa6 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -107,12 +107,12 @@ private:
void SetFillAndTabType_Impl();
// Handler
- DECL_LINK( NewHdl_Impl, Button* );
- DECL_LINK(DelHdl_Impl, void *);
- DECL_LINK(DelAllHdl_Impl, void *);
+ DECL_LINK_TYPED( NewHdl_Impl, Button*, void );
+ DECL_LINK_TYPED(DelHdl_Impl, Button*, void );
+ DECL_LINK_TYPED(DelAllHdl_Impl, Button*, void );
- DECL_LINK( FillTypeCheckHdl_Impl, RadioButton* );
- DECL_LINK( TabTypeCheckHdl_Impl, RadioButton* );
+ DECL_LINK_TYPED( FillTypeCheckHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( TabTypeCheckHdl_Impl, Button*, void );
DECL_LINK(SelectHdl_Impl, void *);
DECL_LINK(ModifyHdl_Impl, void *);
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index e0d237850114..c0a1896bcc4b 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -66,10 +66,10 @@ private:
SfxMapUnit eUnit;
DECL_LINK( SelectEffectHdl_Impl, void * );
- DECL_LINK( ClickEndlessHdl_Impl, void * );
- DECL_LINK( ClickAutoHdl_Impl, void * );
- DECL_LINK( ClickPixelHdl_Impl, void * );
- DECL_LINK( ClickDirectionHdl_Impl, ImageButton * );
+ DECL_LINK_TYPED( ClickEndlessHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickAutoHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickPixelHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickDirectionHdl_Impl, Button*, void );
void SelectDirection( SdrTextAniDirection nValue );
sal_uInt16 GetSelectedDirection();
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index 881f3fd4837c..c232882889c4 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -66,8 +66,8 @@ private:
bool bWordWrapTextEnabled;
bool bFitToSizeEnabled;
- DECL_LINK( ClickFullWidthHdl_Impl, void * );
- DECL_LINK( ClickHdl_Impl, void * );
+ DECL_LINK_TYPED( ClickFullWidthHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickHdl_Impl, Button*, void );
/** Return whether the text direction is from left to right (</sal_True>) or
top to bottom (</sal_False>).
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index 4aaa4da782ec..6fd929d430fa 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -142,8 +142,8 @@ public:
OUString getErrStr() const { return m_aErrStr; }
// Handler
- DECL_LINK( ReplaceBtnHdl_Impl, Button * );
- DECL_LINK( LeftBtnHdl_Impl, Button * );
+ DECL_LINK_TYPED( ReplaceBtnHdl_Impl, Button *, void );
+ DECL_LINK_TYPED( LeftBtnHdl_Impl, Button *, void );
DECL_LINK( LanguageHdl_Impl, ListBox * );
DECL_LINK( WordSelectHdl_Impl, ComboBox * );
DECL_LINK( AlternativesSelectHdl_Impl, SvxCheckListBox * );
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 10bc6712d2f3..6a967756f2a9 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -130,16 +130,16 @@ private:
RECT_POINT meRP;
- DECL_LINK( ChangePosProtectHdl, void * );
- DECL_LINK( ChangeSizeProtectHdl, void * );
+ DECL_LINK_TYPED( ChangePosProtectHdl, Button*, void );
+ DECL_LINK_TYPED( ChangeSizeProtectHdl, Button*, void );
void SetMinMaxPosition();
void GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange& rRange);
DECL_LINK( ChangeWidthHdl, void * );
DECL_LINK( ChangeHeightHdl, void * );
- DECL_LINK( ClickSizeProtectHdl, void * );
- DECL_LINK( ClickAutoHdl, void * );
+ DECL_LINK_TYPED( ClickSizeProtectHdl, Button*, void );
+ DECL_LINK_TYPED( ClickAutoHdl, Button*, void );
public:
SvxPositionSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 4bb282dbccba..08a7d2fb1b7e 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -185,8 +185,8 @@ private:
protected:
DECL_STATIC_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox* );
DECL_LINK(ShowPageHdl_Impl, void *);
- DECL_LINK(BackHdl_Impl, void *);
- DECL_LINK(OKHdl_Impl, void *);
+ DECL_LINK_TYPED(BackHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(OKHdl_Impl, Button*, void);
void SelectHdl_Impl();
virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx
index 55bb1dc2adc9..dcd7c41c81a4 100644
--- a/cui/source/inc/zoom.hxx
+++ b/cui/source/inc/zoom.hxx
@@ -48,12 +48,12 @@ private:
std::unique_ptr<SfxItemSet> mpOutSet;
bool mbModified;
- DECL_LINK(UserHdl, RadioButton*);
+ DECL_LINK_TYPED(UserHdl, Button*, void);
DECL_LINK(SpinHdl, void*);
- DECL_LINK(ViewLayoutUserHdl, RadioButton*);
+ DECL_LINK_TYPED(ViewLayoutUserHdl, Button*, void);
DECL_LINK(ViewLayoutSpinHdl, NumericField*);
- DECL_LINK(ViewLayoutCheckHdl, CheckBox*);
- DECL_LINK(OKHdl, Button*);
+ DECL_LINK_TYPED(ViewLayoutCheckHdl, Button*, void);
+ DECL_LINK_TYPED(OKHdl, Button*, void);
public:
SvxZoomDialog(vcl::Window* pParent, const SfxItemSet& rCoreSet);
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 89a4930942a8..e0e6866e18e1 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -115,7 +115,7 @@ CertPathDialog::CertPathDialog(vcl::Window* pParent)
AddCertPath("$MOZILLA_CERTIFICATE_FOLDER", OUString(pEnv, strlen(pEnv), osl_getThreadTextEncoding()));
}
-IMPL_LINK_NOARG(CertPathDialog, OKHdl_Impl)
+IMPL_LINK_NOARG_TYPED(CertPathDialog, OKHdl_Impl, Button*, void)
{
try
{
@@ -131,8 +131,6 @@ IMPL_LINK_NOARG(CertPathDialog, OKHdl_Impl)
}
EndDialog(RET_OK);
-
- return 0;
}
OUString CertPathDialog::getDirectory() const
@@ -217,7 +215,7 @@ void CertPathDialog::AddCertPath(const OUString &rProfile, const OUString &rPath
HandleCheckEntry(pEntry);
}
-IMPL_LINK_NOARG(CertPathDialog, AddHdl_Impl)
+IMPL_LINK_NOARG_TYPED(CertPathDialog, AddHdl_Impl, Button*, void)
{
try
{
@@ -240,8 +238,6 @@ IMPL_LINK_NOARG(CertPathDialog, AddHdl_Impl)
{
SAL_WARN("cui.options", "caught UNO exception: " << e.Message);
}
-
- return 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx
index 5a09f9c153eb..510c1529efc2 100644
--- a/cui/source/options/certpath.hxx
+++ b/cui/source/options/certpath.hxx
@@ -27,8 +27,8 @@ private:
OUString m_sManual;
DECL_LINK(CheckHdl_Impl, SvSimpleTable *);
- DECL_LINK(AddHdl_Impl, void *);
- DECL_LINK(OKHdl_Impl, void *);
+ DECL_LINK_TYPED(AddHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(OKHdl_Impl, Button*, void);
void HandleCheckEntry(SvTreeListEntry* _pEntry);
void AddCertPath(const OUString &rProfile, const OUString &rPath);
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index b8253a6b1d21..21e5b51c776b 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -449,7 +449,7 @@ namespace offapp
}
- IMPL_LINK( ConnectionPoolOptionsPage, OnEnabledDisabled, const CheckBox*, _pCheckBox )
+ IMPL_LINK_TYPED( ConnectionPoolOptionsPage, OnEnabledDisabled, Button*, _pCheckBox, void )
{
bool bGloballyEnabled = m_pEnablePooling->IsChecked();
bool bLocalDriverChanged = m_pDriverPoolingEnabled == _pCheckBox;
@@ -474,8 +474,6 @@ namespace offapp
m_pDriverList->getCurrentRow()->bEnabled = m_pDriverPoolingEnabled->IsChecked();
m_pDriverList->updateCurrentRow();
}
-
- return 0L;
}
} // namespace offapp
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index d06ec8893afd..124a7971c9b4 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -59,7 +59,7 @@ namespace offapp
virtual void ActivatePage( const SfxItemSet& _rSet) SAL_OVERRIDE;
protected:
- DECL_LINK( OnEnabledDisabled, const CheckBox* );
+ DECL_LINK_TYPED( OnEnabledDisabled, Button*, void );
DECL_LINK( OnDriverRowChanged, const void* );
void implInitControls(const SfxItemSet& _rSet, bool _bFromReset);
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 569032936e65..eedd4f4b440c 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -145,7 +145,7 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons
Size aHeadSize = rBar.GetSizePixel();
m_pPathBox->SetStyle( m_pPathBox->GetStyle()|nBits );
- m_pPathBox->SetDoubleClickHdl( LINK( this, DbRegistrationOptionsPage, EditHdl ) );
+ m_pPathBox->SetDoubleClickHdl( LINK( this, DbRegistrationOptionsPage, PathBoxDoubleClickHdl ) );
m_pPathBox->SetSelectHdl( LINK( this, DbRegistrationOptionsPage, PathSelect_Impl ) );
m_pPathBox->SetSelectionMode( SINGLE_SELECTION );
m_pPathBox->SetPosSizePixel( Point( 0, aHeadSize.Height() ),
@@ -273,7 +273,7 @@ void DbRegistrationOptionsPage::FillUserData()
SetUserData( aUserData );
}
-IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl)
+IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, DeleteHdl, Button*, void)
{
SvTreeListEntry* pEntry = m_pPathBox->FirstSelected();
if ( pEntry )
@@ -282,32 +282,35 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl)
if ( aQuery->Execute() == RET_YES )
m_pPathBox->GetModel()->Remove(pEntry);
}
- return 0;
}
-IMPL_LINK_NOARG(DbRegistrationOptionsPage, NewHdl)
+IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, NewHdl, Button*, void)
{
OUString sNewName,sNewLocation;
openLinkDialog(sNewName,sNewLocation);
+}
+
+IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathBoxDoubleClickHdl)
+{
+ EditHdl(NULL);
return 0;
}
-IMPL_LINK_NOARG(DbRegistrationOptionsPage, EditHdl)
+
+IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, EditHdl, Button*, void)
{
SvTreeListEntry* pEntry = m_pPathBox->GetCurEntry();
if ( !pEntry )
- return 0L;
+ return;
DatabaseRegistration* pOldRegistration = static_cast< DatabaseRegistration* >( pEntry->GetUserData() );
if ( !pOldRegistration || pOldRegistration->bReadOnly )
- return 0L;
+ return;
OUString sOldName = SvTabListBox::GetEntryText(pEntry,0);
m_pCurEntry = pEntry;
openLinkDialog( sOldName, pOldRegistration->sLocation, pEntry );
m_pCurEntry = NULL;
-
- return 1L;
}
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index f5f24b741380..304a74ad285e 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -103,7 +103,7 @@ namespace svx
}
- IMPL_LINK_NOARG(ODocumentLinkDialog, OnOk)
+ IMPL_LINK_NOARG_TYPED(ODocumentLinkDialog, OnOk, Button*, void)
{
// get the current URL
OUString sURL = m_pURL->GetText();
@@ -128,7 +128,7 @@ namespace svx
sMsg = sMsg.replaceFirst("$file$", m_pURL->GetText());
ScopedVclPtrInstance< MessageDialog > aError(this, sMsg);
aError->Execute();
- return 0L;
+ return;
} // if (!bFileExists)
INetURLObject aURL( sURL );
if ( aURL.GetProtocol() != INetProtocol::File )
@@ -137,7 +137,7 @@ namespace svx
sMsg = sMsg.replaceFirst("$file$", m_pURL->GetText());
ScopedVclPtrInstance< MessageDialog > aError(this, sMsg);
aError->Execute();
- return 0L;
+ return;
}
OUString sCurrentText = m_pName->GetText();
@@ -152,16 +152,15 @@ namespace svx
m_pName->SetSelection(Selection(0,sCurrentText.getLength()));
m_pName->GrabFocus();
- return 0L;
+ return;
}
}
EndDialog(RET_OK);
- return 0L;
}
- IMPL_LINK_NOARG(ODocumentLinkDialog, OnBrowseFile)
+ IMPL_LINK_NOARG_TYPED(ODocumentLinkDialog, OnBrowseFile, Button*, void)
{
::sfx2::FileDialogHelper aFileDlg(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0);
@@ -180,7 +179,7 @@ namespace svx
}
if (0 != aFileDlg.Execute())
- return 0L;
+ return;
if (m_pName->GetText().isEmpty())
{ // default the name to the base of the chosen URL
@@ -202,7 +201,6 @@ namespace svx
m_pURL->SetText(aTransformer.get(OFileNotation::N_SYSTEM));
validate();
- return 0L;
}
diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx
index 376d6f04d0e7..a9c935c3a085 100644
--- a/cui/source/options/doclinkdialog.hxx
+++ b/cui/source/options/doclinkdialog.hxx
@@ -60,8 +60,8 @@ namespace svx
protected:
DECL_LINK(OnTextModified, void *);
- DECL_LINK( OnBrowseFile, void* );
- DECL_LINK( OnOk, void* );
+ DECL_LINK_TYPED( OnBrowseFile, Button*, void );
+ DECL_LINK_TYPED( OnOk, Button*, void );
void validate( );
};
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 848625204ca8..3d5c9f978c3d 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -89,15 +89,16 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent,
aTextColor = m_pCheckLB->GetTextColor();
Link<> aLink(LINK(this, SvxFontSubstTabPage, SelectHdl));
+ Link<Button*,void> aClickLink(LINK(this, SvxFontSubstTabPage, ClickHdl));
m_pCheckLB->SetSelectHdl(aLink);
- m_pUseTableCB->SetClickHdl(aLink);
+ m_pUseTableCB->SetClickHdl(aClickLink);
m_pFont1CB->SetSelectHdl(aLink);
m_pFont1CB->SetModifyHdl(aLink);
m_pFont2CB->SetSelectHdl(aLink);
m_pFont2CB->SetModifyHdl(aLink);
- m_pApply->SetClickHdl(aLink);
- m_pDelete->SetClickHdl(aLink);
+ m_pApply->SetClickHdl(aClickLink);
+ m_pDelete->SetClickHdl(aClickLink);
m_pNonPropFontsOnlyCB->SetClickHdl(LINK(this, SvxFontSubstTabPage, NonPropFontsHdl));
@@ -256,6 +257,11 @@ void SvxFontSubstTabPage::Reset( const SfxItemSet* )
m_pFontHeightLB->SaveValue();
}
+IMPL_LINK_TYPED(SvxFontSubstTabPage, ClickHdl, Button*, pButton, void)
+{
+ SelectHdl(pButton);
+}
+
IMPL_LINK(SvxFontSubstTabPage, SelectHdl, vcl::Window*, pWin)
{
if (pWin == m_pApply || pWin == m_pDelete)
@@ -333,10 +339,10 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, vcl::Window*, pWin)
}
-IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox)
+IMPL_LINK_TYPED(SvxFontSubstTabPage, NonPropFontsHdl, Button*, pBox, void)
{
OUString sFontName = m_pFontNameLB->GetSelectEntry();
- bool bNonPropOnly = pBox->IsChecked();
+ bool bNonPropOnly = static_cast<CheckBox*>(pBox)->IsChecked();
m_pFontNameLB->Clear();
FontList aFntLst( Application::GetDefaultDevice() );
m_pFontNameLB->InsertEntry(m_sAutomatic);
@@ -348,7 +354,6 @@ IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox)
m_pFontNameLB->InsertEntry(rInfo.GetName());
}
m_pFontNameLB->SelectEntry(sFontName);
- return 0;
}
void SvxFontSubstTabPage::CheckEnable()
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index 5a47c784d791..f82330bba6d5 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -82,7 +82,8 @@ class SvxFontSubstTabPage : public SfxTabPage
SvLBoxButtonData* pCheckButtonData;
DECL_LINK(SelectHdl, vcl::Window *);
- DECL_LINK(NonPropFontsHdl, CheckBox* );
+ DECL_LINK_TYPED(ClickHdl, Button*, void);
+ DECL_LINK_TYPED(NonPropFontsHdl, Button*, void);
SvTreeListEntry* CreateEntry(OUString& rFont1, OUString& rFont2);
void CheckEnable();
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 7b18d07adc2a..c4676a1446b9 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -155,7 +155,7 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* pParent/*, const SfxI
m_pEditBtn->SetClickHdl( LINK( this, CuiAboutConfigTabPage, StandardHdl_Impl ) );
m_pResetBtn->SetClickHdl( LINK( this, CuiAboutConfigTabPage, ResetBtnHdl_Impl ) );
- m_pPrefBox->SetDoubleClickHdl( LINK(this, CuiAboutConfigTabPage, StandardHdl_Impl) );
+ m_pPrefBox->SetDoubleClickHdl( LINK(this, CuiAboutConfigTabPage, DoubleClickHdl_Impl) );
m_pPrefBox->SetExpandingHdl( LINK(this, CuiAboutConfigTabPage, ExpandingHdl_Impl) );
m_pSearchBtn->SetClickHdl( LINK(this, CuiAboutConfigTabPage, SearchHdl_Impl) );
@@ -570,17 +570,22 @@ void CuiAboutConfigValueDialog::dispose()
ModalDialog::dispose();
}
-IMPL_LINK_NOARG( CuiAboutConfigTabPage, ResetBtnHdl_Impl )
+IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, ResetBtnHdl_Impl, Button*, void )
{
Reset();
+}
+
+IMPL_LINK_NOARG( CuiAboutConfigTabPage, DoubleClickHdl_Impl )
+{
+ StandardHdl_Impl(NULL);
return 0;
}
-IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl )
+IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void )
{
SvTreeListEntry* pEntry = m_pPrefBox->GetHdlEntry();
if(pEntry == nullptr)
- return 0;
+ return;
UserData *pUserData = static_cast<UserData*>(pEntry->GetUserData());
if(pUserData && pUserData->bIsPropertyPath)
@@ -812,10 +817,9 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl )
{
}
}
- return 0;
}
-IMPL_LINK_NOARG( CuiAboutConfigTabPage, SearchHdl_Impl)
+IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, SearchHdl_Impl, Button*, void)
{
m_pPrefBox->Clear();
m_pPrefBox->SetUpdateMode( false );
@@ -863,8 +867,6 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, SearchHdl_Impl)
m_pPrefBox->SortByCol(sortedCol, sortMode == SortAscending);
m_pPrefBox->SetUpdateMode( true );
-
- return 0;
}
void CuiAboutConfigTabPage::InsertEntry( SvTreeListEntry *pEntry)
diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx
index 0938dc86d0ce..35fdd5559c41 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -61,9 +61,10 @@ private:
static std::vector< OUString > commaStringToSequence( const OUString& rCommaSepString );
void InsertEntry( SvTreeListEntry *pEntry);
- DECL_LINK( StandardHdl_Impl, void * );
- DECL_LINK( ResetBtnHdl_Impl, void * );
- DECL_LINK( SearchHdl_Impl, void* );
+ DECL_LINK_TYPED( StandardHdl_Impl, Button*, void );
+ DECL_LINK( DoubleClickHdl_Impl, void* );
+ DECL_LINK_TYPED( ResetBtnHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( SearchHdl_Impl, Button*, void );
DECL_LINK( ExpandingHdl_Impl, void* );
public:
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 31d4b4308659..9f2ac0421969 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -378,16 +378,15 @@ IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl)
return 0;
}
-IMPL_LINK(SvxAsianLayoutPage, ChangeStandardHdl, CheckBox*, pBox)
+IMPL_LINK_TYPED(SvxAsianLayoutPage, ChangeStandardHdl, Button*, pBox, void)
{
- bool bCheck = pBox->IsChecked();
+ bool bCheck = static_cast<CheckBox*>(pBox)->IsChecked();
m_pStartED->Enable(!bCheck);
m_pEndED->Enable(!bCheck);
m_pStartFT->Enable(!bCheck);
m_pEndFT->Enable(!bCheck);
ModifyHdl(m_pStartED);
- return 0;
}
IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit)
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index f9e3c0e22d40..04193d1d5b53 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -180,7 +180,7 @@ long SvxDefaultColorOptPage::GetColorIndex( const Color& rCol )
// ResetToDefaults
-IMPL_LINK_NOARG(SvxDefaultColorOptPage, ResetToDefaults)
+IMPL_LINK_NOARG_TYPED(SvxDefaultColorOptPage, ResetToDefaults, Button*, void)
{
if( pColorConfig )
{
@@ -192,14 +192,12 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, ResetToDefaults)
m_pLbChartColors->SelectEntryPos( 0 );
m_pPBRemove->Enable( true );
}
-
- return 0L;
}
// AddChartColor
-IMPL_LINK_NOARG(SvxDefaultColorOptPage, AddChartColor)
+IMPL_LINK_NOARG_TYPED(SvxDefaultColorOptPage, AddChartColor, Button*, void)
{
if( pColorConfig )
{
@@ -213,19 +211,17 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, AddChartColor)
m_pLbChartColors->SelectEntryPos( pColorConfig->GetColorList().size() - 1 );
m_pPBRemove->Enable( true );
}
-
- return 0L;
}
// RemoveChartColor
-IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, PushButton*, pButton )
+IMPL_LINK_TYPED( SvxDefaultColorOptPage, RemoveChartColor, Button*, pButton, void )
{
sal_Int32 nIndex = m_pLbChartColors->GetSelectEntryPos();
if (m_pLbChartColors->GetSelectEntryCount() == 0)
- return 0L;
+ return;
if( pColorConfig )
{
@@ -249,8 +245,6 @@ IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, PushButton*, pButton )
m_pPBRemove->Enable(true);
}
}
-
- return 0L;
}
IMPL_LINK( SvxDefaultColorOptPage, ListClickedHdl, ColorLB*, _pColorList )
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 506b9c87f1a0..17f6af34a627 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -43,9 +43,9 @@ private:
SvxChartColorTableItem* pColorConfig;
XColorListRef pColorList;
- DECL_LINK( ResetToDefaults, void * );
- DECL_LINK( AddChartColor, void * );
- DECL_LINK( RemoveChartColor, PushButton * );
+ DECL_LINK_TYPED( ResetToDefaults, Button *, void );
+ DECL_LINK_TYPED( AddChartColor, Button *, void );
+ DECL_LINK_TYPED( RemoveChartColor, Button *, void );
DECL_LINK( ListClickedHdl, ColorLB * );
DECL_LINK(BoxClickedHdl, void *);
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 999aeecdea2b..1f90dcf72efc 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -179,7 +179,7 @@ public:
virtual void dispose() SAL_OVERRIDE;
public:
- void SetLinks (Link<> const&, Link<> const&, Link<> const&);
+ void SetLinks (Link<Button*,void> const&, Link<> const&, Link<> const&);
unsigned GetEntryHeight () const { return vEntries[0]->GetHeight(); }
void Update (EditableColorConfig const*, EditableExtendedColorConfig const*);
void ScrollHdl(const ScrollBar&);
@@ -221,7 +221,7 @@ private:
void SetAppearance(Wallpaper const& aTextWall, ColorListBox const& aSampleList);
void SetTextColor (Color C) { m_pText->SetTextColor(C); }
public:
- void SetLinks (Link<> const&, Link<> const&, Link<> const&);
+ void SetLinks (Link<Button*,void> const&, Link<> const&, Link<> const&);
void Update (ColorConfigEntry, ColorConfigValue const&);
void Update (ExtendedColorConfigValue const&);
void ColorChanged (ColorConfigEntry, ColorConfigValue&);
@@ -416,7 +416,7 @@ void ColorConfigWindow_Impl::Entry::SetAppearance(
// SetLinks()
void ColorConfigWindow_Impl::Entry::SetLinks(
- Link<> const& aCheckLink, Link<> const& aColorLink,
+ Link<Button*,void> const& aCheckLink, Link<> const& aColorLink,
Link<> const& aGetFocusLink)
{
m_pColorList->SetSelectHdl(aColorLink);
@@ -691,7 +691,7 @@ void ColorConfigWindow_Impl::Init(ScrollBar *pVScroll, HeaderBar *pHeaderHB)
// SetLinks()
void ColorConfigWindow_Impl::SetLinks (
- Link<> const& aCheckLink, Link<> const& aColorLink, Link<> const& aGetFocusLink
+ Link<Button*,void> const& aCheckLink, Link<> const& aColorLink, Link<> const& aGetFocusLink
) {
for (unsigned i = 0; i != vEntries.size(); ++i)
vEntries[i]->SetLinks(aCheckLink, aColorLink, aGetFocusLink);
@@ -847,7 +847,7 @@ class ColorConfigCtrl_Impl : public VclVBox
EditableExtendedColorConfig* pExtColorConfig;
DECL_LINK(ScrollHdl, ScrollBar*);
- DECL_LINK(ClickHdl, CheckBox*);
+ DECL_LINK_TYPED(ClickHdl, Button*, void);
DECL_LINK(ColorHdl, ColorListBox*);
DECL_LINK(ControlFocusHdl, Control*);
@@ -901,7 +901,7 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(vcl::Window* pParent)
m_pVScroll->SetScrollHdl(aScrollLink);
m_pVScroll->SetEndScrollHdl(aScrollLink);
- Link<> aCheckLink = LINK(this, ColorConfigCtrl_Impl, ClickHdl);
+ Link<Button*,void> aCheckLink = LINK(this, ColorConfigCtrl_Impl, ClickHdl);
Link<> aColorLink = LINK(this, ColorConfigCtrl_Impl, ColorHdl);
Link<> aGetFocusLink = LINK(this, ColorConfigCtrl_Impl, ControlFocusHdl);
m_pScrollWindow->SetLinks(aCheckLink, aColorLink, aGetFocusLink);
@@ -1002,11 +1002,10 @@ void ColorConfigCtrl_Impl::DataChanged( const DataChangedEvent& rDCEvt )
}
}
-IMPL_LINK(ColorConfigCtrl_Impl, ClickHdl, CheckBox*, pBox)
+IMPL_LINK_TYPED(ColorConfigCtrl_Impl, ClickHdl, Button*, pBox, void)
{
DBG_ASSERT(pColorConfig, "Configuration not set");
- m_pScrollWindow->ClickHdl(pColorConfig, pBox);
- return 0;
+ m_pScrollWindow->ClickHdl(pColorConfig, static_cast<CheckBox*>(pBox));
}
// a color list has changed
@@ -1071,7 +1070,7 @@ SvxColorOptionsTabPage::SvxColorOptionsTabPage(
get<vcl::Window>("preview")->GetText());
m_pColorSchemeLB->SetSelectHdl(LINK(this, SvxColorOptionsTabPage, SchemeChangedHdl_Impl));
- Link<> aLk = LINK(this, SvxColorOptionsTabPage, SaveDeleteHdl_Impl );
+ Link<Button*,void> aLk = LINK(this, SvxColorOptionsTabPage, SaveDeleteHdl_Impl );
m_pSaveSchemePB->SetClickHdl(aLk);
m_pDeleteSchemePB->SetClickHdl(aLk);
}
@@ -1188,7 +1187,7 @@ IMPL_LINK(SvxColorOptionsTabPage, SchemeChangedHdl_Impl, ListBox*, pBox)
return 0;
}
-IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton )
+IMPL_LINK_TYPED(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, void )
{
if (m_pSaveSchemePB == pButton)
{
@@ -1230,7 +1229,6 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton )
}
}
m_pDeleteSchemePB->Enable( m_pColorSchemeLB->GetEntryCount() > 1 );
- return 0;
}
IMPL_LINK(SvxColorOptionsTabPage, CheckNameHdl_Impl, AbstractSvxNameDialog*, pDialog )
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index c16c2973ee0f..ca290410d458 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -42,7 +42,7 @@ class SvxColorOptionsTabPage : public SfxTabPage
svtools::EditableExtendedColorConfig* pExtColorConfig;
DECL_LINK(SchemeChangedHdl_Impl, ListBox*);
- DECL_LINK(SaveDeleteHdl_Impl, PushButton*);
+ DECL_LINK_TYPED(SaveDeleteHdl_Impl, Button*, void);
DECL_LINK(CheckNameHdl_Impl, AbstractSvxNameDialog*);
void UpdateColorConfig();
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 4cc080630f75..5b8911db6fa3 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -24,7 +24,7 @@
// class SvxCTLOptionsPage -----------------------------------------------------
-IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl)
+IMPL_LINK_NOARG_TYPED(SvxCTLOptionsPage, SequenceCheckingCB_Hdl, Button*, void)
{
bool bIsSequenceChecking = m_pSequenceCheckingCB->IsChecked();
m_pRestrictedCB->Enable( bIsSequenceChecking );
@@ -35,7 +35,6 @@ IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl)
m_pTypeReplaceCB->Check();
m_pRestrictedCB->Check();
}
- return 0;
}
SvxCTLOptionsPage::SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) :
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index ac2544d47c27..3cffb33e08e6 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.hxx
@@ -39,7 +39,7 @@ private:
VclPtr<ListBox> m_pNumeralsLB;
- DECL_LINK( SequenceCheckingCB_Hdl, void* );
+ DECL_LINK_TYPED( SequenceCheckingCB_Hdl, Button*, void );
public:
SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 7026e5f3664f..9b3e949a6fa2 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -133,7 +133,7 @@ void SvxNewDictionaryDialog::dispose()
}
-IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void)
{
OUString sDict = comphelper::string::stripEnd(pNameEdit->GetText(), ' ');
// add extension for personal dictionaries
@@ -158,7 +158,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl)
// duplicate names?
ScopedVclPtrInstance<MessageDialog>::Create(this, CUI_RESSTR(RID_SVXSTR_OPT_DOUBLE_DICTS), VCL_MESSAGE_INFO)->Execute();
pNameEdit->GrabFocus();
- return 0;
+ return;
}
// create and add
@@ -202,7 +202,6 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl)
EndDialog( RET_OK );
- return 0;
}
@@ -273,8 +272,8 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
pWordED->SetModifyHdl(LINK(this, SvxEditDictionaryDialog, ModifyHdl));
pReplaceED->SetModifyHdl(LINK(this, SvxEditDictionaryDialog, ModifyHdl));
- pWordED->SetActionHdl(LINK(this, SvxEditDictionaryDialog, NewDelHdl));
- pReplaceED->SetActionHdl(LINK(this, SvxEditDictionaryDialog, NewDelHdl));
+ pWordED->SetActionHdl(LINK(this, SvxEditDictionaryDialog, NewDelActionHdl));
+ pReplaceED->SetActionHdl(LINK(this, SvxEditDictionaryDialog, NewDelActionHdl));
// fill listbox with all available WB's
const Reference< XDictionary > *pDic = aDics.getConstArray();
@@ -593,7 +592,12 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox)
-IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn)
+IMPL_LINK_TYPED(SvxEditDictionaryDialog, NewDelHdl, Button*, pBtn, void)
+{
+ NewDelActionHdl(static_cast<PushButton*>(pBtn));
+}
+
+IMPL_LINK(SvxEditDictionaryDialog, NewDelActionHdl, PushButton*, pBtn)
{
SvTreeListEntry* pEntry = pWordsLB->FirstSelected();
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index af543b331743..4f35b27cf43d 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -73,16 +73,14 @@ void OfaMSFilterTabPage::dispose()
}
-IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl)
+IMPL_LINK_NOARG_TYPED(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl, Button*, void)
{
aWBasicWbctblCB->Enable( aWBasicCodeCB->IsChecked() );
- return 0;
}
-IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl)
+IMPL_LINK_NOARG_TYPED(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, Button*, void)
{
aEBasicExectblCB->Enable( aEBasicCodeCB->IsChecked() );
- return 0;
}
VclPtr<SfxTabPage> OfaMSFilterTabPage::Create( vcl::Window* pParent,
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 2abda52cb46e..d9535fb5dbf0 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -37,8 +37,8 @@ class OfaMSFilterTabPage : public SfxTabPage
VclPtr<CheckBox> aPBasicStgCB;
- DECL_LINK(LoadWordBasicCheckHdl_Impl, void *);
- DECL_LINK(LoadExcelBasicCheckHdl_Impl, void *);
+ DECL_LINK_TYPED(LoadWordBasicCheckHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(LoadExcelBasicCheckHdl_Impl, Button*, void);
public:
OfaMSFilterTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~OfaMSFilterTabPage();
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 4970b4b4fda5..02926c82368c 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1140,7 +1140,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet&
m_pLocaleSettingLB->SetSelectHdl( LINK( this, OfaLanguagesTabPage, LocaleSettingHdl ) );
m_pDatePatternsED->SetModifyHdl( LINK( this, OfaLanguagesTabPage, DatePatternsHdl ) );
- Link<> aLink( LINK( this, OfaLanguagesTabPage, SupportHdl ) );
+ Link<Button*,void> aLink( LINK( this, OfaLanguagesTabPage, SupportHdl ) );
m_pAsianSupportCB->SetClickHdl( aLink );
m_pCTLSupportCB->SetClickHdl( aLink );
@@ -1615,10 +1615,10 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet )
}
}
-IMPL_LINK( OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox )
+IMPL_LINK_TYPED( OfaLanguagesTabPage, SupportHdl, Button*, pButton, void )
{
+ CheckBox* pBox = static_cast<CheckBox*>(pButton);
DBG_ASSERT( pBox, "OfaLanguagesTabPage::SupportHdl(): pBox invalid" );
-
bool bCheck = pBox->IsChecked();
if ( m_pAsianSupportCB == pBox )
{
@@ -1638,8 +1638,6 @@ IMPL_LINK( OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox )
}
else
SAL_WARN( "cui.options", "OfaLanguagesTabPage::SupportHdl(): wrong pBox" );
-
- return 0;
}
namespace
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 013f28d4ac7e..b031e7918bbb 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -160,7 +160,7 @@ class OfaLanguagesTabPage : public SfxTabPage
bool m_bDatePatternsValid;
- DECL_LINK( SupportHdl, CheckBox* ) ;
+ DECL_LINK_TYPED( SupportHdl, Button*, void ) ;
DECL_LINK( LocaleSettingHdl, SvxLanguageBox* ) ;
DECL_LINK( DatePatternsHdl, Edit* ) ;
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 537018c5ef4f..a54e17f63871 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -182,10 +182,9 @@ void OfaHtmlTabPage::Reset( const SfxItemSet* )
aCharSetLB->SelectTextEncoding( rHtmlOpt.GetTextEncoding() );
}
-IMPL_LINK(OfaHtmlTabPage, CheckBoxHdl_Impl, CheckBox*, pBox)
+IMPL_LINK_TYPED(OfaHtmlTabPage, CheckBoxHdl_Impl, Button*, pBox, void)
{
- aStarBasicWarningCB->Enable(!pBox->IsChecked());
- return 0;
+ aStarBasicWarningCB->Enable(!static_cast<CheckBox*>(pBox)->IsChecked());
}
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index c8a0bd999343..3fce3de5273a 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -47,7 +47,7 @@ class OfaHtmlTabPage : public SfxTabPage
VclPtr<CheckBox> aSaveGrfLocalCB;
VclPtr<SvxTextEncodingBox> aCharSetLB;
- DECL_LINK(CheckBoxHdl_Impl, CheckBox*);
+ DECL_LINK_TYPED(CheckBoxHdl_Impl, Button*, void);
public:
virtual ~OfaHtmlTabPage();
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 67d5fed7124c..4891a4550e73 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -666,15 +666,14 @@ void SvxSecurityTabPage::dispose()
SfxTabPage::dispose();
}
-IMPL_LINK_NOARG(SvxSecurityTabPage, SecurityOptionsHdl)
+IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, SecurityOptionsHdl, Button*, void)
{
if ( !mpSecOptDlg )
mpSecOptDlg = VclPtr<svx::SecurityOptionsDialog>::Create( this, mpSecOptions );
mpSecOptDlg->Execute();
- return 0;
}
-IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl)
+IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, SavePasswordHdl, Button*, void)
{
try
{
@@ -725,11 +724,9 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl)
{
m_pSavePasswordsCB->Check( !m_pSavePasswordsCB->IsChecked() );
}
-
- return 0;
}
-IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MasterPasswordHdl)
+IMPL_STATIC_LINK_NOARG_TYPED(SvxSecurityTabPage, MasterPasswordHdl, Button*, void)
{
try
{
@@ -741,11 +738,9 @@ IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MasterPasswordHdl)
}
catch (const Exception&)
{}
-
- return 0;
}
-IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordCBHdl)
+IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, MasterPasswordCBHdl, Button*, void)
{
try
{
@@ -785,11 +780,9 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordCBHdl)
{
m_pSavePasswordsCB->Check( !m_pSavePasswordsCB->IsChecked() );
}
-
- return 0;
}
-IMPL_LINK_NOARG(SvxSecurityTabPage, ShowPasswordsHdl)
+IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, ShowPasswordsHdl, Button*, void)
{
try
{
@@ -804,10 +797,9 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, ShowPasswordsHdl)
}
catch (const Exception&)
{}
- return 0;
}
-IMPL_LINK_NOARG(SvxSecurityTabPage, CertPathPBHdl)
+IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, CertPathPBHdl, Button*, void)
{
if (!mpCertPathDlg)
mpCertPathDlg = VclPtr<CertPathDialog>::Create(this);
@@ -820,11 +812,9 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, CertPathPBHdl)
ScopedVclPtrInstance< MessageDialog > aWarnBox(this, CUI_RES(RID_SVXSTR_OPTIONS_RESTART), VCL_MESSAGE_INFO);
aWarnBox->Execute();
}
-
- return 0;
}
-IMPL_LINK_NOARG(SvxSecurityTabPage, TSAURLsPBHdl)
+IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, TSAURLsPBHdl, Button*, void)
{
// Unlike the mpCertPathDlg, we *don't* keep the same dialog object around between
// invocations. Seems clearer to my little brain that way.
@@ -832,11 +822,9 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, TSAURLsPBHdl)
ScopedVclPtrInstance<TSAURLsDialog> pTSAURLsDlg(this);
pTSAURLsDlg->Execute();
-
- return 0;
}
-IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MacroSecPBHdl)
+IMPL_STATIC_LINK_NOARG_TYPED(SvxSecurityTabPage, MacroSecPBHdl, Button*, void)
{
try
{
@@ -849,7 +837,6 @@ IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MacroSecPBHdl)
OSL_FAIL(OUStringToOString(e.Message, osl_getThreadTextEncoding()).getStr());
(void)e;
}
- return 0;
}
@@ -1076,7 +1063,7 @@ void SvxEMailTabPage::Reset( const SfxItemSet* )
/* -------------------------------------------------------------------------*/
-IMPL_LINK( SvxEMailTabPage, FileDialogHdl_Impl, PushButton*, pButton )
+IMPL_LINK_TYPED( SvxEMailTabPage, FileDialogHdl_Impl, Button*, pButton, void )
{
if (m_pMailerURLPB == pButton && !pImpl->bROProgram)
{
@@ -1103,7 +1090,6 @@ IMPL_LINK( SvxEMailTabPage, FileDialogHdl_Impl, PushButton*, pButton )
m_pMailerURLED->SetText(sPath);
}
}
- return 0;
}
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index c23dc7be8c87..0c5da70c3cee 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -155,14 +155,14 @@ private:
OUString m_sPasswordStoringDeactivateStr;
- DECL_LINK(SecurityOptionsHdl, void *);
- DECL_LINK(SavePasswordHdl, void* );
- DECL_STATIC_LINK(SvxSecurityTabPage, MasterPasswordHdl, void *);
- DECL_LINK(MasterPasswordCBHdl, void* );
- DECL_LINK(ShowPasswordsHdl, void *);
- DECL_STATIC_LINK(SvxSecurityTabPage, MacroSecPBHdl, void* );
- DECL_LINK(CertPathPBHdl, void* );
- DECL_LINK(TSAURLsPBHdl, void* );
+ DECL_LINK_TYPED(SecurityOptionsHdl, Button*, void);
+ DECL_LINK_TYPED(SavePasswordHdl, Button*, void);
+ DECL_STATIC_LINK_TYPED(SvxSecurityTabPage, MasterPasswordHdl, Button*, void);
+ DECL_LINK_TYPED(MasterPasswordCBHdl, Button*, void);
+ DECL_LINK_TYPED(ShowPasswordsHdl, Button*, void);
+ DECL_STATIC_LINK_TYPED(SvxSecurityTabPage, MacroSecPBHdl, Button*, void );
+ DECL_LINK_TYPED(CertPathPBHdl, Button*, void );
+ DECL_LINK_TYPED(TSAURLsPBHdl, Button*, void );
void InitControls();
@@ -195,7 +195,7 @@ class SvxEMailTabPage : public SfxTabPage
SvxEMailTabPage_Impl* pImpl;
- DECL_LINK( FileDialogHdl_Impl, PushButton* ) ;
+ DECL_LINK_TYPED( FileDialogHdl_Impl, Button*, void );
public:
SvxEMailTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 6da45086e863..ee9afe036efa 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -236,12 +236,11 @@ void SvxJavaOptionsPage::dispose()
-IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, EnableHdl_Impl, Button*, void)
{
bool bEnable = m_pJavaEnableCB->IsChecked();
m_pJavaBox->Enable(bEnable);
bEnable ? m_pJavaList->EnableTable() : m_pJavaList->DisableTable();
- return 0;
}
@@ -273,7 +272,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl)
-IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, AddHdl_Impl, Button*, void)
{
try
{
@@ -294,13 +293,11 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl)
{
SAL_WARN( "cui.options", "SvxJavaOptionsPage::AddHdl_Impl(): caught exception: " << e.Message);
}
-
- return 0;
}
-IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ParameterHdl_Impl, Button*, void)
{
#if HAVE_FEATURE_JAVA
Sequence< OUString > aParameterList;
@@ -344,12 +341,11 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl)
else
m_pParamDlg->SetParameters( aParameterList );
#endif
- return 0;
}
-IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ClassPathHdl_Impl, Button*, void)
{
#if HAVE_FEATURE_JAVA
OUString sClassPath;
@@ -389,7 +385,6 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl)
else
m_pPathDlg->SetClassPath( sClassPath );
#endif
- return 0;
}
@@ -433,7 +428,7 @@ IMPL_LINK_TYPED( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt,
-IMPL_LINK_NOARG( SvxJavaOptionsPage, ExpertConfigHdl_Impl )
+IMPL_LINK_NOARG_TYPED( SvxJavaOptionsPage, ExpertConfigHdl_Impl, Button*, void )
{
ScopedVclPtrInstance< CuiAboutConfigTabPage > m_pExpertConfigDlg(this);
m_pExpertConfigDlg->Reset();//initialize and reset function
@@ -444,7 +439,6 @@ IMPL_LINK_NOARG( SvxJavaOptionsPage, ExpertConfigHdl_Impl )
}
m_pExpertConfigDlg.disposeAndClear();
- return 0;
}
@@ -844,7 +838,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl)
-IMPL_LINK_NOARG(SvxJavaParameterDlg, AssignHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, AssignHdl_Impl, Button*, void)
{
OUString sParam = comphelper::string::strip(m_pParameterEdit->GetText(), ' ');
if (!sParam.isEmpty())
@@ -857,8 +851,6 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, AssignHdl_Impl)
ModifyHdl_Impl( m_pParameterEdit );
EnableRemoveButton();
}
-
- return 0;
}
@@ -881,7 +873,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, DblClickHdl_Impl)
-IMPL_LINK_NOARG(SvxJavaParameterDlg, RemoveHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, RemoveHdl_Impl, Button*, void)
{
sal_Int32 nPos = m_pAssignedList->GetSelectEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -896,8 +888,6 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, RemoveHdl_Impl)
}
}
EnableRemoveButton();
-
- return 0;
}
@@ -979,7 +969,7 @@ void SvxJavaClassPathDlg::dispose()
ModalDialog::dispose();
}
-IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void)
{
sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE, 0 );
aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) );
@@ -1011,12 +1001,11 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl)
}
}
EnableRemoveButton();
- return 0;
}
-IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void)
{
Reference < XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
Reference < XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext);;
@@ -1048,12 +1037,11 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl)
}
}
EnableRemoveButton();
- return 0;
}
-IMPL_LINK_NOARG(SvxJavaClassPathDlg, RemoveHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, RemoveHdl_Impl, Button*, void)
{
sal_Int32 nPos = m_pPathList->GetSelectEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -1069,7 +1057,6 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, RemoveHdl_Impl)
}
EnableRemoveButton();
- return 0;
}
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 06bd595bb81b..70acc0e922c9 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -84,18 +84,18 @@ private:
css::uno::Reference< ::svt::DialogClosedListener > xDialogListener;
css::uno::Reference< css::ui::dialogs::XFolderPicker2 > xFolderPicker;
- DECL_LINK(EnableHdl_Impl, void *);
+ DECL_LINK_TYPED(EnableHdl_Impl, Button*, void);
DECL_LINK( CheckHdl_Impl, SvSimpleTable * );
DECL_LINK(SelectHdl_Impl, void *);
- DECL_LINK(AddHdl_Impl, void *);
- DECL_LINK(ParameterHdl_Impl, void *);
- DECL_LINK(ClassPathHdl_Impl, void *);
+ DECL_LINK_TYPED(AddHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(ParameterHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(ClassPathHdl_Impl, Button*, void);
DECL_LINK_TYPED(ResetHdl_Impl, Idle *, void);
DECL_LINK( StartFolderPickerHdl, void * );
DECL_LINK_TYPED( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void );
- DECL_LINK(ExpertConfigHdl_Impl, void *);
+ DECL_LINK_TYPED(ExpertConfigHdl_Impl, Button*, void);
void ClearJavaInfo();
void ClearJavaList();
@@ -128,10 +128,10 @@ private:
VclPtr<PushButton> m_pRemoveBtn;
DECL_LINK(ModifyHdl_Impl, void *);
- DECL_LINK(AssignHdl_Impl, void *);
+ DECL_LINK_TYPED(AssignHdl_Impl, Button*, void);
DECL_LINK(SelectHdl_Impl, void *);
DECL_LINK(DblClickHdl_Impl, void *);
- DECL_LINK(RemoveHdl_Impl, void *);
+ DECL_LINK_TYPED(RemoveHdl_Impl, Button*, void);
inline void EnableRemoveButton()
{ m_pRemoveBtn->Enable(
@@ -162,9 +162,9 @@ private:
OUString m_sOldPath;
- DECL_LINK(AddArchiveHdl_Impl, void *);
- DECL_LINK(AddPathHdl_Impl, void *);
- DECL_LINK(RemoveHdl_Impl, void *);
+ DECL_LINK_TYPED(AddArchiveHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(AddPathHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(RemoveHdl_Impl, Button*, void);
DECL_LINK(SelectHdl_Impl, void *);
bool IsPathDuplicate( const OUString& _rPath );
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 5a6817984955..f404fa28fa4c 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1582,7 +1582,7 @@ IMPL_LINK( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox )
-IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
+IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void )
{
if (m_pLinguModulesEditPB == pBtn)
{
@@ -1670,7 +1670,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
ScopedVclPtrInstance<MessageDialog> aQuery(this, "QueryDeleteDictionaryDialog",
"cui/ui/querydeletedictionarydialog.ui");
if (RET_NO == aQuery->Execute())
- return 0;
+ return;
SvTreeListEntry *pEntry = m_pLinguDicsCLB->GetCurEntry();
if (pEntry)
@@ -1758,8 +1758,6 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
{
OSL_FAIL( "pBtn unexpected value" );
}
-
- return 0;
}
@@ -2274,7 +2272,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
return 0;
}
-IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn )
+IMPL_LINK_TYPED( SvxEditModulesDlg, UpDownHdl_Impl, Button *, pBtn, void )
{
bool bUp = m_pPrioUpPB == pBtn;
sal_uLong nCurPos = m_pModulesCLB->GetSelectEntryPos();
@@ -2300,22 +2298,19 @@ IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn )
SelectHdl_Impl(m_pModulesCLB);
m_pModulesCLB->SetUpdateMode(true);
}
- return 0;
}
-IMPL_LINK_NOARG(SvxEditModulesDlg, ClickHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxEditModulesDlg, ClickHdl_Impl, Button*, void)
{
// store language config
LangSelectHdl_Impl(m_pLanguageLB);
EndDialog( RET_OK );
- return 0;
}
-IMPL_LINK_NOARG(SvxEditModulesDlg, BackHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxEditModulesDlg, BackHdl_Impl, Button*, void)
{
rLinguData = *pDefaultLinguData;
LangSelectHdl_Impl(0);
- return 0;
}
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 4c97609dcbc4..e20876b9ede0 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -372,41 +372,40 @@ void SvxOpenCLTabPage::EnableOpenCLHdl(VclFrame* pFrame, bool aEnable)
pFrame->Enable(aEnable);
}
-IMPL_LINK_NOARG(SvxOpenCLTabPage, BlackListEditHdl)
+IMPL_LINK_NOARG_TYPED(SvxOpenCLTabPage, BlackListEditHdl, Button*, void)
{
- return EditHdl(mpBlackList, maConfig.maBlackList, "bledit");
+ EditHdl(mpBlackList, maConfig.maBlackList, "bledit");
}
-IMPL_LINK_NOARG(SvxOpenCLTabPage, BlackListAddHdl)
+IMPL_LINK_NOARG_TYPED(SvxOpenCLTabPage, BlackListAddHdl, Button*, void)
{
- return AddHdl(mpBlackList, maConfig.maBlackList, "bladd");
+ AddHdl(mpBlackList, maConfig.maBlackList, "bladd");
}
-IMPL_LINK_NOARG(SvxOpenCLTabPage, BlackListDeleteHdl)
+IMPL_LINK_NOARG_TYPED(SvxOpenCLTabPage, BlackListDeleteHdl, Button*, void)
{
- return DeleteHdl(mpBlackList, maConfig.maBlackList);
+ DeleteHdl(mpBlackList, maConfig.maBlackList);
}
-IMPL_LINK_NOARG(SvxOpenCLTabPage, WhiteListEditHdl)
+IMPL_LINK_NOARG_TYPED(SvxOpenCLTabPage, WhiteListEditHdl, Button*, void)
{
- return EditHdl(mpWhiteList, maConfig.maWhiteList, "wledit");
+ EditHdl(mpWhiteList, maConfig.maWhiteList, "wledit");
}
-IMPL_LINK_NOARG(SvxOpenCLTabPage, WhiteListAddHdl)
+IMPL_LINK_NOARG_TYPED(SvxOpenCLTabPage, WhiteListAddHdl, Button*, void)
{
- return AddHdl(mpWhiteList, maConfig.maWhiteList, "wladd");
+ AddHdl(mpWhiteList, maConfig.maWhiteList, "wladd");
}
-IMPL_LINK_NOARG(SvxOpenCLTabPage, WhiteListDeleteHdl)
+IMPL_LINK_NOARG_TYPED(SvxOpenCLTabPage, WhiteListDeleteHdl, Button*, void)
{
- return DeleteHdl(mpWhiteList, maConfig.maWhiteList);
+ DeleteHdl(mpWhiteList, maConfig.maWhiteList);
}
-IMPL_LINK_NOARG(SvxOpenCLTabPage, EnableOpenCLHdl)
+IMPL_LINK_NOARG_TYPED(SvxOpenCLTabPage, EnableOpenCLHdl, Button*, void)
{
EnableOpenCLHdl(mpBlackListFrame, mpUseOpenCL->IsChecked());
EnableOpenCLHdl(mpWhiteListFrame, mpUseOpenCL->IsChecked());
- return 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx
index 99886acbe038..1c57826bfa43 100644
--- a/cui/source/options/optopencl.hxx
+++ b/cui/source/options/optopencl.hxx
@@ -52,15 +52,15 @@ private:
VclPtr<PushButton> mpWhiteListAdd;
VclPtr<PushButton> mpWhiteListDelete;
- DECL_LINK(BlackListEditHdl, void*);
- DECL_LINK(BlackListAddHdl, void*);
- DECL_LINK(BlackListDeleteHdl, void*);
+ DECL_LINK_TYPED(BlackListEditHdl, Button*, void);
+ DECL_LINK_TYPED(BlackListAddHdl, Button*, void);
+ DECL_LINK_TYPED(BlackListDeleteHdl, Button*, void);
- DECL_LINK(WhiteListEditHdl, void*);
- DECL_LINK(WhiteListAddHdl, void*);
- DECL_LINK(WhiteListDeleteHdl, void*);
+ DECL_LINK_TYPED(WhiteListEditHdl, Button*, void);
+ DECL_LINK_TYPED(WhiteListAddHdl, Button*, void);
+ DECL_LINK_TYPED(WhiteListDeleteHdl, Button*, void);
- DECL_LINK(EnableOpenCLHdl, void*);
+ DECL_LINK_TYPED(EnableOpenCLHdl, Button*, void);
long EditHdl(SvSimpleTable* pListBox, OpenCLConfig::ImplMatcherSet& rSet, const OString& rTag);
long AddHdl(SvSimpleTable* pListBox, OpenCLConfig::ImplMatcherSet& rSet, const OString& rTag);
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 6b985e73c876..787b9564160d 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -195,8 +195,7 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
get(m_pPathCtrl, "paths");
m_pStandardBtn->SetClickHdl(LINK(this, SvxPathTabPage, StandardHdl_Impl));
- Link<> aLink = LINK( this, SvxPathTabPage, PathHdl_Impl );
- m_pPathBtn->SetClickHdl( aLink );
+ m_pPathBtn->SetClickHdl( LINK( this, SvxPathTabPage, PathHdl_Impl ) );
Size aControlSize(236 , 147);
aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
@@ -224,7 +223,7 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
aTabs[3] = aTabs[2] + nWidth2 + 12;
pPathBox->SetTabs(aTabs, MAP_PIXEL);
- pPathBox->SetDoubleClickHdl( aLink );
+ pPathBox->SetDoubleClickHdl( LINK( this, SvxPathTabPage, DoubleClickPathHdl_Impl ) );
pPathBox->SetSelectHdl( LINK( this, SvxPathTabPage, PathSelect_Impl ) );
pPathBox->SetSelectionMode( MULTIPLE_SELECTION );
pPathBox->SetHighlightRange();
@@ -405,7 +404,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl)
-IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxPathTabPage, StandardHdl_Impl, Button*, void)
{
SvTreeListEntry* pEntry = pPathBox->FirstSelected();
while ( pEntry )
@@ -456,7 +455,6 @@ IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl)
}
pEntry = pPathBox->NextSelected( pEntry );
}
- return 0;
}
@@ -526,7 +524,13 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder )
-IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl)
+IMPL_LINK_NOARG(SvxPathTabPage, DoubleClickPathHdl_Impl)
+{
+ PathHdl_Impl(NULL);
+ return 0;
+}
+
+IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathHdl_Impl, Button*, void)
{
SvTreeListEntry* pEntry = pPathBox->GetCurEntry();
sal_uInt16 nPos = ( pEntry != NULL ) ? static_cast<PathUserData_Impl*>(pEntry->GetUserData())->nRealId : 0;
@@ -541,7 +545,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl)
}
if(pEntry && !(!SvTreeListBox::GetCollapsedEntryBmp(pEntry)))
- return 0;
+ return;
if ( IsMultiPath_Impl( nPos ) )
{
@@ -615,7 +619,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl)
{
short nRet = xFolderPicker->execute();
if ( ExecutableDialogResults::OK != nRet )
- return 0;
+ return;
OUString sFolder( xFolderPicker->getDirectory() );
ChangeCurrentEntry( sFolder );
@@ -626,7 +630,6 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl)
SAL_WARN( "cui.options", "SvxPathTabPage::PathHdl_Impl: exception from folder picker" );
}
}
- return 0;
}
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 8bb88384c6c6..1ec65657ccd0 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -118,8 +118,7 @@ SvxSaveTabPage::SvxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet
aDocTypeLB->SetEntryData(5, reinterpret_cast<void*>(APP_DRAW) );
aDocTypeLB->SetEntryData(6, reinterpret_cast<void*>(APP_MATH) );
- Link<> aLink = LINK( this, SvxSaveTabPage, AutoClickHdl_Impl );
- aAutoSaveCB->SetClickHdl( aLink );
+ aAutoSaveCB->SetClickHdl( LINK( this, SvxSaveTabPage, AutoClickHdl_Impl ) );
aAutoSaveEdit->SetMaxTextLen( 2 );
SvtModuleOptions aModuleOpt;
@@ -186,7 +185,7 @@ SvxSaveTabPage::SvxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet
pImpl->aDefaultReadonlyArr[APP_WRITER_GLOBAL] = aModuleOpt.IsDefaultFilterReadonly(SvtModuleOptions::EFactory::WRITERGLOBAL);
}
- aLink = LINK( this, SvxSaveTabPage, ODFVersionHdl_Impl );
+ Link<> aLink = LINK( this, SvxSaveTabPage, ODFVersionHdl_Impl );
aODFVersionLB->SetSelectHdl( aLink );
aLink = LINK( this, SvxSaveTabPage, FilterHdl_Impl );
aDocTypeLB->SetSelectHdl( aLink );
@@ -515,7 +514,7 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
-IMPL_LINK( SvxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox )
+IMPL_LINK_TYPED( SvxSaveTabPage, AutoClickHdl_Impl, Button*, pBox, void )
{
if ( pBox == aAutoSaveCB )
{
@@ -532,7 +531,6 @@ IMPL_LINK( SvxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox )
aUserAutoSaveCB->Disable();
}
}
- return 0;
}
static OUString lcl_ExtracUIName(const Sequence<PropertyValue> &rProperties)
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index 98ec868a1b88..0a33a2a36239 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -60,7 +60,7 @@ private:
SvxSaveTabPage_Impl* pImpl;
- DECL_LINK( AutoClickHdl_Impl, CheckBox * );
+ DECL_LINK_TYPED( AutoClickHdl_Impl, Button*, void );
DECL_LINK( FilterHdl_Impl, ListBox * );
DECL_LINK(ODFVersionHdl_Impl, void *);
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 5dee38d29b04..741a2ecca292 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -277,20 +277,18 @@ void SvxOnlineUpdateTabPage::FillUserData()
-IMPL_LINK( SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, CheckBox *, pBox )
+IMPL_LINK_TYPED( SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, Button*, pBox, void )
{
- bool bEnabled = pBox->IsChecked();
+ bool bEnabled = static_cast<CheckBox*>(pBox)->IsChecked();
m_pEveryDayButton->Enable(bEnabled);
m_pEveryWeekButton->Enable(bEnabled);
m_pEveryMonthButton->Enable(bEnabled);
-
- return 0;
}
-IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxOnlineUpdateTabPage, FileDialogHdl_Impl, Button*, void)
{
uno::Reference < uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
uno::Reference < ui::dialogs::XFolderPicker2 > xFolderPicker = ui::dialogs::FolderPicker::create(xContext);
@@ -308,13 +306,11 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl)
if( osl::FileBase::E_None == osl::FileBase::getSystemPathFromFileURL(xFolderPicker->getDirectory(), aFolder))
m_pDestPath->SetText( aFolder );
}
-
- return 0;
}
-IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxOnlineUpdateTabPage, CheckNowHdl_Impl, Button*, void)
{
uno::Reference < uno::XComponentContext> xContext( ::comphelper::getProcessComponentContext() );
@@ -361,8 +357,6 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl)
OSL_TRACE( "Caught exception: %s\n thread terminated.\n",
OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
}
-
- return 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index efafee9a6dc5..aaba652011fe 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -42,9 +42,9 @@ private:
OUString m_aNeverChecked;
OUString m_aLastCheckedTemplate;
- DECL_LINK(FileDialogHdl_Impl, void *) ;
- DECL_LINK(CheckNowHdl_Impl, void *) ;
- DECL_LINK( AutoCheckHdl_Impl, CheckBox* ) ;
+ DECL_LINK_TYPED(FileDialogHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(CheckNowHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(AutoCheckHdl_Impl, Button*, void);
css::uno::Reference< css::container::XNameReplace > m_xUpdateAccess;
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 8c0c5941026a..2450e1ab9484 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -119,7 +119,7 @@ OUString SelectPersonaDialog::GetSelectedPersona() const
return OUString();
}
-IMPL_LINK( SelectPersonaDialog, SearchPersonas, PushButton*, pButton )
+IMPL_LINK_TYPED( SelectPersonaDialog, SearchPersonas, Button*, pButton, void )
{
OUString searchTerm;
if( m_rSearchThread.is() )
@@ -140,7 +140,7 @@ IMPL_LINK( SelectPersonaDialog, SearchPersonas, PushButton*, pButton )
}
if( searchTerm.isEmpty( ) )
- return 0;
+ return;
// TODO FIXME!
// Before the release, the allizom.org url should be changed to:
@@ -176,10 +176,9 @@ IMPL_LINK( SelectPersonaDialog, SearchPersonas, PushButton*, pButton )
OUString rSearchURL = "https://addons.allizom.org/en-US/firefox/api/1.5/search/" + searchTerm + "/9/9";
m_rSearchThread = new SearchAndParseThread( this, rSearchURL );
m_rSearchThread->launch();
- return 0;
}
-IMPL_LINK( SelectPersonaDialog, ActionOK, PushButton*, /* pButton */ )
+IMPL_LINK_NOARG_TYPED( SelectPersonaDialog, ActionOK, Button*, void )
{
OUString aSelectedPersona = GetSelectedPersona();
@@ -195,19 +194,17 @@ IMPL_LINK( SelectPersonaDialog, ActionOK, PushButton*, /* pButton */ )
m_rSearchThread->StopExecution();
EndDialog( RET_OK );
}
- return 0;
}
-IMPL_LINK( SelectPersonaDialog, ActionCancel, PushButton*, /* pButton */ )
+IMPL_LINK_NOARG_TYPED( SelectPersonaDialog, ActionCancel, Button*, void )
{
if( m_rSearchThread.is() )
m_rSearchThread->StopExecution();
EndDialog();
- return 0;
}
-IMPL_LINK( SelectPersonaDialog, SelectPersona, PushButton*, pButton )
+IMPL_LINK_TYPED( SelectPersonaDialog, SelectPersona, Button*, pButton, void )
{
if( m_rSearchThread.is() )
m_rSearchThread->StopExecution();
@@ -229,7 +226,6 @@ IMPL_LINK( SelectPersonaDialog, SelectPersona, PushButton*, pButton )
break;
}
}
- return 0;
}
void SelectPersonaDialog::SetAppliedPersonaSetting( OUString& rPersonaSetting )
@@ -474,7 +470,7 @@ void SvxPersonalizationTabPage::LoadExtensionThemes()
}
}
-IMPL_LINK( SvxPersonalizationTabPage, SelectPersona, PushButton*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( SvxPersonalizationTabPage, SelectPersona, Button*, void )
{
ScopedVclPtrInstance< SelectPersonaDialog > aDialog(nullptr);
@@ -486,19 +482,15 @@ IMPL_LINK( SvxPersonalizationTabPage, SelectPersona, PushButton*, /*pButton*/ )
SetPersonaSettings( aPersonaSetting );
}
}
-
- return 0;
}
-IMPL_LINK( SvxPersonalizationTabPage, ForceSelect, RadioButton*, pButton )
+IMPL_LINK_TYPED( SvxPersonalizationTabPage, ForceSelect, Button*, pButton, void )
{
if ( pButton == m_pOwnPersona && m_aPersonaSettings.isEmpty() )
SelectPersona( m_pSelectPersona );
-
- return 0;
}
-IMPL_LINK( SvxPersonalizationTabPage, DefaultPersona, PushButton*, pButton )
+IMPL_LINK_TYPED( SvxPersonalizationTabPage, DefaultPersona, Button*, pButton, void )
{
m_pDefaultPersona->Check();
for( sal_Int32 nIndex = 0; nIndex < 3; nIndex++ )
@@ -506,8 +498,6 @@ IMPL_LINK( SvxPersonalizationTabPage, DefaultPersona, PushButton*, pButton )
if( pButton == m_vDefaultPersonaImages[nIndex] )
m_aPersonaSettings = m_vDefaultPersonaSettings[nIndex];
}
-
- return 0;
}
IMPL_LINK( SvxPersonalizationTabPage, SelectInstalledPersona, ListBox*, )
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index f5805026a01f..59e9cbdf81a9 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -59,13 +59,13 @@ public:
private:
/// Handle the Persona selection
- DECL_LINK( SelectPersona, PushButton* );
+ DECL_LINK_TYPED( SelectPersona, Button*, void );
/// When 'own' is chosen, but the Persona is not chosen yet.
- DECL_LINK( ForceSelect, RadioButton* );
+ DECL_LINK_TYPED( ForceSelect, Button*, void );
/// Handle the default Persona selection
- DECL_LINK( DefaultPersona, PushButton* );
+ DECL_LINK_TYPED( DefaultPersona, Button*, void );
/// Handle the Personas installed through extensions selection
DECL_LINK( SelectInstalledPersona, ListBox* );
@@ -107,10 +107,10 @@ public:
private:
/// Handle the Search button
- DECL_LINK( SearchPersonas, PushButton* );
- DECL_LINK( SelectPersona, PushButton* );
- DECL_LINK( ActionOK, PushButton* );
- DECL_LINK( ActionCancel, PushButton* );
+ DECL_LINK_TYPED( SearchPersonas, Button*, void );
+ DECL_LINK_TYPED( SelectPersona, Button*, void );
+ DECL_LINK_TYPED( ActionOK, Button*, void );
+ DECL_LINK_TYPED( ActionCancel, Button*, void );
};
class SearchAndParseThread: public salhelper::Thread
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 3cb968246754..e83351f80191 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -657,7 +657,7 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, ShowPageHdl_Impl)
return 0;
}
-IMPL_LINK_NOARG(OfaTreeOptionsDialog, BackHdl_Impl)
+IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, BackHdl_Impl, Button*, void)
{
if ( pCurrentPageEntry && pTreeLB->GetParent( pCurrentPageEntry ) )
{
@@ -674,10 +674,9 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, BackHdl_Impl)
else if ( pPageInfo->m_pExtPage )
pPageInfo->m_pExtPage->ResetPage();
}
- return 0;
}
-IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl)
+IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, OKHdl_Impl, Button*, void)
{
pTreeLB->EndSelection();
if ( pCurrentPageEntry && pTreeLB->GetParent( pCurrentPageEntry ) )
@@ -695,7 +694,7 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl)
{
// the page mustn't be left
pTreeLB->Select(pCurrentPageEntry);
- return 0;
+ return;
}
}
pPageInfo->m_pPage->Hide();
@@ -724,7 +723,6 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl)
pEntry = pTreeLB->Next(pEntry);
}
EndDialog(RET_OK);
- return 0;
}
// an opened group shall be completely visible
diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx
index a886975b4bab..82668264249f 100644
--- a/cui/source/options/tsaurls.cxx
+++ b/cui/source/options/tsaurls.cxx
@@ -50,7 +50,7 @@ TSAURLsDialog::TSAURLsDialog(vcl::Window* pParent)
}
}
-IMPL_LINK_NOARG(TSAURLsDialog, OKHdl_Impl)
+IMPL_LINK_NOARG_TYPED(TSAURLsDialog, OKHdl_Impl, Button*, void)
{
std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create());
@@ -63,8 +63,6 @@ IMPL_LINK_NOARG(TSAURLsDialog, OKHdl_Impl)
batch->commit();
EndDialog(RET_OK);
-
- return 0;
}
TSAURLsDialog::~TSAURLsDialog()
@@ -97,7 +95,7 @@ void TSAURLsDialog::AddTSAURL(const OUString& rURL)
m_pURLListBox->SetUpdateMode(true);
}
-IMPL_LINK_NOARG(TSAURLsDialog, AddHdl_Impl)
+IMPL_LINK_NOARG_TYPED(TSAURLsDialog, AddHdl_Impl, Button*, void)
{
OUString aURL;
OUString aDesc( get<FixedText>("enteraurl")->GetText() );
@@ -112,22 +110,18 @@ IMPL_LINK_NOARG(TSAURLsDialog, AddHdl_Impl)
AddTSAURL(aURL);
m_pOKBtn->Enable();
}
-
- return 0;
}
-IMPL_LINK_NOARG(TSAURLsDialog, DeleteHdl_Impl)
+IMPL_LINK_NOARG_TYPED(TSAURLsDialog, DeleteHdl_Impl, Button*, void)
{
sal_Int32 nSel = m_pURLListBox->GetSelectEntryPos();
if (nSel == LISTBOX_ENTRY_NOTFOUND)
- return 0;
+ return;
m_aURLs.erase(m_pURLListBox->GetEntry(nSel));
m_pURLListBox->RemoveEntry(nSel);
m_pOKBtn->Enable();
-
- return 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/tsaurls.hxx b/cui/source/options/tsaurls.hxx
index 421710113533..003c9771c27f 100644
--- a/cui/source/options/tsaurls.hxx
+++ b/cui/source/options/tsaurls.hxx
@@ -21,9 +21,9 @@ private:
VclPtr<PushButton> m_pDeleteBtn;
VclPtr<OKButton> m_pOKBtn;
- DECL_LINK(AddHdl_Impl, void *);
- DECL_LINK(DeleteHdl_Impl, void *);
- DECL_LINK(OKHdl_Impl, void *);
+ DECL_LINK_TYPED(AddHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(DeleteHdl_Impl, Button*, void);
+ DECL_LINK_TYPED(OKHdl_Impl, Button*, void);
std::set<OUString> m_aURLs;
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 98e0b875d904..b58a7cbf2ee6 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -206,7 +206,7 @@ void WebConnectionInfoDialog::FillPasswordList()
}
-IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl)
+IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, RemovePasswordHdl, Button*, void)
{
try
{
@@ -233,12 +233,10 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl)
}
catch( uno::Exception& )
{}
-
- return 0;
}
-IMPL_LINK_NOARG(WebConnectionInfoDialog, RemoveAllPasswordsHdl)
+IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, RemoveAllPasswordsHdl, Button*, void)
{
try
{
@@ -257,12 +255,10 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, RemoveAllPasswordsHdl)
}
catch( uno::Exception& )
{}
-
- return 0;
}
-IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl)
+IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, ChangePasswordHdl, Button*, void)
{
try
{
@@ -296,8 +292,6 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl)
}
catch( uno::Exception& )
{}
-
- return 0;
}
diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx
index 9b830af762e3..02bf741eff6e 100644
--- a/cui/source/options/webconninfo.hxx
+++ b/cui/source/options/webconninfo.hxx
@@ -51,9 +51,9 @@ namespace svx
sal_Int32 m_nPos;
DECL_LINK( HeaderBarClickedHdl, SvSimpleTable* );
- DECL_LINK(RemovePasswordHdl, void *);
- DECL_LINK(RemoveAllPasswordsHdl, void *);
- DECL_LINK(ChangePasswordHdl, void *);
+ DECL_LINK_TYPED(RemovePasswordHdl, Button*, void);
+ DECL_LINK_TYPED(RemoveAllPasswordsHdl, Button*, void);
+ DECL_LINK_TYPED(ChangePasswordHdl, Button*, void);
DECL_LINK( EntrySelectedHdl, void* );
void FillPasswordList();
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index cad777dfcc7a..343f42dacc1b 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -206,7 +206,7 @@ AlignmentTabPage::AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCor
Link<> aLink = LINK( this, AlignmentTabPage, UpdateEnableHdl );
m_pLbHorAlign->SetSelectHdl( aLink );
- m_pBtnWrap->SetClickHdl( aLink );
+ m_pBtnWrap->SetClickHdl( LINK( this, AlignmentTabPage, UpdateEnableClickHdl ) );
// Asian vertical mode
m_pCbAsianMode->Show( SvtCJKOptions().IsVerticalTextEnabled() );
@@ -430,6 +430,11 @@ bool AlignmentTabPage::HasAlignmentChanged( const SfxItemSet& rNew, sal_uInt16 n
return eMethodOld != eMethodNew;
}
+IMPL_LINK_NOARG_TYPED(AlignmentTabPage, UpdateEnableClickHdl, Button*, void)
+{
+ UpdateEnableControls();
+}
+
IMPL_LINK_NOARG(AlignmentTabPage, UpdateEnableHdl)
{
UpdateEnableControls();
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 57ab3849edf1..7487c6d7523d 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -446,7 +446,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( vcl::Window* pParent,
m_pCheckLB->SetStyle(m_pCheckLB->GetStyle()|WB_HSCROLL| WB_VSCROLL);
m_pCheckLB->SetSelectHdl(LINK(this, OfaSwAutoFmtOptionsPage, SelectHdl));
- m_pCheckLB->SetDoubleClickHdl(LINK(this, OfaSwAutoFmtOptionsPage, EditHdl));
+ m_pCheckLB->SetDoubleClickHdl(LINK(this, OfaSwAutoFmtOptionsPage, DoubleClickEditHdl));
static long aStaticTabs[]=
{
@@ -724,7 +724,13 @@ IMPL_LINK(OfaSwAutoFmtOptionsPage, SelectHdl, OfaACorrCheckListBox*, pBox)
return 0;
}
-IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl)
+IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, DoubleClickEditHdl)
+{
+ EditHdl(NULL);
+ return 0;
+}
+
+IMPL_LINK_NOARG_TYPED(OfaSwAutoFmtOptionsPage, EditHdl, Button*, void)
{
sal_uLong nSelEntryPos = m_pCheckLB->GetSelectEntryPos();
if( nSelEntryPos == REPLACE_BULLETS ||
@@ -757,7 +763,6 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl)
}
}
m_pCheckLB->Invalidate();
- return 0;
}
void OfaACorrCheckListBox::SetTabs()
@@ -900,8 +905,8 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( vcl::Window* pParent,
m_pDeleteReplacePB->SetClickHdl( LINK(this, OfaAutocorrReplacePage, NewDelHdl) );
m_pShortED->SetModifyHdl( LINK(this, OfaAutocorrReplacePage, ModifyHdl) );
m_pReplaceED->SetModifyHdl( LINK(this, OfaAutocorrReplacePage, ModifyHdl) );
- m_pShortED->SetActionHdl( LINK(this, OfaAutocorrReplacePage, NewDelHdl) );
- m_pReplaceED->SetActionHdl( LINK(this, OfaAutocorrReplacePage, NewDelHdl) );
+ m_pShortED->SetActionHdl( LINK(this, OfaAutocorrReplacePage, NewDelActionHdl) );
+ m_pReplaceED->SetActionHdl( LINK(this, OfaAutocorrReplacePage, NewDelActionHdl) );
m_pReplaceED->SetSpaces(true);
m_pShortED->SetSpaces(true);
@@ -1237,7 +1242,12 @@ void OfaAutocorrReplacePage::DeleteEntry(const OUString& sShort, const OUString&
rDeletedArray.push_back(aDeletedString);
}
-IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn)
+IMPL_LINK_TYPED(OfaAutocorrReplacePage, NewDelHdl, Button*, pBtn, void)
+{
+ NewDelActionHdl(static_cast<PushButton*>(pBtn));
+}
+
+IMPL_LINK(OfaAutocorrReplacePage, NewDelActionHdl, PushButton*, pBtn)
{
SvTreeListEntry* pEntry = m_pReplaceTLB->FirstSelected();
if( pBtn == m_pDeleteReplacePB )
@@ -1443,8 +1453,8 @@ OfaAutocorrExceptPage::OfaAutocorrExceptPage(vcl::Window* pParent, const SfxItem
m_pAbbrevED->SetModifyHdl(LINK(this, OfaAutocorrExceptPage, ModifyHdl));
m_pDoubleCapsED->SetModifyHdl(LINK(this, OfaAutocorrExceptPage, ModifyHdl));
- m_pAbbrevED->SetActionHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl));
- m_pDoubleCapsED->SetActionHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl));
+ m_pAbbrevED->SetActionHdl(LINK(this, OfaAutocorrExceptPage, NewDelActionHdl));
+ m_pDoubleCapsED->SetActionHdl(LINK(this, OfaAutocorrExceptPage, NewDelActionHdl));
}
OfaAutocorrExceptPage::~OfaAutocorrExceptPage()
@@ -1681,7 +1691,12 @@ void OfaAutocorrExceptPage::Reset( const SfxItemSet* )
m_pAutoCapsCB->SaveValue();
}
-IMPL_LINK(OfaAutocorrExceptPage, NewDelHdl, void*, pBtn)
+IMPL_LINK_TYPED(OfaAutocorrExceptPage, NewDelHdl, Button*, pBtn, void)
+{
+ NewDelActionHdl(pBtn);
+}
+
+IMPL_LINK(OfaAutocorrExceptPage, NewDelActionHdl, void*, pBtn)
{
if((pBtn == m_pNewAbbrevPB || pBtn == m_pAbbrevED.get() )
&& !m_pAbbrevED->GetText().isEmpty())
@@ -2046,7 +2061,7 @@ void OfaQuoteTabPage::Reset( const SfxItemSet* )
#define DBL_END 3
-IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn )
+IMPL_LINK_TYPED( OfaQuoteTabPage, QuoteHdl, Button*, pBtn, void )
{
sal_uInt16 nMode = SGL_START;
if (pBtn == m_pSglEndQuotePB)
@@ -2116,11 +2131,9 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn )
break;
}
}
-
- return 0;
}
-IMPL_LINK( OfaQuoteTabPage, StdQuoteHdl, PushButton*, pBtn )
+IMPL_LINK_TYPED( OfaQuoteTabPage, StdQuoteHdl, Button*, pBtn, void )
{
if (pBtn == m_pDblStandardPB)
{
@@ -2137,7 +2150,6 @@ IMPL_LINK( OfaQuoteTabPage, StdQuoteHdl, PushButton*, pBtn )
cSglEndQuote = 0;
m_pSglEndExFT->SetText(ChangeStringExt_Impl(0));
}
- return 0;
}
@@ -2357,7 +2369,7 @@ void OfaAutoCompleteTabPage::ActivatePage( const SfxItemSet& )
static_cast<OfaAutoCorrDlg*>(GetTabDialog())->EnableLanguage( false );
}
-IMPL_LINK_NOARG(OfaAutoCompleteTabPage, DeleteHdl)
+IMPL_LINK_NOARG_TYPED(OfaAutoCompleteTabPage, DeleteHdl, Button*, void)
{
sal_Int32 nSelCnt =
(m_pAutoCompleteList) ? m_pLBEntries->GetSelectEntryCount() : 0;
@@ -2369,7 +2381,6 @@ IMPL_LINK_NOARG(OfaAutoCompleteTabPage, DeleteHdl)
editeng::IAutoCompleteString hack(*pStr); // UGLY
m_pAutoCompleteList->erase(&hack);
}
- return 0;
}
IMPL_LINK( OfaAutoCompleteTabPage, CheckHdl, CheckBox*, pBox )
@@ -2579,7 +2590,7 @@ void OfaSmartTagOptionsTabPage::FillListBox( const SmartTagMgr& rSmartTagMgr )
/** Handler for the push button
*/
-IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, ClickHdl)
+IMPL_LINK_NOARG_TYPED(OfaSmartTagOptionsTabPage, ClickHdl, Button*, void)
{
const sal_uLong nPos = m_pSmartTagTypesLB->GetSelectEntryPos();
const SvTreeListEntry* pEntry = m_pSmartTagTypesLB->GetEntry(nPos);
@@ -2590,8 +2601,6 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, ClickHdl)
const lang::Locale aLocale( LanguageTag::convertToLocale( eLastDialogLanguage ) );
if ( xRec->hasPropertyPage( nSmartTagIdx, aLocale ) )
xRec->displayPropertyPage( nSmartTagIdx, aLocale );
-
- return 0;
}
/** Handler for the check box
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index e5841f02e6e9..10764588a3c5 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1163,7 +1163,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, SelectHdl_Impl)
return 0;
}
-IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox )
+IMPL_LINK_TYPED( SvxBackgroundTabPage, FileClickHdl_Impl, Button*, pBox, void )
{
if (m_pBtnLink == pBox)
{
@@ -1207,10 +1207,9 @@ IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox )
else
m_pPreviewWin2->NotifyChange( NULL );
}
- return 0;
}
-IMPL_LINK( SvxBackgroundTabPage, RadioClickHdl_Impl, RadioButton*, pBtn )
+IMPL_LINK_TYPED( SvxBackgroundTabPage, RadioClickHdl_Impl, Button*, pBtn, void )
{
if (pBtn == m_pBtnPosition)
{
@@ -1225,16 +1224,15 @@ IMPL_LINK( SvxBackgroundTabPage, RadioClickHdl_Impl, RadioButton*, pBtn )
m_pWndPosition->Disable();
m_pWndPosition->Invalidate();
}
- return 0;
}
/** Handler, called by pressing the browse button.
Create graphic/insert dialog, set path and start.
*/
-IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxBackgroundTabPage, BrowseHdl_Impl, Button*, void)
{
if ( pPageImpl->pLoadIdle->IsActive() )
- return 0;
+ return;
bool bHtml = 0 != ( nHtmlMode & HTMLMODE_ON );
OUString aStrBrowse(get<vcl::Window>("findgraphicsft")->GetText());
@@ -1261,7 +1259,6 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl)
}
else
DELETEZ( pImportDlg );
- return 0;
}
/** Delayed loading of the graphic.
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index b9cdb4517f5b..bcd3846fd139 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -1196,10 +1196,9 @@ IMPL_LINK( SvxBorderTabPage, ModifyDistanceHdl_Impl, MetricField*, pField)
return 0;
}
-IMPL_LINK( SvxBorderTabPage, SyncHdl_Impl, CheckBox*, pBox)
+IMPL_LINK_TYPED( SvxBorderTabPage, SyncHdl_Impl, Button*, pBox, void)
{
- mbSync = pBox->IsChecked();
- return 0;
+ mbSync = static_cast<CheckBox*>(pBox)->IsChecked();
}
void SvxBorderTabPage::DataChanged( const DataChangedEvent& rDCEvt )
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 4d822c0afc3b..c5a74d674dfd 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1496,9 +1496,9 @@ void SvxCharEffectsPage::Initialize()
m_pEffectsLB->SelectEntryPos( 0 );
m_pIndividualWordsBtn->SetClickHdl( LINK( this, SvxCharEffectsPage, CbClickHdl_Impl ) );
- aLink = LINK( this, SvxCharEffectsPage, TristClickHdl_Impl );
- m_pOutlineBtn->SetClickHdl( aLink );
- m_pShadowBtn->SetClickHdl( aLink );
+ Link<Button*,void> aLink2 = LINK( this, SvxCharEffectsPage, TristClickHdl_Impl );
+ m_pOutlineBtn->SetClickHdl( aLink2 );
+ m_pShadowBtn->SetClickHdl( aLink2 );
if ( !SvtLanguageOptions().IsAsianTypographyEnabled() )
{
@@ -1738,18 +1738,16 @@ IMPL_LINK_NOARG(SvxCharEffectsPage, UpdatePreview_Impl)
-IMPL_LINK_NOARG(SvxCharEffectsPage, CbClickHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxCharEffectsPage, CbClickHdl_Impl, Button*, void)
{
UpdatePreview_Impl();
- return 0;
}
-IMPL_LINK_NOARG(SvxCharEffectsPage, TristClickHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxCharEffectsPage, TristClickHdl_Impl, Button*, void)
{
UpdatePreview_Impl();
- return 0;
}
@@ -2693,17 +2691,17 @@ void SvxCharPositionPage::Initialize()
m_pKerningLB->SelectEntryPos( 0 );
KerningSelectHdl_Impl( NULL );
- Link<> aLink = LINK( this, SvxCharPositionPage, PositionHdl_Impl );
- m_pHighPosBtn->SetClickHdl( aLink );
- m_pNormalPosBtn->SetClickHdl( aLink );
- m_pLowPosBtn->SetClickHdl( aLink );
+ Link<Button*,void> aLink2 = LINK( this, SvxCharPositionPage, PositionHdl_Impl );
+ m_pHighPosBtn->SetClickHdl( aLink2 );
+ m_pNormalPosBtn->SetClickHdl( aLink2 );
+ m_pLowPosBtn->SetClickHdl( aLink2 );
- aLink = LINK( this, SvxCharPositionPage, RotationHdl_Impl );
- m_p0degRB->SetClickHdl( aLink );
- m_p90degRB->SetClickHdl( aLink );
- m_p270degRB->SetClickHdl( aLink );
+ aLink2 = LINK( this, SvxCharPositionPage, RotationHdl_Impl );
+ m_p0degRB->SetClickHdl( aLink2 );
+ m_p90degRB->SetClickHdl( aLink2 );
+ m_p270degRB->SetClickHdl( aLink2 );
- aLink = LINK( this, SvxCharPositionPage, FontModifyHdl_Impl );
+ Link<> aLink = LINK( this, SvxCharPositionPage, FontModifyHdl_Impl );
m_pHighLowMF->SetModifyHdl( aLink );
m_pFontSizeMF->SetModifyHdl( aLink );
@@ -2773,7 +2771,7 @@ void SvxCharPositionPage::SetEscapement_Impl( sal_uInt16 nEsc )
-IMPL_LINK( SvxCharPositionPage, PositionHdl_Impl, RadioButton*, pBtn )
+IMPL_LINK_TYPED( SvxCharPositionPage, PositionHdl_Impl, Button*, pBtn, void )
{
sal_uInt16 nEsc = SVX_ESCAPEMENT_OFF; // also when pBtn == NULL
@@ -2783,12 +2781,11 @@ IMPL_LINK( SvxCharPositionPage, PositionHdl_Impl, RadioButton*, pBtn )
nEsc = SVX_ESCAPEMENT_SUBSCRIPT;
SetEscapement_Impl( nEsc );
- return 0;
}
-IMPL_LINK( SvxCharPositionPage, RotationHdl_Impl, RadioButton*, pBtn )
+IMPL_LINK_TYPED( SvxCharPositionPage, RotationHdl_Impl, Button*, pBtn, void )
{
bool bEnable = false;
if (m_p90degRB == pBtn || m_p270degRB == pBtn)
@@ -2796,7 +2793,6 @@ IMPL_LINK( SvxCharPositionPage, RotationHdl_Impl, RadioButton*, pBtn )
else
OSL_ENSURE( m_p0degRB == pBtn, "unexpected button" );
m_pFitToLineCB->Enable( bEnable );
- return 0;
}
@@ -2812,9 +2808,9 @@ IMPL_LINK_NOARG(SvxCharPositionPage, FontModifyHdl_Impl)
-IMPL_LINK( SvxCharPositionPage, AutoPositionHdl_Impl, CheckBox*, pBox )
+IMPL_LINK_TYPED( SvxCharPositionPage, AutoPositionHdl_Impl, Button*, pBox, void )
{
- if ( pBox->IsChecked() )
+ if ( static_cast<CheckBox*>(pBox)->IsChecked() )
{
m_pHighLowFT->Disable();
m_pHighLowMF->Disable();
@@ -2823,12 +2819,11 @@ IMPL_LINK( SvxCharPositionPage, AutoPositionHdl_Impl, CheckBox*, pBox )
PositionHdl_Impl( m_pHighPosBtn->IsChecked() ? m_pHighPosBtn
: m_pLowPosBtn->IsChecked() ? m_pLowPosBtn
: m_pNormalPosBtn );
- return 0;
}
-IMPL_LINK( SvxCharPositionPage, FitToLineHdl_Impl, CheckBox*, pBox )
+IMPL_LINK_TYPED( SvxCharPositionPage, FitToLineHdl_Impl, Button*, pBox, void )
{
if (m_pFitToLineCB == pBox)
{
@@ -2839,7 +2834,6 @@ IMPL_LINK( SvxCharPositionPage, FitToLineHdl_Impl, CheckBox*, pBox )
m_pPreviewWin->SetFontWidthScale( nVal );
}
- return 0;
}
@@ -3168,8 +3162,8 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet )
m_pScalingAndRotationFT->Show();
m_pScalingFT->Hide();
- Link<> aOldLink( m_pFitToLineCB->GetClickHdl() );
- m_pFitToLineCB->SetClickHdl( Link<>() );
+ Link<Button*,void> aOldLink( m_pFitToLineCB->GetClickHdl() );
+ m_pFitToLineCB->SetClickHdl( Link<Button*,void>() );
if( eState >= SfxItemState::DEFAULT )
{
const SvxCharRotateItem& rItem =
@@ -3489,13 +3483,12 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, bool bStart )
-IMPL_LINK_NOARG(SvxCharTwoLinesPage, TwoLinesHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxCharTwoLinesPage, TwoLinesHdl_Impl, Button*, void)
{
bool bChecked = m_pTwoLinesBtn->IsChecked();
m_pEnclosingFrame->Enable( bChecked );
UpdatePreview_Impl();
- return 0;
}
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 538fa48836ac..22521fd51fb7 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -118,8 +118,7 @@ SvxGrfCropPage::SvxGrfCropPage ( vcl::Window *pParent, const SfxItemSet &rSet )
m_pTopMF->SetLoseFocusHdl( aLk );
m_pBottomMF->SetLoseFocusHdl( aLk );
- aLk = LINK(this, SvxGrfCropPage, OrigSizeHdl);
- m_pOrigSizePB->SetClickHdl( aLk );
+ m_pOrigSizePB->SetClickHdl( LINK(this, SvxGrfCropPage, OrigSizeHdl) );
aTimer.SetTimeoutHdl(LINK(this, SvxGrfCropPage, Timeout));
aTimer.SetTimeout( 1500 );
@@ -571,7 +570,7 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField )
description: set original size
--------------------------------------------------------------------*/
-IMPL_LINK_NOARG(SvxGrfCropPage, OrigSizeHdl)
+IMPL_LINK_NOARG_TYPED(SvxGrfCropPage, OrigSizeHdl, Button*, void)
{
SfxItemPool* pPool = GetItemSet().GetPool();
DBG_ASSERT( pPool, "Wo ist der Pool" );
@@ -589,7 +588,6 @@ IMPL_LINK_NOARG(SvxGrfCropPage, OrigSizeHdl)
m_pWidthZoomMF->SetValue(100);
m_pHeightZoomMF->SetValue(100);
bSetOrigSize = true;
- return 0;
}
/*--------------------------------------------------------------------
description: compute scale
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 3e0ae6245af1..f26fe3c287c3 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -440,7 +440,7 @@ IMPL_LINK( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox *, pListBox )
return 0;
}
-IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton )
+IMPL_LINK_TYPED( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton, void )
{
if (pButton == m_pCB_LAENGE)
{
@@ -455,7 +455,6 @@ IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton )
m_pMF_LAENGE->Enable();
}
}
- return 0;
}
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 0f6c8b566d7f..cfa8eecc4e55 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -297,6 +297,11 @@ IMPL_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox*, )
return 0;
}
+IMPL_LINK_TYPED( _SfxMacroTabPage, AssignDeleteClickHdl_Impl, Button*, pBtn, void )
+{
+ AssignDeleteHdl_Impl(static_cast<PushButton*>(pBtn));
+}
+
IMPL_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn )
{
SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
@@ -367,8 +372,8 @@ void _SfxMacroTabPage::InitAndSetHandler()
HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar();
Link<> aLnk(LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl ));
mpImpl->pMacroLB->SetDoubleClickHdl( aLnk );
- mpImpl->pDeletePB->SetClickHdl( aLnk );
- mpImpl->pAssignPB->SetClickHdl( aLnk );
+ mpImpl->pDeletePB->SetClickHdl( LINK(this, _SfxMacroTabPage, AssignDeleteClickHdl_Impl ) );
+ mpImpl->pAssignPB->SetClickHdl( LINK(this, _SfxMacroTabPage, AssignDeleteClickHdl_Impl ) );
rListBox.SetDoubleClickHdl( aLnk );
rListBox.SetSelectHdl( LINK( this, _SfxMacroTabPage, SelectEvent_Impl ));
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 0e83582080fe..2d76be168a90 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -142,9 +142,9 @@ SvxMeasurePage::SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs
m_pMtrFldHelpline1Len->SetModifyHdl( aLink );
m_pMtrFldHelpline2Len->SetModifyHdl( aLink );
m_pMtrFldDecimalPlaces->SetModifyHdl( aLink );
- m_pTsbBelowRefEdge->SetClickHdl( aLink );
- m_pTsbParallel->SetClickHdl( aLink );
- m_pTsbShowUnit->SetClickHdl( aLink );
+ m_pTsbBelowRefEdge->SetClickHdl( LINK( this, SvxMeasurePage, ChangeAttrClickHdl_Impl ) );
+ m_pTsbParallel->SetClickHdl( LINK( this, SvxMeasurePage, ChangeAttrClickHdl_Impl ) );
+ m_pTsbShowUnit->SetClickHdl( LINK( this, SvxMeasurePage, ChangeAttrClickHdl_Impl ) );
m_pLbUnit->SetSelectHdl( aLink );
}
@@ -613,7 +613,7 @@ void SvxMeasurePage::PointChanged( vcl::Window* pWindow, RECT_POINT /*eRP*/ )
ChangeAttrHdl_Impl( pWindow );
}
-IMPL_LINK( SvxMeasurePage, ClickAutoPosHdl_Impl, void *, p )
+IMPL_LINK_TYPED( SvxMeasurePage, ClickAutoPosHdl_Impl, Button*, p, void )
{
if( m_pTsbAutoPosH->GetState() == TRISTATE_TRUE )
{
@@ -658,10 +658,12 @@ IMPL_LINK( SvxMeasurePage, ClickAutoPosHdl_Impl, void *, p )
}
}
ChangeAttrHdl_Impl( p );
-
- return 0L;
}
+IMPL_LINK_TYPED( SvxMeasurePage, ChangeAttrClickHdl_Impl, Button*, p, void )
+{
+ ChangeAttrHdl_Impl(p);
+}
IMPL_LINK( SvxMeasurePage, ChangeAttrHdl_Impl, void *, p )
{
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index de90abbc676e..173ca19d0e7e 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -341,14 +341,14 @@ void SvxNumberFormatTabPage::Init_Impl()
m_pLbFormat->SetSelectHdl( aLink );
m_pLbLanguage->SetSelectHdl( aLink );
m_pLbCurrency->SetSelectHdl( aLink );
- m_pCbSourceFormat->SetClickHdl( aLink );
+ m_pCbSourceFormat->SetClickHdl( LINK( this, SvxNumberFormatTabPage, SelFormatClickHdl_Impl ) );
aLink = LINK( this, SvxNumberFormatTabPage, OptHdl_Impl );
m_pEdDecimals->SetModifyHdl( aLink );
m_pEdLeadZeroes->SetModifyHdl( aLink );
- m_pBtnNegRed->SetClickHdl( aLink );
- m_pBtnThousand->SetClickHdl( aLink );
+ m_pBtnNegRed->SetClickHdl( LINK( this, SvxNumberFormatTabPage, OptClickHdl_Impl ) );
+ m_pBtnThousand->SetClickHdl( LINK( this, SvxNumberFormatTabPage, OptClickHdl_Impl ) );
m_pLbFormat->SetDoubleClickHdl( HDL( DoubleClickHdl_Impl ) );
m_pEdFormat->SetModifyHdl( HDL( EditHdl_Impl ) );
m_pIbAdd->SetClickHdl( HDL( ClickHdl_Impl ) );
@@ -732,7 +732,7 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet* rCoreAttrs )
// delete it in case of bOneAreaFlag and resulting category change).
// Upon switching tab pages we need all settings to be consistent
// in case this page will be redisplayed later.
- bDataChanged = (ClickHdl_Impl(m_pIbAdd) != 0);
+ bDataChanged = Click_Impl(m_pIbAdd);
nCurKey = pNumFmtShell->GetCurNumFmtKey();
}
else if(nCurKey == NUMKEY_UNDEFINED)
@@ -1190,6 +1190,10 @@ IMPL_LINK( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvxFontListBox*, pLb )
#*
#************************************************************************/
+IMPL_LINK_TYPED( SvxNumberFormatTabPage, SelFormatClickHdl_Impl, Button*, pLb, void )
+{
+ SelFormatHdl_Impl(pLb);
+}
IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb )
{
if (pLb == m_pCbSourceFormat)
@@ -1311,9 +1315,13 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb )
#*
#************************************************************************/
-IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, PushButton*, pIB)
+IMPL_LINK_TYPED( SvxNumberFormatTabPage, ClickHdl_Impl, Button*, pIB, void)
+{
+ Click_Impl(static_cast<PushButton*>(pIB));
+}
+bool SvxNumberFormatTabPage::Click_Impl(PushButton* pIB)
{
- bool bDeleted = false;
+ bool bDeleted = false;
sal_uLong nReturn = 0;
const sal_uLong nReturnChanged = 0x1; // THE boolean return value
const sal_uLong nReturnAdded = 0x2; // temp: format added
@@ -1554,6 +1562,10 @@ IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat )
#*
#************************************************************************/
+IMPL_LINK_TYPED( SvxNumberFormatTabPage, OptClickHdl_Impl, Button*, pOptCtrl, void )
+{
+ OptHdl_Impl(pOptCtrl);
+}
IMPL_LINK( SvxNumberFormatTabPage, OptHdl_Impl, void *, pOptCtrl )
{
if ( (pOptCtrl == m_pEdLeadZeroes)
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 4b6e643a932d..ad06c745e3c4 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1012,13 +1012,13 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, DoubleClickHdl_Impl)
return 0;
}
-IMPL_LINK_NOARG(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, Button*, void)
{
sfx2::FileDialogHelper aFileDialog(0, 0);
aFileDialog.SetTitle(CUI_RES(RID_SVXSTR_ADD_IMAGE));
if ( aFileDialog.Execute() != ERRCODE_NONE )
- return 0;
+ return;
OUString aPath = SvtPathOptions().GetGalleryPath();
OUString aPathToken = aPath.getToken( 1 , SEARCHPATH_DELIMITER );
@@ -1103,7 +1103,6 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl)
}
}
- return 0;
}
// static
@@ -2008,9 +2007,9 @@ IMPL_LINK( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox *, pBox )
}
-IMPL_LINK( SvxNumOptionsTabPage, SameLevelHdl_Impl, CheckBox *, pBox )
+IMPL_LINK_TYPED( SvxNumOptionsTabPage, SameLevelHdl_Impl, Button*, pBox, void )
{
- bool bSet = pBox->IsChecked();
+ bool bSet = static_cast<CheckBox*>(pBox)->IsChecked();
pActNum->SetContinuousNumbering(bSet);
bool bRepaint = false;
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
@@ -2024,7 +2023,6 @@ IMPL_LINK( SvxNumOptionsTabPage, SameLevelHdl_Impl, CheckBox *, pBox )
}
SetModified(bRepaint);
InitControls();
- return 0;
}
IMPL_LINK( SvxNumOptionsTabPage, BulColorHdl_Impl, ColorListBox*, pBox )
@@ -2198,7 +2196,7 @@ IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, PopupActivateHdl_Impl, Menu *, bool)
return false;
}
-IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, BulletHdl_Impl, Button*, void)
{
VclPtrInstance< SvxCharacterMap > pMap( this, true );
@@ -2255,7 +2253,6 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl)
SetModified();
}
- return 0;
}
IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField)
@@ -2326,16 +2323,15 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField)
return 0;
}
-IMPL_LINK( SvxNumOptionsTabPage, RatioHdl_Impl, CheckBox *, pBox )
+IMPL_LINK_TYPED( SvxNumOptionsTabPage, RatioHdl_Impl, Button*, pBox, void )
{
- if (pBox->IsChecked())
+ if (static_cast<CheckBox*>(pBox)->IsChecked())
{
if (bLastWidthModified)
SizeHdl_Impl(m_pWidthMF);
else
SizeHdl_Impl(m_pHeightMF);
}
- return 0;
}
IMPL_LINK_NOARG(SvxNumOptionsTabPage, CharFmtHdl_Impl)
@@ -3472,9 +3468,9 @@ IMPL_LINK( SvxNumPositionTabPage, DistanceHdl_Impl, MetricField *, pFld )
return 0;
}
-IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, CheckBox *, pBox )
+IMPL_LINK_TYPED( SvxNumPositionTabPage, RelativeHdl_Impl, Button*, pBox, void )
{
- bool bOn = pBox->IsChecked();
+ bool bOn = static_cast<CheckBox*>(pBox)->IsChecked();
bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 && SAL_MAX_UINT16 != nActNumLvl;
bool bSetValue = false;
long nValue = 0;
@@ -3512,7 +3508,6 @@ IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, CheckBox *, pBox )
m_pDistBorderMF->Enable(bOn || bSingleSelection);
m_pDistBorderFT->Enable(bOn || bSingleSelection);
bLastRelative = bOn;
- return 0;
}
IMPL_LINK_NOARG(SvxNumPositionTabPage, LabelFollowedByHdl_Impl)
@@ -3648,7 +3643,7 @@ IMPL_LINK( SvxNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pFld )
return 0;
}
-IMPL_LINK_NOARG(SvxNumPositionTabPage, StandardHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxNumPositionTabPage, StandardHdl_Impl, Button*, void)
{
sal_uInt16 nMask = 1;
SvxNumRule aTmpNumRule( pActNum->GetFeatureFlags(),
@@ -3685,7 +3680,6 @@ IMPL_LINK_NOARG(SvxNumPositionTabPage, StandardHdl_Impl)
InitControls();
SetModified();
- return 0;
}
void SvxNumPositionTabPage::SetModified(bool bRepaint)
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 7a60414d310f..d1f1e4a95476 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -1087,7 +1087,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl)
-IMPL_LINK( SvxPageDescPage, SwapOrientation_Impl, RadioButton *, pBtn )
+IMPL_LINK_TYPED( SvxPageDescPage, SwapOrientation_Impl, Button *, pBtn, void )
{
if (
(!bLandscape && pBtn == m_pLandscapeBtn) ||
@@ -1111,7 +1111,6 @@ IMPL_LINK( SvxPageDescPage, SwapOrientation_Impl, RadioButton *, pBtn )
SwapFirstValues_Impl( bBorderModified );
UpdateExample_Impl( true );
}
- return 0;
}
@@ -1649,12 +1648,11 @@ void SvxPageDescPage::CalcMargin_Impl()
-IMPL_LINK_NOARG(SvxPageDescPage, CenterHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxPageDescPage, CenterHdl_Impl, Button*, void)
{
m_pBspWin->SetHorz( m_pHorzBox->IsChecked() );
m_pBspWin->SetVert( m_pVertBox->IsChecked() );
UpdateExample_Impl();
- return 0;
}
void SvxPageDescPage::SetCollectionList(const std::vector<OUString> &aList)
@@ -1673,10 +1671,10 @@ void SvxPageDescPage::SetCollectionList(const std::vector<OUString> &aList)
-IMPL_LINK( SvxPageDescPage, RegisterModify, CheckBox*, pBox )
+IMPL_LINK_TYPED( SvxPageDescPage, RegisterModify, Button*, pBox, void )
{
bool bEnable = false;
- if(pBox->IsChecked())
+ if(static_cast<CheckBox*>(pBox)->IsChecked())
{
bEnable = true;
if(USHRT_MAX == m_pRegisterLB->GetSelectEntryPos())
@@ -1684,7 +1682,6 @@ IMPL_LINK( SvxPageDescPage, RegisterModify, CheckBox*, pBox )
}
m_pRegisterFT->Enable( bEnable );
m_pRegisterLB->Enable( bEnable );
- return 0;
}
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 1b13d74fbd30..1544e8d3482d 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -900,12 +900,11 @@ void SvxStdParagraphTabPage::EnableContextualMode()
m_pContextualCB->Show();
}
-IMPL_LINK( SvxStdParagraphTabPage, AutoHdl_Impl, CheckBox*, pBox )
+IMPL_LINK_TYPED( SvxStdParagraphTabPage, AutoHdl_Impl, Button*, pBox, void )
{
- bool bEnable = !pBox->IsChecked();
+ bool bEnable = !static_cast<CheckBox*>(pBox)->IsChecked();
m_pFLineLabel->Enable(bEnable);
m_pFLineIndent->Enable(bEnable);
- return 0;
}
void SvxStdParagraphTabPage::SetPageWidth( sal_uInt16 nPageWidth )
@@ -1018,7 +1017,7 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet
if ( m_pLastLineLB->GetEntryCount() == LASTLINECOUNT_NEW )
m_pLastLineLB->RemoveEntry( nLastLinePos );
- Link<> aLink = LINK( this, SvxParaAlignTabPage, AlignHdl_Impl );
+ Link<Button*,void> aLink = LINK( this, SvxParaAlignTabPage, AlignHdl_Impl );
m_pLeft->SetClickHdl( aLink );
m_pRight->SetClickHdl( aLink );
m_pCenter->SetClickHdl( aLink );
@@ -1263,7 +1262,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet* rSet )
UpdateExample_Impl();
}
-IMPL_LINK_NOARG(SvxParaAlignTabPage, AlignHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxParaAlignTabPage, AlignHdl_Impl, Button*, void)
{
bool bJustify = m_pJustify->IsChecked();
m_pLastLineFT->Enable(bJustify);
@@ -1271,7 +1270,6 @@ IMPL_LINK_NOARG(SvxParaAlignTabPage, AlignHdl_Impl)
bool bLastLineIsBlock = m_pLastLineLB->GetSelectEntryPos() == 2;
m_pExpandCB->Enable(bJustify && bLastLineIsBlock);
UpdateExample_Impl();
- return 0;
}
IMPL_LINK_NOARG(SvxParaAlignTabPage, LastLineHdl_Impl)
@@ -1976,7 +1974,7 @@ void SvxExtParagraphTabPage::dispose()
SfxTabPage::dispose();
}
-IMPL_LINK_NOARG(SvxExtParagraphTabPage, PageBreakHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, PageBreakHdl_Impl, Button*, void)
{
switch ( m_pPageBreakBox->GetState() )
{
@@ -2015,19 +2013,16 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, PageBreakHdl_Impl)
m_pBreakPositionLB->Enable(false);
break;
}
- return 0;
}
-IMPL_LINK_NOARG(SvxExtParagraphTabPage, KeepTogetherHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, KeepTogetherHdl_Impl, Button*, void)
{
bool bEnable = m_pKeepTogetherBox->GetState() == TRISTATE_FALSE;
m_pWidowBox->Enable(bEnable);
m_pOrphanBox->Enable(bEnable);
-
- return 0;
}
-IMPL_LINK_NOARG(SvxExtParagraphTabPage, WidowHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, WidowHdl_Impl, Button*, void)
{
switch ( m_pWidowBox->GetState() )
{
@@ -2047,10 +2042,9 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, WidowHdl_Impl)
m_pWidowRowLabel->Enable(false);
break;
}
- return 0;
}
-IMPL_LINK_NOARG(SvxExtParagraphTabPage, OrphanHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, OrphanHdl_Impl, Button*, void)
{
switch( m_pOrphanBox->GetState() )
{
@@ -2070,10 +2064,9 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, OrphanHdl_Impl)
m_pOrphanRowLabel->Enable(false);
break;
}
- return 0;
}
-IMPL_LINK_NOARG(SvxExtParagraphTabPage, HyphenClickHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, HyphenClickHdl_Impl, Button*, void)
{
bool bEnable = m_pHyphenBox->GetState() == TRISTATE_TRUE;
@@ -2084,11 +2077,9 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, HyphenClickHdl_Impl)
m_pMaxHyphenLabel->Enable(bEnable);
m_pMaxHyphenEdit->Enable(bEnable);
m_pHyphenBox->SetState( bEnable ? TRISTATE_TRUE : TRISTATE_FALSE);
-
- return 0;
}
-IMPL_LINK_NOARG(SvxExtParagraphTabPage, ApplyCollClickHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, ApplyCollClickHdl_Impl, Button*, void)
{
bool bEnable = false;
if ( m_pApplyCollBtn->GetState() == TRISTATE_TRUE &&
@@ -2107,7 +2098,6 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, ApplyCollClickHdl_Impl)
m_pPagenumText->Enable(bEnable);
m_pPagenumEdit->Enable(bEnable);
}
- return 0;
}
IMPL_LINK( SvxExtParagraphTabPage, PageBreakPosHdl_Impl, ListBox *, pListBox )
@@ -2171,7 +2161,7 @@ SvxAsianTabPage::SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet )
get(m_pHangingPunctCB,"checkHangPunct");
get(m_pScriptSpaceCB,"checkApplySpacing");
- Link<> aLink = LINK( this, SvxAsianTabPage, ClickHdl_Impl );
+ Link<Button*,void> aLink = LINK( this, SvxAsianTabPage, ClickHdl_Impl );
m_pHangingPunctCB->SetClickHdl( aLink );
m_pScriptSpaceCB->SetClickHdl( aLink );
m_pForbiddenRulesCB->SetClickHdl( aLink );
@@ -2262,10 +2252,9 @@ void SvxAsianTabPage::Reset( const SfxItemSet* rSet )
lcl_SetBox(*rSet, SID_ATTR_PARA_SCRIPTSPACE, *m_pScriptSpaceCB );
}
-IMPL_STATIC_LINK( SvxAsianTabPage, ClickHdl_Impl, CheckBox*, pBox )
+IMPL_STATIC_LINK_TYPED( SvxAsianTabPage, ClickHdl_Impl, Button*, pBox, void )
{
- pBox->EnableTriState( false );
- return 0;
+ static_cast<CheckBox*>(pBox)->EnableTriState( false );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 2b5652759297..7b45ae17f6aa 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -563,7 +563,7 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(vcl::Window* pParent, const SfxItemSet&
m_pHeightMF->SetLoseFocusHdl( aLk );
m_pHoriByMF->SetLoseFocusHdl( aLk );
m_pVertByMF->SetLoseFocusHdl( aLk );
- m_pFollowCB->SetClickHdl( aLk );
+ m_pFollowCB->SetClickHdl( LINK(this, SvxSwPosSizeTabPage, RangeModifyClickHdl) );
aLk = LINK(this, SvxSwPosSizeTabPage, ModifyHdl);
m_pWidthMF->SetModifyHdl( aLk );
@@ -571,12 +571,12 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(vcl::Window* pParent, const SfxItemSet&
m_pHoriByMF->SetModifyHdl( aLk );
m_pVertByMF->SetModifyHdl( aLk );
- aLk = LINK(this, SvxSwPosSizeTabPage, AnchorTypeHdl);
- m_pToPageRB->SetClickHdl( aLk );
- m_pToParaRB->SetClickHdl( aLk );
- m_pToCharRB->SetClickHdl( aLk );
- m_pAsCharRB->SetClickHdl( aLk );
- m_pToFrameRB->SetClickHdl( aLk );
+ Link<Button*,void> aLk2 = LINK(this, SvxSwPosSizeTabPage, AnchorTypeHdl);
+ m_pToPageRB->SetClickHdl( aLk2 );
+ m_pToParaRB->SetClickHdl( aLk2 );
+ m_pToCharRB->SetClickHdl( aLk2 );
+ m_pAsCharRB->SetClickHdl( aLk2 );
+ m_pToFrameRB->SetClickHdl( aLk2 );
m_pHoriLB->SetSelectHdl(LINK(this, SvxSwPosSizeTabPage, PosHdl));
m_pVertLB->SetSelectHdl(LINK(this, SvxSwPosSizeTabPage, PosHdl));
@@ -1137,6 +1137,10 @@ short SvxSwPosSizeTabPage::GetAnchorType(bool* pbHasChanged)
return nRet;
}
+IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, RangeModifyClickHdl, Button*, void)
+{
+ RangeModifyHdl(NULL);
+}
IMPL_LINK_NOARG(SvxSwPosSizeTabPage, RangeModifyHdl)
{
if(m_bPositioningDisabled)
@@ -1221,7 +1225,7 @@ IMPL_LINK_NOARG(SvxSwPosSizeTabPage, RangeModifyHdl)
return 0;
}
-IMPL_LINK_NOARG(SvxSwPosSizeTabPage, AnchorTypeHdl)
+IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, AnchorTypeHdl, Button*, void)
{
m_pHoriMirrorCB->Enable(!m_pAsCharRB->IsChecked() && !m_bIsMultiSelection);
@@ -1239,15 +1243,12 @@ IMPL_LINK_NOARG(SvxSwPosSizeTabPage, AnchorTypeHdl)
PosHdl(m_pHoriLB);
PosHdl(m_pVertLB);
}
- return 0;
}
-IMPL_LINK_NOARG(SvxSwPosSizeTabPage, MirrorHdl)
+IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, MirrorHdl, Button*, void)
{
short nId = GetAnchorType();
InitPos( nId, USHRT_MAX, 0, USHRT_MAX, 0, LONG_MAX, LONG_MAX);
-
- return 0;
}
IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox *, pLB )
@@ -1408,10 +1409,9 @@ IMPL_LINK( SvxSwPosSizeTabPage, ModifyHdl, Edit *, pEdit )
return 0;
}
-IMPL_LINK_NOARG(SvxSwPosSizeTabPage, ProtectHdl)
+IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, ProtectHdl, Button*, void)
{
m_pSizeCB->Enable(m_pPositionCB->IsEnabled() && !m_pPositionCB->IsChecked());
- return 0;
}
short SvxSwPosSizeTabPage::GetRelation(FrmMap *, ListBox &rRelationLB)
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 13f031668f36..62169efe59ff 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -223,12 +223,11 @@ short SvxAreaTabDialog::Ok()
-IMPL_LINK_NOARG(SvxAreaTabDialog, CancelHdlImpl)
+IMPL_LINK_NOARG_TYPED(SvxAreaTabDialog, CancelHdlImpl, Button*, void)
{
SavePalettes();
EndDialog();
- return 0;
}
void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index 2e96f608f10e..56245180390f 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -183,12 +183,11 @@ short SvxLineTabDialog::Ok()
-IMPL_LINK_NOARG(SvxLineTabDialog, CancelHdlImpl)
+IMPL_LINK_NOARG_TYPED(SvxLineTabDialog, CancelHdlImpl, Button*, void)
{
SavePalettes();
EndDialog();
- return 0;
}
void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 73f8ae4d64c9..7f3fbb8fa097 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -148,7 +148,7 @@ SvxTabulatorTabPage::SvxTabulatorTabPage(vcl::Window* pParent, const SfxItemSet&
m_pDelBtn->SetClickHdl( LINK( this,SvxTabulatorTabPage, DelHdl_Impl ) );
m_pDelAllBtn->SetClickHdl( LINK( this,SvxTabulatorTabPage, DelAllHdl_Impl ) );
- Link<> aLink = LINK( this, SvxTabulatorTabPage, TabTypeCheckHdl_Impl );
+ Link<Button*,void> aLink = LINK( this, SvxTabulatorTabPage, TabTypeCheckHdl_Impl );
m_pLeftTab->SetClickHdl( aLink );
m_pRightTab->SetClickHdl( aLink );
m_pDezTab->SetClickHdl( aLink );
@@ -461,7 +461,7 @@ void SvxTabulatorTabPage::SetFillAndTabType_Impl()
pFillBtn->Check();
}
-IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn )
+IMPL_LINK_TYPED( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn, void )
{
// Add a new one and select it
// Get the value from the display
@@ -469,7 +469,7 @@ IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn )
// If the pBtn == 0 && the value == 0 then do not create a tab, because we create via OK
if ( nVal == 0 && pBtn == 0 )
- return 0;
+ return;
long nOffset = 0;
const SfxPoolItem* pItem = 0;
@@ -514,20 +514,19 @@ IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn )
bCheck = true;
// Set the selection into the position Edit
m_pTabBox->SetSelection(Selection(0, m_pTabBox->GetText().getLength()));
- return 0;
}
-IMPL_LINK_NOARG(SvxTabulatorTabPage, DelHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, DelHdl_Impl, Button*, void)
{
sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue() );
if ( nPos == COMBOBOX_ENTRY_NOTFOUND )
- return 0;
+ return;
if ( m_pTabBox->GetEntryCount() == 1 )
{
DelAllHdl_Impl( 0 );
- return 0;
+ return;
}
// Delete Tab
@@ -555,10 +554,9 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, DelHdl_Impl)
// If no RadioButton was clicked, we need to put anyway
bCheck = true;
- return 0;
}
-IMPL_LINK_NOARG(SvxTabulatorTabPage, DelAllHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, DelAllHdl_Impl, Button*, void)
{
if ( aNewTabs.Count() )
{
@@ -568,10 +566,9 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, DelAllHdl_Impl)
// So that we put in FillItemSet()
bCheck = true;
}
- return 0;
}
-IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, RadioButton *, pBox )
+IMPL_LINK_TYPED( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, Button *, pBox, void )
{
bCheck = true;
SvxTabAdjust eAdj;
@@ -601,10 +598,9 @@ IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, RadioButton *, pBox )
aNewTabs.Remove( nPos );
aNewTabs.Insert( aAktTab );
}
- return 0;
}
-IMPL_LINK( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, RadioButton *, pBox )
+IMPL_LINK_TYPED( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, Button *, pBox, void )
{
bCheck = true;
sal_uInt8 cFill = ' ';
@@ -630,7 +626,6 @@ IMPL_LINK( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, RadioButton *, pBox )
aNewTabs.Remove( nPos );
aNewTabs.Insert( aAktTab );
}
- return 0;
}
IMPL_LINK( SvxTabulatorTabPage, GetFillCharHdl_Impl, Edit *, pEdit )
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index eb58430b65b1..0a5e83e47460 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -115,7 +115,7 @@ SvxTextAnimationPage::SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemS
m_pTsbAuto->SetClickHdl( LINK( this, SvxTextAnimationPage, ClickAutoHdl_Impl ) );
m_pTsbPixel->SetClickHdl( LINK( this, SvxTextAnimationPage, ClickPixelHdl_Impl ) );
- Link<> aLink( LINK( this, SvxTextAnimationPage, ClickDirectionHdl_Impl ) );
+ Link<Button*,void> aLink( LINK( this, SvxTextAnimationPage, ClickDirectionHdl_Impl ) );
m_pBtnUp->SetClickHdl( aLink );
m_pBtnLeft->SetClickHdl( aLink );
m_pBtnRight->SetClickHdl( aLink );
@@ -525,7 +525,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl)
return 0L;
}
-IMPL_LINK_NOARG(SvxTextAnimationPage, ClickEndlessHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, ClickEndlessHdl_Impl, Button*, void)
{
if( eAniKind != SDRTEXTANI_SLIDE )
@@ -542,10 +542,9 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickEndlessHdl_Impl)
m_pNumFldCount->SetValue( m_pNumFldCount->GetValue() );
}
}
- return 0L;
}
-IMPL_LINK_NOARG(SvxTextAnimationPage, ClickAutoHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, ClickAutoHdl_Impl, Button*, void)
{
TriState eState = m_pTsbAuto->GetState();
if( eState != TRISTATE_FALSE )
@@ -558,11 +557,9 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickAutoHdl_Impl)
m_pMtrFldDelay->Enable();
m_pMtrFldDelay->SetValue( m_pMtrFldDelay->GetValue() );
}
-
- return 0L;
}
-IMPL_LINK_NOARG(SvxTextAnimationPage, ClickPixelHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, ClickPixelHdl_Impl, Button*, void)
{
TriState eState = m_pTsbPixel->GetState();
if( eState == TRISTATE_TRUE )
@@ -597,18 +594,14 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickPixelHdl_Impl)
m_pMtrFldAmount->SetValue( nValue );
}
-
- return 0L;
}
-IMPL_LINK( SvxTextAnimationPage, ClickDirectionHdl_Impl, ImageButton *, pBtn )
+IMPL_LINK_TYPED( SvxTextAnimationPage, ClickDirectionHdl_Impl, Button *, pBtn, void )
{
m_pBtnUp->Check( pBtn == m_pBtnUp );
m_pBtnLeft->Check( pBtn == m_pBtnLeft );
m_pBtnRight->Check( pBtn == m_pBtnRight );
m_pBtnDown->Check( pBtn == m_pBtnDown );
-
- return 0L;
}
void SvxTextAnimationPage::SelectDirection( SdrTextAniDirection nValue )
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index af1ac29d54b8..1fc0b48f3f73 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -87,7 +87,7 @@ SvxTextAttrPage::SvxTextAttrPage(vcl::Window* pWindow, const SfxItemSet& rInAttr
SetFieldUnit( *m_pMtrFldTop, eFUnit );
SetFieldUnit( *m_pMtrFldBottom, eFUnit );
- Link<> aLink( LINK( this, SvxTextAttrPage, ClickHdl_Impl ) );
+ Link<Button*,void> aLink( LINK( this, SvxTextAttrPage, ClickHdl_Impl ) );
m_pTsbAutoGrowWidth->SetClickHdl( aLink );
m_pTsbAutoGrowHeight->SetClickHdl( aLink );
m_pTsbFitToSize->SetClickHdl( aLink );
@@ -582,7 +582,7 @@ void SvxTextAttrPage::PointChanged( vcl::Window*, RECT_POINT eRP )
to be moved to a valid and adjacent position. This position depends on
the current anchor position and the text writing direction.
*/
-IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxTextAttrPage, ClickFullWidthHdl_Impl, Button*, void)
{
if( m_pTsbFullWidth->GetState() == TRISTATE_TRUE )
{
@@ -631,7 +631,6 @@ IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl)
}
}
}
- return 0L;
}
/*************************************************************************
@@ -640,7 +639,7 @@ IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl)
|*
\************************************************************************/
-IMPL_LINK_NOARG(SvxTextAttrPage, ClickHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxTextAttrPage, ClickHdl_Impl, Button*, void)
{
bool bAutoGrowWidth = m_pTsbAutoGrowWidth->GetState() == TRISTATE_TRUE;
bool bAutoGrowHeight = m_pTsbAutoGrowHeight->GetState() == TRISTATE_TRUE;
@@ -681,8 +680,6 @@ IMPL_LINK_NOARG(SvxTextAttrPage, ClickHdl_Impl)
// #83698# enable/disable text anchoring dependent of contour
m_pFlPosition->Enable(!bContour && !bHorAndVer);
-
- return 0L;
}
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index f2958cadf35d..96b8fa4d4b61 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -75,7 +75,7 @@ const sal_uInt16 SvxTransparenceTabPage::pTransparenceRanges[] =
|*
\************************************************************************/
-IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransOffHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransOffHdl_Impl, Button*, void)
{
// disable all other controls
ActivateLinear(false);
@@ -88,11 +88,9 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransOffHdl_Impl)
m_pCtlBitmapPreview->SetAttributes( aXFillAttr.GetItemSet() );
InvalidatePreview( false );
-
- return 0L;
}
-IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransLinearHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransLinearHdl_Impl, Button*, void)
{
// enable linear, disable other
ActivateLinear(true);
@@ -101,11 +99,9 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransLinearHdl_Impl)
// preview
rXFSet.ClearItem (XATTR_FILLFLOATTRANSPARENCE);
ModifyTransparentHdl_Impl (NULL);
-
- return 0L;
}
-IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransGradientHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransGradientHdl_Impl, Button*, void)
{
// enable gradient, disable other
ActivateLinear(false);
@@ -114,8 +110,6 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransGradientHdl_Impl)
// preview
rXFSet.ClearItem (XATTR_FILLTRANSPARENCE);
ModifiedTrgrHdl_Impl (NULL);
-
- return 0L;
}
SvxTransparenceTabPage::~SvxTransparenceTabPage()
@@ -744,17 +738,18 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs
m_pLbHatching->SetSelectHdl( LINK( this, SvxAreaTabPage, ModifyHatchingHdl_Impl ) );
m_pLbBitmap->SetSelectHdl( LINK( this, SvxAreaTabPage, ModifyBitmapHdl_Impl ) );
- m_pTsbStepCount->SetClickHdl( LINK( this, SvxAreaTabPage, ModifyStepCountHdl_Impl ) );
+ m_pTsbStepCount->SetClickHdl( LINK( this, SvxAreaTabPage, ModifyStepCountClickHdl_Impl ) );
m_pNumFldStepCount->SetModifyHdl( LINK( this, SvxAreaTabPage, ModifyStepCountHdl_Impl ) );
Link<> aLink( LINK( this, SvxAreaTabPage, ModifyTileHdl_Impl ) );
- m_pTsbTile->SetClickHdl( aLink );
- m_pTsbStretch->SetClickHdl( aLink );
- m_pTsbOriginal->SetClickHdl( aLink );
+ Link<Button*,void> aClickLink( LINK( this, SvxAreaTabPage, ModifyTileClickHdl_Impl ) );
+ m_pTsbTile->SetClickHdl( aClickLink );
+ m_pTsbStretch->SetClickHdl( aClickLink );
+ m_pTsbOriginal->SetClickHdl( aClickLink );
m_pMtrFldXSize->SetModifyHdl( aLink );
m_pMtrFldYSize->SetModifyHdl( aLink );
- m_pRbtRow->SetClickHdl( aLink );
- m_pRbtColumn->SetClickHdl( aLink );
+ m_pRbtRow->SetClickHdl( aClickLink );
+ m_pRbtColumn->SetClickHdl( aClickLink );
m_pMtrFldOffset->SetModifyHdl( aLink );
m_pMtrFldXOffset->SetModifyHdl( aLink );
m_pMtrFldYOffset->SetModifyHdl( aLink );
@@ -2163,6 +2158,10 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyBitmapHdl_Impl)
+IMPL_LINK_TYPED( SvxAreaTabPage, ModifyStepCountClickHdl_Impl, Button*, p, void )
+{
+ ModifyStepCountHdl_Impl(p);
+}
IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p )
{
if( p == m_pTsbStepCount )
@@ -2192,7 +2191,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p )
return 0L;
}
-IMPL_LINK_NOARG( SvxAreaTabPage, ClickImportHdl_Impl )
+IMPL_LINK_NOARG_TYPED( SvxAreaTabPage, ClickImportHdl_Impl, Button*, void )
{
ResMgr& rMgr = CUI_MGR();
SvxOpenGraphicDialog aDlg("Import");
@@ -2228,12 +2227,14 @@ IMPL_LINK_NOARG( SvxAreaTabPage, ClickImportHdl_Impl )
ScopedVclPtrInstance<MessageDialog>::Create (this, OUString(ResId(RID_SVXSTR_READ_DATA_ERROR, rMgr)))->Execute();
}
}
-
- return 0L;
}
//------------------------------------------------------------------------
+IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyTileClickHdl_Impl, Button*, void)
+{
+ ModifyTileHdl_Impl(NULL);
+}
IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl)
{
TriState eState = m_pTsbTile->GetState();
@@ -2387,7 +2388,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl)
-IMPL_LINK_NOARG(SvxAreaTabPage, ClickScaleHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ClickScaleHdl_Impl, Button*, void)
{
if( m_pTsbScale->GetState() == TRISTATE_TRUE )
{
@@ -2419,8 +2420,6 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ClickScaleHdl_Impl)
}
ModifyTileHdl_Impl( NULL );
-
- return 0L;
}
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 21afbd10b46e..b70fdd8ab171 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -459,13 +459,13 @@ long SvxBitmapTabPage::CheckChanges_Impl()
{
case RET_BTN_1:
{
- ClickModifyHdl_Impl( this );
+ ClickModifyHdl_Impl( NULL );
}
break;
case RET_BTN_2:
{
- ClickAddHdl_Impl( this );
+ ClickAddHdl_Impl( NULL );
}
break;
@@ -482,7 +482,7 @@ long SvxBitmapTabPage::CheckChanges_Impl()
-IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickAddHdl_Impl, Button*, void)
{
OUString aNewName( SVX_RES( RID_SVXSTR_BITMAP ) );
@@ -582,7 +582,6 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl)
m_pBtnDelete->Enable();
m_pBtnSave->Enable();
}
- return 0L;
}
@@ -592,7 +591,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl)
-IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickImportHdl_Impl, Button*, void)
{
ResMgr& rMgr = CUI_MGR();
SvxOpenGraphicDialog aDlg( OUString("Import") );
@@ -670,13 +669,11 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl)
,"NoLoadedFileDialog"
,"cui/ui/querynoloadedfiledialog.ui")->Execute();
}
-
- return 0L;
}
-IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickModifyHdl_Impl, Button*, void)
{
sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos();
@@ -735,12 +732,11 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl)
}
}
}
- return 0L;
}
-IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickDeleteHdl_Impl, Button*, void)
{
sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos();
@@ -769,12 +765,11 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl_Impl)
m_pBtnDelete->Disable();
m_pBtnSave->Disable();
}
- return 0L;
}
-IMPL_LINK_NOARG(SvxBitmapTabPage, ClickLoadHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickLoadHdl_Impl, Button*, void)
{
sal_uInt16 nReturn = RET_YES;
ResMgr& rMgr = CUI_MGR();
@@ -872,12 +867,11 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickLoadHdl_Impl)
m_pBtnDelete->Disable();
m_pBtnSave->Disable();
}
- return 0L;
}
-IMPL_LINK_NOARG(SvxBitmapTabPage, ClickSaveHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickSaveHdl_Impl, Button*, void)
{
::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
OUString aStrFilterType( "*.sob" );
@@ -940,8 +934,6 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickSaveHdl_Impl)
,"cui/ui/querynosavefiledialog.ui")->Execute();
}
}
-
- return 0L;
}
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 224c1af8f0bd..3d1391afa996 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -121,7 +121,7 @@ void SvxColorTabPage::UpdateTableName()
-IMPL_LINK_NOARG(SvxColorTabPage, ClickLoadHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickLoadHdl_Impl, Button*, void)
{
sal_uInt16 nReturn = RET_YES;
bool bLoaded = false;
@@ -189,8 +189,6 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickLoadHdl_Impl)
}
}
Update( bLoaded );
-
- return 0;
}
void SvxColorTabPage::EnableSave( bool bCanSave )
@@ -203,7 +201,7 @@ void SvxColorTabPage::EnableSave( bool bCanSave )
-IMPL_LINK_NOARG(SvxColorTabPage, ClickSaveHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickSaveHdl_Impl, Button*, void)
{
::sfx2::FileDialogHelper aDlg(
css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
@@ -258,7 +256,6 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickSaveHdl_Impl)
,"cui/ui/querynosavefiledialog.ui")->Execute();
}
}
- return 0;
}
void SvxColorTabPage::Update(bool bLoaded)
@@ -561,14 +558,14 @@ long SvxColorTabPage::CheckChanges_Impl()
{
case RET_BTN_1:
{
- ClickModifyHdl_Impl( this );
+ ClickModifyHdl_Impl( NULL );
aColor = pColorList->GetColor( nPos )->GetColor();
}
break;
case RET_BTN_2:
{
- ClickAddHdl_Impl( this );
+ ClickAddHdl_Impl( NULL );
nPos = m_pLbColor->GetSelectEntryPos();
aColor = pColorList->GetColor( nPos )->GetColor();
}
@@ -690,7 +687,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ModifiedHdl_Impl)
-IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickAddHdl_Impl, Button*, void)
{
OUString aNewName( SVX_RES( RID_SVXSTR_COLOR ) );
OUString aDesc( CUI_RES( RID_SVXSTR_DESC_COLOR ) );
@@ -771,13 +768,11 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl)
}
UpdateModified();
-
- return 0;
}
-IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickModifyHdl_Impl, Button*, void)
{
sal_Int32 nPos = m_pLbColor->GetSelectEntryPos();
@@ -841,12 +836,11 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl)
*pnColorListState |= ChangeType::MODIFIED;
}
}
- return 0;
}
-IMPL_LINK_NOARG(SvxColorTabPage, ClickWorkOnHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickWorkOnHdl_Impl, Button*, void)
{
boost::scoped_ptr<SvColorDialog> pColorDlg(new SvColorDialog( GetParentDialog() ));
@@ -881,13 +875,11 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickWorkOnHdl_Impl)
m_pCtlPreviewNew->Invalidate();
}
-
- return 0;
}
-IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickDeleteHdl_Impl, Button*, void)
{
sal_Int32 nPos = m_pLbColor->GetSelectEntryPos();
@@ -918,8 +910,6 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl)
}
}
UpdateModified();
-
- return 0;
}
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index c84dc61042c4..0c4a25c39bc7 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -306,14 +306,14 @@ long SvxGradientTabPage::CheckChanges_Impl()
{
case RET_BTN_1:
{
- ClickModifyHdl_Impl( this );
+ ClickModifyHdl_Impl( NULL );
aGradient = m_pGradientList->GetGradient( nPos )->GetGradient();
}
break;
case RET_BTN_2:
{
- ClickAddHdl_Impl( this );
+ ClickAddHdl_Impl( NULL );
nPos = m_pLbGradients->GetSelectEntryPos();
aGradient = m_pGradientList->GetGradient( nPos )->GetGradient();
}
@@ -430,7 +430,7 @@ IMPL_LINK( SvxGradientTabPage, ModifiedHdl_Impl, void *, pControl )
-IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void)
{
OUString aNewName( SVX_RES( RID_SVXSTR_GRADIENT ) );
OUString aDesc( CUI_RES( RID_SVXSTR_DESC_GRADIENT ) );
@@ -528,12 +528,11 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl)
m_pBtnDelete->Enable();
m_pBtnSave->Enable();
}
- return 0L;
}
-IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickModifyHdl_Impl, Button*, void)
{
sal_Int32 nPos = m_pLbGradients->GetSelectEntryPos();
@@ -596,12 +595,11 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl)
}
}
- return 0L;
}
-IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickDeleteHdl_Impl, Button*, void)
{
sal_Int32 nPos = m_pLbGradients->GetSelectEntryPos();
@@ -629,12 +627,11 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl)
m_pBtnDelete->Disable();
m_pBtnSave->Disable();
}
- return 0L;
}
-IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickLoadHdl_Impl, Button*, void)
{
ResMgr& rMgr = CUI_MGR();
sal_uInt16 nReturn = RET_YES;
@@ -735,12 +732,11 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl)
m_pBtnDelete->Disable();
m_pBtnSave->Disable();
}
- return 0L;
}
-IMPL_LINK_NOARG(SvxGradientTabPage, ClickSaveHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickSaveHdl_Impl, Button*, void)
{
::sfx2::FileDialogHelper aDlg(
css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
@@ -804,8 +800,6 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickSaveHdl_Impl)
,"cui/ui/querynosavefiledialog.ui")->Execute();
}
}
-
- return 0L;
}
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index cc1934a84bf5..9a4b525fbaf1 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -276,13 +276,13 @@ long SvxHatchTabPage::CheckChanges_Impl()
{
case RET_BTN_1:
{
- ClickModifyHdl_Impl( this );
+ ClickModifyHdl_Impl( NULL );
}
break;
case RET_BTN_2:
{
- ClickAddHdl_Impl( this );
+ ClickAddHdl_Impl( NULL );
}
break;
@@ -473,7 +473,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ChangeHatchHdl_Impl)
-IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void)
{
OUString aNewName( SVX_RES( RID_SVXSTR_HATCH ) );
OUString aDesc( CUI_RES( RID_SVXSTR_DESC_HATCH ) );
@@ -565,12 +565,11 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl)
m_pBtnDelete->Enable();
m_pBtnSave->Enable();
}
- return 0L;
}
-IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickModifyHdl_Impl, Button*, void)
{
sal_Int32 nPos = m_pLbHatchings->GetSelectEntryPos();
@@ -633,12 +632,11 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl)
}
}
}
- return 0L;
}
-IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickDeleteHdl_Impl, Button*, void)
{
sal_Int32 nPos = m_pLbHatchings->GetSelectEntryPos();
@@ -666,12 +664,11 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl)
m_pBtnDelete->Disable();
m_pBtnSave->Disable();
}
- return 0L;
}
-IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickLoadHdl_Impl, Button*, void)
{
ResMgr& rMgr = CUI_MGR();
sal_uInt16 nReturn = RET_YES;
@@ -762,12 +759,11 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl)
m_pBtnDelete->Disable();
m_pBtnSave->Disable();
}
- return 0L;
}
-IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickSaveHdl_Impl, Button*, void)
{
::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
OUString aStrFilterType( "*.soh" );
@@ -830,8 +826,6 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl)
,"cui/ui/querynosavefiledialog.ui")->Execute();
}
}
-
- return 0L;
}
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 1c3266c32e0f..ce672bf4f25a 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -194,8 +194,8 @@ SvxLineTabPage::SvxLineTabPage
m_pLbEndStyle->SetSelectHdl( aEnd );
m_pMtrStartWidth->SetModifyHdl( aStart );
m_pMtrEndWidth->SetModifyHdl( aEnd );
- m_pTsbCenterStart->SetClickHdl( aStart );
- m_pTsbCenterEnd->SetClickHdl( aEnd );
+ m_pTsbCenterStart->SetClickHdl( LINK( this, SvxLineTabPage, ChangeStartClickHdl_Impl ) );
+ m_pTsbCenterEnd->SetClickHdl( LINK( this, SvxLineTabPage, ChangeEndClickHdl_Impl ) );
// #116827#
Link<> aEdgeStyle = LINK( this, SvxLineTabPage, ChangeEdgeStyleHdl_Impl );
@@ -1598,6 +1598,10 @@ IMPL_LINK( SvxLineTabPage, ChangePreviewHdl_Impl, void *, pCntrl )
+IMPL_LINK_TYPED( SvxLineTabPage, ChangeStartClickHdl_Impl, Button*, p, void )
+{
+ ChangeStartHdl_Impl(p);
+}
IMPL_LINK( SvxLineTabPage, ChangeStartHdl_Impl, void *, p )
{
if( m_pCbxSynchronize->IsChecked() )
@@ -1674,6 +1678,10 @@ IMPL_LINK_NOARG(SvxLineTabPage, ClickInvisibleHdl_Impl)
+IMPL_LINK_TYPED( SvxLineTabPage, ChangeEndClickHdl_Impl, Button*, p, void )
+{
+ ChangeEndHdl_Impl(p);
+}
IMPL_LINK( SvxLineTabPage, ChangeEndHdl_Impl, void *, p )
{
if( m_pCbxSynchronize->IsChecked() )
@@ -1789,16 +1797,15 @@ IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, MetricField *, pField)
aSymbolLastSize=aSymbolSize;
return 0;
}
-IMPL_LINK( SvxLineTabPage, RatioHdl_Impl, CheckBox *, pBox )
+IMPL_LINK_TYPED( SvxLineTabPage, RatioHdl_Impl, Button*, pBox, void )
{
- if (pBox->IsChecked())
+ if (static_cast<CheckBox*>(pBox)->IsChecked())
{
if (bLastWidthModified)
SizeHdl_Impl(m_pSymbolWidthMF);
else
SizeHdl_Impl(m_pSymbolHeightMF);
}
- return 0;
}
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 5e6c13124534..d6a48aa54112 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -259,13 +259,13 @@ void SvxLineDefTabPage::CheckChanges_Impl()
{
case RET_BTN_1:
{
- ClickModifyHdl_Impl( this );
+ ClickModifyHdl_Impl( NULL );
}
break;
case RET_BTN_2:
{
- ClickAddHdl_Impl( this );
+ ClickAddHdl_Impl( NULL );
}
break;
@@ -439,7 +439,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber2Hdl_Impl)
-IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, void *, p )
+IMPL_LINK_TYPED( SvxLineDefTabPage, ChangeMetricHdl_Impl, Button*, p, void )
{
if( !m_pCbxSynchronize->IsChecked() && m_pMtrLength1->GetUnit() != eFUnit )
{
@@ -503,8 +503,6 @@ IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, void *, p )
}
SelectTypeHdl_Impl( NULL );
-
- return 0L;
}
@@ -544,7 +542,7 @@ IMPL_LINK( SvxLineDefTabPage, SelectTypeHdl_Impl, void *, p )
-IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void)
{
ResMgr& rMgr = CUI_MGR();
OUString aNewName( SVX_RES( RID_SVXSTR_LINESTYLE ) );
@@ -629,12 +627,11 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl)
m_pBtnDelete->Enable();
m_pBtnSave->Enable();
}
- return 0L;
}
-IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void)
{
sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos();
@@ -699,12 +696,11 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl)
}
}
}
- return 0L;
}
-IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickDeleteHdl_Impl, Button*, void)
{
sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos();
@@ -736,12 +732,11 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl)
m_pBtnDelete->Disable();
m_pBtnSave->Disable();
}
- return 0L;
}
-IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void)
{
sal_uInt16 nReturn = RET_YES;
@@ -818,12 +813,11 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl)
m_pBtnDelete->Disable();
m_pBtnSave->Disable();
}
- return 0L;
}
-IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickSaveHdl_Impl, Button*, void)
{
::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
OUString aStrFilterType( "*.sod" );
@@ -873,8 +867,6 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl)
,"cui/ui/querynosavefiledialog.ui")->Execute();
}
}
-
- return 0L;
}
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 30eeeaeb148c..22d88d359ecb 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -209,7 +209,7 @@ void SvxLineEndDefTabPage::CheckChanges_Impl()
,"AskChangeLineEndDialog"
,"cui/ui/querychangelineenddialog.ui" );
if ( aQueryBox->Execute() == RET_YES )
- ClickModifyHdl_Impl( this );
+ ClickModifyHdl_Impl( NULL );
}
}
nPos = m_pLbLineEnds->GetSelectEntryPos();
@@ -321,7 +321,7 @@ long SvxLineEndDefTabPage::ChangePreviewHdl_Impl( void* )
-IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void)
{
sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos();
@@ -397,12 +397,11 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl)
}
}
}
- return 0L;
}
-IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void)
{
if( pPolyObj )
{
@@ -423,10 +422,10 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl)
pNewObj = pConvPolyObj = pPolyObj->ConvertToPolyObj( true, false );
if( !pNewObj || !pNewObj->ISA( SdrPathObj ) )
- return 0L; // cancel, additional safety, which
+ return; // cancel, additional safety, which
// has no use for group objects though.
}
- else return 0L; // cancel
+ else return; // cancel
}
basegfx::B2DPolyPolygon aNewPolyPolygon(static_cast<const SdrPathObj*>(pNewObj)->GetPathPoly());
@@ -512,12 +511,11 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl)
m_pBtnDelete->Enable();
m_pBtnSave->Enable();
}
- return 0L;
}
-IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickDeleteHdl_Impl, Button*, void)
{
sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos();
@@ -548,12 +546,11 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl)
m_pBtnDelete->Disable();
m_pBtnSave->Disable();
}
- return 0L;
}
-IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickLoadHdl_Impl, Button*, void)
{
sal_uInt16 nReturn = RET_YES;
@@ -631,12 +628,11 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl)
m_pBtnDelete->Disable();
m_pBtnSave->Disable();
}
- return 0L;
}
-IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickSaveHdl_Impl, Button*, void)
{
::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
OUString aStrFilterType( "*.soe" );
@@ -686,7 +682,6 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl)
,"cui/ui/querynosavefiledialog.ui")->Execute();
}
}
- return 0L;
}
void SvxLineEndDefTabPage::DataChanged( const DataChangedEvent& rDCEvt )
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 327f33c2211a..13f119f5eafa 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -492,7 +492,7 @@ VclPtr<SfxTabPage> SvxShadowTabPage::Create( vcl::Window* pWindow,
-IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, ClickShadowHdl_Impl, Button*, void)
{
if( m_pTsbShowShadow->GetState() == TRISTATE_FALSE )
{
@@ -505,8 +505,6 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl)
m_pCtlPosition->Invalidate();
ModifyShadowHdl_Impl( NULL );
-
- return 0L;
}
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 62199fd27bb8..aa75a5d56c51 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -953,7 +953,7 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* )
m_pCtlPos->Reset();
// #i2379# Disable controls for protected objects
- ChangePosProtectHdl( this );
+ ChangePosProtectHdl( NULL );
}
{ // #i75273# set width
@@ -1018,7 +1018,7 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* )
ClickSizeProtectHdl( NULL );
// #i2379# Disable controls for protected objects
- ChangeSizeProtectHdl( this );
+ ChangeSizeProtectHdl( NULL );
}
@@ -1068,12 +1068,11 @@ SfxTabPage::sfxpg SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet )
-IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangePosProtectHdl)
+IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangePosProtectHdl, Button*, void)
{
// #106572# Remember user's last choice
m_pTsbSizeProtect->SetState( m_pTsbPosProtect->GetState() == TRISTATE_TRUE ? TRISTATE_TRUE : mnProtectSizeState );
UpdateControlStates();
- return 0L;
}
@@ -1112,7 +1111,7 @@ void SvxPositionSizeTabPage::UpdateControlStates()
-IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeSizeProtectHdl)
+IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeSizeProtectHdl, Button*, void)
{
if( m_pTsbSizeProtect->IsEnabled() )
{
@@ -1128,8 +1127,6 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeSizeProtectHdl)
}
UpdateControlStates();
-
- return 0L;
}
@@ -1498,23 +1495,20 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeHeightHdl)
-IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickSizeProtectHdl)
+IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ClickSizeProtectHdl, Button*, void)
{
UpdateControlStates();
- return 0L;
}
-IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickAutoHdl)
+IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ClickAutoHdl, Button*, void)
{
if( m_pCbxScale->IsChecked() )
{
mfOldWidth = std::max( (double)GetCoreValue( *m_pMtrWidth, mePoolUnit ), 1.0 );
mfOldHeight = std::max( (double)GetCoreValue( *m_pMtrHeight, mePoolUnit ), 1.0 );
}
-
- return 0L;
}
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 6440a2c3b2bf..d2a95d8d6fb3 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -584,18 +584,18 @@ void OFieldDescControl::SetControlText( sal_uInt16 nControlId, const OUString& r
}
}
-IMPL_LINK( OFieldDescControl, FormatClickHdl, Button *, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( OFieldDescControl, FormatClickHdl, Button *, void )
{
// Create temporary Column, which is used for data exchange with Dialog
if( !pActFieldDescr )
- return 0;
+ return;
sal_Int32 nOldFormatKey(pActFieldDescr->GetFormatKey());
SvxCellHorJustify rOldJustify = pActFieldDescr->GetHorJustify();
Reference< XNumberFormatsSupplier > xSupplier = GetFormatter()->getNumberFormatsSupplier();
SvNumberFormatsSupplierObj* pSupplierImpl = SvNumberFormatsSupplierObj::getImplementation( xSupplier );
if (!pSupplierImpl)
- return 0;
+ return;
SvNumberFormatter* pFormatter = pSupplierImpl->GetNumberFormatter();
if(::dbaui::callColumnFormatDialog(this,pFormatter,pActFieldDescr->GetType(),nOldFormatKey,rOldJustify,true))
@@ -618,7 +618,6 @@ IMPL_LINK( OFieldDescControl, FormatClickHdl, Button *, /*pButton*/ )
UpdateFormatSample(pActFieldDescr);
}
}
- return 0;
}
void OFieldDescControl::SetModified(bool /*bModified*/)
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index e90f0fd153e9..57d42019cd78 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -107,11 +107,11 @@ void OCollectionView::dispose()
ModalDialog::dispose();
}
-IMPL_LINK_NOARG(OCollectionView, Save_Click)
+IMPL_LINK_NOARG_TYPED(OCollectionView, Save_Click, Button*, void)
{
OUString sName = m_pName->GetText();
if ( sName.isEmpty() )
- return 0;
+ return;
try
{
OUString sSubFolder = m_pView->GetCurrentURL();
@@ -170,7 +170,7 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click)
pRequest->addContinuation(pApprove);
xHandler->handle(xRequest);
- return 0;
+ return;
}
}
}
@@ -182,7 +182,7 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click)
{
ScopedVclPtrInstance< QueryBox > aBox( this, WB_YES_NO, ModuleRes( STR_ALREADYEXISTOVERWRITE ) );
if ( aBox->Execute() != RET_YES )
- return 0;
+ return;
}
m_pName->SetText(sName);
EndDialog( RET_OK );
@@ -192,10 +192,9 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click)
{
DBG_UNHANDLED_EXCEPTION();
}
- return 0;
}
-IMPL_LINK_NOARG(OCollectionView, NewFolder_Click)
+IMPL_LINK_NOARG_TYPED(OCollectionView, NewFolder_Click, Button*, void)
{
try
{
@@ -211,10 +210,9 @@ IMPL_LINK_NOARG(OCollectionView, NewFolder_Click)
{
DBG_UNHANDLED_EXCEPTION();
}
- return 0;
}
-IMPL_LINK_NOARG(OCollectionView, Up_Click)
+IMPL_LINK_NOARG_TYPED(OCollectionView, Up_Click, Button*, void)
{
try
{
@@ -236,7 +234,6 @@ IMPL_LINK_NOARG(OCollectionView, Up_Click)
{
DBG_UNHANDLED_EXCEPTION();
}
- return 0;
}
IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView)
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 24d1ebd66871..a28fd3a9b402 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -164,7 +164,7 @@ namespace dbaui
m_pAdminDialog->enableConfirmSettings( !getURLNoPrefix().isEmpty() );
}
- IMPL_LINK(OConnectionHelper, OnBrowseConnections, PushButton*, /*_pButton*/)
+ IMPL_LINK_NOARG_TYPED(OConnectionHelper, OnBrowseConnections, Button*, void)
{
OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
const ::dbaccess::DATASOURCE_TYPE eType = m_pCollection->determineType(m_eType);
@@ -185,7 +185,7 @@ namespace dbaui
xFolderPicker->setDisplayDirectory(sOldPath);
if (0 == xFolderPicker->execute())
// cancelled by the user
- return 0L;
+ return;
sOldPath = xFolderPicker->getDirectory();
switch (checkPathExistence(sOldPath))
@@ -194,7 +194,7 @@ namespace dbaui
bDoBrowse = true;
break;
case RET_CANCEL:
- return 0L;
+ return;
default:
break;
}
@@ -265,7 +265,7 @@ namespace dbaui
callModifiedHdl();
}
else
- return 1L;
+ return;
}
break;
#ifdef _ADO_DATALINK_BROWSE_
@@ -282,7 +282,7 @@ namespace dbaui
callModifiedHdl();
}
else
- return 1L;
+ return;
}
break;
#endif
@@ -337,11 +337,9 @@ namespace dbaui
}
checkTestConnection();
-
- return 0L;
}
- IMPL_LINK(OConnectionHelper, OnCreateDatabase, PushButton*, /*_pButton*/)
+ IMPL_LINK_NOARG_TYPED(OConnectionHelper, OnCreateDatabase, Button*, void)
{
OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
const ::dbaccess::DATASOURCE_TYPE eType = m_pCollection->determineType(m_eType);
@@ -363,8 +361,6 @@ namespace dbaui
}
checkTestConnection();
-
- return 0L;
}
bool OConnectionHelper::checkTestConnection()
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
index 9fd69e7459c4..2f80e5d3c678 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
@@ -91,8 +91,8 @@ namespace dbaui
virtual bool checkTestConnection();
private:
- DECL_LINK(OnBrowseConnections, PushButton*);
- DECL_LINK(OnCreateDatabase, PushButton*);
+ DECL_LINK_TYPED(OnBrowseConnections, Button*, void);
+ DECL_LINK_TYPED(OnCreateDatabase, Button*, void);
OUString impl_getURL( bool _bPrefix ) const;
void impl_setURL( const OUString& _rURL, bool _bPrefix );
void implUpdateURLDependentStates() const;
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index b9c8fba68944..5d79776b5cca 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -104,7 +104,7 @@ namespace dbaui
m_pJavaDriver->SetModifyHdl(getControlModifiedLink());
m_pJavaDriver->SetModifyHdl(LINK(this, OConnectionTabPage, OnEditModified));
m_pUserName->SetModifyHdl(getControlModifiedLink());
- m_pPasswordRequired->SetClickHdl(getControlModifiedLink());
+ m_pPasswordRequired->SetClickHdl(getControlModifiedClickLink());
m_pTestConnection->SetClickHdl(LINK(this,OGenericAdministrationPage,OnTestConnectionClickHdl));
m_pTestJavaDriver->SetClickHdl(LINK(this,OConnectionTabPage,OnTestJavaClickHdl));
@@ -288,7 +288,7 @@ namespace dbaui
return bChangedSomething;
}
- IMPL_LINK(OConnectionTabPage, OnTestJavaClickHdl, PushButton*, /*_pButton*/)
+ IMPL_LINK_NOARG_TYPED(OConnectionTabPage, OnTestJavaClickHdl, Button*, void)
{
OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
bool bSuccess = false;
@@ -311,7 +311,6 @@ namespace dbaui
const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error;
ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt );
aMsg->Execute();
- return 0L;
}
bool OConnectionTabPage::checkTestConnection()
{
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index 6f373cc24426..e7f41afbda7e 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -52,7 +52,7 @@ namespace dbaui
VclPtr<PushButton> m_pTestConnection;
// called when the test connection button was clicked
- DECL_LINK(OnTestJavaClickHdl, PushButton*);
+ DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void);
DECL_LINK(OnEditModified, Edit*);
public:
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 4d3a5817fd77..54ae2b4e6138 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -373,11 +373,6 @@ using namespace ::com::sun::star;
OnModified( NULL );
}
- Link<> MySQLNativeSetupPage::getControlModifiedLink()
- {
- return LINK( this, MySQLNativeSetupPage, OnModified );
- }
-
IMPL_LINK( MySQLNativeSetupPage, OnModified, Edit*, _pEdit )
{
SetRoadmapStateValue( m_aMySQLSettings->canAdvance() );
@@ -540,7 +535,7 @@ using namespace ::com::sun::star;
SetRoadmapStateValue(bRoadmapState);
}
- IMPL_LINK(OGeneralSpecialJDBCConnectionPageSetup, OnTestJavaClickHdl, PushButton*, /*_pButton*/)
+ IMPL_LINK_NOARG_TYPED(OGeneralSpecialJDBCConnectionPageSetup, OnTestJavaClickHdl, Button*, void)
{
OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
@@ -564,7 +559,6 @@ using namespace ::com::sun::star;
const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error;
ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt );
aMsg->Execute();
- return 0L;
}
IMPL_LINK(OGeneralSpecialJDBCConnectionPageSetup, OnEditModified, Edit*, _pEdit)
@@ -664,7 +658,7 @@ using namespace ::com::sun::star;
return bEnableTestConnection;
}
- IMPL_LINK(OJDBCConnectionPageSetup, OnTestJavaClickHdl, PushButton*, /*_pButton*/)
+ IMPL_LINK_NOARG_TYPED(OJDBCConnectionPageSetup, OnTestJavaClickHdl, Button*, void)
{
OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
bool bSuccess = false;
@@ -686,7 +680,6 @@ using namespace ::com::sun::star;
sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString() );
aMsg->Execute();
- return 0L;
}
IMPL_LINK(OJDBCConnectionPageSetup, OnEditModified, Edit*, _pEdit)
@@ -761,8 +754,8 @@ using namespace ::com::sun::star;
get(m_pCBPasswordRequired, "passRequiredCheckbutton");
get(m_pPBTestConnection, "testConnectionButton");
m_pETUserName->SetModifyHdl(getControlModifiedLink());
- m_pCBPasswordRequired->SetClickHdl(getControlModifiedLink());
- m_pPBTestConnection->SetClickHdl(LINK(this,OGenericAdministrationPage,OnTestConnectionClickHdl));
+ m_pCBPasswordRequired->SetClickHdl(getControlModifiedClickLink());
+ m_pPBTestConnection->SetClickHdl(LINK(this,OGenericAdministrationPage,OnTestConnectionClickHdl));
LayoutHelper::fitSizeRightAligned( *m_pPBTestConnection );
}
@@ -843,7 +836,7 @@ using namespace ::com::sun::star;
get(m_pFTFinalText, "finishText");
m_pCBOpenAfterwards->SetClickHdl(LINK(this, OFinalDBPageSetup, OnOpenSelected));
- m_pCBStartTableWizard->SetClickHdl(getControlModifiedLink());
+ m_pCBStartTableWizard->SetClickHdl(getControlModifiedClickLink());
m_pRBRegisterDataSource->SetState(true);
}
@@ -911,12 +904,10 @@ using namespace ::com::sun::star;
return true;
}
- IMPL_LINK(OFinalDBPageSetup, OnOpenSelected, CheckBox*, _pBox)
+ IMPL_LINK_TYPED(OFinalDBPageSetup, OnOpenSelected, Button*, _pBox, void)
{
- m_pCBStartTableWizard->Enable( _pBox->IsEnabled() && _pBox->IsChecked() );
+ m_pCBStartTableWizard->Enable( _pBox->IsEnabled() && static_cast<CheckBox*>(_pBox)->IsChecked() );
callModifiedHdl();
- // outta here
- return 0L;
}
}
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index 4cb177cceb82..2bdaef0aa384 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -127,7 +127,7 @@ namespace dbaui
virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
- virtual Link<> getControlModifiedLink() SAL_OVERRIDE;
+ virtual Link<> getControlModifiedLink() SAL_OVERRIDE { return LINK( this, MySQLNativeSetupPage, OnModified ); }
private:
DECL_LINK( OnModified, Edit* );
@@ -156,7 +156,7 @@ namespace dbaui
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
virtual Link<> getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OGeneralSpecialJDBCConnectionPageSetup, OnEditModified); }
- DECL_LINK(OnTestJavaClickHdl,PushButton*);
+ DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void);
DECL_LINK(OnEditModified,Edit*);
VclPtr<FixedText> m_pHeaderText;
VclPtr<FixedText> m_pFTHelpText;
@@ -193,7 +193,7 @@ namespace dbaui
virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
- DECL_LINK(OnTestJavaClickHdl,PushButton*);
+ DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void);
DECL_LINK(OnEditModified,Edit*);
VclPtr<FixedText> m_pFTDriverClass;
VclPtr<Edit> m_pETDriverClass;
@@ -286,7 +286,7 @@ namespace dbaui
/// may be used in SetXXXHdl calls to controls, is a link to <method>OnControlModified</method>
Link<> getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OGenericAdministrationPage, OnControlModified); }
- DECL_LINK(OnOpenSelected, CheckBox*);
+ DECL_LINK_TYPED(OnOpenSelected, Button*, void);
protected:
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index a408c34b9786..7ce766d8c96f 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -152,7 +152,7 @@ void ORelationDialog::Init(const TTableConnectionData::value_type& _pConnectionD
}
}
-IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( ORelationDialog, OKClickHdl, Button*, void )
{
// RadioButtons auslesen
sal_uInt16 nAttrib = 0;
@@ -197,7 +197,7 @@ IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ )
{
m_pOrigConnData->CopyFrom( *m_pConnData );
EndDialog( RET_OK );
- return 0L;
+ return;
}
}
catch( const SQLException& )
@@ -219,8 +219,6 @@ IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ )
Init(m_pConnData);
m_xTableControl->Init( m_pConnData );
m_xTableControl->lateInit();
-
- return 0;
}
short ORelationDialog::Execute()
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index 5e9afea0f7ea..e4a7c8d46e9a 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -57,7 +57,7 @@ class OPasswordDialog : public ModalDialog
VclPtr<Edit> m_pEDPasswordRepeat;
VclPtr<OKButton> m_pOKBtn;
- DECL_LINK( OKHdl_Impl, void * );
+ DECL_LINK_TYPED( OKHdl_Impl, Button*, void );
DECL_LINK( ModifiedHdl, Edit * );
public:
@@ -95,7 +95,7 @@ OPasswordDialog::OPasswordDialog(vcl::Window* _pParent,const OUString& _sUserNam
m_pEDOldPassword->SetModifyHdl( LINK( this, OPasswordDialog, ModifiedHdl ) );
}
-IMPL_LINK_NOARG(OPasswordDialog, OKHdl_Impl)
+IMPL_LINK_NOARG_TYPED(OPasswordDialog, OKHdl_Impl, Button*, void)
{
if( m_pEDPassword->GetText() == m_pEDPasswordRepeat->GetText() )
EndDialog( RET_OK );
@@ -108,7 +108,6 @@ IMPL_LINK_NOARG(OPasswordDialog, OKHdl_Impl)
m_pEDPasswordRepeat->SetText( OUString() );
m_pEDPassword->GrabFocus();
}
- return 0;
}
IMPL_LINK( OPasswordDialog, ModifiedHdl, Edit *, pEdit )
@@ -207,7 +206,7 @@ VclPtr<SfxTabPage> OUserAdmin::Create( vcl::Window* pParent, const SfxItemSet* _
return VclPtr<OUserAdmin>::Create( pParent, *_rAttrSet );
}
-IMPL_LINK( OUserAdmin, UserHdl, PushButton *, pButton )
+IMPL_LINK_TYPED( OUserAdmin, UserHdl, Button *, pButton, void )
{
try
{
@@ -270,14 +269,10 @@ IMPL_LINK( OUserAdmin, UserHdl, PushButton *, pButton )
catch(const SQLException& e)
{
::dbaui::showError(::dbtools::SQLExceptionInfo(e), this, m_xORB);
- return 0;
}
catch(Exception& )
{
- return 0;
}
-
- return 0;
}
IMPL_LINK( OUserAdmin, ListDblClickHdl, ListBox *, /*pListBox*/ )
diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx
index d3084e220bc1..7aad1f80e3e9 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.hxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.hxx
@@ -57,7 +57,7 @@ protected:
// methods
DECL_LINK( ListDblClickHdl, ListBox * );
DECL_LINK( CloseHdl, PushButton * );
- DECL_LINK( UserHdl, PushButton * );
+ DECL_LINK_TYPED( UserHdl, Button *, void );
void FillUserNames();
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 1b5dbba4fb9c..8e8b0f4a3080 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -102,10 +102,14 @@ namespace dbaui
_rReadonly = !_rValid || (pReadonly && pReadonly->GetValue());
}
- IMPL_LINK_NOARG(OGenericAdministrationPage, OnControlModified)
+ IMPL_LINK(OGenericAdministrationPage, OnControlModified, Button*, /*pCtrl*/)
{
callModifiedHdl();
- return 0L;
+ return 0;
+ }
+ IMPL_LINK_TYPED(OGenericAdministrationPage, OnControlModifiedClick, Button*, pCtrl, void)
+ {
+ getControlModifiedLink().Call(pCtrl);
}
bool OGenericAdministrationPage::getSelectedDataSource(OUString& _sReturn, OUString& _sCurr)
{
@@ -209,7 +213,7 @@ namespace dbaui
}
}
- IMPL_LINK(OGenericAdministrationPage, OnTestConnectionClickHdl, PushButton*, /*_pButton*/)
+ IMPL_LINK_NOARG_TYPED(OGenericAdministrationPage, OnTestConnectionClickHdl, Button*, void)
{
OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
bool bSuccess = false;
@@ -248,7 +252,6 @@ namespace dbaui
if ( !bSuccess )
m_pAdminDialog->clearPassword();
}
- return 0L;
}
// LayoutHelper
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index dfc47c8e11a7..a87342fed9bb 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -230,11 +230,15 @@ namespace dbaui
/** This link be used for controls where the tabpage does not need to take any special action when the control
is modified. The implementation just calls callModifiedHdl.
*/
- DECL_LINK(OnControlModified, void*);
- DECL_LINK(OnTestConnectionClickHdl, PushButton*);
+ DECL_LINK(OnControlModified, Button*);
+ DECL_LINK_TYPED(OnTestConnectionClickHdl, Button*, void);
/// may be used in SetXXXHdl calls to controls, is a link to <method>OnControlModified</method>
virtual Link<> getControlModifiedLink() { return LINK(this, OGenericAdministrationPage, OnControlModified); }
+ // calls via getControlModifiedLink()
+ Link<Button*,void> getControlModifiedClickLink() { return LINK(this, OGenericAdministrationPage, OnControlModifiedClick); }
+ private:
+ DECL_LINK_TYPED(OnControlModifiedClick, Button*, void);
};
// ControlRelation
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index cd5e097f8165..575af56e9b00 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -417,10 +417,9 @@ void OAddTableDlg::impl_addTable()
}
}
-IMPL_LINK( OAddTableDlg, AddClickHdl, Button*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( OAddTableDlg, AddClickHdl, Button*, void )
{
TableListDoubleClickHdl(NULL);
- return 0;
}
IMPL_LINK_NOARG( OAddTableDlg, TableListDoubleClickHdl )
@@ -442,18 +441,17 @@ IMPL_LINK_NOARG( OAddTableDlg, TableListSelectHdl )
return 0;
}
-IMPL_LINK( OAddTableDlg, CloseClickHdl, Button*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( OAddTableDlg, CloseClickHdl, Button*, void )
{
- return int(Close());
+ Close();
}
-IMPL_LINK_NOARG( OAddTableDlg, OnTypeSelected )
+IMPL_LINK_NOARG_TYPED( OAddTableDlg, OnTypeSelected, Button*, void )
{
if ( m_pCaseTables->IsChecked() )
impl_switchTo( Tables );
else
impl_switchTo( Queries );
- return 0;
}
bool OAddTableDlg::Close()
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 45d57e73db2d..0f6e7bc6985f 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -100,7 +100,7 @@ namespace dbaui
if ( rFeatures.has( nItemId ) )
{
get(*setting->ppControl, setting->sControlId);
- (*setting->ppControl)->SetClickHdl( getControlModifiedLink() );
+ (*setting->ppControl)->SetClickHdl( getControlModifiedClickLink() );
(*setting->ppControl)->Show();
// check whether this must be a tristate check box
@@ -336,7 +336,7 @@ namespace dbaui
get(m_pAutoRetrievingLabel, "queryft");
get(m_pAutoRetrieving, "query");
- m_pAutoRetrievingEnabled->SetClickHdl( getControlModifiedLink() );
+ m_pAutoRetrievingEnabled->SetClickHdl( getControlModifiedClickLink() );
m_pAutoIncrement->SetModifyHdl( getControlModifiedLink() );
m_pAutoRetrieving->SetModifyHdl( getControlModifiedLink() );
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx
index 7c08e920a687..accd6c301d95 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -91,6 +91,7 @@ namespace dbaui
private:
void impl_initBooleanSettings();
+ DECL_LINK(ClickHdl, Button*);
};
// GeneratedValuesPage
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 2ee6700967c4..6bea91f71364 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -188,7 +188,7 @@ void ODbaseIndexDialog::InsertTableIndex( const OUString& _rTableName, const OTa
implInsertIndex(_rIndex, aTablePos->aIndexList, *m_pLB_TableIndexes);
}
-IMPL_LINK( ODbaseIndexDialog, OKClickHdl, PushButton*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, OKClickHdl, Button*, void )
{
// let all tables write their INF file
@@ -199,10 +199,9 @@ IMPL_LINK( ODbaseIndexDialog, OKClickHdl, PushButton*, /*pButton*/ )
aLoop->WriteInfFile(m_aDSN);
EndDialog();
- return 0;
}
-IMPL_LINK( ODbaseIndexDialog, AddClickHdl, PushButton*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, AddClickHdl, Button*, void )
{
OUString aSelection = m_pLB_FreeIndexes->GetSelectEntry();
OUString aTableName = m_pCB_Tables->GetText();
@@ -210,10 +209,9 @@ IMPL_LINK( ODbaseIndexDialog, AddClickHdl, PushButton*, /*pButton*/ )
InsertTableIndex( aTableName, aIndex );
checkButtons();
- return 0;
}
-IMPL_LINK( ODbaseIndexDialog, RemoveClickHdl, PushButton*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, RemoveClickHdl, Button*, void )
{
OUString aSelection = m_pLB_TableIndexes->GetSelectEntry();
OUString aTableName = m_pCB_Tables->GetText();
@@ -221,10 +219,9 @@ IMPL_LINK( ODbaseIndexDialog, RemoveClickHdl, PushButton*, /*pButton*/ )
InsertFreeIndex( aIndex );
checkButtons();
- return 0;
}
-IMPL_LINK( ODbaseIndexDialog, AddAllClickHdl, PushButton*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, AddAllClickHdl, Button*, void )
{
sal_uInt16 nCnt = m_pLB_FreeIndexes->GetEntryCount();
OUString aTableName = m_pCB_Tables->GetText();
@@ -233,10 +230,9 @@ IMPL_LINK( ODbaseIndexDialog, AddAllClickHdl, PushButton*, /*pButton*/ )
InsertTableIndex( aTableName, RemoveFreeIndex( m_pLB_FreeIndexes->GetEntry(0), true ) );
checkButtons();
- return 0;
}
-IMPL_LINK( ODbaseIndexDialog, RemoveAllClickHdl, PushButton*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, RemoveAllClickHdl, Button*, void )
{
sal_uInt16 nCnt = m_pLB_TableIndexes->GetEntryCount();
OUString aTableName = m_pCB_Tables->GetText();
@@ -245,7 +241,6 @@ IMPL_LINK( ODbaseIndexDialog, RemoveAllClickHdl, PushButton*, /*pButton*/ )
InsertFreeIndex( RemoveTableIndex( aTableName, m_pLB_TableIndexes->GetEntry(0), true ) );
checkButtons();
- return 0;
}
IMPL_LINK( ODbaseIndexDialog, OnListEntrySelected, ListBox*, /*NOTINTERESTEDIN*/ )
diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx
index 8feeff259ca9..ef0c43a7dde4 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hxx
+++ b/dbaccess/source/ui/dlg/dbfindex.hxx
@@ -85,11 +85,11 @@ protected:
VclPtr<PushButton> m_pRemoveAll;
DECL_LINK( TableSelectHdl, ComboBox* );
- DECL_LINK( AddClickHdl, PushButton* );
- DECL_LINK( RemoveClickHdl, PushButton* );
- DECL_LINK( AddAllClickHdl, PushButton* );
- DECL_LINK( RemoveAllClickHdl, PushButton* );
- DECL_LINK( OKClickHdl, PushButton* );
+ DECL_LINK_TYPED( AddClickHdl, Button*, void );
+ DECL_LINK_TYPED( RemoveClickHdl, Button*, void );
+ DECL_LINK_TYPED( AddAllClickHdl, Button*, void );
+ DECL_LINK_TYPED( RemoveAllClickHdl, Button*, void );
+ DECL_LINK_TYPED( OKClickHdl, Button*, void );
DECL_LINK( OnListEntrySelected, ListBox* );
OUString m_aDSN;
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index b090ddc8df06..d51829ca1655 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -243,7 +243,7 @@ namespace dbaui
return bChangedSomething;
}
- IMPL_LINK( ODbaseDetailsPage, OnButtonClicked, Button*, pButton )
+ IMPL_LINK_TYPED( ODbaseDetailsPage, OnButtonClicked, Button*, pButton, void )
{
if (m_pIndexes == pButton)
{
@@ -256,8 +256,6 @@ namespace dbaui
// it was one of the checkboxes -> we count as modified from now on
callModifiedHdl();
}
-
- return 0;
}
// OAdoDetailsPage
@@ -516,7 +514,7 @@ namespace dbaui
m_pEDDriverClass->SetModifyFlag();
}
}
- IMPL_LINK(OGeneralSpecialJDBCDetailsPage, OnTestJavaClickHdl, PushButton*, /*_pButton*/)
+ IMPL_LINK_NOARG_TYPED(OGeneralSpecialJDBCDetailsPage, OnTestJavaClickHdl, Button*, void)
{
OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
OSL_ENSURE(m_bUseClass,"Who called me?");
@@ -541,7 +539,6 @@ namespace dbaui
const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error;
ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt );
aMsg->Execute();
- return 0L;
}
IMPL_LINK(OGeneralSpecialJDBCDetailsPage, OnEditModified, Edit*, _pEdit)
{
@@ -704,7 +701,7 @@ namespace dbaui
fillBool(*_rSet,m_pCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething);
return bChangedSomething;
}
- IMPL_LINK( OLDAPDetailsPage, OnCheckBoxClick, CheckBox*, pCheckBox )
+ IMPL_LINK_TYPED( OLDAPDetailsPage, OnCheckBoxClick, Button*, pCheckBox, void )
{
callModifiedHdl();
if ( pCheckBox == m_pCBUseSSL)
@@ -720,7 +717,6 @@ namespace dbaui
m_pNFPortNumber->SetValue(m_iNormalPort);
}
}
- return 0;
}
void OLDAPDetailsPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue)
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index 407a986c2c1c..7ab4d970a469 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -104,7 +104,7 @@ namespace dbaui
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
private:
- DECL_LINK( OnButtonClicked, Button * );
+ DECL_LINK_TYPED( OnButtonClicked, Button *, void );
};
// OAdoDetailsPage
@@ -174,7 +174,7 @@ namespace dbaui
virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
- DECL_LINK(OnTestJavaClickHdl,PushButton*);
+ DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void);
DECL_LINK(OnEditModified,Edit*);
VclPtr<Edit> m_pEDHostname;
@@ -235,7 +235,7 @@ namespace dbaui
sal_Int32 m_iSSLPort;
sal_Int32 m_iNormalPort;
- DECL_LINK( OnCheckBoxClick, CheckBox * );
+ DECL_LINK_TYPED( OnCheckBoxClick, Button*, void );
};
// OMozillaDetailsPage Detail page for Mozilla and Thunderbird addressbook
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index 120d075411f5..b97d8ed546cc 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -60,7 +60,7 @@ namespace dbaui
m_pSQL->GrabFocus();
m_pExecute->SetClickHdl(LINK(this, DirectSQLDialog, OnExecute));
- m_pClose->SetClickHdl(LINK(this, DirectSQLDialog, OnClose));
+ m_pClose->SetClickHdl(LINK(this, DirectSQLDialog, OnCloseClick));
m_pSQLHistory->SetSelectHdl(LINK(this, DirectSQLDialog, OnListEntrySelected));
m_pSQLHistory->SetDropDownLineCount(10);
@@ -314,16 +314,19 @@ namespace dbaui
return 0L;
}
+ IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnCloseClick, Button*, void )
+ {
+ EndDialog( RET_OK );
+ }
IMPL_LINK_NOARG( DirectSQLDialog, OnClose )
{
EndDialog( RET_OK );
return 0L;
}
- IMPL_LINK_NOARG( DirectSQLDialog, OnExecute )
+ IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnExecute, Button*, void )
{
executeCurrent();
- return 0L;
}
IMPL_LINK_NOARG( DirectSQLDialog, OnListEntrySelected )
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index 39239d839d11..dbb78c608a93 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -293,7 +293,7 @@ void OSaveAsDlg::dispose()
ModalDialog::dispose();
}
-IMPL_LINK(OSaveAsDlg, ButtonClickHdl, Button *, pButton)
+IMPL_LINK_TYPED(OSaveAsDlg, ButtonClickHdl, Button *, pButton, void)
{
if (pButton == m_pImpl->m_pPB_OK)
{
@@ -320,7 +320,6 @@ IMPL_LINK(OSaveAsDlg, ButtonClickHdl, Button *, pButton)
showError( aNameError, this, m_xContext );
m_pImpl->m_pTitle->GrabFocus();
}
- return 0;
}
IMPL_LINK(OSaveAsDlg, EditModifyHdl, Edit *, pEdit )
diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx
index 6c254a494e84..eee8a4dd2097 100644
--- a/dbaccess/source/ui/dlg/dlgsize.cxx
+++ b/dbaccess/source/ui/dlg/dlgsize.cxx
@@ -76,9 +76,8 @@ sal_Int32 DlgSize::GetValue()
return (sal_Int32)m_pMF_VALUE->GetValue( FUNIT_CM );
}
-IMPL_LINK( DlgSize, CbClickHdl, Button *, pButton )
+IMPL_LINK_TYPED( DlgSize, CbClickHdl, Button *, pButton, void )
{
-
if( pButton == m_pCB_STANDARD )
{
m_pMF_VALUE->Enable(!m_pCB_STANDARD->IsChecked());
@@ -93,7 +92,6 @@ IMPL_LINK( DlgSize, CbClickHdl, Button *, pButton )
SetValue( m_nPrevValue );
}
}
- return 0;
}
} // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 663f0e0a04af..08bc95202364 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -699,21 +699,19 @@ namespace dbaui
return aDocument;
}
- IMPL_LINK( OGeneralPageWizard, OnCreateDatabaseModeSelected, RadioButton*, /*_pBox*/ )
+ IMPL_LINK_NOARG_TYPED( OGeneralPageWizard, OnCreateDatabaseModeSelected, Button*, void )
{
if ( m_aCreationModeHandler.IsSet() )
m_aCreationModeHandler.Call( this );
OnEmbeddedDBTypeSelected( m_pEmbeddedDBType );
- return 1L;
}
- IMPL_LINK( OGeneralPageWizard, OnSetupModeSelected, RadioButton*, /*_pBox*/ )
+ IMPL_LINK_NOARG_TYPED( OGeneralPageWizard, OnSetupModeSelected, Button*, void )
{
if ( m_aCreationModeHandler.IsSet() )
m_aCreationModeHandler.Call( this );
OnDatasourceTypeSelected(m_pDatasourceType);
- return 1L;
}
IMPL_LINK( OGeneralPageWizard, OnDocumentSelected, ListBox*, /*_pBox*/ )
@@ -722,7 +720,7 @@ namespace dbaui
return 0L;
}
- IMPL_LINK( OGeneralPageWizard, OnOpenDocument, PushButton*, /*_pBox*/ )
+ IMPL_LINK_NOARG_TYPED( OGeneralPageWizard, OnOpenDocument, Button*, void )
{
::sfx2::FileDialogHelper aFileDlg(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
@@ -742,15 +740,12 @@ namespace dbaui
aError->Execute();
m_pRB_ConnectDatabase->Check();
OnSetupModeSelected( m_pRB_ConnectDatabase );
- return 0L;
+ return;
}
m_aBrowsedDocument.sURL = sPath;
m_aBrowsedDocument.sFilter.clear();
m_aChooseDocumentHandler.Call( this );
- return 1L;
}
-
- return 0L;
}
} // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index 30b012cb7031..320b619ecd3b 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -186,10 +186,10 @@ namespace dbaui
protected:
DECL_LINK( OnEmbeddedDBTypeSelected, ListBox* );
- DECL_LINK( OnCreateDatabaseModeSelected, RadioButton* );
- DECL_LINK( OnSetupModeSelected, RadioButton* );
+ DECL_LINK_TYPED( OnCreateDatabaseModeSelected, Button*, void );
+ DECL_LINK_TYPED( OnSetupModeSelected, Button*, void );
DECL_LINK( OnDocumentSelected, ListBox* );
- DECL_LINK( OnOpenDocument, PushButton* );
+ DECL_LINK_TYPED( OnOpenDocument, Button*, void );
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 9f0e584c2a4e..6fff7c236cd1 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -237,7 +237,7 @@ namespace dbaui
fillIndexList();
- m_pUnique->SetClickHdl(LINK(this, DbaIndexDialog, OnModified));
+ m_pUnique->SetClickHdl(LINK(this, DbaIndexDialog, OnModifiedClick));
m_pFields->SetModifyHdl(LINK(this, DbaIndexDialog, OnModified));
m_pClose->SetClickHdl(LINK(this, DbaIndexDialog, OnCloseDialog));
@@ -557,7 +557,7 @@ namespace dbaui
OnResetIndex();
}
- IMPL_LINK_NOARG( DbaIndexDialog, OnCloseDialog )
+ IMPL_LINK_NOARG_TYPED( DbaIndexDialog, OnCloseDialog, Button*, void )
{
if (m_pIndexList->IsEditingActive())
{
@@ -567,7 +567,7 @@ namespace dbaui
m_pIndexList->EndEditing();
if (m_bEditAgain)
// could not commit the new name (started a new - asynchronous - edit trial)
- return 1L;
+ return;
}
// the currently selected entry
@@ -592,17 +592,15 @@ namespace dbaui
{
case RET_YES:
if (!implCommitPreviouslySelected())
- return 1L;
+ return;
break;
case RET_NO:
break;
default:
- return 1L;
+ return;
}
EndDialog(RET_OK);
-
- return 0L;
}
IMPL_LINK( DbaIndexDialog, OnEditIndexAgain, SvTreeListEntry*, _pEntry )
@@ -733,6 +731,10 @@ namespace dbaui
return true;
}
+ IMPL_LINK_NOARG_TYPED( DbaIndexDialog, OnModifiedClick, Button*, void )
+ {
+ OnModified(NULL);
+ }
IMPL_LINK_NOARG( DbaIndexDialog, OnModified )
{
OSL_ENSURE(m_pPreviousSelection, "DbaIndexDialog, OnModified: invalid call!");
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index e20d01c813c2..36766be76ca3 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -208,14 +208,14 @@ namespace dbaui
return 0L;
}
- IMPL_LINK(OParameterDialog, OnButtonClicked, PushButton*, pButton)
+ IMPL_LINK_TYPED(OParameterDialog, OnButtonClicked, Button*, pButton, void)
{
if (m_pCancelBtn == pButton)
{
// no interpreting of the given values anymore ....
m_pParam->SetLoseFocusHdl(Link<>()); // no direct call from the control anymore ...
m_bNeedErrorOnCurrent = false; // in case of any indirect calls -> no error message
- m_pCancelBtn->SetClickHdl(Link<>());
+ m_pCancelBtn->SetClickHdl(Link<Button*,void>());
m_pCancelBtn->Click();
}
else if (m_pOKBtn == pButton)
@@ -227,7 +227,7 @@ namespace dbaui
// we're are out of the complex web :) of direct and indirect calls to OnValueLoseFocus now,
// so the next time it is called we need an error message, again ....
// (TODO : there surely are better solutions for this ...)
- return 1L;
+ return;
}
if (m_xParams.is())
@@ -253,7 +253,7 @@ namespace dbaui
}
// to close the dialog (which is more code than a simple EndDialog)
- m_pOKBtn->SetClickHdl(Link<>());
+ m_pOKBtn->SetClickHdl(Link<Button*,void>());
m_pOKBtn->Click();
}
else if (m_pTravelNext == pButton)
@@ -278,8 +278,6 @@ namespace dbaui
// so the next time it is called we need an error message, again ....
// (TODO : there surely are better solutions for this ...)
}
-
- return 0L;
}
IMPL_LINK(OParameterDialog, OnEntrySelected, ListBox*, /*pList*/)
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 8fd564ba9e3a..1189f79f9a0c 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -710,11 +710,10 @@ void OSQLMessageBox::dispose()
ButtonDialog::dispose();
}
-IMPL_LINK( OSQLMessageBox, ButtonClickHdl, Button *, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( OSQLMessageBox, ButtonClickHdl, Button *, void )
{
ScopedVclPtrInstance< OExceptionChainDialog > aDlg( this, m_pImpl->aDisplayInfo );
aDlg->Execute();
- return 0;
}
// OSQLWarningBox
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index b20f6775d86b..6980f8042804 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -400,7 +400,7 @@ namespace dbaui
}
IMPL_LINK( OTableSubscriptionPage, OnTreeEntryChecked, Control*, _pControl )
{
- return OnControlModified(_pControl);
+ return OnControlModified(static_cast<Button*>(_pControl));
}
IMPL_LINK( OTableSubscriptionPage, OnTreeEntryCompare, const SvSortData*, _pSortData )
{
diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
index 9fa798b1b096..e52ca7aeec7f 100644
--- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx
+++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
@@ -67,17 +67,14 @@ namespace dbaui
return ModalDialog::Execute();
}
- IMPL_LINK( TextConnectionSettingsDialog, OnOK, PushButton*, /*_pButton*/ )
+ IMPL_LINK_NOARG_TYPED( TextConnectionSettingsDialog, OnOK, Button*, void )
{
if ( m_pTextConnectionHelper->prepareLeave() )
{
bool bUnused = false;
m_pTextConnectionHelper->FillItemSet( m_rItems, bUnused );
EndDialog( RET_OK );
- return 1L;
}
-
- return 0L;
}
} // namespace dbaui
diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx
index 3b2ac64ec2f6..e90bd5d8ef29 100644
--- a/dbaccess/source/ui/inc/CollectionView.hxx
+++ b/dbaccess/source/ui/inc/CollectionView.hxx
@@ -44,9 +44,9 @@ namespace dbaui
css::uno::Reference< css::uno::XComponentContext > m_xContext;
bool m_bCreateForm;
- DECL_LINK(Up_Click,void*);
- DECL_LINK(NewFolder_Click,void*);
- DECL_LINK(Save_Click,void*);
+ DECL_LINK_TYPED(Up_Click, Button*, void);
+ DECL_LINK_TYPED(NewFolder_Click, Button*, void);
+ DECL_LINK_TYPED(Save_Click, Button*, void);
DECL_LINK(Dbl_Click_FileView,void*);
/// sets the fixedtext to the right content
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx
index 4d5cef55694a..e0c00701a589 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -116,7 +116,7 @@ namespace dbaui
DECL_LINK( OnScroll, ScrollBar*);
- DECL_LINK( FormatClickHdl, Button * );
+ DECL_LINK_TYPED( FormatClickHdl, Button *, void );
DECL_LINK( ChangeHdl, ListBox * );
// used by ActivatePropertyField
diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx
index 877b56f8a117..91ce6c80bb3e 100644
--- a/dbaccess/source/ui/inc/RelationDlg.hxx
+++ b/dbaccess/source/ui/inc/RelationDlg.hxx
@@ -90,7 +90,7 @@ namespace dbaui
void Init(const TTableConnectionData::value_type& _pConnectionData);
private:
- DECL_LINK( OKClickHdl, Button* );
+ DECL_LINK_TYPED( OKClickHdl, Button*, void );
};
}
#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONDLG_HXX
diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx
index 008a9376ce01..80256e7e0d7e 100644
--- a/dbaccess/source/ui/inc/WCPage.hxx
+++ b/dbaccess/source/ui/inc/WCPage.hxx
@@ -51,9 +51,9 @@ namespace dbaui
bool m_bPKeyAllowed;
bool m_bUseHeaderAllowed;
- DECL_LINK( AppendDataClickHdl, Button* );
- DECL_LINK( RadioChangeHdl, Button* );
- DECL_LINK( KeyClickHdl, Button* );
+ DECL_LINK_TYPED( AppendDataClickHdl, Button*, void );
+ DECL_LINK_TYPED( RadioChangeHdl, Button*, void );
+ DECL_LINK_TYPED( KeyClickHdl, Button*, void );
bool checkAppendData();
void SetAppendDataRadio();
diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx
index 0c179f2367fb..a653d9e31950 100644
--- a/dbaccess/source/ui/inc/WColumnSelect.hxx
+++ b/dbaccess/source/ui/inc/WColumnSelect.hxx
@@ -42,7 +42,7 @@ namespace dbaui
VclPtr<PushButton> m_pColumns_LH;
VclPtr<ListBox> m_pNewColumnNames; // right side
- DECL_LINK( ButtonClickHdl, Button * );
+ DECL_LINK_TYPED( ButtonClickHdl, Button *, void );
DECL_LINK( ListDoubleClickHdl, ListBox * );
static void clearListBox(ListBox& _rListBox);
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx
index 22a961341cef..711d9c145124 100644
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@ -279,9 +279,9 @@ namespace dbaui
bool m_bUseHeaderLine;
private:
- DECL_LINK( ImplPrevHdl , void* );
- DECL_LINK( ImplNextHdl , void* );
- DECL_LINK( ImplOKHdl , void* );
+ DECL_LINK_TYPED( ImplPrevHdl, Button*, void );
+ DECL_LINK_TYPED( ImplNextHdl, Button*, void);
+ DECL_LINK_TYPED( ImplOKHdl, Button*, void );
DECL_LINK( ImplActivateHdl, void* );
bool CheckColumns(sal_Int32& _rnBreakPos);
void loadData( const ICopyTableSourceObject& _rSourceObject,
diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx
index 61f71b56ce47..f4119bed01cd 100644
--- a/dbaccess/source/ui/inc/WNameMatch.hxx
+++ b/dbaccess/source/ui/inc/WNameMatch.hxx
@@ -65,9 +65,9 @@ namespace dbaui
Image m_aImgUp;
Image m_aImgDown;
- DECL_LINK( ButtonClickHdl, Button * );
- DECL_LINK( RightButtonClickHdl, Button * );
- DECL_LINK( AllNoneClickHdl, Button * );
+ DECL_LINK_TYPED( ButtonClickHdl, Button *, void );
+ DECL_LINK_TYPED( RightButtonClickHdl, Button *, void );
+ DECL_LINK_TYPED( AllNoneClickHdl, Button *, void );
DECL_LINK( TableListClickHdl, void* );
DECL_LINK( TableListRightSelectHdl, void* );
diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx
index cc84c5bd3705..e8778521e50a 100644
--- a/dbaccess/source/ui/inc/WTypeSelect.hxx
+++ b/dbaccess/source/ui/inc/WTypeSelect.hxx
@@ -92,7 +92,7 @@ namespace dbaui
friend class OWizTypeSelectList;
DECL_LINK( ColumnSelectHdl, MultiListBox* );
- DECL_LINK( ButtonClickHdl, Button * );
+ DECL_LINK_TYPED( ButtonClickHdl, Button *, void );
protected:
VclPtr<OWizTypeSelectList> m_pColumnNames;
VclPtr<FixedText> m_pColumns;
diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx
index 4de1c3398134..855853bd1d95 100644
--- a/dbaccess/source/ui/inc/adtabdlg.hxx
+++ b/dbaccess/source/ui/inc/adtabdlg.hxx
@@ -70,11 +70,11 @@ namespace dbaui
IAddTableDialogContext& m_rContext;
- DECL_LINK( AddClickHdl, Button* );
- DECL_LINK( CloseClickHdl, Button* );
+ DECL_LINK_TYPED( AddClickHdl, Button*, void );
+ DECL_LINK_TYPED( CloseClickHdl, Button*, void);
DECL_LINK( TableListDoubleClickHdl, void* );
DECL_LINK( TableListSelectHdl, void* );
- DECL_LINK( OnTypeSelected, void* );
+ DECL_LINK_TYPED( OnTypeSelected, Button*, void );
public:
OAddTableDlg(
diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx
index 0d46a61465e5..df80ad6b8b31 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -85,8 +85,9 @@ namespace dbaui
virtual void _disposing( const css::lang::EventObject& _rSource ) SAL_OVERRIDE;
protected:
- DECL_LINK( OnExecute, void* );
+ DECL_LINK_TYPED( OnExecute, Button*, void );
DECL_LINK( OnClose, void* );
+ DECL_LINK_TYPED( OnCloseClick, Button*, void );
DECL_LINK( OnListEntrySelected, void* );
DECL_LINK( OnStatementModified, void* );
diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx
index c53341dce924..9f883a3f7b68 100644
--- a/dbaccess/source/ui/inc/dlgsave.hxx
+++ b/dbaccess/source/ui/inc/dlgsave.hxx
@@ -72,7 +72,7 @@ namespace dbaui
OUString getCatalog() const;
OUString getSchema() const;
private:
- DECL_LINK(ButtonClickHdl, Button *);
+ DECL_LINK_TYPED(ButtonClickHdl, Button *, void);
DECL_LINK(EditModifyHdl, Edit * );
void implInitOnlyTitle(const OUString& _rLabel);
diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx
index 1d51ed11a534..90f7092e428b 100644
--- a/dbaccess/source/ui/inc/dlgsize.hxx
+++ b/dbaccess/source/ui/inc/dlgsize.hxx
@@ -37,7 +37,7 @@ namespace dbaui
void SetValue( sal_Int32 nVal );
protected:
- DECL_LINK( CbClickHdl, Button * );
+ DECL_LINK_TYPED( CbClickHdl, Button *, void );
VclPtr<MetricField> m_pMF_VALUE;
VclPtr<CheckBox> m_pCB_STANDARD;
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index 7e9733353644..50f46556e974 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -133,8 +133,9 @@ namespace dbaui
DECL_LINK( OnIndexSelected, DbaIndexList* );
DECL_LINK_TYPED( OnIndexAction, ToolBox*, void );
DECL_LINK( OnEntryEdited, SvTreeListEntry* );
+ DECL_LINK_TYPED( OnModifiedClick, Button*, void );
DECL_LINK( OnModified, void* );
- DECL_LINK( OnCloseDialog, void* );
+ DECL_LINK_TYPED( OnCloseDialog, Button*, void );
DECL_LINK( OnEditIndexAgain, SvTreeListEntry* );
diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx
index 6c52896a149e..44d3316dd61d 100644
--- a/dbaccess/source/ui/inc/paramdialog.hxx
+++ b/dbaccess/source/ui/inc/paramdialog.hxx
@@ -98,7 +98,7 @@ namespace dbaui
DECL_LINK_TYPED(OnVisitedTimeout, Timer*, void);
DECL_LINK(OnValueModified, Control*);
DECL_LINK(OnEntrySelected, ListBox*);
- DECL_LINK(OnButtonClicked, PushButton*);
+ DECL_LINK_TYPED(OnButtonClicked, Button*, void);
DECL_LINK(OnValueLoseFocus, Control*);
};
diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx
index 0ae541b4794e..d8987a3b9026 100644
--- a/dbaccess/source/ui/inc/sqlmessage.hxx
+++ b/dbaccess/source/ui/inc/sqlmessage.hxx
@@ -95,7 +95,7 @@ public:
private:
void Construct( WinBits nStyle, MessageType eImage );
- DECL_LINK(ButtonClickHdl, Button* );
+ DECL_LINK_TYPED(ButtonClickHdl, Button*, void );
private:
void impl_positionControls();
diff --git a/dbaccess/source/ui/inc/textconnectionsettings.hxx b/dbaccess/source/ui/inc/textconnectionsettings.hxx
index 89bcfc354e9c..05ca314322be 100644
--- a/dbaccess/source/ui/inc/textconnectionsettings.hxx
+++ b/dbaccess/source/ui/inc/textconnectionsettings.hxx
@@ -54,7 +54,7 @@ namespace dbaui
SfxItemSet& m_rItems;
private:
- DECL_LINK( OnOK, PushButton* );
+ DECL_LINK_TYPED( OnOK, Button*, void );
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index 19d2af726eec..9b170b21f625 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -124,11 +124,9 @@ void OCopyTable::dispose()
OWizardPage::dispose();
}
-IMPL_LINK( OCopyTable, AppendDataClickHdl, Button*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( OCopyTable, AppendDataClickHdl, Button*, void )
{
-
SetAppendDataRadio();
- return 0;
}
void OCopyTable::SetAppendDataRadio()
@@ -140,7 +138,7 @@ void OCopyTable::SetAppendDataRadio()
m_pParent->setOperation(CopyTableOperation::AppendData);
}
-IMPL_LINK( OCopyTable, RadioChangeHdl, Button*, pButton )
+IMPL_LINK_TYPED( OCopyTable, RadioChangeHdl, Button*, pButton, void )
{
m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,pButton != m_pRB_View);
bool bKey = m_bPKeyAllowed && pButton != m_pRB_View;
@@ -156,15 +154,12 @@ IMPL_LINK( OCopyTable, RadioChangeHdl, Button*, pButton )
m_pParent->setOperation( CopyTableOperation::CopyDefinitionOnly );
else if( IsOptionView() )
m_pParent->setOperation( CopyTableOperation::CreateAsView );
-
- return 0;
}
-IMPL_LINK( OCopyTable, KeyClickHdl, Button*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( OCopyTable, KeyClickHdl, Button*, void )
{
m_pEdKeyName->Enable(m_pCB_PrimaryColumn->IsChecked());
m_pFT_KeyName->Enable(m_pCB_PrimaryColumn->IsChecked());
- return 0;
}
bool OCopyTable::LeavePage()
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index d7ae174e4b65..b0b618882845 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -183,7 +183,7 @@ bool OWizColumnSelect::LeavePage()
return true;
}
-IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton )
+IMPL_LINK_TYPED( OWizColumnSelect, ButtonClickHdl, Button *, pButton, void )
{
ListBox *pLeft = NULL;
ListBox *pRight = NULL;
@@ -213,7 +213,7 @@ IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton )
}
if (!pLeft || !pRight)
- return 0;
+ return;
Reference< XDatabaseMetaData > xMetaData( m_pParent->m_xDestConnection->getMetaData() );
OUString sExtraChars = xMetaData->getExtraNameCharacters();
@@ -244,8 +244,6 @@ IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton )
if(m_pOrgColumnNames->GetEntryCount())
m_pOrgColumnNames->SelectEntryPos(0);
-
- return 0;
}
IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, ListBox *, pListBox )
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 9e07344f49eb..2aca86e1c8d6 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -717,7 +717,7 @@ void OCopyTableWizard::dispose()
WizardDialog::dispose();
}
-IMPL_LINK_NOARG(OCopyTableWizard, ImplPrevHdl)
+IMPL_LINK_NOARG_TYPED(OCopyTableWizard, ImplPrevHdl, Button*, void)
{
m_ePressed = WIZARD_PREV;
if ( GetCurLevel() )
@@ -732,10 +732,9 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplPrevHdl)
else
ShowPrevPage();
}
- return 0;
}
-IMPL_LINK_NOARG(OCopyTableWizard, ImplNextHdl)
+IMPL_LINK_NOARG_TYPED(OCopyTableWizard, ImplNextHdl, Button*, void)
{
m_ePressed = WIZARD_NEXT;
if ( GetCurLevel() < MAX_PAGES )
@@ -750,7 +749,6 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplNextHdl)
else
ShowNextPage();
}
- return 0;
}
bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos)
@@ -836,7 +834,7 @@ bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos)
return bRet;
}
-IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl)
+IMPL_LINK_NOARG_TYPED(OCopyTableWizard, ImplOKHdl, Button*, void)
{
m_ePressed = WIZARD_FINISH;
bool bFinish = DeactivatePage();
@@ -868,7 +866,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl)
m_mNameMapping.clear();
pPage->setDisplayRow(nBreakPos);
ShowPage(3);
- return 0;
+ return;
}
}
if ( m_xDestConnection.is() )
@@ -906,7 +904,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl)
else if ( xAbort->wasSelected() )
{
ShowPage(3);
- return 0;
+ return;
}
}
}
@@ -924,7 +922,6 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl)
EndDialog(RET_OK);
}
- return bFinish ? 1 : 0;
}
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index fbf71a00a916..f007eda758ff 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -204,7 +204,7 @@ bool OWizNameMatching::LeavePage()
OUString OWizNameMatching::GetTitle() const { return ModuleRes(STR_WIZ_NAME_MATCHING_TITEL); }
-IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton )
+IMPL_LINK_TYPED( OWizNameMatching, ButtonClickHdl, Button *, pButton, void )
{
SvTreeListEntry* pEntry = m_pCTRL_LEFT->FirstSelected();
if ( pEntry )
@@ -229,11 +229,9 @@ IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton )
TableListClickHdl(m_pCTRL_LEFT);
}
-
- return 0;
}
-IMPL_LINK( OWizNameMatching, RightButtonClickHdl, Button *, pButton )
+IMPL_LINK_TYPED( OWizNameMatching, RightButtonClickHdl, Button *, pButton, void )
{
SvTreeListEntry* pEntry = m_pCTRL_RIGHT->FirstSelected();
if ( pEntry )
@@ -254,7 +252,6 @@ IMPL_LINK( OWizNameMatching, RightButtonClickHdl, Button *, pButton )
m_pCTRL_RIGHT->GetVScroll()->DoScrollAction(SCROLL_LINEDOWN);
TableListRightSelectHdl(m_pCTRL_RIGHT);
}
- return 0;
}
IMPL_LINK_NOARG( OWizNameMatching, TableListClickHdl )
@@ -325,7 +322,7 @@ IMPL_LINK_NOARG( OWizNameMatching, TableListRightSelectHdl )
return 0;
}
-IMPL_LINK( OWizNameMatching, AllNoneClickHdl, Button *, pButton )
+IMPL_LINK_TYPED( OWizNameMatching, AllNoneClickHdl, Button *, pButton, void )
{
bool bAll = pButton == m_pAll;
SvTreeListEntry* pEntry = m_pCTRL_LEFT->First();
@@ -334,8 +331,6 @@ IMPL_LINK( OWizNameMatching, AllNoneClickHdl, Button *, pButton )
m_pCTRL_LEFT->SetCheckButtonState( pEntry, bAll ? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED);
pEntry = m_pCTRL_LEFT->Next(pEntry);
}
-
- return 0;
}
// class OColumnString
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index f631f99cf95f..f6d06c99711a 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -351,15 +351,13 @@ void OWizTypeSelect::EnableAuto(bool bEnable)
m_pAutoType->Show(bEnable);
}
-IMPL_LINK( OWizTypeSelect, ButtonClickHdl, Button *, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( OWizTypeSelect, ButtonClickHdl, Button *, void )
{
sal_Int32 nBreakPos;
m_pParent->CheckColumns(nBreakPos);
fillColumnList(m_pAutoEt->GetText().toInt32());
ActivatePage();
-
- return 0;
}
OWizTypeSelectList::~OWizTypeSelectList()
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx
index 798fcaef3d80..cb9dff43fee2 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -241,14 +241,12 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ )
return 1;
}
-IMPL_LINK( DlgQryJoin, OKClickHdl, Button*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( DlgQryJoin, OKClickHdl, Button*, void )
{
-
m_pConnData->Update();
m_pOrigConnData->CopyFrom( *m_pConnData );
EndDialog(RET_OK);
- return 1;
}
IMPL_LINK( DlgQryJoin, NaturalToggleHdl, CheckBox*, /*pButton*/ )
diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx
index 02009b20bf31..c90d13b812d6 100644
--- a/dbaccess/source/ui/querydesign/querydlg.hxx
+++ b/dbaccess/source/ui/querydesign/querydlg.hxx
@@ -54,7 +54,7 @@ namespace dbaui
css::uno::Reference< css::sdbc::XConnection > m_xConnection;