[Libreoffice-commits] core.git: avmedia/inc avmedia/source basctl/source chart2/source cui/source dbaccess/source extensions/source filter/source formula/source fpicker/source include/sfx2 include/svtools include/svx include/vcl reportdesign/source sc/source sd/source sfx2/source starmath/inc starmath/source svtools/source svx/source sw/source vcl/generic vcl/inc vcl/source vcl/workben xmlsecurity/inc xmlsecurity/source
Noel Grandin
noelgrandin at gmail.com
Mon Oct 12 03:48:46 PDT 2015
avmedia/inc/mediacontrol.hxx | 2
avmedia/source/framework/mediacontrol.cxx | 33 -
basctl/source/basicide/baside2.hxx | 2
basctl/source/basicide/baside2b.cxx | 3
basctl/source/basicide/moduldl2.cxx | 3
basctl/source/basicide/moduldlg.hxx | 2
basctl/source/dlged/managelang.cxx | 10
basctl/source/inc/managelang.hxx | 2
chart2/source/controller/dialogs/res_BarGeometry.cxx | 2
chart2/source/controller/dialogs/res_BarGeometry.hxx | 2
chart2/source/controller/dialogs/res_ErrorBar.cxx | 3
chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx | 5
chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx | 2
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 6
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx | 2
chart2/source/controller/dialogs/tp_AxisPositions.cxx | 13
chart2/source/controller/dialogs/tp_AxisPositions.hxx | 4
chart2/source/controller/dialogs/tp_ChartType.cxx | 23 -
chart2/source/controller/dialogs/tp_ChartType.hxx | 2
chart2/source/controller/dialogs/tp_Scale.cxx | 3
chart2/source/controller/dialogs/tp_Scale.hxx | 2
chart2/source/controller/inc/res_ErrorBar.hxx | 2
chart2/source/controller/sidebar/ChartAxisPanel.cxx | 4
chart2/source/controller/sidebar/ChartAxisPanel.hxx | 2
chart2/source/controller/sidebar/ChartElementsPanel.cxx | 3
chart2/source/controller/sidebar/ChartElementsPanel.hxx | 2
chart2/source/controller/sidebar/ChartErrorBarPanel.cxx | 4
chart2/source/controller/sidebar/ChartErrorBarPanel.hxx | 2
chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 4
chart2/source/controller/sidebar/ChartSeriesPanel.hxx | 2
cui/source/customize/cfg.cxx | 39 --
cui/source/customize/eventdlg.cxx | 7
cui/source/customize/eventdlg.hxx | 2
cui/source/dialogs/SpellDialog.cxx | 5
cui/source/dialogs/cuicharmap.cxx | 11
cui/source/dialogs/cuifmsearch.cxx | 21 -
cui/source/dialogs/cuigaldlg.cxx | 6
cui/source/dialogs/hangulhanjadlg.cxx | 14
cui/source/dialogs/multipat.cxx | 11
cui/source/dialogs/pastedlg.cxx | 7
cui/source/dialogs/thesdlg.cxx | 5
cui/source/inc/SpellDialog.hxx | 2
cui/source/inc/align.hxx | 2
cui/source/inc/autocdlg.hxx | 4
cui/source/inc/backgrnd.hxx | 4
cui/source/inc/border.hxx | 4
cui/source/inc/cfg.hxx | 6
cui/source/inc/chardlg.hxx | 12
cui/source/inc/connect.hxx | 1
cui/source/inc/cuicharmap.hxx | 4
cui/source/inc/cuifmsearch.hxx | 8
cui/source/inc/cuigaldlg.hxx | 2
cui/source/inc/cuitabarea.hxx | 30 -
cui/source/inc/cuitabline.hxx | 28 +
cui/source/inc/hangulhanjadlg.hxx | 5
cui/source/inc/labdlg.hxx | 4
cui/source/inc/measure.hxx | 1
cui/source/inc/multipat.hxx | 2
cui/source/inc/numfmt.hxx | 5
cui/source/inc/numpages.hxx | 19 -
cui/source/inc/optasian.hxx | 2
cui/source/inc/optdict.hxx | 4
cui/source/inc/optlingu.hxx | 3
cui/source/inc/page.hxx | 6
cui/source/inc/paragrph.hxx | 10
cui/source/inc/pastedlg.hxx | 2
cui/source/inc/swpossizetabpage.hxx | 4
cui/source/inc/textanim.hxx | 2
cui/source/inc/thesdlg.hxx | 2
cui/source/options/optasian.cxx | 8
cui/source/options/optchart.cxx | 10
cui/source/options/optchart.hxx | 2
cui/source/options/optcolor.cxx | 29 -
cui/source/options/optcolor.hxx | 2
cui/source/options/optdict.cxx | 6
cui/source/options/optgdlg.cxx | 7
cui/source/options/optgdlg.hxx | 2
cui/source/options/optinet2.cxx | 5
cui/source/options/optinet2.hxx | 2
cui/source/options/optjava.cxx | 8
cui/source/options/optjava.hxx | 4
cui/source/options/optlingu.cxx | 10
cui/source/options/optopencl.cxx | 8
cui/source/options/optsave.cxx | 19 -
cui/source/options/optsave.hxx | 4
cui/source/options/personalization.cxx | 4
cui/source/options/personalization.hxx | 2
cui/source/tabpages/align.cxx | 5
cui/source/tabpages/autocdlg.cxx | 16
cui/source/tabpages/backgrnd.cxx | 10
cui/source/tabpages/border.cxx | 24 -
cui/source/tabpages/chardlg.cxx | 53 +-
cui/source/tabpages/connect.cxx | 6
cui/source/tabpages/labdlg.cxx | 10
cui/source/tabpages/measure.cxx | 7
cui/source/tabpages/numfmt.cxx | 33 -
cui/source/tabpages/numpages.cxx | 76 +---
cui/source/tabpages/page.cxx | 15
cui/source/tabpages/paragrph.cxx | 30 -
cui/source/tabpages/swpossizetabpage.cxx | 33 -
cui/source/tabpages/textanim.cxx | 5
cui/source/tabpages/tparea.cxx | 52 +-
cui/source/tabpages/tpbitmap.cxx | 26 -
cui/source/tabpages/tpcolor.cxx | 17
cui/source/tabpages/tpgradnt.cxx | 22 -
cui/source/tabpages/tphatch.cxx | 21 -
cui/source/tabpages/tpline.cxx | 88 ++--
cui/source/tabpages/tplnedef.cxx | 32 +
cui/source/tabpages/tplneend.cxx | 9
cui/source/tabpages/tpshadow.cxx | 6
dbaccess/source/ui/control/FieldDescControl.cxx | 20 -
dbaccess/source/ui/control/RelationControl.cxx | 13
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 7
dbaccess/source/ui/dlg/TextConnectionHelper.hxx | 1
dbaccess/source/ui/dlg/UserAdmin.cxx | 3
dbaccess/source/ui/dlg/UserAdmin.hxx | 2
dbaccess/source/ui/dlg/advancedsettings.cxx | 7
dbaccess/source/ui/dlg/advancedsettings.hxx | 1
dbaccess/source/ui/dlg/dbfindex.cxx | 3
dbaccess/source/ui/dlg/dbfindex.hxx | 2
dbaccess/source/ui/dlg/detailpages.cxx | 7
dbaccess/source/ui/dlg/detailpages.hxx | 2
dbaccess/source/ui/dlg/directsql.cxx | 3
dbaccess/source/ui/dlg/generalpage.cxx | 23 -
dbaccess/source/ui/dlg/generalpage.hxx | 6
dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 3
dbaccess/source/ui/dlg/paramdialog.cxx | 19 -
dbaccess/source/ui/dlg/queryfilter.cxx | 12
dbaccess/source/ui/dlg/queryorder.cxx | 3
dbaccess/source/ui/inc/FieldDescControl.hxx | 2
dbaccess/source/ui/inc/RelationControl.hxx | 2
dbaccess/source/ui/inc/WTypeSelect.hxx | 2
dbaccess/source/ui/inc/directsql.hxx | 2
dbaccess/source/ui/inc/indexfieldscontrol.hxx | 2
dbaccess/source/ui/inc/paramdialog.hxx | 3
dbaccess/source/ui/inc/queryfilter.hxx | 4
dbaccess/source/ui/inc/queryorder.hxx | 2
dbaccess/source/ui/misc/WTypeSelect.cxx | 7
dbaccess/source/ui/querydesign/querydlg.cxx | 7
dbaccess/source/ui/querydesign/querydlg.hxx | 2
extensions/source/abpilot/tableselectionpage.cxx | 3
extensions/source/abpilot/tableselectionpage.hxx | 2
extensions/source/bibliography/datman.cxx | 11
extensions/source/bibliography/toolbar.cxx | 3
extensions/source/bibliography/toolbar.hxx | 2
extensions/source/dbpilots/commonpagesdbp.cxx | 8
extensions/source/dbpilots/commonpagesdbp.hxx | 2
extensions/source/dbpilots/gridwizard.cxx | 3
extensions/source/dbpilots/gridwizard.hxx | 2
extensions/source/dbpilots/groupboxwiz.cxx | 6
extensions/source/dbpilots/groupboxwiz.hxx | 4
extensions/source/dbpilots/listcombowizard.cxx | 6
extensions/source/dbpilots/listcombowizard.hxx | 4
extensions/source/propctrlr/commoncontrol.cxx | 3
extensions/source/propctrlr/commoncontrol.hxx | 4
extensions/source/propctrlr/standardcontrol.hxx | 15
extensions/source/scanner/sanedlg.cxx | 9
extensions/source/scanner/sanedlg.hxx | 2
filter/source/pdf/impdialog.cxx | 3
filter/source/pdf/impdialog.hxx | 2
formula/source/ui/dlg/funcpage.cxx | 7
formula/source/ui/dlg/funcpage.hxx | 2
fpicker/source/office/RemoteFilesDialog.cxx | 12
fpicker/source/office/RemoteFilesDialog.hxx | 4
fpicker/source/office/iodlg.cxx | 4
fpicker/source/office/iodlg.hxx | 2
fpicker/source/office/iodlgimp.hxx | 4
include/sfx2/dinfdlg.hxx | 2
include/sfx2/mgetempl.hxx | 4
include/svtools/PlaceEditDialog.hxx | 2
include/svtools/ServerDetailsControls.hxx | 2
include/svtools/addresstemplate.hxx | 2
include/svtools/editbrowsebox.hxx | 3
include/svtools/prnsetup.hxx | 2
include/svx/ctredlin.hxx | 3
include/svx/fillctrl.hxx | 4
include/svx/float3d.hxx | 2
include/svx/fontwork.hxx | 2
include/svx/lboxctrl.hxx | 2
include/svx/rubydialog.hxx | 6
include/svx/sidebar/AreaPropertyPanelBase.hxx | 6
include/svx/sidebar/LinePropertyPanelBase.hxx | 10
include/svx/srchdlg.hxx | 2
include/vcl/lstbox.hxx | 6
include/vcl/tabctrl.hxx | 2
reportdesign/source/ui/dlg/Condition.cxx | 6
reportdesign/source/ui/dlg/Condition.hxx | 4
reportdesign/source/ui/dlg/GroupsSorting.cxx | 19 -
reportdesign/source/ui/inc/GroupsSorting.hxx | 2
sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx | 5
sc/source/ui/condformat/colorformat.cxx | 10
sc/source/ui/condformat/condformatdlg.cxx | 20 -
sc/source/ui/condformat/condformatdlgentry.cxx | 73 +---
sc/source/ui/dbgui/PivotLayoutDialog.cxx | 7
sc/source/ui/dbgui/consdlg.cxx | 13
sc/source/ui/dbgui/dapidata.cxx | 3
sc/source/ui/dbgui/filtdlg.cxx | 42 +-
sc/source/ui/dbgui/foptmgr.cxx | 6
sc/source/ui/dbgui/pfiltdlg.cxx | 15
sc/source/ui/dbgui/pvfundlg.cxx | 16
sc/source/ui/dbgui/scuiasciiopt.cxx | 18 -
sc/source/ui/dbgui/sfiltdlg.cxx | 6
sc/source/ui/dbgui/tpsort.cxx | 21 -
sc/source/ui/dbgui/tpsubt.cxx | 13
sc/source/ui/dbgui/validate.cxx | 15
sc/source/ui/formdlg/dwfunctr.cxx | 19 -
sc/source/ui/inc/PivotLayoutDialog.hxx | 3
sc/source/ui/inc/RandomNumberGeneratorDialog.hxx | 2
sc/source/ui/inc/areasdlg.hxx | 6
sc/source/ui/inc/colorformat.hxx | 4
sc/source/ui/inc/condformatdlg.hxx | 6
sc/source/ui/inc/condformatdlgentry.hxx | 16
sc/source/ui/inc/consdlg.hxx | 2
sc/source/ui/inc/crnrdlg.hxx | 2
sc/source/ui/inc/dapidata.hxx | 2
sc/source/ui/inc/dwfunctr.hxx | 2
sc/source/ui/inc/filtdlg.hxx | 4
sc/source/ui/inc/foptmgr.hxx | 2
sc/source/ui/inc/funcpage.hxx | 4
sc/source/ui/inc/instbdlg.hxx | 2
sc/source/ui/inc/linkarea.hxx | 2
sc/source/ui/inc/mvtabdlg.hxx | 2
sc/source/ui/inc/namedlg.hxx | 2
sc/source/ui/inc/optsolver.hxx | 2
sc/source/ui/inc/pfiltdlg.hxx | 2
sc/source/ui/inc/pvfundlg.hxx | 4
sc/source/ui/inc/scuiasciiopt.hxx | 4
sc/source/ui/inc/scuiautofmt.hxx | 2
sc/source/ui/inc/scuitphfedit.hxx | 2
sc/source/ui/inc/solveroptions.hxx | 2
sc/source/ui/inc/tpsort.hxx | 6
sc/source/ui/inc/tpsubt.hxx | 3
sc/source/ui/inc/tptable.hxx | 2
sc/source/ui/inc/tpusrlst.hxx | 2
sc/source/ui/inc/tpview.hxx | 6
sc/source/ui/inc/validate.hxx | 7
sc/source/ui/miscdlgs/crnrdlg.cxx | 10
sc/source/ui/miscdlgs/instbdlg.cxx | 3
sc/source/ui/miscdlgs/linkarea.cxx | 3
sc/source/ui/miscdlgs/mvtabdlg.cxx | 8
sc/source/ui/miscdlgs/optsolver.cxx | 3
sc/source/ui/miscdlgs/scuiautofmt.cxx | 12
sc/source/ui/miscdlgs/solveroptions.cxx | 3
sc/source/ui/namedlg/namedlg.cxx | 3
sc/source/ui/optdlg/calcoptionsdlg.cxx | 11
sc/source/ui/optdlg/calcoptionsdlg.hxx | 4
sc/source/ui/optdlg/tpusrlst.cxx | 18 -
sc/source/ui/optdlg/tpview.cxx | 21 -
sc/source/ui/pagedlg/areasdlg.cxx | 7
sc/source/ui/pagedlg/scuitphfedit.cxx | 5
sc/source/ui/pagedlg/tptable.cxx | 9
sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 10
sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx | 2
sd/source/filter/html/pubdlg.cxx | 4
sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 7
sd/source/ui/animations/CustomAnimationDialog.cxx | 51 +-
sd/source/ui/animations/CustomAnimationPane.cxx | 12
sd/source/ui/animations/CustomAnimationPane.hxx | 3
sd/source/ui/animations/SlideTransitionPane.cxx | 9
sd/source/ui/animations/SlideTransitionPane.hxx | 6
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 3
sd/source/ui/dlg/PhotoAlbumDialog.hxx | 2
sd/source/ui/dlg/copydlg.cxx | 3
sd/source/ui/dlg/custsdlg.cxx | 23 -
sd/source/ui/dlg/dlgass.cxx | 36 --
sd/source/ui/dlg/dlgfield.cxx | 4
sd/source/ui/dlg/headerfooterdlg.cxx | 7
sd/source/ui/dlg/navigatr.cxx | 4
sd/source/ui/dlg/tpaction.cxx | 8
sd/source/ui/dlg/tpoption.cxx | 3
sd/source/ui/inc/copydlg.hxx | 2
sd/source/ui/inc/custsdlg.hxx | 4
sd/source/ui/inc/dlgfield.hxx | 2
sd/source/ui/inc/navigatr.hxx | 2
sd/source/ui/inc/pubdlg.hxx | 2
sd/source/ui/inc/tpaction.hxx | 2
sd/source/ui/inc/tpoption.hxx | 2
sfx2/source/appl/newhelp.cxx | 4
sfx2/source/appl/newhelp.hxx | 2
sfx2/source/dialog/dinfdlg.cxx | 9
sfx2/source/dialog/mgetempl.cxx | 6
sfx2/source/dialog/templdlg.cxx | 6
sfx2/source/doc/new.cxx | 24 -
sfx2/source/inc/templdgi.hxx | 2
starmath/inc/ElementsDockingWindow.hxx | 2
starmath/inc/dialog.hxx | 6
starmath/inc/utility.hxx | 2
starmath/source/ElementsDockingWindow.cxx | 7
starmath/source/dialog.cxx | 14
starmath/source/utility.cxx | 4
svtools/source/brwbox/ebbcontrols.cxx | 9
svtools/source/dialogs/PlaceEditDialog.cxx | 10
svtools/source/dialogs/ServerDetailsControls.cxx | 3
svtools/source/dialogs/addresstemplate.cxx | 10
svtools/source/dialogs/prnsetup.cxx | 3
svtools/source/filter/exportdialog.cxx | 12
svtools/source/filter/exportdialog.hxx | 1
svx/source/dialog/ctredlin.cxx | 17
svx/source/dialog/fontwork.cxx | 3
svx/source/dialog/rubydialog.cxx | 19 -
svx/source/dialog/srchdlg.cxx | 5
svx/source/engine3d/float3d.cxx | 180 ++++------
svx/source/fmcomp/gridcell.cxx | 2
svx/source/form/datanavi.cxx | 10
svx/source/gallery2/galbrws1.cxx | 9
svx/source/gallery2/galbrws1.hxx | 4
svx/source/inc/datanavi.hxx | 4
svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 162 ++++-----
svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 3
svx/source/sidebar/graphic/GraphicPropertyPanel.hxx | 2
svx/source/sidebar/line/LinePropertyPanelBase.cxx | 32 -
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 9
svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx | 2
svx/source/sidebar/shadow/ShadowPropertyPanel.cxx | 6
svx/source/sidebar/shadow/ShadowPropertyPanel.hxx | 2
svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 9
svx/source/sidebar/text/TextCharacterSpacingControl.hxx | 2
svx/source/tbxctrls/colorwindow.hxx | 2
svx/source/tbxctrls/fillctrl.cxx | 176 ++++-----
svx/source/tbxctrls/itemwin.cxx | 8
svx/source/tbxctrls/lboxctrl.cxx | 3
svx/source/tbxctrls/tbcontrl.cxx | 8
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 6
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx | 1
sw/source/ui/chrdlg/break.cxx | 3
sw/source/ui/chrdlg/drpcps.cxx | 3
sw/source/ui/chrdlg/numpara.cxx | 12
sw/source/ui/chrdlg/swuiccoll.cxx | 11
sw/source/ui/config/optcomp.cxx | 4
sw/source/ui/config/optload.cxx | 19 -
sw/source/ui/config/optpage.cxx | 40 --
sw/source/ui/dbui/customizeaddresslistdialog.cxx | 3
sw/source/ui/dbui/customizeaddresslistdialog.hxx | 2
sw/source/ui/dbui/dbinsdlg.cxx | 15
sw/source/ui/dbui/mmaddressblockpage.cxx | 11
sw/source/ui/dbui/mmgreetingspage.cxx | 12
sw/source/ui/dbui/mmgreetingspage.hxx | 1
sw/source/ui/dbui/mmlayoutpage.cxx | 5
sw/source/ui/dbui/mmlayoutpage.hxx | 2
sw/source/ui/dbui/mmoutputpage.cxx | 19 -
sw/source/ui/dbui/mmoutputpage.hxx | 4
sw/source/ui/dialog/ascfldlg.cxx | 5
sw/source/ui/envelp/envfmt.cxx | 5
sw/source/ui/envelp/envfmt.hxx | 2
sw/source/ui/envelp/envlop1.cxx | 7
sw/source/ui/envelp/label1.cxx | 28 -
sw/source/ui/envelp/labelexp.cxx | 10
sw/source/ui/envelp/swuilabimp.hxx | 8
sw/source/ui/fldui/flddb.cxx | 19 -
sw/source/ui/fldui/flddb.hxx | 7
sw/source/ui/fldui/flddinf.cxx | 8
sw/source/ui/fldui/flddinf.hxx | 2
sw/source/ui/fldui/flddok.cxx | 18 -
sw/source/ui/fldui/flddok.hxx | 6
sw/source/ui/fldui/fldfunc.cxx | 18 -
sw/source/ui/fldui/fldfunc.hxx | 5
sw/source/ui/fldui/fldref.cxx | 20 -
sw/source/ui/fldui/fldref.hxx | 5
sw/source/ui/fldui/fldvar.cxx | 20 -
sw/source/ui/fldui/fldvar.hxx | 7
sw/source/ui/frmdlg/column.cxx | 20 -
sw/source/ui/frmdlg/cption.cxx | 6
sw/source/ui/frmdlg/frmpage.cxx | 39 --
sw/source/ui/index/cnttab.cxx | 46 +-
sw/source/ui/index/multmrk.cxx | 9
sw/source/ui/index/swuiidxmrk.cxx | 26 -
sw/source/ui/misc/docfnote.cxx | 5
sw/source/ui/misc/glosbib.cxx | 6
sw/source/ui/misc/impfnote.hxx | 2
sw/source/ui/misc/num.cxx | 28 -
sw/source/ui/misc/outline.cxx | 33 -
sw/source/ui/misc/pgfnote.cxx | 3
sw/source/ui/misc/pggrid.cxx | 11
sw/source/ui/misc/srtdlg.cxx | 10
sw/source/ui/table/tautofmt.cxx | 12
sw/source/uibase/inc/ascfldlg.hxx | 2
sw/source/uibase/inc/break.hxx | 2
sw/source/uibase/inc/column.hxx | 4
sw/source/uibase/inc/cption.hxx | 1
sw/source/uibase/inc/dbinsdlg.hxx | 4
sw/source/uibase/inc/drpcps.hxx | 2
sw/source/uibase/inc/envlop.hxx | 2
sw/source/uibase/inc/frmpage.hxx | 6
sw/source/uibase/inc/glosbib.hxx | 1
sw/source/uibase/inc/multmrk.hxx | 2
sw/source/uibase/inc/navipi.hxx | 2
sw/source/uibase/inc/num.hxx | 6
sw/source/uibase/inc/numfmtlb.hxx | 2
sw/source/uibase/inc/numpara.hxx | 4
sw/source/uibase/inc/optcomp.hxx | 2
sw/source/uibase/inc/optload.hxx | 5
sw/source/uibase/inc/optpage.hxx | 8
sw/source/uibase/inc/outline.hxx | 8
sw/source/uibase/inc/pgfnote.hxx | 2
sw/source/uibase/inc/pggrid.hxx | 2
sw/source/uibase/inc/srtdlg.hxx | 3
sw/source/uibase/inc/swuiccoll.hxx | 3
sw/source/uibase/inc/swuicnttab.hxx | 17
sw/source/uibase/inc/swuiidxmrk.hxx | 5
sw/source/uibase/inc/tautofmt.hxx | 2
sw/source/uibase/sidebar/WrapPropertyPanel.cxx | 6
sw/source/uibase/sidebar/WrapPropertyPanel.hxx | 2
sw/source/uibase/uiview/viewling.cxx | 11
sw/source/uibase/utlui/gloslst.cxx | 5
sw/source/uibase/utlui/navipi.cxx | 5
sw/source/uibase/utlui/numfmtlb.cxx | 9
vcl/generic/print/prtsetup.cxx | 20 -
vcl/generic/print/prtsetup.hxx | 4
vcl/inc/printdlg.hxx | 4
vcl/source/control/lstbox.cxx | 2
vcl/source/control/tabctrl.cxx | 3
vcl/source/window/printdlg.cxx | 21 -
vcl/workben/svpclient.cxx | 5
xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 2
xmlsecurity/source/dialogs/macrosecurity.cxx | 3
415 files changed, 1886 insertions(+), 2078 deletions(-)
New commits:
commit 3c99f8500f657ed84b316390d5175a6f5e56bc69
Author: Noel Grandin <noelgrandin at gmail.com>
Date: Sun Oct 4 15:05:38 2015 +0200
convert Link<> to typed
Change-Id: Iec15042138e0715459b2c9e872a7464d75a6b1eb
Reviewed-on: https://gerrit.libreoffice.org/19305
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index 521cd98..d2a5685 100644
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
@@ -83,7 +83,7 @@ private:
DECL_LINK_TYPED( implTimeEndHdl, Slider*, void );
DECL_LINK_TYPED( implVolumeHdl, Slider*, void );
DECL_LINK_TYPED( implSelectHdl, ToolBox*, void );
- DECL_LINK( implZoomSelectHdl, ListBox* );
+ DECL_LINK_TYPED( implZoomSelectHdl, ListBox&, void );
DECL_LINK_TYPED(implTimeoutHdl, Idle *, void);
ImageList maImageList;
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index e5b58a8c..d8efcf2 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -560,30 +560,25 @@ IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void )
-IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox*, p )
+IMPL_LINK_TYPED( MediaControl, implZoomSelectHdl, ListBox&, p, void )
{
- if( p )
- {
- MediaItem aExecItem;
- css::media::ZoomLevel eLevel;
-
- switch( p->GetSelectEntryPos() )
- {
- case( AVMEDIA_ZOOMLEVEL_50 ): eLevel = css::media::ZoomLevel_ZOOM_1_TO_2; break;
- case( AVMEDIA_ZOOMLEVEL_100 ): eLevel = css::media::ZoomLevel_ORIGINAL; break;
- case( AVMEDIA_ZOOMLEVEL_200 ): eLevel = css::media::ZoomLevel_ZOOM_2_TO_1; break;
- case( AVMEDIA_ZOOMLEVEL_FIT ): eLevel = css::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT; break;
- case( AVMEDIA_ZOOMLEVEL_SCALED ): eLevel = css::media::ZoomLevel_FIT_TO_WINDOW; break;
+ MediaItem aExecItem;
+ css::media::ZoomLevel eLevel;
- default: eLevel = css::media::ZoomLevel_NOT_AVAILABLE; break;
- }
+ switch( p.GetSelectEntryPos() )
+ {
+ case( AVMEDIA_ZOOMLEVEL_50 ): eLevel = css::media::ZoomLevel_ZOOM_1_TO_2; break;
+ case( AVMEDIA_ZOOMLEVEL_100 ): eLevel = css::media::ZoomLevel_ORIGINAL; break;
+ case( AVMEDIA_ZOOMLEVEL_200 ): eLevel = css::media::ZoomLevel_ZOOM_2_TO_1; break;
+ case( AVMEDIA_ZOOMLEVEL_FIT ): eLevel = css::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT; break;
+ case( AVMEDIA_ZOOMLEVEL_SCALED ): eLevel = css::media::ZoomLevel_FIT_TO_WINDOW; break;
- aExecItem.setZoom( eLevel );
- execute( aExecItem );
- update();
+ default: eLevel = css::media::ZoomLevel_NOT_AVAILABLE; break;
}
- return 0;
+ aExecItem.setZoom( eLevel );
+ execute( aExecItem );
+ update();
}
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 23a7863..ca6aa2d 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -496,7 +496,7 @@ public:
void InsertSelectedEntry(); //insert the selected entry
DECL_LINK_TYPED(ImplDoubleClickHdl, ListBox&, void);
- DECL_LINK(ImplSelectHdl, void*);
+ DECL_LINK_TYPED(ImplSelectHdl, ListBox&, void);
protected:
virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE;
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index b060c62..4580924 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2647,10 +2647,9 @@ IMPL_LINK_NOARG_TYPED(CodeCompleteListBox, ImplDoubleClickHdl, ListBox&, void)
InsertSelectedEntry();
}
-IMPL_LINK_NOARG(CodeCompleteListBox, ImplSelectHdl)
+IMPL_LINK_NOARG_TYPED(CodeCompleteListBox, ImplSelectHdl, ListBox&, void)
{//give back the focus to the parent
pCodeCompleteWindow->pParent->GrabFocus();
- return 0;
}
ExtTextView* CodeCompleteListBox::GetParentEditView()
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 5d5cecd..1ddf3d7 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -611,11 +611,10 @@ IMPL_LINK_TYPED( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox, void )
CheckButtons();
}
-IMPL_LINK( LibPage, BasicSelectHdl, ListBox *, /*pBox*/ )
+IMPL_LINK_NOARG_TYPED( LibPage, BasicSelectHdl, ListBox&, void )
{
SetCurLib();
CheckButtons();
- return 0;
}
IMPL_LINK_TYPED( LibPage, ButtonHdl, Button *, pButton, void )
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index d7e1651..e23e6c4 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -230,7 +230,7 @@ protected:
LibraryLocation m_eCurLocation;
DECL_LINK_TYPED( TreeListHighlightHdl, SvTreeListBox *, void );
- DECL_LINK( BasicSelectHdl, ListBox * );
+ DECL_LINK_TYPED( BasicSelectHdl, ListBox&, void );
DECL_LINK_TYPED( ButtonHdl, Button *, void );
DECL_LINK_TYPED( CheckPasswordHdl, SvxPasswordDialog *, bool );
void CheckButtons();
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index fcc515a..3d4fb1f 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -70,7 +70,7 @@ ManageLanguageDialog::ManageLanguageDialog(vcl::Window* pParent, std::shared_ptr
Init();
FillLanguageBox();
- SelectHdl( NULL );
+ SelectHdl( *m_pLanguageLB );
}
ManageLanguageDialog::~ManageLanguageDialog()
@@ -193,7 +193,7 @@ IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, DeleteHdl, Button*, void)
if ( nCount <= nPos )
nPos = nCount - 1;
m_pLanguageLB->SelectEntryPos( nPos );
- SelectHdl( NULL );
+ SelectHdl( *m_pLanguageLB );
}
}
@@ -210,11 +210,11 @@ IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, MakeDefHdl, Button*, void)
FillLanguageBox();
// reset selection
m_pLanguageLB->SelectEntryPos( nPos );
- SelectHdl( NULL );
+ SelectHdl( *m_pLanguageLB );
}
}
-IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl)
+IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, SelectHdl, ListBox&, void)
{
const sal_Int32 nCount = m_pLanguageLB->GetEntryCount();
bool bEmpty = ( !nCount ||
@@ -224,8 +224,6 @@ IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl)
m_pDeletePB->Enable(bEnable);
m_pMakeDefPB->Enable(bEnable && nCount > 1 && m_pLanguageLB->GetSelectEntryCount() == 1);
-
- return 1;
}
// class SetDefaultLanguageDialog -----------------------------------------------
diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx
index 469ee68..c601729 100644
--- a/basctl/source/inc/managelang.hxx
+++ b/basctl/source/inc/managelang.hxx
@@ -69,7 +69,7 @@ private:
DECL_LINK_TYPED(AddHdl, Button*, void);
DECL_LINK_TYPED(DeleteHdl, Button*, void);
DECL_LINK_TYPED(MakeDefHdl, Button*, void);
- DECL_LINK(SelectHdl, void *);
+ DECL_LINK_TYPED(SelectHdl, ListBox&, void);
public:
ManageLanguageDialog( vcl::Window* pParent, std::shared_ptr<LocalizationMgr> _pLMgr );
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx
index dd3db5e..f3602e4 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.cxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx
@@ -28,7 +28,7 @@ BarGeometryResources::BarGeometryResources(VclBuilderContainer* pWindow)
pWindow->get(m_pLB_Geometry, "shape");
}
-void BarGeometryResources::SetSelectHdl( const Link<>& rLink )
+void BarGeometryResources::SetSelectHdl( const Link<ListBox&,void>& rLink )
{
m_pLB_Geometry->SetSelectHdl( rLink );
}
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.hxx b/chart2/source/controller/dialogs/res_BarGeometry.hxx
index 168cd4e..3193672 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.hxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.hxx
@@ -38,7 +38,7 @@ public:
sal_Int32 GetSelectEntryPos() const;
void SelectEntryPos(sal_Int32 nPos);
- void SetSelectHdl( const Link<>& rLink );
+ void SetSelectHdl( const Link<ListBox&,void>& rLink );
private:
VclPtr<FixedText> m_pFT_Geometry;
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 748dcc1..7f8d948 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -340,10 +340,9 @@ void ErrorBarResources::UpdateControlStates()
}
}
-IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen2 )
+IMPL_LINK_NOARG_TYPED( ErrorBarResources, CategoryChosen2, ListBox&, void )
{
CategoryChosen(NULL);
- return 0;
}
IMPL_LINK_NOARG_TYPED( ErrorBarResources, CategoryChosen, Button*, void )
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index fafa6fc..ed3a1f3 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -291,10 +291,10 @@ void ThreeD_SceneAppearance_TabPage::updateScheme()
}
}
-IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl)
+IMPL_LINK_NOARG_TYPED(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, ListBox&, void)
{
if( !m_bUpdateOtherControls )
- return 0;
+ return;
{
// locked controllers
@@ -314,7 +314,6 @@ IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl)
// update other controls
initControlsFromModel();
- return 0;
}
IMPL_LINK_NOARG_TYPED(ThreeD_SceneAppearance_TabPage, SelectShading, CheckBox&, void)
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
index 6896466..94e10c9 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
@@ -44,7 +44,7 @@ public:
virtual void ActivatePage() SAL_OVERRIDE;
private:
- DECL_LINK( SelectSchemeHdl, void* );
+ DECL_LINK_TYPED( SelectSchemeHdl, ListBox&, void );
DECL_LINK_TYPED( SelectShading, CheckBox&, void );
DECL_LINK_TYPED( SelectRoundedEdgeOrObjectLines, CheckBox&, void );
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 0ee4077..a4796a8 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -444,12 +444,13 @@ IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, ColorDialogHdl, Button*, pBut
if(pInfo)
applyLightSourceToModel( nL );
}
- SelectColorHdl( pListBox );
+ SelectColorHdl( *pListBox );
}
}
-IMPL_LINK( ThreeD_SceneIllumination_TabPage, SelectColorHdl, ColorLB*, pListBox )
+IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, SelectColorHdl, ListBox&, rBox, void )
{
+ ColorLB* pListBox = static_cast<ColorLB*>(&rBox);
if(pListBox==m_pLB_AmbientLight)
{
m_bInCommitToModel = true;
@@ -475,7 +476,6 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, SelectColorHdl, ColorLB*, pListBox
}
}
this->updatePreview();
- return 0;
}
IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl, Button*, pBtn, void )
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
index f8cec26..03a2684 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
@@ -61,7 +61,7 @@ public:
private:
DECL_LINK_TYPED( ClickLightSourceButtonHdl, Button*, void );
- DECL_LINK( SelectColorHdl, ColorLB* );
+ DECL_LINK_TYPED( SelectColorHdl, ListBox&, void );
DECL_LINK_TYPED( ColorDialogHdl, Button*, void );
DECL_LINK_TYPED( PreviewChangeHdl, SvxLightCtl3D*, void );
DECL_LINK_TYPED( PreviewSelectHdl, SvxLightCtl3D*, void );
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 62e6e35..590c754 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -198,7 +198,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs)
if( nPos < m_pLB_CrossesAt->GetEntryCount() )
m_pLB_CrossesAt->SelectEntryPos( nPos );
- CrossesAtSelectHdl( nullptr );
+ CrossesAtSelectHdl( *m_pLB_CrossesAt );
if( rInAttrs->GetItemState(SCHATTR_AXIS_POSITION_VALUE,true, &pPoolItem)== SfxItemState::SET || bZero )
{
@@ -231,7 +231,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs)
}
else
m_pLB_PlaceLabels->SetNoSelection();
- PlaceLabelsSelectHdl( nullptr );
+ PlaceLabelsSelectHdl( *m_pLB_PlaceLabels );
// Tick marks
long nTicks = 0, nMinorTicks = 0;
@@ -313,7 +313,7 @@ void AxisPositionsTabPage::SupportAxisPositioning( bool bSupportAxisPositioning
m_bSupportAxisPositioning = bSupportAxisPositioning;
}
-IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl)
+IMPL_LINK_NOARG_TYPED(AxisPositionsTabPage, CrossesAtSelectHdl, ListBox&, void)
{
sal_Int32 nPos = m_pLB_CrossesAt->GetSelectEntryPos();
m_pED_CrossesAt->Show( (2==nPos) && !m_bCrossingAxisIsCategoryAxis );
@@ -324,11 +324,10 @@ IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl)
if( 0 == m_pED_CrossesAtCategory->GetSelectEntryCount() )
m_pED_CrossesAtCategory->SelectEntryPos(0);
- PlaceLabelsSelectHdl( nullptr );
- return 0;
+ PlaceLabelsSelectHdl( *m_pLB_PlaceLabels );
}
-IMPL_LINK_NOARG(AxisPositionsTabPage, PlaceLabelsSelectHdl)
+IMPL_LINK_NOARG_TYPED(AxisPositionsTabPage, PlaceLabelsSelectHdl, ListBox&, void)
{
sal_Int32 nLabelPos = m_pLB_PlaceLabels->GetSelectEntryPos();
@@ -340,8 +339,6 @@ IMPL_LINK_NOARG(AxisPositionsTabPage, PlaceLabelsSelectHdl)
bEnableTickmarkPlacement=false;
}
m_pBxPlaceTicks->Enable(bEnableTickmarkPlacement);
-
- return 0;
}
} //namespace chart
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index a05ae58..bb1a6b4 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -50,8 +50,8 @@ public:
void SupportAxisPositioning( bool bSupportAxisPositioning );
private: //methods:
- DECL_LINK( CrossesAtSelectHdl, void* );
- DECL_LINK( PlaceLabelsSelectHdl, void* );
+ DECL_LINK_TYPED( CrossesAtSelectHdl, ListBox&, void );
+ DECL_LINK_TYPED( PlaceLabelsSelectHdl, ListBox&, void );
private: //member:
VclPtr<VclFrame> m_pFL_AxisLine;
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index f356a05..55feb29 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -56,7 +56,7 @@ public:
private:
DECL_LINK_TYPED( Dim3DLookCheckHdl, CheckBox&, void );
- DECL_LINK( SelectSchemeHdl, void* );
+ DECL_LINK_TYPED( SelectSchemeHdl, ListBox&, void );
private:
VclPtr<CheckBox> m_pCB_3DLook;
@@ -110,11 +110,10 @@ IMPL_LINK_NOARG_TYPED(Dim3DLookResourceGroup, Dim3DLookCheckHdl, CheckBox&, void
m_pChangeListener->stateChanged(this);
}
-IMPL_LINK_NOARG(Dim3DLookResourceGroup, SelectSchemeHdl)
+IMPL_LINK_NOARG_TYPED(Dim3DLookResourceGroup, SelectSchemeHdl, ListBox&, void)
{
if(m_pChangeListener)
m_pChangeListener->stateChanged(this);
- return 0;
}
class SortByXValuesResourceGroup : public ChangingResource
@@ -320,7 +319,7 @@ public:
virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE;
private:
- DECL_LINK( SplineTypeListBoxHdl, void* );
+ DECL_LINK_TYPED( SplineTypeListBoxHdl, ListBox&, void );
private:
VclPtr<ListBox> m_pLB_Spline_Type;
@@ -393,11 +392,10 @@ void SplinePropertiesDialog::fillParameter( ChartTypeParameter& rParameter, bool
rParameter.nCurveResolution = static_cast< sal_Int32 >( m_pMF_SplineResolution->GetValue());
rParameter.nSplineOrder = static_cast< sal_Int32 >( m_pMF_SplineOrder->GetValue());
}
-IMPL_LINK_NOARG(SplinePropertiesDialog, SplineTypeListBoxHdl)
+IMPL_LINK_NOARG_TYPED(SplinePropertiesDialog, SplineTypeListBoxHdl, ListBox&, void)
{
m_pFT_SplineOrder->Enable(B_SPLINE_POS == m_pLB_Spline_Type->GetSelectEntryPos());
m_pMF_SplineOrder->Enable(B_SPLINE_POS == m_pLB_Spline_Type->GetSelectEntryPos());
- return 0;
}
class SteppedPropertiesDialog : public ModalDialog
@@ -493,7 +491,7 @@ public:
void fillParameter( ChartTypeParameter& rParameter );
private:
- DECL_LINK( LineTypeChangeHdl, void* );
+ DECL_LINK_TYPED( LineTypeChangeHdl, ListBox&, void );
DECL_LINK_TYPED( SplineDetailsDialogHdl, Button*, void );
DECL_LINK_TYPED( SteppedDetailsDialogHdl, Button*, void );
SplinePropertiesDialog& getSplinePropertiesDialog();
@@ -586,11 +584,10 @@ void SplineResourceGroup::fillParameter( ChartTypeParameter& rParameter )
break;
}
}
-IMPL_LINK_NOARG(SplineResourceGroup, LineTypeChangeHdl)
+IMPL_LINK_NOARG_TYPED(SplineResourceGroup, LineTypeChangeHdl, ListBox&, void)
{
if( m_pChangeListener )
m_pChangeListener->stateChanged(this);
- return 0;
}
IMPL_LINK_NOARG_TYPED(SplineResourceGroup, SplineDetailsDialogHdl, Button*, void)
{
@@ -644,7 +641,7 @@ public:
void fillParameter( ChartTypeParameter& rParameter );
private:
- DECL_LINK( GeometryChangeHdl, void* );
+ DECL_LINK_TYPED( GeometryChangeHdl, ListBox&, void );
private:
BarGeometryResources m_aGeometryResources;
@@ -676,11 +673,10 @@ void GeometryResourceGroup::fillParameter( ChartTypeParameter& rParameter )
rParameter.nGeometry3D = m_aGeometryResources.GetSelectEntryPos();
}
-IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl)
+IMPL_LINK_NOARG_TYPED(GeometryResourceGroup, GeometryChangeHdl, ListBox&, void)
{
if( m_pChangeListener )
m_pChangeListener->stateChanged(this);
- return 0;
}
ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent
@@ -891,10 +887,9 @@ IMPL_LINK_NOARG_TYPED(ChartTypeTabPage, SelectSubTypeHdl, ValueSet*, void)
}
}
-IMPL_LINK_NOARG(ChartTypeTabPage, SelectMainTypeHdl)
+IMPL_LINK_NOARG_TYPED(ChartTypeTabPage, SelectMainTypeHdl, ListBox&, void)
{
selectMainType();
- return 0;
}
void ChartTypeTabPage::selectMainType()
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx
index fb93114..3cf4d7a 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -74,7 +74,7 @@ protected:
void commitToModel( const ChartTypeParameter& rParameter );
void selectMainType();
- DECL_LINK( SelectMainTypeHdl, void* );
+ DECL_LINK_TYPED( SelectMainTypeHdl, ListBox&, void );
DECL_LINK_TYPED( SelectSubTypeHdl, ValueSet*, void );
protected:
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 42639c3..5206848 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -258,7 +258,7 @@ enum AxisTypeListBoxEntry
TYPE_DATE=2
};
-IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl)
+IMPL_LINK_NOARG_TYPED(ScaleTabPage, SelectAxisTypeHdl, ListBox&, void)
{
const sal_Int32 nPos = m_pLB_AxisType->GetSelectEntryPos();
if( nPos==TYPE_DATE )
@@ -269,7 +269,6 @@ IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl)
m_pCbxLogarithm->Check(false);
EnableControls();
SetNumFormat();
- return 0;
}
VclPtr<SfxTabPage> ScaleTabPage::Create(vcl::Window* pWindow,const SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index c1143af..da93b70 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -99,7 +99,7 @@ private:
void EnableControls();
- DECL_LINK( SelectAxisTypeHdl, void* );
+ DECL_LINK_TYPED( SelectAxisTypeHdl, ListBox&, void );
DECL_LINK_TYPED( EnableValueHdl, Button*, void );
DECL_STATIC_LINK( ScaleTabPage, FmtFieldModifiedHdl, FormattedField* );
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index 76a36f2..f19ca18 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -123,7 +123,7 @@ private:
bool m_bEnableDataTableDialog;
DECL_LINK_TYPED( CategoryChosen, Button*, void );
- DECL_LINK( CategoryChosen2, void* );
+ DECL_LINK_TYPED( CategoryChosen2, ListBox&, void );
DECL_LINK_TYPED( SynchronizePosAndNeg, CheckBox&, void );
DECL_LINK( PosValueChanged, void * );
DECL_LINK_TYPED( IndicatorChanged, Button *, void );
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
index 572974b..11a4533 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
@@ -343,14 +343,12 @@ IMPL_LINK_TYPED(ChartAxisPanel, CheckBoxHdl, Button*, pButton, void)
setReverse(mxModel, aCID, bChecked);
}
-IMPL_LINK_NOARG(ChartAxisPanel, ListBoxHdl)
+IMPL_LINK_NOARG_TYPED(ChartAxisPanel, ListBoxHdl, ListBox&, void)
{
OUString aCID = getCID(mxModel);
sal_Int32 nPos = mpLBLabelPos->GetSelectEntryPos();
setLabelPosition(mxModel, aCID, nPos);
-
- return 0;
}
}} // end of namespace ::chart::sidebar
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
index 50c0021..7086101 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
@@ -93,7 +93,7 @@ private:
void Initialize();
DECL_LINK_TYPED(CheckBoxHdl, Button*, void);
- DECL_LINK(ListBoxHdl, void*);
+ DECL_LINK_TYPED(ListBoxHdl, ListBox&, void);
};
} } // end of namespace ::chart::sidebar
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index b22570a..3d74fd2 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -573,11 +573,10 @@ IMPL_LINK_TYPED(ChartElementsPanel, CheckBoxHdl, Button*, pButton, void)
setGridVisible(mxModel, GridType::HOR_MINOR, bChecked);
}
-IMPL_LINK_NOARG(ChartElementsPanel, LegendPosHdl)
+IMPL_LINK_NOARG_TYPED(ChartElementsPanel, LegendPosHdl, ListBox&, void)
{
sal_Int32 nPos = mpLBLegendPosition->GetSelectEntryPos();
setLegendPos(mxModel, nPos);
- return 0;
}
void ChartElementsPanel::setTitleVisible(TitleHelper::eTitleType eTitle, bool bVisible)
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
index 952c64a..96a1288 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
@@ -114,7 +114,7 @@ private:
void setTitleVisible(TitleHelper::eTitleType eTitle, bool bVisible);
DECL_LINK_TYPED(CheckBoxHdl, Button*, void);
- DECL_LINK(LegendPosHdl, void*);
+ DECL_LINK_TYPED(LegendPosHdl, ListBox&, void);
};
} } // end of namespace ::chart::sidebar
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
index 6a455ec..0777408 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
@@ -412,14 +412,12 @@ IMPL_LINK_NOARG_TYPED(ChartErrorBarPanel, RadioBtnHdl, RadioButton&, void)
setShowNegativeError(mxModel, aCID, bNeg);
}
-IMPL_LINK_NOARG(ChartErrorBarPanel, ListBoxHdl)
+IMPL_LINK_NOARG_TYPED(ChartErrorBarPanel, ListBoxHdl, ListBox&, void)
{
OUString aCID = getCID(mxModel);
sal_Int32 nPos = mpLBType->GetSelectEntryPos();
setTypePos(mxModel, aCID, nPos);
-
- return 0;
}
IMPL_LINK(ChartErrorBarPanel, NumericFieldHdl, NumericField*, pMetricField)
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
index 2182635..57fb90f 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
@@ -89,7 +89,7 @@ private:
void Initialize();
DECL_LINK_TYPED(RadioBtnHdl, RadioButton&, void);
- DECL_LINK(ListBoxHdl, void*);
+ DECL_LINK_TYPED(ListBoxHdl, ListBox&, void);
DECL_LINK(NumericFieldHdl, NumericField*);
};
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index e8032f7..98106e3 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -482,14 +482,12 @@ IMPL_LINK_NOARG_TYPED(ChartSeriesPanel, RadioBtnHdl, RadioButton&, void)
setAttachedAxisType(mxModel, aCID, bChecked);
}
-IMPL_LINK_NOARG(ChartSeriesPanel, ListBoxHdl)
+IMPL_LINK_NOARG_TYPED(ChartSeriesPanel, ListBoxHdl, ListBox&, void)
{
OUString aCID = getCID(mxModel);
sal_Int32 nPos = mpLBLabelPlacement->GetSelectEntryPos();
setDataLabelPlacement(mxModel, aCID, nPos);
-
- return 0;
}
}} // end of namespace ::chart::sidebar
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
index bd3d3e3..f3e3ab6 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
@@ -110,7 +110,7 @@ private:
DECL_LINK_TYPED(CheckBoxHdl, Button*, void);
DECL_LINK_TYPED(RadioBtnHdl, RadioButton&, void);
- DECL_LINK(ListBoxHdl, void*);
+ DECL_LINK_TYPED(ListBoxHdl, ListBox&, void);
};
} } // end of namespace ::chart::sidebar
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index d70b472..c6f363c 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1870,15 +1870,12 @@ bool SvxConfigPage::FillItemSet( SfxItemSet* )
return result;
}
-IMPL_LINK( SvxConfigPage, SelectSaveInLocation, ListBox *, pBox )
+IMPL_LINK_NOARG_TYPED( SvxConfigPage, SelectSaveInLocation, ListBox&, void )
{
- (void)pBox;
-
pCurrentSaveInData = static_cast<SaveInData*>(m_pSaveInListBox->GetEntryData(
m_pSaveInListBox->GetSelectEntryPos()));
Init();
- return 1;
}
void SvxConfigPage::ReloadTopLevelListBox( SvxConfigEntry* pToSelect )
@@ -1916,7 +1913,7 @@ void SvxConfigPage::ReloadTopLevelListBox( SvxConfigEntry* pToSelect )
nSelectionPos : m_pTopLevelListBox->GetEntryCount() - 1;
m_pTopLevelListBox->SelectEntryPos( nSelectionPos );
- m_pTopLevelListBox->GetSelectHdl().Call( this );
+ m_pTopLevelListBox->GetSelectHdl().Call( *m_pTopLevelListBox );
}
void SvxConfigPage::AddSubMenusToUI(
@@ -2254,7 +2251,7 @@ void SvxMenuConfigPage::Init()
ReloadTopLevelListBox();
m_pTopLevelListBox->SelectEntryPos(0);
- m_pTopLevelListBox->GetSelectHdl().Call(this);
+ m_pTopLevelListBox->GetSelectHdl().Call(*m_pTopLevelListBox);
}
void SvxMenuConfigPage::dispose()
@@ -2388,10 +2385,8 @@ short SvxMenuConfigPage::QueryReset()
return qbox->Execute();
}
-IMPL_LINK( SvxMenuConfigPage, SelectMenu, ListBox *, pBox )
+IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, SelectMenu, ListBox&, void )
{
- (void)pBox;
-
m_pContentsListBox->Clear();
SvxConfigEntry* pMenuData = GetTopLevelSelection();
@@ -2414,8 +2409,6 @@ IMPL_LINK( SvxMenuConfigPage, SelectMenu, ListBox *, pBox )
}
UpdateButtonStates();
-
- return 0;
}
IMPL_LINK_TYPED( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton, void )
@@ -2969,7 +2962,7 @@ void SvxToolbarConfigPage::DeleteSelectedTopLevel()
{
m_pTopLevelListBox->SelectEntryPos( nSelectionPos - 1 );
}
- m_pTopLevelListBox->GetSelectHdl().Call( this );
+ m_pTopLevelListBox->GetSelectHdl().Call( *m_pTopLevelListBox );
// and now remove the entry
m_pTopLevelListBox->RemoveEntry( nSelectionPos );
@@ -3099,7 +3092,7 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton,
pSaveInData_->RestoreToolbar( pToolbar );
- m_pTopLevelListBox->GetSelectHdl().Call( this );
+ m_pTopLevelListBox->GetSelectHdl().Call( *m_pTopLevelListBox );
}
break;
@@ -3109,7 +3102,7 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton,
pToolbar->SetStyle( 0 );
pSaveInData->SetSystemStyle( m_xFrame, pToolbar->GetCommand(), 0 );
- m_pTopLevelListBox->GetSelectHdl().Call( this );
+ m_pTopLevelListBox->GetSelectHdl().Call( *m_pTopLevelListBox );
break;
}
@@ -3118,7 +3111,7 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton,
pToolbar->SetStyle( 1 );
pSaveInData->SetSystemStyle( m_xFrame, pToolbar->GetCommand(), 1 );
- m_pTopLevelListBox->GetSelectHdl().Call( this );
+ m_pTopLevelListBox->GetSelectHdl().Call( *m_pTopLevelListBox );
break;
}
@@ -3127,7 +3120,7 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton,
pToolbar->SetStyle( 2 );
pSaveInData->SetSystemStyle( m_xFrame, pToolbar->GetCommand(), 2 );
- m_pTopLevelListBox->GetSelectHdl().Call( this );
+ m_pTopLevelListBox->GetSelectHdl().Call( *m_pTopLevelListBox );
break;
}
@@ -3439,7 +3432,7 @@ void SvxToolbarConfigPage::Init()
}
m_pTopLevelListBox->SelectEntryPos(nPos);
- m_pTopLevelListBox->GetSelectHdl().Call(this);
+ m_pTopLevelListBox->GetSelectHdl().Call(*m_pTopLevelListBox);
}
SaveInData* SvxToolbarConfigPage::CreateSaveInData(
@@ -4319,10 +4312,8 @@ short SvxToolbarConfigPage::QueryReset()
return qbox->Execute();
}
-IMPL_LINK( SvxToolbarConfigPage, SelectToolbar, ListBox *, pBox )
+IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, SelectToolbar, ListBox&, void )
{
- (void)pBox;
-
m_pContentsListBox->Clear();
SvxConfigEntry* pToolbar = GetTopLevelSelection();
@@ -4332,7 +4323,7 @@ IMPL_LINK( SvxToolbarConfigPage, SelectToolbar, ListBox *, pBox )
m_pModifyCommandButton->Enable( false );
m_pAddCommandsButton->Enable( false );
- return 0;
+ return;
}
m_pModifyTopLevelButton->Enable( true );
@@ -4389,8 +4380,6 @@ IMPL_LINK( SvxToolbarConfigPage, SelectToolbar, ListBox *, pBox )
}
UpdateButtonStates();
-
- return 0;
}
IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, NewToolbarHdl, Button *, void )
@@ -4431,7 +4420,7 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, NewToolbarHdl, Button *, void )
if ( GetSaveInData() != pData )
{
m_pSaveInListBox->SelectEntryPos( nInsertPos );
- m_pSaveInListBox->GetSelectHdl().Call(this);
+ m_pSaveInListBox->GetSelectHdl().Call(*m_pSaveInListBox);
}
SvxConfigEntry* pToolbar =
@@ -4445,7 +4434,7 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, NewToolbarHdl, Button *, void )
nInsertPos = m_pTopLevelListBox->InsertEntry( pToolbar->GetName() );
m_pTopLevelListBox->SetEntryData( nInsertPos, pToolbar );
m_pTopLevelListBox->SelectEntryPos( nInsertPos );
- m_pTopLevelListBox->GetSelectHdl().Call(this);
+ m_pTopLevelListBox->GetSelectHdl().Call(*m_pTopLevelListBox);
pData->SetModified();
}
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 347d1ab..ae2ef79 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -97,7 +97,7 @@ void SvxEventConfigPage::LateInit( const uno::Reference< frame::XFrame >& _rxFra
InitAndSetHandler( m_xAppEvents, m_xDocumentEvents, m_xDocumentModifiable );
- SelectHdl_Impl( NULL );
+ SelectHdl_Impl( *m_pSaveInListBox );
}
SvxEventConfigPage::~SvxEventConfigPage()
@@ -167,10 +167,8 @@ void SvxEventConfigPage::ImplInitDocument()
}
}
-IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *, pBox )
+IMPL_LINK_NOARG_TYPED( SvxEventConfigPage, SelectHdl_Impl, ListBox&, void )
{
- (void)pBox;
-
bool* bApp = static_cast<bool*>(m_pSaveInListBox->GetEntryData(
m_pSaveInListBox->GetSelectEntryPos()));
@@ -209,7 +207,6 @@ IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *, pBox )
}
mpImpl->pEventLB->SetUpdateMode( true );
- return sal_IntPtr(true);
}
bool SvxEventConfigPage::FillItemSet( SfxItemSet* rSet )
diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx
index e3b25e6..c1f283f 100644
--- a/cui/source/customize/eventdlg.hxx
+++ b/cui/source/customize/eventdlg.hxx
@@ -37,7 +37,7 @@ class SvxEventConfigPage : public _SvxMacroTabPage
bool bAppConfig;
- DECL_LINK( SelectHdl_Impl, ListBox* );
+ DECL_LINK_TYPED( SelectHdl_Impl, ListBox&, void );
SvxEventConfigPage (const SvxEventConfigPage &) SAL_DELETED_FUNCTION;
SvxEventConfigPage & operator= (const SvxEventConfigPage &) SAL_DELETED_FUNCTION;
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 02034c5..a64911f 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -783,7 +783,7 @@ LanguageType SpellDialog::GetSelectedLang_Impl() const
}
-IMPL_LINK(SpellDialog, LanguageSelectHdl, SvxLanguageBox*, pBox)
+IMPL_LINK_TYPED(SpellDialog, LanguageSelectHdl, ListBox&, rBox, void)
{
//If selected language changes, then add->list should be regenerated to
//match
@@ -795,7 +795,7 @@ IMPL_LINK(SpellDialog, LanguageSelectHdl, SvxLanguageBox*, pBox)
m_pSuggestionLB->Clear();
if(!sError.isEmpty())
{
- LanguageType eLanguage = pBox->GetSelectLanguage();
+ LanguageType eLanguage = static_cast<SvxLanguageBox*>(&rBox)->GetSelectLanguage();
Reference <XSpellAlternatives> xAlt = xSpell->spell( sError, eLanguage,
Sequence< PropertyValue >() );
if( xAlt.is() )
@@ -809,7 +809,6 @@ IMPL_LINK(SpellDialog, LanguageSelectHdl, SvxLanguageBox*, pBox)
m_pSentenceED->AddUndoAction(new SpellUndoAction_Impl(SPELLUNDO_CHANGE_LANGUAGE, aDialogUndoLink));
}
SpellDialog::UpdateBoxes_Impl();
- return 0;
}
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index fd605cd..6d83d55 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -359,7 +359,7 @@ void SvxCharacterMap::init()
m_pFontLB->SelectEntry( aDefStr );
else if ( m_pFontLB->GetEntryCount() )
m_pFontLB->SelectEntryPos(0);
- FontSelectHdl(m_pFontLB);
+ FontSelectHdl(*m_pFontLB);
m_pOKBtn->SetClickHdl( LINK( this, SvxCharacterMap, OKHdl ) );
m_pFontLB->SetSelectHdl( LINK( this, SvxCharacterMap, FontSelectHdl ) );
@@ -388,7 +388,7 @@ void SvxCharacterMap::SetCharFont( const vcl::Font& rFont )
m_pFontLB->SelectEntry( aTmp.GetName() );
aFont = aTmp;
- FontSelectHdl(m_pFontLB);
+ FontSelectHdl(*m_pFontLB);
// for compatibility reasons
ModalDialog::SetFont( aFont );
@@ -424,7 +424,7 @@ void SvxCharacterMap::fillAllSubsets(ListBox &rListBox)
-IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl)
+IMPL_LINK_NOARG_TYPED(SvxCharacterMap, FontSelectHdl, ListBox&, void)
{
const sal_Int32 nPos = m_pFontLB->GetSelectEntryPos();
const sal_uInt16 nFont = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFontLB->GetEntryData( nPos ));
@@ -473,13 +473,11 @@ IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl)
m_pSubsetText->Enable(bNeedSubset);
m_pSubsetLB->Enable(bNeedSubset);
-
- return 0;
}
-IMPL_LINK_NOARG(SvxCharacterMap, SubsetSelectHdl)
+IMPL_LINK_NOARG_TYPED(SvxCharacterMap, SubsetSelectHdl, ListBox&, void)
{
const sal_Int32 nPos = m_pSubsetLB->GetSelectEntryPos();
const Subset* pSubset = static_cast<const Subset*> (m_pSubsetLB->GetEntryData(nPos));
@@ -489,7 +487,6 @@ IMPL_LINK_NOARG(SvxCharacterMap, SubsetSelectHdl)
m_pShowSet->SelectCharacter( cFirst );
}
m_pSubsetLB->SelectEntryPos( nPos );
- return 0;
}
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index cf5b2d1..e5fd633 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -409,19 +409,16 @@ IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnFocusGrabbed, Control&, void)
m_pcmbSearchText->SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
}
-IMPL_LINK(FmSearchDialog, OnPositionSelected, ListBox*, pBox)
+IMPL_LINK_TYPED(FmSearchDialog, OnPositionSelected, ListBox&, rBox, void)
{
- (void) pBox; // avoid warning
- DBG_ASSERT(pBox->GetSelectEntryCount() == 1, "FmSearchDialog::OnMethodSelected : unerwartet : nicht genau ein Eintrag selektiert !");
+ DBG_ASSERT(rBox.GetSelectEntryCount() == 1, "FmSearchDialog::OnMethodSelected : unerwartet : nicht genau ein Eintrag selektiert !");
m_pSearchEngine->SetPosition(m_plbPosition->GetSelectEntryPos());
- return 0;
}
-IMPL_LINK(FmSearchDialog, OnFieldSelected, ListBox*, pBox)
+IMPL_LINK_TYPED(FmSearchDialog, OnFieldSelected, ListBox&, rBox, void)
{
- (void) pBox; // avoid warning
- DBG_ASSERT(pBox->GetSelectEntryCount() == 1, "FmSearchDialog::OnFieldSelected : unerwartet : nicht genau ein Eintrag selektiert !");
+ DBG_ASSERT(rBox.GetSelectEntryCount() == 1, "FmSearchDialog::OnFieldSelected : unerwartet : nicht genau ein Eintrag selektiert !");
m_pSearchEngine->RebuildUsedFields(m_prbAllFields->IsChecked() ? -1 : (sal_Int16)m_plbField->GetSelectEntryPos());
// calls m_pSearchEngine->InvalidatePreviousLoc too
@@ -429,7 +426,6 @@ IMPL_LINK(FmSearchDialog, OnFieldSelected, ListBox*, pBox)
sal_Int32 nCurrentContext = m_plbForm->GetSelectEntryPos();
if (nCurrentContext != LISTBOX_ENTRY_NOTFOUND)
m_arrContextFields[nCurrentContext] = OUString(m_plbField->GetSelectEntry());
- return 0;
}
IMPL_LINK_TYPED(FmSearchDialog, OnCheckBoxToggled, CheckBox&, rBox, void)
@@ -557,10 +553,9 @@ void FmSearchDialog::InitContext(sal_Int16 nContext)
m_pftRecord->SetText(OUString::number(fmscContext.xCursor->getRow()));
}
-IMPL_LINK( FmSearchDialog, OnContextSelection, ListBox*, pBox)
+IMPL_LINK_TYPED( FmSearchDialog, OnContextSelection, ListBox&, rBox, void)
{
- InitContext(pBox->GetSelectEntryPos());
- return 0L;
+ InitContext(rBox.GetSelectEntryPos());
}
void FmSearchDialog::EnableSearchUI(bool bEnable)
@@ -776,7 +771,7 @@ void FmSearchDialog::LoadParams()
if (nInitialField == LISTBOX_ENTRY_NOTFOUND)
nInitialField = 0;
m_plbField->SelectEntryPos(nInitialField);
- LINK(this, FmSearchDialog, OnFieldSelected).Call(m_plbField);
+ LINK(this, FmSearchDialog, OnFieldSelected).Call(*m_plbField);
// all fields/single field (AFTER selecting the field because OnClickedFieldRadios expects a valid value there)
if (aParams.bAllFields)
{
@@ -793,7 +788,7 @@ void FmSearchDialog::LoadParams()
}
m_plbPosition->SelectEntryPos(aParams.nPosition);
- LINK(this, FmSearchDialog, OnPositionSelected).Call(m_plbPosition);
+ LINK(this, FmSearchDialog, OnPositionSelected).Call(*m_plbPosition);
// field formatting/case sensitivity/direction
m_pcbUseFormat->Check(aParams.bUseFormatter);
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index bb703c2..f820a62 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -420,7 +420,7 @@ IMPL_LINK_NOARG_TYPED(TakeProgress, CleanUpHdl, void*, void)
aRemainingVector.clear();
mpBrowser->m_pLbxFound->SetUpdateMode( true );
- mpBrowser->SelectFoundHdl( NULL );
+ mpBrowser->SelectFoundHdl( *mpBrowser->m_pLbxFound );
GetParent()->LeaveWait();
EndDialog( RET_OK );
@@ -1172,7 +1172,7 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickTakeAllHdl, Button*, void)
-IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl)
+IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, SelectFoundHdl, ListBox&, void)
{
if( bInputAllowed )
{
@@ -1199,8 +1199,6 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl)
if( bPreviewPossible && m_pCbxPreview->IsChecked() )
aPreviewTimer.Start();
}
-
- return 0;
}
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 727042d..92281b8 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -370,7 +370,7 @@ namespace svx
, m_bInSelectionUpdate( false )
{
m_aValueSet->SetSelectHdl( LINK( this, SuggestionDisplay, SelectSuggestionValueSetHdl ) );
- m_aListBox->SetSelectHdl( LINK( this, SuggestionDisplay, SelectSuggestionHdl ) );
+ m_aListBox->SetSelectHdl( LINK( this, SuggestionDisplay, SelectSuggestionListBoxHdl ) );
m_aValueSet->SetLineCount( LINE_CNT );
m_aValueSet->SetStyle( m_aValueSet->GetStyle() | WB_ITEMBORDER | WB_FLATVALUESET | WB_VSCROLL );
@@ -483,10 +483,14 @@ namespace svx
{
SelectSuggestionHdl(pControl);
}
- IMPL_LINK( SuggestionDisplay, SelectSuggestionHdl, Control*, pControl )
+ IMPL_LINK_TYPED( SuggestionDisplay, SelectSuggestionListBoxHdl, ListBox&, rControl, void )
+ {
+ SelectSuggestionHdl(&rControl);
+ }
+ void SuggestionDisplay::SelectSuggestionHdl( Control* pControl )
{
if( m_bInSelectionUpdate )
- return 0L;
+ return;
m_bInSelectionUpdate = true;
if( pControl == m_aListBox.get() )
@@ -501,7 +505,6 @@ namespace svx
}
m_bInSelectionUpdate = false;
m_aSelectLink.Call( *this );
- return 0L;
}
void SuggestionDisplay::SetSelectHdl( const Link<SuggestionDisplay&,void>& rLink )
@@ -1535,10 +1538,9 @@ namespace svx
return 0;
}
- IMPL_LINK_NOARG( HangulHanjaEditDictDialog, BookLBSelectHdl )
+ IMPL_LINK_NOARG_TYPED( HangulHanjaEditDictDialog, BookLBSelectHdl, ListBox&, void )
{
InitEditDictDialog( m_aBookLB->GetSelectEntryPos() );
- return 0;
}
IMPL_LINK_NOARG_TYPED( HangulHanjaEditDictDialog, NewPBPushHdl, Button*, void )
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index d04fd57..dc7300f 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -48,13 +48,12 @@ IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, SelectHdl_Impl, SvTreeListBox*, void)
m_pDelBtn->Enable(bEnable && bIsSelected);
}
-IMPL_LINK_NOARG(SvxPathSelectDialog, SelectHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, SelectHdl_Impl, ListBox&, void)
{
sal_uLong nCount = m_pPathLB->GetEntryCount();
bool bIsSelected = m_pPathLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND;
bool bEnable = nCount > 1;
m_pDelBtn->Enable(bEnable && bIsSelected);
- return 0;
}
IMPL_LINK_TYPED( SvxMultiPathDialog, CheckHdl_Impl, SvTreeListBox*, pBox, void )
@@ -125,7 +124,7 @@ IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, AddHdl_Impl, Button*, void)
m_pPathLB->SetEntryData( nPos, new OUString( aURL ) );
}
- SelectHdl_Impl( NULL );
+ SelectHdl_Impl( *m_pPathLB );
}
}
@@ -170,7 +169,7 @@ IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, DelHdl_Impl, Button*, void)
m_pPathLB->SelectEntryPos( nPos );
}
- SelectHdl_Impl( NULL );
+ SelectHdl_Impl( *m_pPathLB );
}
SvxMultiPathDialog::SvxMultiPathDialog(vcl::Window* pParent)
@@ -216,7 +215,7 @@ SvxPathSelectDialog::SvxPathSelectDialog(vcl::Window* pParent)
m_pAddBtn->SetClickHdl( LINK( this, SvxPathSelectDialog, AddHdl_Impl ) );
m_pDelBtn->SetClickHdl( LINK( this, SvxPathSelectDialog, DelHdl_Impl ) );
- SelectHdl_Impl( NULL );
+ SelectHdl_Impl( *m_pPathLB );
}
SvxMultiPathDialog::~SvxMultiPathDialog()
@@ -354,7 +353,7 @@ void SvxPathSelectDialog::SetPath(const OUString& rPath)
while (nIndex >= 0);
}
- SelectHdl_Impl( NULL );
+ SelectHdl_Impl( *m_pPathLB );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index afec285..b6f3013 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -69,17 +69,14 @@ void SvPasteObjectDialog::SelectObject()
if (m_pLbInsertList->GetEntryCount())
{
m_pLbInsertList->SelectEntryPos(0);
- SelectHdl(m_pLbInsertList);
+ SelectHdl(*m_pLbInsertList);
}
}
-IMPL_LINK( SvPasteObjectDialog, SelectHdl, ListBox *, pListBox )
+IMPL_LINK_NOARG_TYPED( SvPasteObjectDialog, SelectHdl, ListBox&, void )
{
- (void)pListBox;
-
if ( !m_pOKButton->IsEnabled() )
m_pOKButton->Enable();
- return 0;
}
IMPL_LINK_NOARG_TYPED( SvPasteObjectDialog, DoubleClickHdl, ListBox&, void )
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 4842aff..495d46f 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -351,16 +351,15 @@ IMPL_LINK_TYPED( SvxThesaurusDialog, LeftBtnHdl_Impl, Button *, pBtn, void )
}
}
-IMPL_LINK( SvxThesaurusDialog, LanguageHdl_Impl, ListBox*, pLB )
+IMPL_LINK_TYPED( SvxThesaurusDialog, LanguageHdl_Impl, ListBox&, rLB, void )
{
- OUString aLangText( pLB->GetSelectEntry() );
+ OUString aLangText( rLB.GetSelectEntry() );
LanguageType nLang = SvtLanguageTable::GetLanguageType( aLangText );
DBG_ASSERT( nLang != LANGUAGE_NONE && nLang != LANGUAGE_DONTKNOW, "failed to get language" );
if (xThesaurus->hasLocale( LanguageTag::convertToLocale( nLang ) ))
nLookUpLanguage = nLang;
SetWindowTitle( nLang );
LookUp_Impl();
- return 0;
}
void SvxThesaurusDialog::LookUp_Impl()
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 7509de0..907beea 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -183,7 +183,7 @@ private:
DECL_LINK_TYPED(UndoHdl, Button*, void);
DECL_LINK_TYPED( AddToDictSelectHdl, MenuButton*, void );
DECL_LINK_TYPED( AddToDictClickHdl, Button*, void );
- DECL_LINK( LanguageSelectHdl, SvxLanguageBox* );
+ DECL_LINK_TYPED( LanguageSelectHdl, ListBox&, void );
DECL_LINK_TYPED( DialogUndoHdl, SpellUndoAction_Impl&, void );
DECL_LINK( HandleHyperlink, FixedHyperlink * );
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index b520e48..cc43a73 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -77,7 +77,7 @@ private:
bool HasAlignmentChanged( const SfxItemSet& rNew, sal_uInt16 nWhich ) const;
- DECL_LINK( UpdateEnableHdl, void* );
+ DECL_LINK_TYPED( UpdateEnableHdl, ListBox&, void );
DECL_LINK_TYPED( UpdateEnableClickHdl, Button*, void );
private:
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index eab6248..0110637 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -49,7 +49,7 @@ class OfaAutoCorrDlg : public SfxTabDialog
sal_uInt16 m_nReplacePageId;
sal_uInt16 m_nExceptionsPageId;
- DECL_LINK(SelectLanguageHdl, ListBox*);
+ DECL_LINK_TYPED(SelectLanguageHdl, ListBox&, void);
public:
OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet *pSet);
@@ -317,7 +317,7 @@ private:
DECL_LINK_TYPED(NewDelButtonHdl, Button*, void);
DECL_LINK_TYPED(NewDelActionHdl, AutoCorrEdit&, bool);
- DECL_LINK(SelectHdl, ListBox*);
+ DECL_LINK_TYPED(SelectHdl, ListBox&, void);
DECL_LINK(ModifyHdl, Edit*);
bool NewDelHdl(void*);
/// Box filled with new language
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 3e2ca3d..b42cc67 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -133,12 +133,12 @@ private:
void ResetFromWallpaperItem( const SfxItemSet& rSet );
DECL_LINK_TYPED( LoadIdleHdl_Impl, Idle*, void );
- DECL_LINK(SelectHdl_Impl, void *);
+ DECL_LINK_TYPED(SelectHdl_Impl, ListBox&, void );
DECL_LINK_TYPED(BrowseHdl_Impl, Button*, void);
DECL_LINK_TYPED( RadioClickHdl_Impl, Button*, void );
DECL_LINK_TYPED( FileClickHdl_Impl, Button*, void );
DECL_LINK_TYPED(BackgroundColorHdl_Impl, ValueSet*, void);
- DECL_LINK( TblDestinationHdl_Impl, ListBox* );
+ DECL_LINK_TYPED( TblDestinationHdl_Impl, ListBox&, void );
};
#endif // INCLUDED_CUI_SOURCE_INC_BACKGRND_HXX
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 3192d51..245d5bc 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -117,8 +117,8 @@ private:
std::set<sal_Int16> maUsedBorderStyles;
// Handler
- DECL_LINK( SelStyleHdl_Impl, ListBox* );
- DECL_LINK( SelColHdl_Impl, ListBox* );
+ DECL_LINK_TYPED( SelStyleHdl_Impl, ListBox&, void );
+ DECL_LINK_TYPED( SelColHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( SelPreHdl_Impl, ValueSet*, void );
DECL_LINK_TYPED( SelSdwHdl_Impl, ValueSet*, void );
DECL_LINK_TYPED( LinesChanged_Impl, LinkParamNone*, void );
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index ff59cf4..c23e1f0 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -326,7 +326,7 @@ private:
bool bInitialised;
SaveInData* pCurrentSaveInData;
- DECL_LINK( SelectSaveInLocation, ListBox * );
+ DECL_LINK_TYPED( SelectSaveInLocation, ListBox&, void );
DECL_LINK_TYPED( AsyncInfoMsg, void*, void );
protected:
@@ -440,7 +440,7 @@ class SvxMenuConfigPage : public SvxConfigPage
{
private:
- DECL_LINK( SelectMenu, ListBox * );
+ DECL_LINK_TYPED( SelectMenu, ListBox&, void );
DECL_LINK_TYPED( SelectMenuEntry, SvTreeListBox *, void );
DECL_LINK_TYPED( NewMenuHdl, Button *, void );
DECL_LINK_TYPED( MenuSelectHdl, MenuButton *, void );
@@ -532,7 +532,7 @@ class SvxToolbarConfigPage : public SvxConfigPage
{
private:
- DECL_LINK( SelectToolbar, ListBox * );
+ DECL_LINK_TYPED( SelectToolbar, ListBox&, void );
DECL_LINK_TYPED( SelectToolbarEntry, SvTreeListBox*, void );
DECL_LINK_TYPED( ToolbarSelectHdl, MenuButton *, void );
DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void );
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index f750d0e..b2415cfd 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -134,6 +134,7 @@ private:
DECL_LINK_TYPED(UpdateHdl_Impl, Idle *, void);
DECL_LINK( FontModifyHdl_Impl, void* );
+ DECL_LINK_TYPED(FontModifyListBoxHdl_Impl, ListBox&, void);
public:
using SfxTabPage::ActivatePage;
@@ -215,11 +216,12 @@ private:
void ResetColor_Impl( const SfxItemSet& rSet );
bool FillItemSetColor_Impl( SfxItemSet& rSet );
- DECL_LINK( SelectHdl_Impl, ListBox* );
+ void SelectHdl_Impl(ListBox*);
+ DECL_LINK_TYPED(SelectListBoxHdl_Impl, ListBox&, 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* );
+ DECL_LINK_TYPED(UpdatePreview_Impl, ListBox&, void);
+ DECL_LINK_TYPED(ColorBoxSelectHdl_Impl, ListBox&, void);
public:
virtual ~SvxCharEffectsPage();
@@ -297,7 +299,7 @@ private:
DECL_LINK( FontModifyHdl_Impl, void *);
DECL_LINK_TYPED( AutoPositionHdl_Impl, Button*, void );
DECL_LINK_TYPED( FitToLineHdl_Impl, Button*, void );
- DECL_LINK( KerningSelectHdl_Impl, void *);
+ DECL_LINK_TYPED( KerningSelectHdl_Impl, ListBox&, void);
DECL_LINK( KerningModifyHdl_Impl, void *);
DECL_LINK_TYPED( LoseFocusHdl_Impl, Control&, void );
DECL_LINK( ScaleWidthModifyHdl_Impl, void *);
@@ -348,7 +350,7 @@ private:
void SetBracket( sal_Unicode cBracket, bool bStart );
DECL_LINK_TYPED(TwoLinesHdl_Impl, Button*, void);
- DECL_LINK( CharacterMapHdl_Impl, ListBox* );
+ DECL_LINK_TYPED(CharacterMapHdl_Impl, ListBox&, void );
public:
virtual ~SvxCharTwoLinesPage();
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index 875ff89..e02333a 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -58,6 +58,7 @@ private:
void FillTypeLB();
DECL_LINK( ChangeAttrHdl_Impl, void * );
+ DECL_LINK_TYPED( ChangeAttrListBoxHdl_Impl, ListBox&, void );
public:
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index c3967d2..f5708e4 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -82,8 +82,8 @@ private:
const SubsetMap* pSubsetMap;
DECL_LINK_TYPED(OKHdl, Button*, void);
- DECL_LINK(FontSelectHdl, void *);
- DECL_LINK(SubsetSelectHdl, void *);
+ DECL_LINK_TYPED(FontSelectHdl, ListBox&, void);
+ DECL_LINK_TYPED(SubsetSelectHdl, ListBox&, void);
DECL_LINK_TYPED(CharDoubleClickHdl, SvxShowCharSet*,void);
DECL_LINK_TYPED(CharSelectHdl, SvxShowCharSet*, void);
DECL_LINK_TYPED(CharHighlightHdl, SvxShowCharSet*, void);
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index eb304a7..e202360 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -163,13 +163,13 @@ private:
DECL_LINK(OnSearchTextModified, void *);
- DECL_LINK( OnPositionSelected, ListBox* );
- DECL_LINK( OnFieldSelected, ListBox* );
+ DECL_LINK_TYPED( OnPositionSelected, ListBox&, void );
+ DECL_LINK_TYPED( OnFieldSelected, ListBox&, void );
DECL_LINK_TYPED( OnFocusGrabbed, Control&, void );
DECL_LINK_TYPED( OnCheckBoxToggled, CheckBox&, void );
- DECL_LINK( OnContextSelection, ListBox* );
+ DECL_LINK_TYPED( OnContextSelection, ListBox&, void );
DECL_LINK_TYPED( OnSearchProgress, const FmSearchProgress*, void );
@@ -184,7 +184,7 @@ inline void FmSearchDialog::SetActiveField(const OUString& strField)
if (nInitialField == LISTBOX_ENTRY_NOTFOUND)
nInitialField = 0;
m_plbField->SelectEntryPos(nInitialField);
- LINK(this, FmSearchDialog, OnFieldSelected).Call(m_plbField);
+ LINK(this, FmSearchDialog, OnFieldSelected).Call(*m_plbField);
}
#endif // INCLUDED_CUI_SOURCE_INC_CUIFMSEARCH_HXX
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 2ab6b08..645c6a9 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -282,7 +282,7 @@ class TPGalleryThemeProperties : public SfxTabPage
DECL_LINK_TYPED( ClickSearchHdl, Button*, void );
DECL_LINK_TYPED( ClickTakeHdl, Button*, void );
DECL_LINK_TYPED( ClickTakeAllHdl, Button*, void );
- DECL_LINK( SelectFoundHdl, void* );
+ DECL_LINK_TYPED( SelectFoundHdl, ListBox&, void );
DECL_LINK( SelectFileTypeHdl, void* );
DECL_LINK_TYPED( DClickFoundHdl, ListBox&, void );
DECL_LINK_TYPED( PreviewTimerHdl, Timer*, void );
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 4514c29..e09587c 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -145,6 +145,7 @@ class SvxTransparenceTabPage : public SvxTabPage
DECL_LINK_TYPED(ClickTransGradientHdl_Impl, Button*, void );
DECL_LINK(ModifyTransparentHdl_Impl, void*);
DECL_LINK(ModifiedTrgrHdl_Impl, void*);
+ DECL_LINK_TYPED(ModifiedTrgrListBoxHdl_Impl, ListBox&, void);
void ActivateLinear(bool bActivate);
void ActivateGradient(bool bActivate);
@@ -263,13 +264,13 @@ private:
OUString maDirectName;
VclPtr<PushButton> m_pBtnImport;
- DECL_LINK(SelectDialogTypeHdl_Impl, void *);
- DECL_LINK( ModifyColorHdl_Impl, void * );
- DECL_LINK( ModifyHatchBckgrdColorHdl_Impl, void * );
- DECL_LINK( ModifyGradientHdl_Impl, void * );
- DECL_LINK( ModifyHatchingHdl_Impl, void * );
+ DECL_LINK_TYPED(SelectDialogTypeHdl_Impl, ListBox&, void);
+ DECL_LINK_TYPED( ModifyColorHdl_Impl, ListBox&, void );
+ DECL_LINK_TYPED( ModifyHatchBckgrdColorHdl_Impl, ListBox&, void );
+ DECL_LINK_TYPED( ModifyGradientHdl_Impl, ListBox&, void );
+ DECL_LINK_TYPED( ModifyHatchingHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( ToggleHatchBckgrdColorHdl_Impl, CheckBox&, void );
- DECL_LINK( ModifyBitmapHdl_Impl, void * );
+ DECL_LINK_TYPED( ModifyBitmapHdl_Impl, ListBox&, void );
DECL_LINK( ModifyStepCountHdl_Impl, void* );
DECL_LINK_TYPED( ModifyStepCountClickHdl_Impl, Button*, void );
@@ -353,6 +354,7 @@ private:
DECL_LINK_TYPED( ClickShadowHdl_Impl, Button*, void );
DECL_LINK( ModifyShadowHdl_Impl, void * );
+ DECL_LINK_TYPED( SelectShadowHdl_Impl, ListBox&, void );
public:
SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
@@ -425,8 +427,9 @@ private:
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_TYPED( ChangeGradientHdl_Impl, ListBox&, void );
DECL_LINK( ModifiedHdl_Impl, void * );
+ DECL_LINK_TYPED( ModifiedListBoxHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void );
DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void );
@@ -500,8 +503,9 @@ private:
SfxMapUnit m_ePoolUnit;
- DECL_LINK( ChangeHatchHdl_Impl, void * );
+ DECL_LINK_TYPED( ChangeHatchHdl_Impl, ListBox&, void );
DECL_LINK( ModifiedHdl_Impl, void * );
+ DECL_LINK_TYPED( ModifiedListBoxHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void );
DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void );
DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void );
@@ -588,9 +592,9 @@ private:
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_TYPED( ChangeBitmapHdl_Impl, ListBox&, void );
+ DECL_LINK_TYPED( ChangePixelColorHdl_Impl, ListBox&, void );
+ DECL_LINK_TYPED( ChangeBackgrndColorHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void );
DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void );
@@ -721,9 +725,9 @@ private:
DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void );
DECL_LINK_TYPED( ClickWorkOnHdl_Impl, Button*, void );
- DECL_LINK( SelectColorLBHdl_Impl, void * );
+ DECL_LINK_TYPED( SelectColorLBHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( SelectValSetHdl_Impl, ValueSet*, void );
- DECL_LINK( SelectColorModelHdl_Impl, void * );
+ DECL_LINK_TYPED( SelectColorModelHdl_Impl, ListBox&, void );
void ChangeColor(const Color &rNewColor);
DECL_LINK( ModifiedHdl_Impl, void * );
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index d912658..b1dcf0a 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -176,18 +176,24 @@ private:
DECL_LINK( SizeHdl_Impl, MetricField * );
DECL_LINK_TYPED( RatioHdl_Impl, Button*, void );
- DECL_LINK( ClickInvisibleHdl_Impl, void * );
- DECL_LINK( ChangeStartHdl_Impl, void * );
+ DECL_LINK_TYPED( ClickInvisibleHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( ChangeStartClickHdl_Impl, Button*, void );
- DECL_LINK( ChangeEndHdl_Impl, void * );
+ DECL_LINK_TYPED( ChangeStartListBoxHdl_Impl, ListBox&, void );
+ DECL_LINK( ChangeStartModifyHdl_Impl, void * );
+ void ChangeStartHdl_Impl(void*);
+ DECL_LINK_TYPED( ChangeEndListBoxHdl_Impl, ListBox&, void );
+ DECL_LINK( ChangeEndModifyHdl_Impl, void * );
DECL_LINK_TYPED( ChangeEndClickHdl_Impl, Button*, void );
- DECL_LINK( ChangePreviewHdl_Impl, void * );
+ void ChangeEndHdl_Impl(void*);
+ DECL_LINK_TYPED( ChangePreviewListBoxHdl_Impl, ListBox&, void );
+ DECL_LINK( ChangePreviewModifyHdl_Impl, void* );
+ void ChangePreviewHdl_Impl(void*);
DECL_LINK( ChangeTransparentHdl_Impl, void * );
- DECL_LINK( ChangeEdgeStyleHdl_Impl, void * );
+ DECL_LINK_TYPED( ChangeEdgeStyleHdl_Impl, ListBox&, void );
- // LineCaps
- DECL_LINK ( ChangeCapStyleHdl_Impl, void * );
+ // LineCaps
+ DECL_LINK_TYPED( ChangeCapStyleHdl_Impl, ListBox&, void );
bool FillXLSet_Impl();
@@ -285,14 +291,16 @@ private:
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_TYPED( SelectLinestyleListBoxHdl_Impl, ListBox&, void );
+ void SelectLinestyleHdl_Impl(ListBox*);
DECL_LINK( ChangePreviewHdl_Impl, void * );
DECL_LINK( ChangeNumber1Hdl_Impl, void * );
DECL_LINK( ChangeNumber2Hdl_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 * );
+ DECL_LINK_TYPED( SelectTypeListBoxHdl_Impl, ListBox&, void );
+ void SelectTypeHdl_Impl(ListBox*);
void CheckChanges_Impl();
@@ -361,7 +369,7 @@ private:
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 * );
+ DECL_LINK_TYPED( SelectLineEndHdl_Impl, ListBox&, void );
long ChangePreviewHdl_Impl( void* p );
void CheckChanges_Impl();
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index 42a85b2a..0151c20 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -79,8 +79,9 @@ namespace svx
virtual void LoseFocus() SAL_OVERRIDE;
virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
- DECL_LINK( SelectSuggestionHdl, Control* );
+ DECL_LINK_TYPED( SelectSuggestionListBoxHdl, ListBox&, void );
DECL_LINK_TYPED( SelectSuggestionValueSetHdl, ValueSet*, void );
+ void SelectSuggestionHdl(Control*);
void SetHelpIds();
@@ -297,7 +298,7 @@ namespace svx
DECL_LINK( EditModifyHdl3, Edit* );
DECL_LINK( EditModifyHdl4, Edit* );
- DECL_LINK( BookLBSelectHdl, void* );
+ DECL_LINK_TYPED( BookLBSelectHdl, ListBox&, void );
DECL_LINK_TYPED( NewPBPushHdl, Button*, void );
DECL_LINK_TYPED( DeletePBPushHdl, Button*, void );
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 571559a..03edc7b 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -65,8 +65,8 @@ private:
void SetupAnsatz_Impl( sal_uInt16 nType );
void SetupType_Impl( sal_uInt16 nType );
- DECL_LINK( AnsatzSelectHdl_Impl, ListBox * );
- DECL_LINK( AnsatzRelSelectHdl_Impl, ListBox * );
+ DECL_LINK_TYPED( AnsatzSelectHdl_Impl, ListBox&, void );
+ DECL_LINK_TYPED( AnsatzRelSelectHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( LineOptHdl_Impl, Button *, void );
DECL_LINK_TYPED( SelectCaptTypeHdl_Impl, ValueSet*, void );
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index 81ffca5..5d68a77 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -62,6 +62,7 @@ private:
DECL_LINK_TYPED( ClickAutoPosHdl_Impl, Button*, void );
DECL_LINK( ChangeAttrHdl_Impl, void * );
+ DECL_LINK_TYPED( ChangeAttrListBoxHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( ChangeAttrClickHdl_Impl, Button*, void );
public:
diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx
index 5415fb2..f462570 100644
--- a/cui/source/inc/multipat.hxx
+++ b/cui/source/inc/multipat.hxx
@@ -66,7 +66,7 @@ private:
DECL_LINK_TYPED(AddHdl_Impl, Button*, void);
DECL_LINK_TYPED(DelHdl_Impl, Button*, void);
- DECL_LINK(SelectHdl_Impl, void *);
+ DECL_LINK_TYPED(SelectHdl_Impl, ListBox&, void);
public:
SvxPathSelectDialog(vcl::Window* pParent);
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 401d399..2c20479 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -153,9 +153,10 @@ private:
// Handler
DECL_LINK_TYPED( LostFocusHdl_Impl, Control&, void );
DECL_LINK_TYPED( DoubleClickHdl_Impl, SvTreeListBox*, bool );
- DECL_LINK( SelFormatHdl_Impl, void * );
- DECL_LINK_TYPED( SelFormatListBoxHdl_Impl, SvTreeListBox*, void );
+ DECL_LINK_TYPED( SelFormatListBoxHdl_Impl, ListBox&, void );
+ DECL_LINK_TYPED( SelFormatTreeListBoxHdl_Impl, SvTreeListBox*, void );
DECL_LINK_TYPED( SelFormatClickHdl_Impl, Button*, void );
+ void SelFormatHdl_Impl(void*);
DECL_LINK_TYPED( ClickHdl_Impl, Button*, void );
DECL_LINK( EditHdl_Impl, Edit* );
DECL_LINK( OptHdl_Impl, void * );
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 5b96a90..67e0445 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -320,19 +320,20 @@ class SvxNumOptionsTabPage : public SfxTabPage
void SwitchNumberType( sal_uInt8 nType, bool bBmp = false );
void CheckForStartValue_Impl(sal_uInt16 nNumberingType);
- DECL_LINK( NumberTypeSelectHdl_Impl, ListBox * );
- DECL_LINK( LevelHdl_Impl, ListBox * );
+ DECL_LINK_TYPED( NumberTypeSelectHdl_Impl, ListBox&, void );
+ DECL_LINK_TYPED( LevelHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( PopupActivateHdl_Impl, Menu *, bool);
DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void );
DECL_LINK_TYPED( BulletHdl_Impl, Button*, void);
DECL_LINK( SizeHdl_Impl, MetricField * );
DECL_LINK_TYPED( RatioHdl_Impl, Button*, void );
- DECL_LINK( CharFmtHdl_Impl, void *);
- DECL_LINK( EditModifyHdl_Impl, Edit * );
+ DECL_LINK_TYPED( CharFmtHdl_Impl, ListBox&, void );
+ DECL_LINK( EditModifyHdl_Impl, Edit* );
+ DECL_LINK_TYPED( EditListBoxHdl_Impl, ListBox&, void );
DECL_LINK( AllLevelHdl_Impl, NumericField * );
- DECL_LINK( OrientHdl_Impl, ListBox * );
+ DECL_LINK_TYPED( OrientHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( SameLevelHdl_Impl, Button*, void );
- DECL_LINK( BulColorHdl_Impl, ColorListBox* );
+ DECL_LINK_TYPED( BulColorHdl_Impl, ListBox&, void );
DECL_LINK( BulRelSizeHdl_Impl, MetricField *);
DECL_LINK_TYPED( PreviewInvalidateHdl_Impl, Timer *, void);
@@ -426,8 +427,8 @@ class SvxNumPositionTabPage : public SfxTabPage
void InitControls();
- DECL_LINK( LevelHdl_Impl, ListBox * );
- DECL_LINK( EditModifyHdl_Impl, void *);
+ DECL_LINK_TYPED( LevelHdl_Impl, ListBox&, void );
+ DECL_LINK_TYPED( EditModifyHdl_Impl, ListBox&, void);
DECL_LINK( DistanceHdl_Impl, MetricField * );
DECL_LINK_TYPED( DistanceFocusHdl_Impl, Control&, void );
DECL_LINK_TYPED( RelativeHdl_Impl, Button*, void );
@@ -436,7 +437,7 @@ class SvxNumPositionTabPage : public SfxTabPage
void InitPosAndSpaceMode();
void ShowControlsDependingOnPosAndSpaceMode();
- DECL_LINK(LabelFollowedByHdl_Impl, void *);
+ DECL_LINK_TYPED(LabelFollowedByHdl_Impl, ListBox&, void);
DECL_LINK( ListtabPosHdl_Impl, MetricField* );
DECL_LINK( AlignAtHdl_Impl, MetricField* );
DECL_LINK( IndentAtHdl_Impl, MetricField* );
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index 441f311..d88d659 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -48,7 +48,7 @@ class SvxAsianLayoutPage : public SfxTabPage
SvxAsianLayoutPage_Impl* pImpl;
- DECL_LINK(LanguageHdl, void *);
+ DECL_LINK_TYPED(LanguageHdl, ListBox&, void);
DECL_LINK_TYPED(ChangeStandardHdl, Button*, void);
DECL_LINK(ModifyHdl, Edit*);
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index fe04cab..d909e84 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -129,8 +129,8 @@ private:
bool bDoNothing;
bool bDicIsReadonly;
- DECL_LINK(SelectBookHdl_Impl, void *);
- DECL_LINK(SelectLangHdl_Impl, void *);
+ DECL_LINK_TYPED(SelectBookHdl_Impl, ListBox&, void);
+ DECL_LINK_TYPED(SelectLangHdl_Impl, ListBox&, void);
DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void);
DECL_LINK_TYPED(NewDelButtonHdl, Button*, void);
DECL_LINK_TYPED(NewDelActionHdl, SvxDictEdit&, bool);
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 76726d3..906ea8c 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -78,10 +78,11 @@ class SvxEditModulesDlg : public ModalDialog
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_TYPED( LangSelectListBoxHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( BoxCheckButtonHdl_Impl2, SvLBoxButtonData*, void );
DECL_LINK_TYPED( BoxCheckButtonHdl_Impl, SvTreeListBox*, void );
DECL_LINK(OpenURLHdl_Impl, void *);
+ void LangSelectHdl_Impl(ListBox*);
public:
SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rData);
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 1d55426..0c5b225 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -149,7 +149,7 @@ private:
bool mbEnableDrawingLayerFillStyles : 1;
void Init_Impl();
- DECL_LINK( LayoutHdl_Impl, void *);
+ DECL_LINK_TYPED( LayoutHdl_Impl, ListBox&, void);
DECL_LINK_TYPED( PaperBinHdl_Impl, Control&, void);
DECL_LINK_TYPED( SwapOrientation_Impl, Button*, void );
void SwapFirstValues_Impl( bool bSet );
@@ -158,10 +158,10 @@ private:
DECL_LINK_TYPED( CenterHdl_Impl, Button*, void);
void UpdateExample_Impl( bool bResetbackground = false );
- DECL_LINK( PaperSizeSelect_Impl, ListBox* );
+ DECL_LINK_TYPED( PaperSizeSelect_Impl, ListBox&, void );
DECL_LINK( PaperSizeModify_Impl, void *);
- DECL_LINK( FrameDirectionModify_Impl, ListBox* );
+ DECL_LINK_TYPED( FrameDirectionModify_Impl, ListBox&, void );
void ResetBackground_Impl( const SfxItemSet& rSet );
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index fdb840c..b4b401e 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -90,7 +90,7 @@ private:
void Init_Impl();
void UpdateExample_Impl();
- DECL_LINK( LineDistHdl_Impl, ListBox* );
+ DECL_LINK_TYPED( LineDistHdl_Impl, ListBox&, void );
DECL_LINK(ModifyHdl_Impl, void *);
DECL_LINK_TYPED( AutoHdl_Impl, Button*, void );
@@ -154,8 +154,8 @@ class SvxParaAlignTabPage : public SfxTabPage
VclPtr<svx::FrameDirectionListBox> m_pTextDirectionLB;
DECL_LINK_TYPED(AlignHdl_Impl, Button*, void);
- DECL_LINK(LastLineHdl_Impl, void *);
- DECL_LINK(TextDirectionHdl_Impl, void *);
+ DECL_LINK_TYPED(LastLineHdl_Impl, ListBox&, void);
+ DECL_LINK_TYPED(TextDirectionHdl_Impl, ListBox&, void);
void UpdateExample_Impl();
@@ -262,8 +262,8 @@ private:
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* );
+ DECL_LINK_TYPED( PageBreakPosHdl_Impl, ListBox&, void );
+ DECL_LINK_TYPED( PageBreakTypeHdl_Impl, ListBox&, void );
virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
};
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index 26a439f..3d5aa61 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -50,7 +50,7 @@ class SvPasteObjectDialog : public ModalDialog
FixedText& ObjectSource() { return *m_pFtObjectSource; }
void SelectObject();
- DECL_LINK( SelectHdl, ListBox * );
+ DECL_LINK_TYPED( SelectHdl, ListBox&, void );
DECL_LINK_TYPED( DoubleClickHdl, ListBox&, void );
public:
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index 6003fc6..7635ec6 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -103,8 +103,8 @@ class SvxSwPosSizeTabPage : public SfxTabPage
DECL_LINK_TYPED(RangeModifyHdl, Control&, void);
DECL_LINK_TYPED(RangeModifyClickHdl, Button*, void);
DECL_LINK_TYPED(AnchorTypeHdl, Button*, void);
- DECL_LINK( PosHdl, ListBox * );
- DECL_LINK( RelHdl, ListBox * );
+ DECL_LINK_TYPED( PosHdl, ListBox&, void );
+ DECL_LINK_TYPED( RelHdl, ListBox&, void );
DECL_LINK_TYPED(MirrorHdl, Button*, void);
DECL_LINK( ModifyHdl, Edit * );
DECL_LINK_TYPED(ProtectHdl, Button*, void);
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index c0a1896..725ef2f 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -65,7 +65,7 @@ private:
FieldUnit eFUnit;
SfxMapUnit eUnit;
- DECL_LINK( SelectEffectHdl_Impl, void * );
+ DECL_LINK_TYPED( SelectEffectHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( ClickEndlessHdl_Impl, Button*, void );
DECL_LINK_TYPED( ClickAutoHdl_Impl, Button*, void );
DECL_LINK_TYPED( ClickPixelHdl_Impl, Button*, void );
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index 26f7523..a598f2e 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -144,7 +144,7 @@ public:
// Handler
DECL_LINK_TYPED( ReplaceBtnHdl_Impl, Button *, void );
DECL_LINK_TYPED( LeftBtnHdl_Impl, Button *, void );
- DECL_LINK( LanguageHdl_Impl, ListBox * );
+ DECL_LINK_TYPED( LanguageHdl_Impl, ListBox&, void );
DECL_LINK( WordSelectHdl_Impl, ComboBox * );
DECL_LINK_TYPED( AlternativesSelectHdl_Impl, SvTreeListBox*, void );
DECL_LINK_TYPED( AlternativesDoubleClickHdl_Impl, SvTreeListBox*, bool );
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 9f2ac04..1ccc1ce 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -139,7 +139,7 @@ SvxAsianLayoutPage::SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet&
get(m_pEndED, "end");
get(m_pHintFT, "hintft");
- LanguageHdl(m_pLanguageLB);
+ LanguageHdl(*m_pLanguageLB);
m_pLanguageLB->SetSelectHdl(LINK(this, SvxAsianLayoutPage, LanguageHdl));
m_pStandardCB->SetClickHdl(LINK(this, SvxAsianLayoutPage, ChangeStandardHdl));
Link<> aLk(LINK(this, SvxAsianLayoutPage, ModifyHdl));
@@ -310,10 +310,10 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet* )
eLastUsedLanguageTypeForForbiddenCharacters = LANGUAGE_CHINESE_TRADITIONAL;
}
m_pLanguageLB->SelectLanguage( eLastUsedLanguageTypeForForbiddenCharacters );
- LanguageHdl(m_pLanguageLB);
+ LanguageHdl(*m_pLanguageLB);
}
-IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl)
+IMPL_LINK_NOARG_TYPED(SvxAsianLayoutPage, LanguageHdl, ListBox&, void)
{
//set current value
LanguageType eSelectLanguage = m_pLanguageLB->GetSelectLanguage();
@@ -374,8 +374,6 @@ IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl)
m_pEndFT->Enable(bAvail);
m_pStartED->SetText(sStart);
m_pEndED->SetText(sEnd);
-
- return 0;
}
IMPL_LINK_TYPED(SvxAsianLayoutPage, ChangeStandardHdl, Button*, pBox, void)
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 9f12dc0..555915e 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -115,7 +115,7 @@ void SvxDefaultColorOptPage::Construct()
FillColorBox();
m_pLbChartColors->SelectEntryPos( 0 );
- ListClickedHdl(m_pLbChartColors);
+ ListClickedHdl(*m_pLbChartColors);
}
@@ -135,7 +135,7 @@ bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet* rOutAttrs )
void SvxDefaultColorOptPage::Reset( const SfxItemSet* )
{
m_pLbChartColors->SelectEntryPos( 0 );
- ListClickedHdl(m_pLbChartColors);
+ ListClickedHdl(*m_pLbChartColors);
}
void SvxDefaultColorOptPage::FillColorBox()
@@ -247,9 +247,9 @@ IMPL_LINK_TYPED( SvxDefaultColorOptPage, RemoveChartColor, Button*, pButton, voi
}
}
-IMPL_LINK( SvxDefaultColorOptPage, ListClickedHdl, ColorLB*, _pColorList )
+IMPL_LINK_TYPED( SvxDefaultColorOptPage, ListClickedHdl, ListBox&, _rBox, void )
{
- Color aCol = _pColorList->GetSelectEntryColor();
+ Color aCol = static_cast<ColorLB&>(_rBox).GetSelectEntryColor();
long nIndex = GetColorIndex( aCol );
@@ -257,8 +257,6 @@ IMPL_LINK( SvxDefaultColorOptPage, ListClickedHdl, ColorLB*, _pColorList )
m_pValSetColorBox->SetNoSelection();
else
m_pValSetColorBox->SelectItem( nIndex + 1 ); // ValueSet is 1-based
-
- return 0L;
}
IMPL_LINK_NOARG_TYPED(SvxDefaultColorOptPage, BoxClickedHdl, ValueSet*, void)
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 8046c1d..bd2d2f0 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -46,7 +46,7 @@ private:
DECL_LINK_TYPED( ResetToDefaults, Button *, void );
DECL_LINK_TYPED( AddChartColor, Button *, void );
DECL_LINK_TYPED( RemoveChartColor, Button *, void );
- DECL_LINK( ListClickedHdl, ColorLB * );
+ DECL_LINK_TYPED( ListClickedHdl, ListBox&, void );
DECL_LINK_TYPED(BoxClickedHdl, ValueSet*, void);
void FillColorBox();
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index d95fd2a..916ea82 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -177,7 +177,7 @@ public:
virtual void dispose() SAL_OVERRIDE;
public:
- void SetLinks (Link<Button*,void> const&, Link<> const&, Link<Control&,void> const&);
+ void SetLinks (Link<Button*,void> const&, Link<ListBox&,void> const&, Link<Control&,void> const&);
unsigned GetEntryHeight () const { return vEntries[0]->GetHeight(); }
void Update (EditableColorConfig const*, EditableExtendedColorConfig const*);
void ScrollHdl(const ScrollBar&);
@@ -219,7 +219,7 @@ private:
void SetAppearance(Wallpaper const& aTextWall, ColorListBox const& aSampleList);
void SetTextColor (Color C) { m_pText->SetTextColor(C); }
public:
- void SetLinks (Link<Button*,void> const&, Link<> const&, Link<Control&,void> const&);
+ void SetLinks (Link<Button*,void> const&, Link<ListBox&,void> const&, Link<Control&,void> const&);
void Update (ColorConfigEntry, ColorConfigValue const&);
void Update (ExtendedColorConfigValue const&);
void ColorChanged (ColorConfigEntry, ColorConfigValue&);
@@ -414,7 +414,7 @@ void ColorConfigWindow_Impl::Entry::SetAppearance(
// SetLinks()
void ColorConfigWindow_Impl::Entry::SetLinks(
- Link<Button*,void> const& aCheckLink, Link<> const& aColorLink,
+ Link<Button*,void> const& aCheckLink, Link<ListBox&,void> const& aColorLink,
Link<Control&,void> const& aGetFocusLink)
{
m_pColorList->SetSelectHdl(aColorLink);
@@ -689,7 +689,7 @@ void ColorConfigWindow_Impl::Init(ScrollBar *pVScroll, HeaderBar *pHeaderHB)
// SetLinks()
void ColorConfigWindow_Impl::SetLinks (
- Link<Button*,void> const& aCheckLink, Link<> const& aColorLink, Link<Control&,void> const& aGetFocusLink
+ Link<Button*,void> const& aCheckLink, Link<ListBox&,void> const& aColorLink, Link<Control&,void> const& aGetFocusLink
) {
for (unsigned i = 0; i != vEntries.size(); ++i)
vEntries[i]->SetLinks(aCheckLink, aColorLink, aGetFocusLink);
@@ -846,7 +846,7 @@ class ColorConfigCtrl_Impl : public VclVBox
DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void);
DECL_LINK_TYPED(ClickHdl, Button*, void);
- DECL_LINK(ColorHdl, ColorListBox*);
+ DECL_LINK_TYPED(ColorHdl, ListBox&, void);
DECL_LINK_TYPED(ControlFocusHdl, Control&, void);
virtual bool PreNotify (NotifyEvent& rNEvt) SAL_OVERRIDE;
@@ -900,7 +900,7 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(vcl::Window* pParent)
m_pVScroll->SetEndScrollHdl(aScrollLink);
Link<Button*,void> aCheckLink = LINK(this, ColorConfigCtrl_Impl, ClickHdl);
- Link<> aColorLink = LINK(this, ColorConfigCtrl_Impl, ColorHdl);
+ Link<ListBox&,void> aColorLink = LINK(this, ColorConfigCtrl_Impl, ColorHdl);
Link<Control&,void> aGetFocusLink = LINK(this, ColorConfigCtrl_Impl, ControlFocusHdl);
m_pScrollWindow->SetLinks(aCheckLink, aColorLink, aGetFocusLink);
@@ -1006,12 +1006,10 @@ IMPL_LINK_TYPED(ColorConfigCtrl_Impl, ClickHdl, Button*, pBox, void)
}
// a color list has changed
-IMPL_LINK(ColorConfigCtrl_Impl, ColorHdl, ColorListBox*, pBox)
+IMPL_LINK_TYPED(ColorConfigCtrl_Impl, ColorHdl, ListBox&, rBox, void)
{
DBG_ASSERT(pColorConfig, "Configuration not set" );
- if (pBox)
- m_pScrollWindow->ColorHdl(pColorConfig, pExtColorConfig, pBox);
- return 0;
+ m_pScrollWindow->ColorHdl(pColorConfig, pExtColorConfig, static_cast<ColorListBox*>(&rBox));
}
IMPL_LINK_TYPED(ColorConfigCtrl_Impl, ControlFocusHdl, Control&, rCtrl, void)
{
@@ -1175,12 +1173,11 @@ void SvxColorOptionsTabPage::UpdateColorConfig()
m_pColorConfigCT->Update();
}
-IMPL_LINK(SvxColorOptionsTabPage, SchemeChangedHdl_Impl, ListBox*, pBox)
+IMPL_LINK_TYPED(SvxColorOptionsTabPage, SchemeChangedHdl_Impl, ListBox&, rBox, void)
{
- pColorConfig->LoadScheme(pBox->GetSelectEntry());
- pExtColorConfig->LoadScheme(pBox->GetSelectEntry());
+ pColorConfig->LoadScheme(rBox.GetSelectEntry());
+ pExtColorConfig->LoadScheme(rBox.GetSelectEntry());
UpdateColorConfig();
- return 0;
}
IMPL_LINK_TYPED(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, void )
@@ -1205,7 +1202,7 @@ IMPL_LINK_TYPED(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, vo
pExtColorConfig->AddScheme(sName);
m_pColorSchemeLB->InsertEntry(sName);
m_pColorSchemeLB->SelectEntry(sName);
- m_pColorSchemeLB->GetSelectHdl().Call(m_pColorSchemeLB);
+ m_pColorSchemeLB->GetSelectHdl().Call(*m_pColorSchemeLB);
}
}
else
@@ -1218,7 +1215,7 @@ IMPL_LINK_TYPED(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, vo
OUString sDeleteScheme(m_pColorSchemeLB->GetSelectEntry());
m_pColorSchemeLB->RemoveEntry(m_pColorSchemeLB->GetSelectEntryPos());
m_pColorSchemeLB->SelectEntryPos(0);
- m_pColorSchemeLB->GetSelectHdl().Call(m_pColorSchemeLB);
+ m_pColorSchemeLB->GetSelectHdl().Call(*m_pColorSchemeLB);
//first select the new scheme and then delete the old one
pColorConfig->DeleteScheme(sDeleteScheme);
pExtColorConfig->DeleteScheme(sDeleteScheme);
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index f182e4b..3fa8d3a 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -41,7 +41,7 @@ class SvxColorOptionsTabPage : public SfxTabPage
svtools::EditableColorConfig* pColorConfig;
svtools::EditableExtendedColorConfig* pExtColorConfig;
- DECL_LINK(SchemeChangedHdl_Impl, ListBox*);
+ DECL_LINK_TYPED(SchemeChangedHdl_Impl, ListBox&, void);
DECL_LINK_TYPED(SaveDeleteHdl_Impl, Button*, void);
DECL_LINK_TYPED(CheckNameHdl_Impl, AbstractSvxNameDialog&, bool);
void UpdateColorConfig();
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 802763a..28535aa 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -433,7 +433,7 @@ void SvxEditDictionaryDialog::RemoveDictEntry(SvTreeListEntry* pEntry)
-IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectBookHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox&, void)
{
sal_Int32 nPos = pAllDictsLB->GetSelectEntryPos();
@@ -453,12 +453,11 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectBookHdl_Impl)
pLangFT->Enable( bEnable );
pLangLB->Enable( bEnable );
}
- return 0;
}
-IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox&, void)
{
sal_Int32 nDicPos = pAllDictsLB->GetSelectEntryPos();
sal_Int32 nLang = pLangLB->GetSelectLanguage();
@@ -488,7 +487,6 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl)
else
SetLanguage_Impl( nOldLang );
}
- return 1;
}
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 79e037c..0764524 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1473,7 +1473,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet )
// let LocaleSettingHdl enable/disable checkboxes for CJK/CTL support
// #i15812# must be done *before* the configured currency is set
// and update the decimal separator used for the given locale
- LocaleSettingHdl(m_pLocaleSettingLB);
+ LocaleSettingHdl(*m_pLocaleSettingLB);
// configured currency, for example, USD-en-US or EUR-de-DE, or empty for locale default
OUString aAbbrev;
@@ -1651,8 +1651,9 @@ namespace
}
}
-IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, SvxLanguageBox*, pBox )
+IMPL_LINK_TYPED( OfaLanguagesTabPage, LocaleSettingHdl, ListBox&, rListBox, void )
{
+ SvxLanguageBox* pBox = static_cast<SvxLanguageBox*>(&rListBox);
LanguageType eLang = pBox->GetSelectLanguage();
SvtScriptType nType = SvtLanguageOptions::GetScriptTypeOfLanguage(eLang);
// first check if CTL must be enabled
@@ -1697,8 +1698,6 @@ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, SvxLanguageBox*, pBox )
OUString aDatePatternsString = lcl_getDatePatternsConfigString( aLocaleWrapper);
m_bDatePatternsValid = true;
m_pDatePatternsED->SetText( aDatePatternsString);
-
- return 0;
}
IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit*, pEd )
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index ae66faa..c2f5fac 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_TYPED( SupportHdl, Button*, void ) ;
- DECL_LINK( LocaleSettingHdl, SvxLanguageBox* ) ;
+ DECL_LINK_TYPED( LocaleSettingHdl, ListBox&, void ) ;
DECL_LINK( DatePatternsHdl, Edit* ) ;
public:
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 3033918..3454684 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -525,9 +525,9 @@ void SvxProxyTabPage::EnableControls_Impl(bool bEnable)
-IMPL_LINK( SvxProxyTabPage, ProxyHdl_Impl, ListBox *, pBox )
+IMPL_LINK_TYPED( SvxProxyTabPage, ProxyHdl_Impl, ListBox&, rBox, void )
{
- sal_Int32 nPos = pBox->GetSelectEntryPos();
+ sal_Int32 nPos = rBox.GetSelectEntryPos();
// Restore original system values
if( nPos == 1 )
@@ -536,7 +536,6 @@ IMPL_LINK( SvxProxyTabPage, ProxyHdl_Impl, ListBox *, pBox )
}
EnableControls_Impl(nPos == 2);
- return 0;
}
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 32804fb..0183f07 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -95,7 +95,7 @@ private:
void ReadConfigDefaults_Impl();
void RestoreConfigDefaults_Impl();
- DECL_LINK( ProxyHdl_Impl, ListBox * );
+ DECL_LINK_TYPED( ProxyHdl_Impl, ListBox&, void );
DECL_STATIC_LINK_TYPED( SvxProxyTabPage, LoseFocusHdl_Impl, Control&, void );
public:
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 552bd17..b43d1e9 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -861,10 +861,9 @@ IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, AssignHdl_Impl, Button*, void)
-IMPL_LINK_NOARG(SvxJavaParameterDlg, SelectHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, SelectHdl_Impl, ListBox&, void)
{
EnableRemoveButton();
- return 0;
}
@@ -1066,10 +1065,9 @@ IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, RemoveHdl_Impl, Button*, void)
-IMPL_LINK_NOARG(SvxJavaClassPathDlg, SelectHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, SelectHdl_Impl, ListBox&, void)
{
EnableRemoveButton();
- return 0;
}
@@ -1129,7 +1127,7 @@ void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
}
// select first entry
m_pPathList->SelectEntryPos(0);
- SelectHdl_Impl( NULL );
+ SelectHdl_Impl( *m_pPathList );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index a139fa2..294f5e9 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -129,7 +129,7 @@ private:
DECL_LINK(ModifyHdl_Impl, void *);
DECL_LINK_TYPED(AssignHdl_Impl, Button*, void);
- DECL_LINK(SelectHdl_Impl, void *);
+ DECL_LINK_TYPED(SelectHdl_Impl, ListBox&, void);
DECL_LINK_TYPED(DblClickHdl_Impl, ListBox&, void);
DECL_LINK_TYPED(RemoveHdl_Impl, Button*, void);
@@ -165,7 +165,7 @@ private:
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 *);
+ DECL_LINK_TYPED(SelectHdl_Impl, ListBox&, void);
bool IsPathDuplicate( const OUString& _rPath );
inline void EnableRemoveButton()
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 40b77cb..2783556 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1901,7 +1901,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rD
if(!m_pLanguageLB->IsLanguageSelected( eSysLang ) )
m_pLanguageLB->SelectEntryPos(0);
- m_pLanguageLB->SetSelectHdl( LINK( this, SvxEditModulesDlg, LangSelectHdl_Impl ));
+ m_pLanguageLB->SetSelectHdl( LINK( this, SvxEditModulesDlg, LangSelectListBoxHdl_Impl ));
LangSelectHdl_Impl(m_pLanguageLB);
}
@@ -2010,7 +2010,12 @@ IMPL_LINK_NOARG_TYPED( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox
}
}
-IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
+IMPL_LINK_TYPED( SvxEditModulesDlg, LangSelectListBoxHdl_Impl, ListBox&, rBox, void )
+{
+ LangSelectHdl_Impl(&rBox);
+}
+
+void SvxEditModulesDlg::LangSelectHdl_Impl(ListBox* pBox)
{
LanguageType eCurLanguage = m_pLanguageLB->GetSelectLanguage();
static Locale aLastLocale;
@@ -2262,7 +2267,6 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
}
}
aLastLocale = aCurLocale;
- return 0;
}
IMPL_LINK_TYPED( SvxEditModulesDlg, UpDownHdl_Impl, Button *, pBtn, void )
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 22f65cc..8042509 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -219,7 +219,7 @@ public:
VclPtr<Edit> mpDevice;
VclPtr<Edit> mpDriverVersion;
- DECL_LINK(OSSelectHdl, ListBox*);
+ DECL_LINK_TYPED(OSSelectHdl, ListBox&, void);
DECL_LINK(EditModifiedHdl, Edit*);
ListEntryDialog(vcl::Window* pParent, const OpenCLConfig::ImplMatcher& rEntry, const OString& rTag);
@@ -274,17 +274,15 @@ ListEntryDialog::ListEntryDialog(vcl::Window* pParent, const OpenCLConfig::ImplM
SetText(get<FixedText>(rTag + "title")->GetText());
}
-IMPL_LINK(ListEntryDialog, OSSelectHdl, ListBox*, pListBox)
+IMPL_LINK_TYPED(ListEntryDialog, OSSelectHdl, ListBox&, rListBox, void)
{
- if (pListBox == mpOS)
+ if (&rListBox == mpOS)
{
if (mpOS->GetSelectEntryPos() == 0)
maEntry.maOS.clear();
else
maEntry.maOS = mpOS->GetSelectEntry();
}
-
- return 0;
}
IMPL_LINK(ListEntryDialog, EditModifiedHdl, Edit*, pEdit)
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index eee1ad2..cdde1a1 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -185,7 +185,7 @@ SvxSaveTabPage::SvxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet
pImpl->aDefaultReadonlyArr[APP_WRITER_GLOBAL] = aModuleOpt.IsDefaultFilterReadonly(SvtModuleOptions::EFactory::WRITERGLOBAL);
}
- Link<> aLink = LINK( this, SvxSaveTabPage, ODFVersionHdl_Impl );
+ Link<ListBox&,void> aLink = LINK( this, SvxSaveTabPage, ODFVersionHdl_Impl );
aODFVersionLB->SetSelectHdl( aLink );
aLink = LINK( this, SvxSaveTabPage, FilterHdl_Impl );
aDocTypeLB->SetSelectHdl( aLink );
@@ -460,7 +460,7 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
}
}
aDocTypeLB->SelectEntryPos(0);
- FilterHdl_Impl(aDocTypeLB);
+ FilterHdl_Impl(*aDocTypeLB);
}
catch(Exception& e)
{
@@ -497,7 +497,7 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
aODFVersionLB->SelectEntryPos( aODFVersionLB->GetEntryPos( pDefaultVersion ) );
AutoClickHdl_Impl( aAutoSaveCB );
- ODFVersionHdl_Impl( aODFVersionLB );
+ ODFVersionHdl_Impl( *aODFVersionLB );
aDocInfoCB->SaveValue();
aBackupCB->SaveValue();
@@ -558,7 +558,7 @@ static OUString lcl_ExtracUIName(const Sequence<PropertyValue> &rProperties)
return sName;
}
-IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox *, pBox )
+IMPL_LINK_TYPED( SvxSaveTabPage, FilterHdl_Impl, ListBox&, rBox, void )
{
const sal_Int32 nCurPos = aDocTypeLB->GetSelectEntryPos();
@@ -568,7 +568,7 @@ IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox *, pBox )
if ( nData >= 0 && nData < APP_COUNT )
{
- if(aDocTypeLB == pBox)
+ if(aDocTypeLB == &rBox)
{
aSaveAsLB->Clear();
const OUString* pFilters = pImpl->aFilterArr[nData].getConstArray();
@@ -604,7 +604,7 @@ IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox *, pBox )
}
else
{
- OUString sSelect = pBox->GetSelectEntry();
+ OUString sSelect = rBox.GetSelectEntry();
const OUString* pFilters = pImpl->aFilterArr[nData].getConstArray();
OUString* pUIFilters = pImpl->aUIFilterArr[nData].getArray();
for(int i = 0; i < pImpl->aUIFilterArr[nData].getLength(); i++)
@@ -618,11 +618,10 @@ IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox *, pBox )
}
}
- ODFVersionHdl_Impl( aSaveAsLB );
- return 0;
+ ODFVersionHdl_Impl( *aSaveAsLB );
};
-IMPL_LINK_NOARG(SvxSaveTabPage, ODFVersionHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxSaveTabPage, ODFVersionHdl_Impl, ListBox&, void)
{
sal_IntPtr nVersion = sal_IntPtr( aODFVersionLB->GetSelectEntryData() );
bool bShown = SvtSaveOptions::ODFDefaultVersion( nVersion ) != SvtSaveOptions::ODFVER_LATEST;
@@ -645,8 +644,6 @@ IMPL_LINK_NOARG(SvxSaveTabPage, ODFVersionHdl_Impl)
aODFWarningFI->Show( bShown );
aODFWarningFT->Show( bShown );
-
- return 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index 0a33a2a..06f4507 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -61,8 +61,8 @@ private:
SvxSaveTabPage_Impl* pImpl;
DECL_LINK_TYPED( AutoClickHdl_Impl, Button*, void );
- DECL_LINK( FilterHdl_Impl, ListBox * );
- DECL_LINK(ODFVersionHdl_Impl, void *);
+ DECL_LINK_TYPED( FilterHdl_Impl, ListBox&, void );
+ DECL_LINK_TYPED(ODFVersionHdl_Impl, ListBox&, void );
void DetectHiddenControls();
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 2450e1a..905cf4e 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -500,7 +500,7 @@ IMPL_LINK_TYPED( SvxPersonalizationTabPage, DefaultPersona, Button*, pButton, vo
}
}
-IMPL_LINK( SvxPersonalizationTabPage, SelectInstalledPersona, ListBox*, )
+IMPL_LINK_NOARG_TYPED( SvxPersonalizationTabPage, SelectInstalledPersona, ListBox&, void)
{
m_pOwnPersona->Check();
@@ -519,8 +519,6 @@ IMPL_LINK( SvxPersonalizationTabPage, SelectInstalledPersona, ListBox*, )
aFilter.ImportGraphic( aGraphic, aURLObj );
Bitmap aBmp = aGraphic.GetBitmap();
m_pExtensionPersonaPreview->SetModeImage( Image( aBmp ) );
-
- return 0;
}
/// Find the value on the Persona page, and convert it to a usable form.
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index 59e9cbd..5878033 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -68,7 +68,7 @@ private:
DECL_LINK_TYPED( DefaultPersona, Button*, void );
/// Handle the Personas installed through extensions selection
- DECL_LINK( SelectInstalledPersona, ListBox* );
+ DECL_LINK_TYPED( SelectInstalledPersona, ListBox&, void );
};
/** Dialog that will allow the user to choose a Persona to use.
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list