[Libreoffice-commits] core.git: basctl/source chart2/source cui/source dbaccess/source extensions/source formula/source fpicker/source include/sfx2 include/svtools include/svx include/vcl sc/source sd/source sfx2/source starmath/inc starmath/source svtools/source svx/inc svx/source sw/inc sw/source uui/source vcl/generic vcl/inc vcl/source
Noel Grandin
noel at peralex.com
Fri Oct 16 02:11:53 PDT 2015
basctl/source/basicide/brkdlg.cxx | 9
basctl/source/basicide/brkdlg.hxx | 2
basctl/source/basicide/macrodlg.cxx | 5
basctl/source/basicide/macrodlg.hxx | 2
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 3
chart2/source/controller/dialogs/ChartTypeDialogController.hxx | 2
chart2/source/controller/dialogs/DataBrowser.cxx | 10
chart2/source/controller/dialogs/res_ErrorBar.cxx | 18 -
chart2/source/controller/dialogs/res_Titles.cxx | 2
chart2/source/controller/dialogs/res_Trendline.cxx | 12
chart2/source/controller/dialogs/res_Trendline.hxx | 2
chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx | 16 -
chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx | 8
chart2/source/controller/dialogs/tp_DataSource.cxx | 20 -
chart2/source/controller/dialogs/tp_DataSource.hxx | 4
chart2/source/controller/dialogs/tp_RangeChooser.cxx | 10
chart2/source/controller/dialogs/tp_RangeChooser.hxx | 4
chart2/source/controller/dialogs/tp_Scale.cxx | 9
chart2/source/controller/dialogs/tp_Scale.hxx | 2
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx | 6
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx | 1
chart2/source/controller/inc/res_ErrorBar.hxx | 4
chart2/source/controller/inc/res_Titles.hxx | 2
chart2/source/controller/sidebar/ChartErrorBarPanel.cxx | 12
chart2/source/controller/sidebar/ChartErrorBarPanel.hxx | 3
cui/source/customize/cfg.cxx | 8
cui/source/dialogs/SpellDialog.cxx | 5
cui/source/dialogs/colorpicker.cxx | 28 +-
cui/source/dialogs/cuifmsearch.cxx | 5
cui/source/dialogs/cuigrfflt.cxx | 36 ++
cui/source/dialogs/dlgname.cxx | 11
cui/source/dialogs/hangulhanjadlg.cxx | 36 --
cui/source/dialogs/hldoctp.cxx | 14 -
cui/source/dialogs/hlinettp.cxx | 8
cui/source/dialogs/hlmailtp.cxx | 4
cui/source/dialogs/zoom.cxx | 15 -
cui/source/inc/SpellDialog.hxx | 10
cui/source/inc/autocdlg.hxx | 4
cui/source/inc/border.hxx | 4
cui/source/inc/cfg.hxx | 2
cui/source/inc/chardlg.hxx | 11
cui/source/inc/connect.hxx | 3
cui/source/inc/cuifmsearch.hxx | 2
cui/source/inc/cuigrfflt.hxx | 5
cui/source/inc/cuioptgenrl.hxx | 2
cui/source/inc/cuitabarea.hxx | 20 -
cui/source/inc/cuitabline.hxx | 16 -
cui/source/inc/dlgname.hxx | 4
cui/source/inc/grfpage.hxx | 10
cui/source/inc/hangulhanjadlg.hxx | 14 -
cui/source/inc/hldoctp.hxx | 4
cui/source/inc/hlinettp.hxx | 4
cui/source/inc/hlmailtp.hxx | 2
cui/source/inc/measure.hxx | 3
cui/source/inc/numfmt.hxx | 6
cui/source/inc/numpages.hxx | 9
cui/source/inc/optasian.hxx | 2
cui/source/inc/optdict.hxx | 4
cui/source/inc/page.hxx | 4
cui/source/inc/paragrph.hxx | 2
cui/source/inc/swpossizetabpage.hxx | 2
cui/source/inc/tabstpge.hxx | 6
cui/source/inc/transfrm.hxx | 4
cui/source/inc/zoom.hxx | 4
cui/source/options/doclinkdialog.cxx | 3
cui/source/options/doclinkdialog.hxx | 2
cui/source/options/fontsubs.cxx | 10
cui/source/options/fontsubs.hxx | 3
cui/source/options/optasian.cxx | 9
cui/source/options/optdict.cxx | 15 -
cui/source/options/optgdlg.cxx | 26 -
cui/source/options/optgdlg.hxx | 4
cui/source/options/optgenrl.cxx | 9
cui/source/options/optjava.cxx | 8
cui/source/options/optjava.hxx | 2
cui/source/options/optmemory.cxx | 6
cui/source/options/optmemory.hxx | 2
cui/source/options/optopencl.cxx | 22 -
cui/source/tabpages/autocdlg.cxx | 37 +-
cui/source/tabpages/border.cxx | 17 -
cui/source/tabpages/chardlg.cxx | 23 -
cui/source/tabpages/connect.cxx | 10
cui/source/tabpages/grfpage.cxx | 27 -
cui/source/tabpages/measure.cxx | 10
cui/source/tabpages/numfmt.cxx | 19 -
cui/source/tabpages/numpages.cxx | 29 +-
cui/source/tabpages/page.cxx | 8
cui/source/tabpages/paragrph.cxx | 5
cui/source/tabpages/swpossizetabpage.cxx | 9
cui/source/tabpages/tabstpge.cxx | 5
cui/source/tabpages/tparea.cxx | 46 +--
cui/source/tabpages/tpcolor.cxx | 6
cui/source/tabpages/tpgradnt.cxx | 10
cui/source/tabpages/tphatch.cxx | 10
cui/source/tabpages/tpline.cxx | 30 --
cui/source/tabpages/tplnedef.cxx | 22 -
cui/source/tabpages/tpshadow.cxx | 20 -
cui/source/tabpages/transfrm.cxx | 12
dbaccess/source/ext/macromigration/macromigrationpages.cxx | 3
dbaccess/source/ext/macromigration/macromigrationpages.hxx | 2
dbaccess/source/ui/control/sqledit.cxx | 4
dbaccess/source/ui/dlg/ConnectionPage.cxx | 10
dbaccess/source/ui/dlg/ConnectionPage.hxx | 2
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 3
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx | 2
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 21 -
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 2
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 20 -
dbaccess/source/ui/dlg/TextConnectionHelper.hxx | 3
dbaccess/source/ui/dlg/UserAdmin.cxx | 7
dbaccess/source/ui/dlg/admincontrols.cxx | 15 -
dbaccess/source/ui/dlg/admincontrols.hxx | 1
dbaccess/source/ui/dlg/adminpages.cxx | 4
dbaccess/source/ui/dlg/adminpages.hxx | 1
dbaccess/source/ui/dlg/advancedsettings.cxx | 6
dbaccess/source/ui/dlg/detailpages.cxx | 27 -
dbaccess/source/ui/dlg/detailpages.hxx | 8
dbaccess/source/ui/dlg/directsql.cxx | 7
dbaccess/source/ui/dlg/dlgsave.cxx | 5
dbaccess/source/ui/dlg/paramdialog.cxx | 4
dbaccess/source/ui/inc/directsql.hxx | 2
dbaccess/source/ui/inc/dlgsave.hxx | 2
dbaccess/source/ui/inc/paramdialog.hxx | 2
dbaccess/source/ui/inc/sqledit.hxx | 2
extensions/source/abpilot/abpfinalpage.cxx | 3
extensions/source/abpilot/abpfinalpage.hxx | 2
extensions/source/dbpilots/groupboxwiz.cxx | 3
extensions/source/dbpilots/groupboxwiz.hxx | 2
extensions/source/dbpilots/listcombowizard.cxx | 3
extensions/source/dbpilots/listcombowizard.hxx | 2
extensions/source/propctrlr/commoncontrol.cxx | 5
extensions/source/propctrlr/commoncontrol.hxx | 21 +
extensions/source/propctrlr/formlinkdialog.cxx | 6
extensions/source/propctrlr/newdatatype.cxx | 6
extensions/source/propctrlr/newdatatype.hxx | 2
extensions/source/propctrlr/standardcontrol.cxx | 4
extensions/source/scanner/sanedlg.cxx | 19 -
extensions/source/scanner/sanedlg.hxx | 2
formula/source/ui/dlg/ControlHelper.hxx | 2
formula/source/ui/dlg/formula.cxx | 11
formula/source/ui/dlg/funcutl.cxx | 6
fpicker/source/office/QueryFolderName.hxx | 2
fpicker/source/office/RemoteFilesDialog.cxx | 4
fpicker/source/office/RemoteFilesDialog.hxx | 2
fpicker/source/office/iodlg.cxx | 7
fpicker/source/office/iodlg.hxx | 2
include/sfx2/newstyle.hxx | 2
include/sfx2/passwd.hxx | 3
include/sfx2/templatedlg.hxx | 2
include/svtools/GraphicExportOptionsDialog.hxx | 6
include/svtools/PlaceEditDialog.hxx | 6
include/svtools/ServerDetailsControls.hxx | 2
include/svtools/editbrowsebox.hxx | 18 -
include/svtools/editimplementation.hxx | 2
include/svtools/filectrl.hxx | 2
include/svx/compressgraphicdialog.hxx | 6
include/svx/ctredlin.hxx | 4
include/svx/dialcontrol.hxx | 2
include/svx/float3d.hxx | 2
include/svx/fontwork.hxx | 2
include/svx/hdft.hxx | 8
include/svx/imapdlg.hxx | 2
include/svx/langbox.hxx | 2
include/svx/optgrid.hxx | 4
include/svx/passwd.hxx | 2
include/svx/rubydialog.hxx | 2
include/svx/sidebar/AreaPropertyPanelBase.hxx | 2
include/svx/sidebar/LinePropertyPanelBase.hxx | 2
include/svx/srchdlg.hxx | 2
include/vcl/edit.hxx | 10
include/vcl/slider.hxx | 3
include/vcl/vclmedit.hxx | 16 -
sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx | 9
sc/source/ui/StatisticsDialogs/SamplingDialog.cxx | 13
sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx | 6
sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx | 6
sc/source/ui/cctrl/checklistmenu.cxx | 4
sc/source/ui/condformat/condformatdlg.cxx | 9
sc/source/ui/condformat/condformatdlgentry.cxx | 23 -
sc/source/ui/dbgui/PivotLayoutDialog.cxx | 3
sc/source/ui/dbgui/consdlg.cxx | 15 -
sc/source/ui/dbgui/dbnamdlg.cxx | 13
sc/source/ui/dbgui/filtdlg.cxx | 138 ++++------
sc/source/ui/dbgui/foptmgr.cxx | 12
sc/source/ui/dbgui/pfiltdlg.cxx | 31 --
sc/source/ui/dbgui/scuiasciiopt.cxx | 16 -
sc/source/ui/dbgui/sfiltdlg.cxx | 14 -
sc/source/ui/inc/PivotLayoutDialog.hxx | 2
sc/source/ui/inc/RandomNumberGeneratorDialog.hxx | 6
sc/source/ui/inc/SamplingDialog.hxx | 4
sc/source/ui/inc/StatisticsInputOutputDialog.hxx | 2
sc/source/ui/inc/StatisticsTwoVariableDialog.hxx | 2
sc/source/ui/inc/areasdlg.hxx | 2
sc/source/ui/inc/checklistmenu.hxx | 2
sc/source/ui/inc/condformatdlg.hxx | 2
sc/source/ui/inc/condformatdlgentry.hxx | 2
sc/source/ui/inc/consdlg.hxx | 2
sc/source/ui/inc/crnrdlg.hxx | 4
sc/source/ui/inc/datafdlg.hxx | 2
sc/source/ui/inc/datastreamdlg.hxx | 2
sc/source/ui/inc/dbnamdlg.hxx | 4
sc/source/ui/inc/filtdlg.hxx | 4
sc/source/ui/inc/foptmgr.hxx | 2
sc/source/ui/inc/instbdlg.hxx | 12
sc/source/ui/inc/mtrindlg.hxx | 2
sc/source/ui/inc/mvtabdlg.hxx | 2
sc/source/ui/inc/namedefdlg.hxx | 2
sc/source/ui/inc/namedlg.hxx | 2
sc/source/ui/inc/optsolver.hxx | 4
sc/source/ui/inc/pfiltdlg.hxx | 2
sc/source/ui/inc/protectiondlg.hxx | 2
sc/source/ui/inc/retypepassdlg.hxx | 2
sc/source/ui/inc/scuiasciiopt.hxx | 5
sc/source/ui/inc/tpdefaults.hxx | 4
sc/source/ui/inc/tpformula.hxx | 2
sc/source/ui/inc/tpusrlst.hxx | 2
sc/source/ui/inc/xmlsourcedlg.hxx | 2
sc/source/ui/miscdlgs/crnrdlg.cxx | 10
sc/source/ui/miscdlgs/datafdlg.cxx | 5
sc/source/ui/miscdlgs/datastreamdlg.cxx | 3
sc/source/ui/miscdlgs/instbdlg.cxx | 3
sc/source/ui/miscdlgs/mtrindlg.cxx | 3
sc/source/ui/miscdlgs/mvtabdlg.cxx | 6
sc/source/ui/miscdlgs/optsolver.cxx | 8
sc/source/ui/miscdlgs/protectiondlg.cxx | 5
sc/source/ui/miscdlgs/retypepassdlg.cxx | 5
sc/source/ui/namedlg/namedefdlg.cxx | 3
sc/source/ui/namedlg/namedlg.cxx | 7
sc/source/ui/optdlg/calcoptionsdlg.cxx | 10
sc/source/ui/optdlg/calcoptionsdlg.hxx | 4
sc/source/ui/optdlg/tpdefaults.cxx | 8
sc/source/ui/optdlg/tpformula.cxx | 16 -
sc/source/ui/optdlg/tpusrlst.cxx | 8
sc/source/ui/pagedlg/areasdlg.cxx | 26 -
sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 16 -
sc/source/ui/sidebar/AlignmentPropertyPanel.hxx | 4
sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 7
sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx | 3
sc/source/ui/xmlsource/xmlsourcedlg.cxx | 5
sd/source/filter/html/pubdlg.cxx | 6
sd/source/ui/animations/CustomAnimationDialog.cxx | 35 +-
sd/source/ui/animations/SlideTransitionPane.cxx | 3
sd/source/ui/animations/SlideTransitionPane.hxx | 2
sd/source/ui/dlg/animobjs.cxx | 8
sd/source/ui/dlg/custsdlg.cxx | 10
sd/source/ui/dlg/dlgass.cxx | 6
sd/source/ui/dlg/present.cxx | 5
sd/source/ui/dlg/vectdlg.cxx | 5
sd/source/ui/inc/animobjs.hxx | 4
sd/source/ui/inc/custsdlg.hxx | 3
sd/source/ui/inc/present.hxx | 2
sd/source/ui/inc/vectdlg.hxx | 2
sfx2/source/appl/impldde.cxx | 5
sfx2/source/appl/newhelp.cxx | 5
sfx2/source/appl/newhelp.hxx | 2
sfx2/source/dialog/newstyle.cxx | 5
sfx2/source/dialog/passwd.cxx | 12
sfx2/source/doc/templatedlg.cxx | 8
starmath/inc/dialog.hxx | 4
starmath/source/dialog.cxx | 28 --
svtools/source/brwbox/ebbcontrols.cxx | 24 -
svtools/source/control/filectrl.cxx | 4
svtools/source/dialogs/PlaceEditDialog.cxx | 11
svtools/source/dialogs/ServerDetailsControls.cxx | 3
svtools/source/filter/GraphicExportOptionsDialog.cxx | 12
svtools/source/filter/exportdialog.cxx | 12
svtools/source/filter/exportdialog.hxx | 8
svtools/source/inc/unoiface.hxx | 3
svtools/source/uno/unoiface.cxx | 15 -
svx/inc/tbunosearchcontrollers.hxx | 2
svx/source/dialog/compressgraphicdialog.cxx | 12
svx/source/dialog/ctredlin.cxx | 37 +-
svx/source/dialog/dialcontrol.cxx | 81 ++---
svx/source/dialog/fontwork.cxx | 5
svx/source/dialog/hdft.cxx | 10
svx/source/dialog/imapdlg.cxx | 6
svx/source/dialog/langbox.cxx | 3
svx/source/dialog/optgrid.cxx | 10
svx/source/dialog/passwd.cxx | 5
svx/source/dialog/rubydialog.cxx | 9
svx/source/dialog/srchdlg.cxx | 15 -
svx/source/engine3d/float3d.cxx | 48 +--
svx/source/fmcomp/gridcell.cxx | 2
svx/source/form/databaselocationinput.cxx | 2
svx/source/form/datanavi.cxx | 3
svx/source/inc/datanavi.hxx | 2
svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 4
svx/source/sidebar/area/AreaTransparencyGradientControl.cxx | 5
svx/source/sidebar/area/AreaTransparencyGradientControl.hxx | 2
svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 21 -
svx/source/sidebar/graphic/GraphicPropertyPanel.hxx | 14 -
svx/source/sidebar/line/LinePropertyPanelBase.cxx | 6
svx/source/sidebar/line/LineWidthControl.cxx | 8
svx/source/sidebar/line/LineWidthControl.hxx | 2
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 5
svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx | 2
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 10
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 4
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 24 -
svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 11
svx/source/sidebar/shadow/ShadowPropertyPanel.cxx | 6
svx/source/sidebar/shadow/ShadowPropertyPanel.hxx | 4
svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 5
svx/source/sidebar/text/TextCharacterSpacingControl.hxx | 2
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 6
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 3
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx | 4
sw/inc/colwd.hxx | 2
sw/source/ui/chrdlg/break.cxx | 3
sw/source/ui/chrdlg/drpcps.cxx | 18 -
sw/source/ui/config/optload.cxx | 9
sw/source/ui/config/optpage.cxx | 28 --
sw/source/ui/dbui/createaddresslistdialog.cxx | 19 -
sw/source/ui/dbui/createaddresslistdialog.hxx | 4
sw/source/ui/dbui/customizeaddresslistdialog.cxx | 7
sw/source/ui/dbui/customizeaddresslistdialog.hxx | 2
sw/source/ui/dbui/mmaddressblockpage.cxx | 10
sw/source/ui/dbui/mmaddressblockpage.hxx | 4
sw/source/ui/dbui/mmgreetingspage.cxx | 5
sw/source/ui/dbui/mmgreetingspage.hxx | 2
sw/source/ui/dbui/mmoutputpage.cxx | 22 -
sw/source/ui/dbui/mmpreparemergepage.cxx | 9
sw/source/ui/dbui/mmpreparemergepage.hxx | 3
sw/source/ui/dialog/uiregionsw.cxx | 43 +--
sw/source/ui/envelp/labfmt.cxx | 10
sw/source/ui/envelp/labfmt.hxx | 4
sw/source/ui/envelp/mailmrge.cxx | 5
sw/source/ui/fldui/flddb.cxx | 3
sw/source/ui/fldui/flddb.hxx | 4
sw/source/ui/fldui/fldfunc.cxx | 18 -
sw/source/ui/fldui/fldfunc.hxx | 16 -
sw/source/ui/fldui/fldref.cxx | 10
sw/source/ui/fldui/fldref.hxx | 2
sw/source/ui/fldui/fldvar.cxx | 14 -
sw/source/ui/fldui/fldvar.hxx | 8
sw/source/ui/frmdlg/column.cxx | 33 +-
sw/source/ui/frmdlg/cption.cxx | 7
sw/source/ui/frmdlg/frmpage.cxx | 17 -
sw/source/ui/index/cnttab.cxx | 38 +-
sw/source/ui/index/swuiidxmrk.cxx | 52 +--
sw/source/ui/misc/bookmark.cxx | 11
sw/source/ui/misc/glosbib.cxx | 5
sw/source/ui/misc/glossary.cxx | 22 -
sw/source/ui/misc/insfnote.cxx | 4
sw/source/ui/misc/linenum.cxx | 8
sw/source/ui/misc/outline.cxx | 22 -
sw/source/ui/misc/pgfnote.cxx | 4
sw/source/ui/table/colwd.cxx | 5
sw/source/ui/table/instable.cxx | 16 -
sw/source/ui/utlui/swrenamexnameddlg.cxx | 5
sw/source/uibase/inc/bookmark.hxx | 2
sw/source/uibase/inc/break.hxx | 2
sw/source/uibase/inc/column.hxx | 13
sw/source/uibase/inc/cption.hxx | 2
sw/source/uibase/inc/drpcps.hxx | 8
sw/source/uibase/inc/frmpage.hxx | 4
sw/source/uibase/inc/glosbib.hxx | 8
sw/source/uibase/inc/glossary.hxx | 8
sw/source/uibase/inc/inputwin.hxx | 2
sw/source/uibase/inc/insfnote.hxx | 2
sw/source/uibase/inc/instable.hxx | 10
sw/source/uibase/inc/linenum.hxx | 2
sw/source/uibase/inc/mailmrge.hxx | 4
sw/source/uibase/inc/optload.hxx | 2
sw/source/uibase/inc/optpage.hxx | 6
sw/source/uibase/inc/outline.hxx | 10
sw/source/uibase/inc/pgfnote.hxx | 10
sw/source/uibase/inc/prcntfld.hxx | 2
sw/source/uibase/inc/regionsw.hxx | 20 -
sw/source/uibase/inc/swrenamexnameddlg.hxx | 2
sw/source/uibase/inc/swuicnttab.hxx | 10
sw/source/uibase/inc/swuiidxmrk.hxx | 25 -
sw/source/uibase/ribbar/inputwin.cxx | 3
sw/source/uibase/sidebar/PageMarginControl.cxx | 10
sw/source/uibase/sidebar/PageMarginControl.hxx | 4
uui/source/masterpasscrtdlg.cxx | 3
uui/source/masterpasscrtdlg.hxx | 2
vcl/generic/print/prtsetup.cxx | 5
vcl/generic/print/prtsetup.hxx | 2
vcl/inc/printdlg.hxx | 4
vcl/source/control/edit.cxx | 4
vcl/source/control/slider.cxx | 25 -
vcl/source/edit/vclmedit.cxx | 4
vcl/source/window/printdlg.cxx | 24 -
384 files changed, 1558 insertions(+), 1809 deletions(-)
New commits:
commit 6f1313b3d44ea54e9a331e0fc00871081fa662fe
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 15 08:13:49 2015 +0200
convert Link<> to typed
Change-Id: Icbba339dac0be31e30dff021bba06a219f8aecd6
Reviewed-on: https://gerrit.libreoffice.org/19405
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index 81ebd05..0ca7e8e 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -172,17 +172,16 @@ IMPL_LINK_TYPED( BreakPointDialog, ComboBoxHighlightHdl, ComboBox&, rBox, void )
-IMPL_LINK( BreakPointDialog, EditModifyHdl, Edit *, pEdit )
+IMPL_LINK_TYPED( BreakPointDialog, EditModifyHdl, Edit&, rEdit, void )
{
- if (pEdit == m_pComboBox)
+ if (&rEdit == m_pComboBox)
CheckButtons();
- else if (pEdit == m_pNumericField)
+ else if (&rEdit == m_pNumericField)
{
BreakPoint* pBrk = GetSelectedBreakPoint();
if ( pBrk )
- pBrk->nStopAfter = pEdit->GetText().toInt32();
+ pBrk->nStopAfter = rEdit.GetText().toInt32();
}
- return 0;
}
diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx
index 9ae8e36..3a0eccf 100644
--- a/basctl/source/basicide/brkdlg.hxx
+++ b/basctl/source/basicide/brkdlg.hxx
@@ -45,7 +45,7 @@ protected:
void CheckButtons();
DECL_LINK_TYPED( CheckBoxHdl, Button*, void );
DECL_LINK_TYPED( ComboBoxHighlightHdl, ComboBox&, void );
- DECL_LINK( EditModifyHdl, Edit * );
+ DECL_LINK_TYPED( EditModifyHdl, Edit&, void );
DECL_LINK_TYPED( ButtonHdl, Button*, void );
void UpdateFields( BreakPoint* pBrk );
BreakPoint* GetSelectedBreakPoint();
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 2e417c1..97598ff 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -550,10 +550,8 @@ IMPL_LINK_TYPED( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox, void )
-IMPL_LINK( MacroChooser, EditModifyHdl, Edit *, pEdit )
+IMPL_LINK_NOARG_TYPED( MacroChooser, EditModifyHdl, Edit&, void )
{
- (void)pEdit;
-
// select the module in which the macro is put at Neu (new),
// if BasicManager or Lib is selecting
SvTreeListEntry* pCurEntry = m_pBasicBox->GetCurEntry();
@@ -606,7 +604,6 @@ IMPL_LINK( MacroChooser, EditModifyHdl, Edit *, pEdit )
}
CheckButtons();
- return 0;
}
diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx
index 9639454..7b446fe 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -70,7 +70,7 @@ private:
DECL_LINK_TYPED( MacroSelectHdl, SvTreeListBox *, void );
DECL_LINK_TYPED( MacroDoubleClickHdl, SvTreeListBox*, bool );
DECL_LINK_TYPED( BasicSelectHdl, SvTreeListBox *, void );
- DECL_LINK( EditModifyHdl, Edit * );
+ DECL_LINK_TYPED( EditModifyHdl, Edit&, void );
DECL_LINK_TYPED( ButtonHdl, Button *, void );
void CheckButtons();
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index a039467..9a410fd 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -1227,11 +1227,10 @@ void CombiColumnLineChartDialogController::setTemplateProperties( const uno::Ref
}
}
-IMPL_LINK_NOARG(CombiColumnLineChartDialogController, ChangeLineCountHdl)
+IMPL_LINK_NOARG_TYPED(CombiColumnLineChartDialogController, ChangeLineCountHdl, Edit&, void)
{
if( m_pChangeListener )
m_pChangeListener->stateChanged(this);
- return 0;
}
void CombiColumnLineChartDialogController::adjustParameterToSubType( ChartTypeParameter& rParameter )
{
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
index 60d4dcc..f3b80ff 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
@@ -278,7 +278,7 @@ public:
virtual void setTemplateProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ) const throw (::com::sun::star::uno::RuntimeException) override;
private:
- DECL_LINK( ChangeLineCountHdl, void* );
+ DECL_LINK_TYPED( ChangeLineCountHdl, Edit&, void );
private:
VclPtr<FixedText> m_pFT_NumberOfLines;
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 00f2be3..e70242d 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -186,8 +186,8 @@ private:
Link<SeriesHeaderEdit*,void> m_aChangeLink;
void notifyChanges();
- DECL_LINK( SeriesNameChanged, void * );
- DECL_LINK( SeriesNameEdited, void * );
+ DECL_LINK_TYPED( SeriesNameChanged, Edit&, void );
+ DECL_LINK_TYPED( SeriesNameEdited, Edit&, void );
static Image GetChartTypeImage(
const Reference< chart2::XChartType > & xChartType,
@@ -326,16 +326,14 @@ void SeriesHeader::SetEditChangedHdl( const Link<SeriesHeaderEdit*,void> & rLink
m_aChangeLink = rLink;
}
-IMPL_LINK_NOARG(SeriesHeader, SeriesNameChanged)
+IMPL_LINK_NOARG_TYPED(SeriesHeader, SeriesNameChanged, Edit&, void)
{
notifyChanges();
- return 0;
}
-IMPL_LINK_NOARG(SeriesHeader, SeriesNameEdited)
+IMPL_LINK_NOARG_TYPED(SeriesHeader, SeriesNameEdited, Edit&, void)
{
m_bSeriesNameChangePending = true;
- return 0;
}
void SeriesHeader::SetGetFocusHdl( const Link<Control&,void>& rLink )
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 7f8d948..a77a042 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -406,10 +406,10 @@ IMPL_LINK_NOARG_TYPED( ErrorBarResources, CategoryChosen, Button*, void )
IMPL_LINK_NOARG_TYPED(ErrorBarResources, SynchronizePosAndNeg, CheckBox&, void)
{
UpdateControlStates();
- PosValueChanged( 0 );
+ PosValueChanged( *m_pMfPositive );
}
-IMPL_LINK_NOARG(ErrorBarResources, PosValueChanged)
+IMPL_LINK_NOARG_TYPED(ErrorBarResources, PosValueChanged, Edit&, void)
{
if( m_pCbSyncPosNeg->IsChecked())
{
@@ -421,8 +421,6 @@ IMPL_LINK_NOARG(ErrorBarResources, PosValueChanged)
else
m_pMfNegative->SetValue( m_pMfPositive->GetValue());
}
-
- return 0;
}
IMPL_LINK_NOARG_TYPED(ErrorBarResources, IndicatorChanged, Button*, void)
@@ -472,21 +470,19 @@ IMPL_LINK_TYPED( ErrorBarResources, ChooseRange, Button*, pButton, void )
m_pCurrentRangeChoosingField = 0;
}
-IMPL_LINK( ErrorBarResources, RangeChanged, Edit *, pEdit )
+IMPL_LINK_TYPED( ErrorBarResources, RangeChanged, Edit&, rEdit, void )
{
- if( pEdit == m_pEdRangePositive )
+ if( &rEdit == m_pEdRangePositive )
{
m_bRangePosUnique = true;
- PosValueChanged( 0 );
+ PosValueChanged( *m_pMfPositive );
}
else
{
m_bRangeNegUnique = true;
}
- isRangeFieldContentValid( *pEdit );
-
- return 0;
+ isRangeFieldContentValid( rEdit );
}
void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
@@ -705,7 +701,7 @@ void ErrorBarResources::listeningFinished(
{
m_pCurrentRangeChoosingField->SetText( aRange );
m_pCurrentRangeChoosingField->GrabFocus();
- PosValueChanged( 0 );
+ PosValueChanged( *m_pMfPositive );
}
m_pCurrentRangeChoosingField = 0;
diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx
index 5186acf..4998e84 100644
--- a/chart2/source/controller/dialogs/res_Titles.cxx
+++ b/chart2/source/controller/dialogs/res_Titles.cxx
@@ -54,7 +54,7 @@ TitleResources::~TitleResources()
{
}
-void TitleResources::SetUpdateDataHdl( const Link<>& rLink )
+void TitleResources::SetUpdateDataHdl( const Link<Edit&,void>& rLink )
{
sal_uLong nTimeout = 4*EDIT_UPDATEDATA_TIMEOUT;
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx
index 5862f13..c5fcb3c 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -77,7 +77,7 @@ TrendlineResources::TrendlineResources( vcl::Window * pParent, const SfxItemSet&
m_pRB_Polynomial->SetClickHdl( aLink );
m_pRB_MovingAverage->SetClickHdl( aLink );
- Link<> aLink2 = LINK(this, TrendlineResources, ChangeValue );
+ Link<Edit&,void> aLink2 = LINK(this, TrendlineResources, ChangeValue );
m_pNF_Degree->SetModifyHdl( aLink2 );
m_pNF_Period->SetModifyHdl( aLink2 );
m_pFmtFld_InterceptValue->SetModifyHdl( aLink2 );
@@ -316,9 +316,9 @@ void TrendlineResources::UpdateControlStates()
m_pCB_ShowCorrelationCoeff->Enable( !bMovingAverage );
}
-IMPL_LINK( TrendlineResources, ChangeValue, void *, pNumericField)
+IMPL_LINK_TYPED( TrendlineResources, ChangeValue, Edit&, rNumericField, void)
{
- if( pNumericField == m_pNF_Degree )
+ if( &rNumericField == m_pNF_Degree )
{
if( !m_pRB_Polynomial->IsChecked() )
{
@@ -326,7 +326,7 @@ IMPL_LINK( TrendlineResources, ChangeValue, void *, pNumericField)
SelectTrendLine(m_pRB_Polynomial);
}
}
- else if( pNumericField == m_pNF_Period )
+ else if( &rNumericField == m_pNF_Period )
{
if( !m_pRB_MovingAverage->IsChecked() )
{
@@ -334,14 +334,12 @@ IMPL_LINK( TrendlineResources, ChangeValue, void *, pNumericField)
SelectTrendLine(m_pRB_MovingAverage);
}
}
- else if( pNumericField == m_pFmtFld_InterceptValue )
+ else if( &rNumericField == m_pFmtFld_InterceptValue )
{
if( !m_pCB_SetIntercept->IsChecked() )
m_pCB_SetIntercept->Check();
}
UpdateControlStates();
-
- return 0;
}
void TrendlineResources::SetNumFormatter( SvNumberFormatter* pFormatter )
diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx
index d69581c..9fe50e6 100644
--- a/chart2/source/controller/dialogs/res_Trendline.hxx
+++ b/chart2/source/controller/dialogs/res_Trendline.hxx
@@ -79,7 +79,7 @@ private:
void UpdateControlStates();
DECL_LINK_TYPED( SelectTrendLine, Button *, void );
- DECL_LINK( ChangeValue, void *);
+ DECL_LINK_TYPED( ChangeValue, Edit&, void);
};
} // namespace chart
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index f0c9c10..93f17f3 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -100,8 +100,8 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( vcl::Window* pWindow
m_pMFZRotation->SetValue(m_nZRotation);
const sal_uLong nTimeout = 4*EDIT_UPDATEDATA_TIMEOUT;
- Link<> aAngleChangedLink( LINK( this, ThreeD_SceneGeometry_TabPage, AngleChanged ));
- Link<> aAngleEditedLink( LINK( this, ThreeD_SceneGeometry_TabPage, AngleEdited ));
+ Link<Edit&,void> aAngleChangedLink( LINK( this, ThreeD_SceneGeometry_TabPage, AngleChanged ));
+ Link<Edit&,void> aAngleEditedLink( LINK( this, ThreeD_SceneGeometry_TabPage, AngleEdited ));
m_pMFXRotation->EnableUpdateData( nTimeout );
m_pMFXRotation->SetUpdateDataHdl( aAngleChangedLink );
@@ -197,19 +197,17 @@ void ThreeD_SceneGeometry_TabPage::applyAnglesToModel()
m_bAngleChangePending = false;
}
-IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, AngleEdited)
+IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, AngleEdited, Edit&, void)
{
m_nXRotation = m_pMFXRotation->GetValue();
m_nYRotation = m_pMFYRotation->GetValue();
m_bAngleChangePending = true;
- return 0;
}
-IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, AngleChanged)
+IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, AngleChanged, Edit&, void)
{
applyAnglesToModel();
- return 0;
}
void ThreeD_SceneGeometry_TabPage::applyPerspectiveToModel()
@@ -233,16 +231,14 @@ void ThreeD_SceneGeometry_TabPage::applyPerspectiveToModel()
m_bPerspectiveChangePending = false;
}
-IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveEdited)
+IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, PerspectiveEdited, Edit&, void)
{
m_bPerspectiveChangePending = true;
- return 0;
}
-IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveChanged)
+IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, PerspectiveChanged, Edit&, void)
{
applyPerspectiveToModel();
- return 0;
}
IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, PerspectiveToggled, CheckBox&, void)
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
index bae9ba1..b9e6eaa 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
@@ -46,14 +46,14 @@ public:
void commitPendingChanges();
// is called by timer to apply changes to model
- DECL_LINK( AngleChanged, void* );
+ DECL_LINK_TYPED( AngleChanged, Edit&, void );
// is called immediately when a field changes
- DECL_LINK( AngleEdited, void* );
+ DECL_LINK_TYPED( AngleEdited, Edit&, void );
// is called by timer to apply changes to model
- DECL_LINK( PerspectiveChanged, void* );
+ DECL_LINK_TYPED( PerspectiveChanged, Edit&, void );
// is called immediately when a field changes
- DECL_LINK( PerspectiveEdited, void* );
+ DECL_LINK_TYPED( PerspectiveEdited, Edit&, void );
DECL_LINK_TYPED( PerspectiveToggled, CheckBox&, void );
DECL_LINK_TYPED( RightAngledAxesToggled, CheckBox&, void );
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 7925d7c..0ef5a70 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -733,14 +733,14 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, DownButtonClickedHdl, Button*, void)
}
}
-IMPL_LINK( DataSourceTabPage, RangeModifiedHdl, Edit*, pEdit )
+IMPL_LINK_TYPED( DataSourceTabPage, RangeModifiedHdl, Edit&, rEdit, void )
{
// note: isValid sets the color of the edit field
- if( isRangeFieldContentValid( *pEdit ))
+ if( isRangeFieldContentValid( rEdit ))
{
setDirty();
- updateModelFromControl( pEdit );
- if( pEdit == m_pEDT_RANGE )
+ updateModelFromControl( &rEdit );
+ if( &rEdit == m_pEDT_RANGE )
{
if( ! lcl_UpdateCurrentSeriesName( *m_pLB_SERIES ))
fillSeriesListBox();
@@ -749,18 +749,16 @@ IMPL_LINK( DataSourceTabPage, RangeModifiedHdl, Edit*, pEdit )
// enable/disable OK button
isValid();
-
- return 0;
}
-IMPL_LINK( DataSourceTabPage, RangeUpdateDataHdl, Edit*, pEdit )
+IMPL_LINK_TYPED( DataSourceTabPage, RangeUpdateDataHdl, Edit&, rEdit, void )
{
// note: isValid sets the color of the edit field
- if( isRangeFieldContentValid( *pEdit ))
+ if( isRangeFieldContentValid( rEdit ))
{
setDirty();
- updateModelFromControl( pEdit );
- if( pEdit == m_pEDT_RANGE )
+ updateModelFromControl( &rEdit );
+ if( &rEdit == m_pEDT_RANGE )
{
if( ! lcl_UpdateCurrentSeriesName( *m_pLB_SERIES ))
fillSeriesListBox();
@@ -768,8 +766,6 @@ IMPL_LINK( DataSourceTabPage, RangeUpdateDataHdl, Edit*, pEdit )
}
// enable/disable OK button
isValid();
-
- return 0;
}
void DataSourceTabPage::listeningFinished(
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index 4915e47..672efc3 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -79,8 +79,8 @@ protected:
DECL_LINK_TYPED( CategoriesRangeButtonClickedHdl, Button*, void );
DECL_LINK_TYPED( AddButtonClickedHdl, Button*, void );
DECL_LINK_TYPED( RemoveButtonClickedHdl, Button*, void );
- DECL_LINK( RangeModifiedHdl, Edit* );
- DECL_LINK( RangeUpdateDataHdl, Edit* );
+ DECL_LINK_TYPED( RangeModifiedHdl, Edit&, void );
+ DECL_LINK_TYPED( RangeUpdateDataHdl, Edit&, void );
DECL_LINK_TYPED( UpButtonClickedHdl, Button*, void );
DECL_LINK_TYPED( DownButtonClickedHdl, Button*, void );
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 7888fb8..aeb0e6c 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -351,29 +351,27 @@ bool RangeChooserTabPage::isValid()
return bIsValid;
}
-IMPL_LINK_NOARG(RangeChooserTabPage, ControlEditedHdl)
+IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ControlEditedHdl, Edit&, void)
{
setDirty();
isValid();
- return 0;
}
IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ControlChangedRadioHdl, RadioButton&, void)
{
- ControlChangedHdl(NULL);
+ ControlChangedHdl(*m_pED_Range);
}
IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ControlChangedCheckBoxHdl, CheckBox&, void)
{
- ControlChangedHdl(NULL);
+ ControlChangedHdl(*m_pED_Range);
}
-IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedHdl)
+IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ControlChangedHdl, Edit&, void)
{
setDirty();
if( isValid())
changeDialogModelAccordingToControls();
- return 0;
}
IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ChooseRangeHdl, Button*, void)
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index 4fb2f59..cd0804f 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -72,10 +72,10 @@ protected: //methods
void setDirty();
DECL_LINK_TYPED( ChooseRangeHdl, Button*, void );
- DECL_LINK( ControlChangedHdl, void* );
+ DECL_LINK_TYPED( ControlChangedHdl, Edit&, void );
DECL_LINK_TYPED( ControlChangedCheckBoxHdl, CheckBox&, void );
DECL_LINK_TYPED( ControlChangedRadioHdl, RadioButton&, void );
- DECL_LINK( ControlEditedHdl, void* );
+ DECL_LINK_TYPED( ControlEditedHdl, Edit&, void );
protected: //member
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 5206848..ece435b 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -157,12 +157,11 @@ void ScaleTabPage::dispose()
SfxTabPage::dispose();
}
-IMPL_STATIC_LINK(
- ScaleTabPage, FmtFieldModifiedHdl, FormattedField*, pFmtFied )
+IMPL_STATIC_LINK_TYPED(
+ ScaleTabPage, FmtFieldModifiedHdl, Edit&, rEdit, void )
{
- if( pFmtFied )
- pFmtFied->SetDefaultValue( pFmtFied->GetValue() );
- return 0;
+ FormattedField& rFmtField = static_cast<FormattedField&>(rEdit);
+ rFmtField.SetDefaultValue( rFmtField.GetValue() );
}
void ScaleTabPage::StateChanged( StateChangedType nType )
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index b6f4803..c4d2bc6 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -101,7 +101,7 @@ private:
DECL_LINK_TYPED( SelectAxisTypeHdl, ListBox&, void );
DECL_LINK_TYPED( EnableValueHdl, Button*, void );
- DECL_STATIC_LINK( ScaleTabPage, FmtFieldModifiedHdl, FormattedField* );
+ DECL_STATIC_LINK_TYPED( ScaleTabPage, FmtFieldModifiedHdl, Edit&, void);
/** shows a warning window due to an invalid input.
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index ef5a731..982bacb 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -49,7 +49,7 @@ TitlesAndObjectsTabPage::TitlesAndObjectsTabPage( svt::OWizardMachine* pParent
get(m_pCB_Grid_Y, "y");
get(m_pCB_Grid_Z, "z");
- m_xTitleResources->SetUpdateDataHdl( LINK( this, TitlesAndObjectsTabPage, ChangeHdl ));
+ m_xTitleResources->SetUpdateDataHdl( LINK( this, TitlesAndObjectsTabPage, ChangeEditHdl ));
m_xLegendPositionResources->SetChangeHdl( LINK( this, TitlesAndObjectsTabPage, ChangeHdl ));
m_pCB_Grid_X->SetToggleHdl( LINK( this, TitlesAndObjectsTabPage, ChangeCheckBoxHdl ));
@@ -150,6 +150,10 @@ IMPL_LINK_NOARG_TYPED(TitlesAndObjectsTabPage, ChangeCheckBoxHdl, CheckBox&, voi
{
ChangeHdl(NULL);
}
+IMPL_LINK_NOARG_TYPED(TitlesAndObjectsTabPage, ChangeEditHdl, Edit&, void)
+{
+ ChangeHdl(NULL);
+}
IMPL_LINK_NOARG(TitlesAndObjectsTabPage, ChangeHdl)
{
if( m_bCommitToModel )
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
index ec7bfd9..8cf86a5 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
@@ -54,6 +54,7 @@ public:
protected:
void commitToModel();
DECL_LINK( ChangeHdl, void* );
+ DECL_LINK_TYPED( ChangeEditHdl, Edit&, void );
DECL_LINK_TYPED( ChangeCheckBoxHdl, CheckBox&, void );
protected:
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index 901ef38..8105e92 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -125,10 +125,10 @@ private:
DECL_LINK_TYPED( CategoryChosen, Button*, void );
DECL_LINK_TYPED( CategoryChosen2, ListBox&, void );
DECL_LINK_TYPED( SynchronizePosAndNeg, CheckBox&, void );
- DECL_LINK( PosValueChanged, void * );
+ DECL_LINK_TYPED( PosValueChanged, Edit&, void );
DECL_LINK_TYPED( IndicatorChanged, Button *, void );
DECL_LINK_TYPED( ChooseRange, Button *, void );
- DECL_LINK( RangeChanged, Edit * );
+ DECL_LINK_TYPED( RangeChanged, Edit&, void );
void UpdateControlStates();
bool isRangeFieldContentValid( Edit & rEdit );
diff --git a/chart2/source/controller/inc/res_Titles.hxx b/chart2/source/controller/inc/res_Titles.hxx
index 05e22ef..79c1ce7 100644
--- a/chart2/source/controller/inc/res_Titles.hxx
+++ b/chart2/source/controller/inc/res_Titles.hxx
@@ -35,7 +35,7 @@ public:
void writeToResources( const TitleDialogData& rInput );
void readFromResources( TitleDialogData& rOutput );
- void SetUpdateDataHdl( const Link<>& rLink );
+ void SetUpdateDataHdl( const Link<Edit&,void>& rLink );
bool IsModified();
void ClearModifyFlag();
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
index 0777408..9b44f0d 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
@@ -296,7 +296,7 @@ void ChartErrorBarPanel::Initialize()
mpLBType->SetSelectHdl(LINK(this, ChartErrorBarPanel, ListBoxHdl));
- Link<> aLink2 = LINK(this, ChartErrorBarPanel, NumericFieldHdl);
+ Link<Edit&,void> aLink2 = LINK(this, ChartErrorBarPanel, NumericFieldHdl);
mpMFPos->SetModifyHdl(aLink2);
mpMFNeg->SetModifyHdl(aLink2);
}
@@ -420,16 +420,14 @@ IMPL_LINK_NOARG_TYPED(ChartErrorBarPanel, ListBoxHdl, ListBox&, void)
setTypePos(mxModel, aCID, nPos);
}
-IMPL_LINK(ChartErrorBarPanel, NumericFieldHdl, NumericField*, pMetricField)
+IMPL_LINK_TYPED(ChartErrorBarPanel, NumericFieldHdl, Edit&, rMetricField, void)
{
OUString aCID = getCID(mxModel);
- double nVal = pMetricField->GetValue();
- if (pMetricField == mpMFPos.get())
+ double nVal = static_cast<NumericField&>(rMetricField).GetValue();
+ if (&rMetricField == mpMFPos.get())
setValue(mxModel, aCID, nVal, true);
- else if (pMetricField == mpMFNeg.get())
+ else if (&rMetricField == mpMFNeg.get())
setValue(mxModel, aCID, nVal, false);
-
- return 0;
}
}} // end of namespace ::chart::sidebar
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
index 9ed600e..ed7a0e6 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
@@ -24,6 +24,7 @@ class FixedText;
class ListBox;
class NumericField;
class MetricField;
+class Edit;
namespace chart {
@@ -90,7 +91,7 @@ private:
DECL_LINK_TYPED(RadioBtnHdl, RadioButton&, void);
DECL_LINK_TYPED(ListBoxHdl, ListBox&, void);
- DECL_LINK(NumericFieldHdl, NumericField*);
+ DECL_LINK_TYPED(NumericFieldHdl, Edit&, void);
};
} } // end of namespace ::chart::sidebar
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 5ccc0ec..0d68bfa 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2673,14 +2673,12 @@ void SvxMainMenuOrganizerDialog::dispose()
ModalDialog::dispose();
}
-IMPL_LINK(SvxMainMenuOrganizerDialog, ModifyHdl, Edit*, pEdit)
+IMPL_LINK_NOARG_TYPED(SvxMainMenuOrganizerDialog, ModifyHdl, Edit&, void)
{
- (void)pEdit;
-
// if the Edit control is empty do not change the name
if (m_pMenuNameEdit->GetText().isEmpty())
{
- return 0;
+ return;
}
SvxConfigEntry* pNewEntryData =
@@ -2689,8 +2687,6 @@ IMPL_LINK(SvxMainMenuOrganizerDialog, ModifyHdl, Edit*, pEdit)
pNewEntryData->SetName(m_pMenuNameEdit->GetText());
m_pMenuListBox->SetEntryText( pNewMenuEntry, pNewEntryData->GetName() );
-
- return 0;
}
IMPL_LINK_NOARG_TYPED( SvxMainMenuOrganizerDialog, SelectHdl, SvTreeListBox*, void )
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 54de68e..c263b7e 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -954,9 +954,9 @@ int SpellDialog::AddToDictionaryExecute( sal_uInt16 nItemId, PopupMenu *pMenu )
}
-IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd)
+IMPL_LINK_TYPED(SpellDialog, ModifyHdl, Edit&, rEd, void)
{
- if (m_pSentenceED == pEd)
+ if (m_pSentenceED == &rEd)
{
bModified = true;
m_pSuggestionLB->SetNoSelection();
@@ -976,7 +976,6 @@ IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd)
}
m_pSentenceED->AddUndoAction(pSpellAction);
}
- return 0;
};
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index d783e88..81d274a 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -990,6 +990,7 @@ public:
void update_color(sal_uInt16 n = UPDATE_ALL);
DECL_LINK(ColorModifyHdl, void*);
+ DECL_LINK_TYPED(ColorModifyEditHdl, Edit&, void);
DECL_LINK_TYPED(ModeModifyHdl, RadioButton&, void);
sal_Int32 GetColor() const;
@@ -1074,20 +1075,21 @@ ColorPickerDialog::ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sa
mpColorField->SetModifyHdl( aLink );
mpColorSlider->SetModifyHdl( aLink );
- mpMFRed->SetModifyHdl( aLink );
- mpMFGreen->SetModifyHdl( aLink );
- mpMFBlue->SetModifyHdl( aLink );
+ Link<Edit&,void> aLink3( LINK( this, ColorPickerDialog, ColorModifyEditHdl ) );
+ mpMFRed->SetModifyHdl( aLink3 );
+ mpMFGreen->SetModifyHdl( aLink3 );
+ mpMFBlue->SetModifyHdl( aLink3 );
- mpMFCyan->SetModifyHdl( aLink );
- mpMFMagenta->SetModifyHdl( aLink );
- mpMFYellow->SetModifyHdl( aLink );
- mpMFKey->SetModifyHdl( aLink );
+ mpMFCyan->SetModifyHdl( aLink3 );
+ mpMFMagenta->SetModifyHdl( aLink3 );
+ mpMFYellow->SetModifyHdl( aLink3 );
+ mpMFKey->SetModifyHdl( aLink3 );
- mpMFHue->SetModifyHdl( aLink );
- mpMFSaturation->SetModifyHdl( aLink );
- mpMFBrightness->SetModifyHdl( aLink );
+ mpMFHue->SetModifyHdl( aLink3 );
+ mpMFSaturation->SetModifyHdl( aLink3 );
+ mpMFBrightness->SetModifyHdl( aLink3 );
- mpEDHex->SetModifyHdl( aLink );
+ mpEDHex->SetModifyHdl( aLink3 );
Link<RadioButton&,void> aLink2 = LINK( this, ColorPickerDialog, ModeModifyHdl );
mpRBRed->SetToggleHdl( aLink2 );
@@ -1278,6 +1280,10 @@ void ColorPickerDialog::update_color( sal_uInt16 n )
mpColorPreview->SetColor(aColor);
}
+IMPL_LINK_TYPED(ColorPickerDialog, ColorModifyEditHdl, Edit&, rEdit, void)
+{
+ ColorModifyHdl(&rEdit);
+}
IMPL_LINK(ColorPickerDialog, ColorModifyHdl, void *, p)
{
sal_uInt16 n = 0;
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index e5fd633..268dbe9 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -264,7 +264,7 @@ void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sIni
OUString sRealSetText = m_pcmbSearchText->GetText();
if (!sRealSetText.equals(sInitialText))
m_pcmbSearchText->SetText(OUString());
- LINK(this, FmSearchDialog, OnSearchTextModified).Call(m_pcmbSearchText);
+ LINK(this, FmSearchDialog, OnSearchTextModified).Call(*m_pcmbSearchText);
// initial
m_aDelayedPaint.SetTimeoutHdl(LINK(this, FmSearchDialog, OnDelayedPaint));
@@ -393,7 +393,7 @@ IMPL_LINK_TYPED(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton, void
}
}
-IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified)
+IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnSearchTextModified, Edit&, void)
{
if ((!m_pcmbSearchText->GetText().isEmpty()) || !m_prbSearchForText->IsChecked())
m_pbSearchAgain->Enable();
@@ -401,7 +401,6 @@ IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified)
m_pbSearchAgain->Disable();
m_pSearchEngine->InvalidatePreviousLoc();
- return 0;
}
IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnFocusGrabbed, Control&, void)
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 73bb4c3..bdf4c93 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -196,11 +196,11 @@ GraphicFilterMosaic::GraphicFilterMosaic( vcl::Window* pParent, const Graphic& r
mpMtrWidth->SetValue( nTileWidth );
mpMtrWidth->SetLast( GetGraphicSizePixel().Width() );
- mpMtrWidth->SetModifyHdl( GetModifyHdl() );
+ mpMtrWidth->SetModifyHdl( LINK(this, GraphicFilterMosaic, EditModifyHdl) );
mpMtrHeight->SetValue( nTileHeight );
mpMtrHeight->SetLast( GetGraphicSizePixel().Height() );
- mpMtrHeight->SetModifyHdl( GetModifyHdl() );
+ mpMtrHeight->SetModifyHdl( LINK(this, GraphicFilterMosaic, EditModifyHdl) );
mpCbxEdges->Check( bEnhanceEdges );
mpCbxEdges->SetToggleHdl( LINK(this, GraphicFilterMosaic, CheckBoxModifyHdl) );
@@ -213,6 +213,11 @@ IMPL_LINK_TYPED(GraphicFilterMosaic, CheckBoxModifyHdl, CheckBox&, rCheckBox, vo
GetModifyHdl().Call(&rCheckBox);
}
+IMPL_LINK_TYPED(GraphicFilterMosaic, EditModifyHdl, Edit&, rEdit, void)
+{
+ GetModifyHdl().Call(&rEdit);
+}
+
GraphicFilterMosaic::~GraphicFilterMosaic()
{
disposeOnce();
@@ -273,10 +278,15 @@ GraphicFilterSmooth::GraphicFilterSmooth( vcl::Window* pParent, const Graphic& r
get(mpMtrRadius, "radius");
mpMtrRadius->SetValue( nRadius* 10 );
- mpMtrRadius->SetModifyHdl( GetModifyHdl() );
+ mpMtrRadius->SetModifyHdl( LINK(this, GraphicFilterSmooth, EditModifyHdl) );
mpMtrRadius->GrabFocus();
}
+IMPL_LINK_TYPED(GraphicFilterSmooth, EditModifyHdl, Edit&, rEdit, void)
+{
+ GetModifyHdl().Call(&rEdit);
+}
+
GraphicFilterSmooth::~GraphicFilterSmooth()
{
disposeOnce();
@@ -329,7 +339,7 @@ GraphicFilterSolarize::GraphicFilterSolarize( vcl::Window* pParent, const Graphi
get(mpCbxInvert, "invert");
mpMtrThreshold->SetValue( FRound( cGreyThreshold / 2.55 ) );
- mpMtrThreshold->SetModifyHdl( GetModifyHdl() );
+ mpMtrThreshold->SetModifyHdl( LINK(this, GraphicFilterSolarize, EditModifyHdl) );
mpCbxInvert->Check( bInvert );
mpCbxInvert->SetToggleHdl( LINK(this, GraphicFilterSolarize, CheckBoxModifyHdl) );
@@ -339,6 +349,10 @@ IMPL_LINK_TYPED(GraphicFilterSolarize, CheckBoxModifyHdl, CheckBox&, rCheckBox,
{
GetModifyHdl().Call(&rCheckBox);
}
+IMPL_LINK_TYPED(GraphicFilterSolarize, EditModifyHdl, Edit&, rEdit, void)
+{
+ GetModifyHdl().Call(&rEdit);
+}
GraphicFilterSolarize::~GraphicFilterSolarize()
{
@@ -399,7 +413,12 @@ GraphicFilterSepia::GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGr
get(mpMtrSepia, "value");
mpMtrSepia->SetValue( nSepiaPercent );
- mpMtrSepia->SetModifyHdl( GetModifyHdl() );
+ mpMtrSepia->SetModifyHdl( LINK(this, GraphicFilterSepia, EditModifyHdl) );
+}
+
+IMPL_LINK_TYPED(GraphicFilterSepia, EditModifyHdl, Edit&, rEdit, void)
+{
+ GetModifyHdl().Call(&rEdit);
}
GraphicFilterSepia::~GraphicFilterSepia()
@@ -452,7 +471,12 @@ GraphicFilterPoster::GraphicFilterPoster(vcl::Window* pParent, const Graphic& rG
mpNumPoster->SetFirst( 2 );
mpNumPoster->SetLast( rGraphic.GetBitmapEx().GetBitCount() );
mpNumPoster->SetValue( nPosterCount );
- mpNumPoster->SetModifyHdl( GetModifyHdl() );
+ mpNumPoster->SetModifyHdl( LINK(this, GraphicFilterPoster, EditModifyHdl) );
+}
+
+IMPL_LINK_TYPED(GraphicFilterPoster, EditModifyHdl, Edit&, rEdit, void)
+{
+ GetModifyHdl().Call(&rEdit);
}
GraphicFilterPoster::~GraphicFilterPoster()
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index 4a064eb..0ab18c3 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -41,7 +41,7 @@ SvxNameDialog::SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const
pFtDescription->SetText( rDesc );
pEdtName->SetText( rName );
pEdtName->SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
- ModifyHdl(pEdtName.get());
+ ModifyHdl(*pEdtName.get());
pEdtName->SetModifyHdl(LINK(this, SvxNameDialog, ModifyHdl));
}
@@ -58,11 +58,10 @@ void SvxNameDialog::dispose()
ModalDialog::dispose();
}
-IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl)
+IMPL_LINK_NOARG_TYPED(SvxNameDialog, ModifyHdl, Edit&, void)
{
if(aCheckNameHdl.IsSet())
pBtnOK->Enable(aCheckNameHdl.Call(*this));
- return 0;
}
@@ -82,7 +81,7 @@ SvxObjectNameDialog::SvxObjectNameDialog(
// activate name
pEdtName->SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
- ModifyHdl(pEdtName.get());
+ ModifyHdl(*pEdtName.get());
pEdtName->SetModifyHdl(LINK(this, SvxObjectNameDialog, ModifyHdl));
}
@@ -99,14 +98,12 @@ void SvxObjectNameDialog::dispose()
}
-IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl)
+IMPL_LINK_NOARG_TYPED(SvxObjectNameDialog, ModifyHdl, Edit&, void)
{
if(aCheckNameHdl.IsSet())
{
pBtnOK->Enable(aCheckNameHdl.Call(*this));
}
-
- return 0;
}
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index c11cd43..c8a1a8d 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -657,7 +657,7 @@ namespace svx
}
m_pWordInput->SetText( sFirstSuggestion );
m_pWordInput->SaveValue();
- OnSuggestionModified( m_pWordInput );
+ OnSuggestionModified( *m_pWordInput );
}
@@ -718,19 +718,17 @@ namespace svx
IMPL_LINK_NOARG_TYPED( HangulHanjaConversionDialog, OnSuggestionSelected, SuggestionDisplay&, void )
{
m_pWordInput->SetText( m_pSuggestions->GetSelectEntry() );
- OnSuggestionModified( NULL );
+ OnSuggestionModified( *m_pWordInput );
}
- IMPL_LINK_NOARG( HangulHanjaConversionDialog, OnSuggestionModified )
+ IMPL_LINK_NOARG_TYPED( HangulHanjaConversionDialog, OnSuggestionModified, Edit&, void )
{
m_pFind->Enable( m_pWordInput->IsValueChangedFromSaved() );
bool bSameLen = m_pWordInput->GetText().getLength() == m_pOriginalWord->GetText().getLength();
m_pReplace->Enable( m_bDocumentMode && bSameLen );
m_pReplaceAll->Enable( m_bDocumentMode && bSameLen );
-
- return 0L;
}
@@ -1197,13 +1195,11 @@ namespace svx
EndDialog( RET_OK );
}
- IMPL_LINK_NOARG(HangulHanjaNewDictDialog, ModifyHdl)
+ IMPL_LINK_NOARG_TYPED(HangulHanjaNewDictDialog, ModifyHdl, Edit&, void)
{
OUString aName(comphelper::string::stripEnd(m_pDictNameED->GetText(), ' '));
m_pOkBtn->Enable( !aName.isEmpty() );
-
- return 0;
}
HangulHanjaNewDictDialog::HangulHanjaNewDictDialog(vcl::Window* pParent)
@@ -1502,39 +1498,33 @@ namespace svx
UpdateScrollbar();
}
- IMPL_LINK_NOARG( HangulHanjaEditDictDialog, OriginalModifyHdl )
+ IMPL_LINK_NOARG_TYPED( HangulHanjaEditDictDialog, OriginalModifyHdl, Edit&, void )
{
m_bModifiedOriginal = true;
m_aOriginal = comphelper::string::stripEnd( m_aOriginalLB->GetText(), ' ' );
UpdateSuggestions();
UpdateButtonStates();
-
- return 0;
}
- IMPL_LINK( HangulHanjaEditDictDialog, EditModifyHdl1, Edit*, pEdit )
+ IMPL_LINK_TYPED( HangulHanjaEditDictDialog, EditModifyHdl1, Edit&, rEdit, void )
{
- EditModify( pEdit, 0 );
- return 0;
+ EditModify( &rEdit, 0 );
}
- IMPL_LINK( HangulHanjaEditDictDialog, EditModifyHdl2, Edit*, pEdit )
+ IMPL_LINK_TYPED( HangulHanjaEditDictDialog, EditModifyHdl2, Edit&, rEdit, void )
{
- EditModify( pEdit, 1 );
- return 0;
+ EditModify( &rEdit, 1 );
}
- IMPL_LINK( HangulHanjaEditDictDialog, EditModifyHdl3, Edit*, pEdit )
+ IMPL_LINK_TYPED( HangulHanjaEditDictDialog, EditModifyHdl3, Edit&, rEdit, void )
{
- EditModify( pEdit, 2 );
- return 0;
+ EditModify( &rEdit, 2 );
}
- IMPL_LINK( HangulHanjaEditDictDialog, EditModifyHdl4, Edit*, pEdit )
+ IMPL_LINK_TYPED( HangulHanjaEditDictDialog, EditModifyHdl4, Edit&, rEdit, void )
{
- EditModify( pEdit, 3 );
- return 0;
+ EditModify( &rEdit, 3 );
}
IMPL_LINK_NOARG_TYPED( HangulHanjaEditDictDialog, BookLBSelectHdl, ListBox&, void )
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index f7c27b3..5fc269e 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -104,7 +104,7 @@ void SvxHyperlinkDocTp::FillDlgFields(const OUString& rStrURL)
aStrMark = rStrURL.copy( nPos+1 );
m_pEdTarget->SetText ( aStrMark );
- ModifiedPathHdl_Impl ( NULL );
+ ModifiedPathHdl_Impl ( *m_pCbbPath );
}
/*************************************************************************
@@ -216,7 +216,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ClickFileopenHdl_Impl, Button*, void)
m_pCbbPath->SetText( aPath );
if ( aOldURL != GetCurrentURL() )
- ModifiedPathHdl_Impl (NULL);
+ ModifiedPathHdl_Impl(*m_pCbbPath);
}
}
@@ -256,7 +256,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ClickTargetHdl_Impl, Button*, void)
|*
|************************************************************************/
-IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedPathHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ModifiedPathHdl_Impl, Edit&, void)
{
maStrURL = GetCurrentURL();
@@ -264,8 +264,6 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedPathHdl_Impl)
maTimer.Start();
m_pFtFullURL->SetText( maStrURL );
-
- return 0L;
}
/*************************************************************************
@@ -297,7 +295,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, void)
|*
|************************************************************************/
-IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedTargetHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ModifiedTargetHdl_Impl, Edit&, void)
{
maStrURL = GetCurrentURL();
@@ -305,8 +303,6 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedTargetHdl_Impl)
mpMarkWnd->SelectEntry ( m_pEdTarget->GetText() );
m_pFtFullURL->SetText( maStrURL );
-
- return 0L;
}
/*************************************************************************
@@ -332,7 +328,7 @@ void SvxHyperlinkDocTp::SetMarkStr ( const OUString& aStrMark )
{
m_pEdTarget->SetText ( aStrMark );
- ModifiedTargetHdl_Impl ( NULL );
+ ModifiedTargetHdl_Impl ( *m_pEdTarget );
}
/*************************************************************************
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 094f05e..f730273 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -224,7 +224,7 @@ void SvxHyperlinkInternetTp::SetInitFocus()
|*
|************************************************************************/
-IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl, Edit&, void)
{
OUString aScheme = GetSchemeFromURL( m_pCbbTarget->GetText() );
if( !aScheme.isEmpty() )
@@ -233,8 +233,6 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl)
// start timer
maTimer.SetTimeout( 2500 );
maTimer.Start();
-
- return 0L;
}
/*************************************************************************
@@ -254,7 +252,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, TimeoutHdl_Impl, Timer *, void)
|*
|************************************************************************/
-IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl, Edit&, void)
{
OUString aStrLogin ( m_pEdLogin->GetText() );
if ( aStrLogin.equalsIgnoreAsciiCase( sAnonymous ) )
@@ -262,8 +260,6 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl)
m_pCbAnonymous->Check();
ClickAnonymousHdl_Impl(NULL);
}
-
- return 0L;
}
void SvxHyperlinkInternetTp::SetScheme(const OUString& rScheme)
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 26febba..567a478 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -229,13 +229,11 @@ void SvxHyperlinkMailTp::RemoveImproperProtocol(const OUString& aProperScheme)
|*
|************************************************************************/
-IMPL_LINK_NOARG(SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl, Edit&, void)
{
OUString aScheme = GetSchemeFromURL( m_pCbbReceiver->GetText() );
if(!aScheme.isEmpty())
SetScheme( aScheme );
-
- return 0L;
}
/*************************************************************************
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 42c77ea..8adf792 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -163,7 +163,7 @@ SvxZoomDialog::SvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet )
m_pSingleBtn->SetClickHdl(aViewLayoutLink);
m_pColumnsBtn->SetClickHdl(aViewLayoutLink);
- Link<> aViewLayoutSpinLink = LINK(this, SvxZoomDialog, ViewLayoutSpinHdl);
+ Link<Edit&,void> aViewLayoutSpinLink = LINK(this, SvxZoomDialog, ViewLayoutSpinHdl);
m_pColumnsEdit->SetModifyHdl(aViewLayoutSpinLink);
Link<Button*,void> aViewLayoutCheckLink = LINK(this, SvxZoomDialog, ViewLayoutCheckHdl);
@@ -328,13 +328,12 @@ IMPL_LINK_TYPED(SvxZoomDialog, UserHdl, Button *, pButton, void)
}
}
-IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl)
+IMPL_LINK_NOARG_TYPED(SvxZoomDialog, SpinHdl, Edit&, void)
{
if (!m_pUserBtn->IsChecked())
- return 0;
+ return;
mbModified = true;
- return 0;
}
IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutUserHdl, Button*, pButton, void)
@@ -364,10 +363,10 @@ IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutUserHdl, Button*, pButton, void)
}
}
-IMPL_LINK(SvxZoomDialog, ViewLayoutSpinHdl, NumericField*, pEdit)
+IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutSpinHdl, Edit&, rEdit, void)
{
- if (pEdit == m_pColumnsEdit && !m_pColumnsBtn->IsChecked())
- return 0;
+ if (&rEdit == m_pColumnsEdit && !m_pColumnsBtn->IsChecked())
+ return;
if (m_pColumnsEdit->GetValue() % 2 == 0)
{
@@ -380,8 +379,6 @@ IMPL_LINK(SvxZoomDialog, ViewLayoutSpinHdl, NumericField*, pEdit)
}
mbModified = true;
-
- return 0;
}
IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutCheckHdl, Button*, pCheckBox, void)
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 7177623..40497fb 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -64,11 +64,11 @@ private:
std::set< sal_uInt16 > m_aIgnoreErrorsAt;
sal_uInt16 m_nErrorStart;
sal_uInt16 m_nErrorEnd;
- bool m_bIsUndoEditMode;
+ bool m_bIsUndoEditMode;
- Link<> m_aModifyLink;
+ Link<Edit&,void> m_aModifyLink;
- void CallModifyLink() {m_aModifyLink.Call(this);}
+ void CallModifyLink() {m_aModifyLink.Call(*this);}
inline SpellDialog* GetSpellDialog() const;
protected:
@@ -77,7 +77,7 @@ protected:
public:
SentenceEditWindow_Impl(vcl::Window* pParent, WinBits nBits);
- void SetModifyHdl(const Link<>& rLink) override { m_aModifyLink = rLink;}
+ void SetModifyHdl(const Link<Edit&,void>& rLink) override { m_aModifyLink = rLink;}
void SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd );
void SetText( const OUString& rStr ) override;
@@ -179,7 +179,7 @@ private:
DECL_LINK_TYPED( CheckGrammarHdl, Button*, void );
DECL_LINK_TYPED( ExtClickHdl, Button*, void );
DECL_LINK_TYPED(CancelHdl, Button*, void);
- DECL_LINK( ModifyHdl, SentenceEditWindow_Impl *);
+ DECL_LINK_TYPED( ModifyHdl, Edit&, void);
DECL_LINK_TYPED(UndoHdl, Button*, void);
DECL_LINK_TYPED( AddToDictSelectHdl, MenuButton*, void );
DECL_LINK_TYPED( AddToDictClickHdl, Button*, void );
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 073b728..bf83041 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -255,7 +255,7 @@ private:
DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void);
DECL_LINK_TYPED(NewDelButtonHdl, Button*, void);
DECL_LINK_TYPED(NewDelActionHdl, AutoCorrEdit&, bool);
- DECL_LINK(ModifyHdl, Edit*);
+ DECL_LINK_TYPED(ModifyHdl, Edit&, void);
bool NewDelHdl(void*);
void RefillReplaceBox( bool bFromReset,
@@ -318,7 +318,7 @@ private:
DECL_LINK_TYPED(NewDelButtonHdl, Button*, void);
DECL_LINK_TYPED(NewDelActionHdl, AutoCorrEdit&, bool);
DECL_LINK_TYPED(SelectHdl, ListBox&, void);
- DECL_LINK(ModifyHdl, Edit*);
+ DECL_LINK_TYPED(ModifyHdl, Edit&, void);
bool NewDelHdl(void*);
/// Box filled with new language
void RefillReplaceBoxes(bool bFromReset,
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 1817195..3fd7659 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -122,8 +122,8 @@ private:
DECL_LINK_TYPED( SelPreHdl_Impl, ValueSet*, void );
DECL_LINK_TYPED( SelSdwHdl_Impl, ValueSet*, void );
DECL_LINK_TYPED( LinesChanged_Impl, LinkParamNone*, void );
- DECL_LINK( ModifyDistanceHdl_Impl, MetricField*);
- DECL_LINK( ModifyWidthHdl_Impl, void*);
+ DECL_LINK_TYPED( ModifyDistanceHdl_Impl, Edit&, void);
+ DECL_LINK_TYPED( ModifyWidthHdl_Impl, Edit&, void);
DECL_LINK_TYPED( SyncHdl_Impl, Button*, void);
sal_uInt16 GetPresetImageId( sal_uInt16 nValueSetIdx ) const;
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index e768576..a85d625 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -483,7 +483,7 @@ class SvxMainMenuOrganizerDialog : public ModalDialog
void UpdateButtonStates();
DECL_LINK_TYPED( MoveHdl, Button *, void );
- DECL_LINK( ModifyHdl, Edit * );
+ DECL_LINK_TYPED( ModifyHdl, Edit&, void );
DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void );
public:
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index a2e8746..1809506 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -133,9 +133,10 @@ private:
bool FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp );
DECL_LINK_TYPED( UpdateHdl_Impl, Idle *, void );
- DECL_LINK( FontModifyHdl_Impl, void* );
+ DECL_LINK_TYPED( FontModifyEditHdl_Impl, Edit&, void );
DECL_LINK_TYPED( FontModifyListBoxHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( FontModifyComboBoxHdl_Impl, ComboBox&, void );
+ void FontModifyHdl_Impl(void*);
public:
using SfxTabPage::ActivatePage;
@@ -297,13 +298,13 @@ private:
DECL_LINK_TYPED( PositionHdl_Impl, Button*, void );
DECL_LINK_TYPED( RotationHdl_Impl, Button*, void );
- DECL_LINK( FontModifyHdl_Impl, void *);
+ DECL_LINK_TYPED( FontModifyHdl_Impl, Edit&, void );
DECL_LINK_TYPED( AutoPositionHdl_Impl, Button*, void );
DECL_LINK_TYPED( FitToLineHdl_Impl, Button*, void );
- DECL_LINK_TYPED( KerningSelectHdl_Impl, ListBox&, void);
- DECL_LINK( KerningModifyHdl_Impl, void *);
+ DECL_LINK_TYPED( KerningSelectHdl_Impl, ListBox&, void );
+ DECL_LINK_TYPED( KerningModifyHdl_Impl, Edit&, void );
DECL_LINK_TYPED( LoseFocusHdl_Impl, Control&, void );
- DECL_LINK( ScaleWidthModifyHdl_Impl, void *);
+ DECL_LINK_TYPED( ScaleWidthModifyHdl_Impl, Edit&, void );
public:
virtual ~SvxCharPositionPage();
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index abf5a02..1b481f9 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -57,8 +57,9 @@ private:
void FillTypeLB();
- DECL_LINK( ChangeAttrHdl_Impl, void * );
+ DECL_LINK_TYPED( ChangeAttrEditHdl_Impl, Edit&, void );
DECL_LINK_TYPED( ChangeAttrListBoxHdl_Impl, ListBox&, void );
+ void ChangeAttrHdl_Impl(void*);
public:
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index da70430..a9b537e 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -161,7 +161,7 @@ private:
DECL_LINK_TYPED(OnClickedSearchAgain, Button *, void);
DECL_LINK_TYPED( OnClickedSpecialSettings, Button*, void );
- DECL_LINK(OnSearchTextModified, void *);
+ DECL_LINK_TYPED(OnSearchTextModified, Edit&, void);
DECL_LINK_TYPED( OnPositionSelected, ListBox&, void );
DECL_LINK_TYPED( OnFieldSelected, ListBox&, void );
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 021e6a3..9d7be2d 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -95,6 +95,7 @@ class GraphicFilterSmooth : public GraphicFilterDialog
{
private:
VclPtr<NumericField> mpMtrRadius;
+ DECL_LINK_TYPED(EditModifyHdl, Edit&, void);
public:
@@ -113,6 +114,7 @@ private:
VclPtr<MetricField> mpMtrHeight;
VclPtr<CheckBox> mpCbxEdges;
DECL_LINK_TYPED(CheckBoxModifyHdl, CheckBox&, void);
+ DECL_LINK_TYPED(EditModifyHdl, Edit&, void);
public:
GraphicFilterMosaic(vcl::Window* pParent, const Graphic& rGraphic,
@@ -132,6 +134,7 @@ private:
VclPtr<MetricField> mpMtrThreshold;
VclPtr<CheckBox> mpCbxInvert;
DECL_LINK_TYPED(CheckBoxModifyHdl, CheckBox&, void);
+ DECL_LINK_TYPED(EditModifyHdl, Edit&, void);
public:
@@ -149,6 +152,7 @@ class GraphicFilterSepia : public GraphicFilterDialog
{
private:
VclPtr<MetricField> mpMtrSepia;
+ DECL_LINK_TYPED(EditModifyHdl, Edit&, void);
public:
GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGraphic,
sal_uInt16 nSepiaPercent );
@@ -165,6 +169,7 @@ class GraphicFilterPoster : public GraphicFilterDialog
{
private:
VclPtr<NumericField> mpNumPoster;
+ DECL_LINK_TYPED(EditModifyHdl, Edit&, void);
public:
GraphicFilterPoster( vcl::Window* pParent, const Graphic& rGraphic,
sal_uInt16 nPosterColorCount );
diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 62da721..f7761c9 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -50,7 +50,7 @@ private:
unsigned nNameRow;
unsigned nShortNameField;
- DECL_LINK( ModifyHdl_Impl, Edit * );
+ DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void );
bool GetAddress_Impl();
void SetAddress_Impl();
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 95a7163..671d422 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -143,9 +143,10 @@ class SvxTransparenceTabPage : public SvxTabPage
DECL_LINK_TYPED(ClickTransOffHdl_Impl, Button*, void );
DECL_LINK_TYPED(ClickTransLinearHdl_Impl, Button*, void );
DECL_LINK_TYPED(ClickTransGradientHdl_Impl, Button*, void );
- DECL_LINK(ModifyTransparentHdl_Impl, void*);
- DECL_LINK(ModifiedTrgrHdl_Impl, void*);
+ DECL_LINK_TYPED(ModifyTransparentHdl_Impl, Edit&, void);
+ DECL_LINK_TYPED(ModifiedTrgrEditHdl_Impl, Edit&, void);
DECL_LINK_TYPED(ModifiedTrgrListBoxHdl_Impl, ListBox&, void);
+ void ModifiedTrgrHdl_Impl(void*);
void ActivateLinear(bool bActivate);
void ActivateGradient(bool bActivate);
@@ -271,13 +272,14 @@ private:
DECL_LINK_TYPED( ModifyHatchingHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( ToggleHatchBckgrdColorHdl_Impl, CheckBox&, void );
DECL_LINK_TYPED( ModifyBitmapHdl_Impl, ListBox&, void );
- DECL_LINK( ModifyStepCountHdl_Impl, void* );
+ DECL_LINK_TYPED( ModifyStepCountEditHdl_Impl, Edit&, void );
DECL_LINK_TYPED( ModifyStepCountClickHdl_Impl, Button*, void );
+ void ModifyStepCountHdl_Impl(void*);
//UUUU
DECL_LINK_TYPED( ClickImportHdl_Impl, Button*, void );
- DECL_LINK( ModifyTileHdl_Impl, void * );
+ DECL_LINK_TYPED( ModifyTileHdl_Impl, Edit&, void );
DECL_LINK_TYPED( ModifyTileClickHdl_Impl, Button*, void );
DECL_LINK_TYPED( ClickScaleHdl_Impl, Button*, void );
void ClickInvisibleHdl_Impl();
@@ -353,7 +355,7 @@ private:
SfxMapUnit m_ePoolUnit;
DECL_LINK_TYPED( ClickShadowHdl_Impl, Button*, void );
- DECL_LINK( ModifyShadowHdl_Impl, void * );
+ DECL_LINK_TYPED( ModifyShadowHdl_Impl, Edit&, void );
DECL_LINK_TYPED( SelectShadowHdl_Impl, ListBox&, void );
public:
@@ -428,10 +430,11 @@ private:
DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void );
DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void );
DECL_LINK_TYPED( ChangeGradientHdl_Impl, ListBox&, void );
- DECL_LINK( ModifiedHdl_Impl, void * );
+ DECL_LINK_TYPED( ModifiedEditHdl_Impl, Edit&, void );
DECL_LINK_TYPED( ModifiedListBoxHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void );
DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void );
+ void ModifiedHdl_Impl(void*);
long CheckChanges_Impl();
void SetControlState_Impl( css::awt::GradientStyle eXGS );
@@ -504,8 +507,9 @@ private:
SfxMapUnit m_ePoolUnit;
DECL_LINK_TYPED( ChangeHatchHdl_Impl, ListBox&, void );
- DECL_LINK( ModifiedHdl_Impl, void * );
+ DECL_LINK_TYPED( ModifiedEditHdl_Impl, Edit&, void );
DECL_LINK_TYPED( ModifiedListBoxHdl_Impl, ListBox&, void );
+ void ModifiedHdl_Impl(void*);
DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void );
DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void );
DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void );
@@ -729,7 +733,7 @@ private:
DECL_LINK_TYPED( SelectValSetHdl_Impl, ValueSet*, void );
DECL_LINK_TYPED( SelectColorModelHdl_Impl, ListBox&, void );
void ChangeColor(const Color &rNewColor);
- DECL_LINK( ModifiedHdl_Impl, void * );
+ DECL_LINK_TYPED( ModifiedHdl_Impl, Edit&, void );
long CheckChanges_Impl();
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 3ad9556..e25562e 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -173,22 +173,22 @@ private:
// handler for gallery popup menu button + size
DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void );
DECL_LINK_TYPED( MenuCreateHdl_Impl, MenuButton *, void );
- DECL_LINK( SizeHdl_Impl, MetricField * );
+ DECL_LINK_TYPED( SizeHdl_Impl, Edit&, void );
DECL_LINK_TYPED( RatioHdl_Impl, Button*, void );
DECL_LINK_TYPED( ClickInvisibleHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( ChangeStartClickHdl_Impl, Button*, void );
DECL_LINK_TYPED( ChangeStartListBoxHdl_Impl, ListBox&, void );
- DECL_LINK( ChangeStartModifyHdl_Impl, void * );
+ DECL_LINK_TYPED( ChangeStartModifyHdl_Impl, Edit&, void );
void ChangeStartHdl_Impl(void*);
DECL_LINK_TYPED( ChangeEndListBoxHdl_Impl, ListBox&, void );
- DECL_LINK( ChangeEndModifyHdl_Impl, void * );
+ DECL_LINK_TYPED( ChangeEndModifyHdl_Impl, Edit&, void );
DECL_LINK_TYPED( ChangeEndClickHdl_Impl, Button*, void );
void ChangeEndHdl_Impl(void*);
DECL_LINK_TYPED( ChangePreviewListBoxHdl_Impl, ListBox&, void );
- DECL_LINK( ChangePreviewModifyHdl_Impl, void* );
+ DECL_LINK_TYPED( ChangePreviewModifyHdl_Impl, Edit&, void );
void ChangePreviewHdl_Impl(void*);
- DECL_LINK( ChangeTransparentHdl_Impl, void * );
+ DECL_LINK_TYPED( ChangeTransparentHdl_Impl, Edit&, void );
DECL_LINK_TYPED( ChangeEdgeStyleHdl_Impl, ListBox&, void );
@@ -293,9 +293,9 @@ private:
DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, 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( ChangePreviewHdl_Impl, Edit&, void );
+ DECL_LINK_TYPED( ChangeNumber1Hdl_Impl, Edit&, void );
+ DECL_LINK_TYPED( ChangeNumber2Hdl_Impl, Edit&, void );
DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void );
DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void );
DECL_LINK_TYPED( ChangeMetricHdl_Impl, Button*, void );
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index 9b52898..ec76529 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -36,7 +36,7 @@ private:
Link<SvxNameDialog&,bool> aCheckNameHdl;
- DECL_LINK(ModifyHdl, void *);
+ DECL_LINK_TYPED(ModifyHdl, Edit&, void);
public:
SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const OUString& rDesc );
@@ -85,7 +85,7 @@ private:
// callback link for name uniqueness
Link<SvxObjectNameDialog&,bool> aCheckNameHdl;
- DECL_LINK(ModifyHdl, void *);
+ DECL_LINK_TYPED(ModifyHdl, Edit&, void);
public:
// constructor
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 49ad01f..d249711 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -95,13 +95,13 @@ class SvxGrfCropPage : public SfxTabPage
virtual ~SvxGrfCropPage();
virtual void dispose() override;
- DECL_LINK( ZoomHdl, MetricField * );
- DECL_LINK( SizeHdl, MetricField * );
+ DECL_LINK_TYPED( ZoomHdl, Edit&, void );
+ DECL_LINK_TYPED( SizeHdl, Edit&, void );
DECL_LINK_TYPED( CropHdl, SpinField&, void );
DECL_LINK_TYPED( CropLoseFocusHdl, Control&, void );
- DECL_LINK( CropModifyHdl, MetricField * );
- DECL_LINK_TYPED(OrigSizeHdl, Button*, void);
- DECL_LINK_TYPED(Timeout, Timer *, void);
+ DECL_LINK_TYPED( CropModifyHdl, Edit&, void );
+ DECL_LINK_TYPED( OrigSizeHdl, Button*, void );
+ DECL_LINK_TYPED( Timeout, Timer *, void );
void CalcZoom();
void CalcMinMaxBorder();
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index da6f675..271d5a0 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -183,7 +183,7 @@ namespace svx
private:
DECL_LINK_TYPED( OnOption, Button*, void );
- DECL_LINK( OnSuggestionModified, void* );
+ DECL_LINK_TYPED( OnSuggestionModified, Edit&, void );
DECL_LINK_TYPED( OnSuggestionSelected, SuggestionDisplay&, void );
DECL_LINK_TYPED( OnConversionDirectionClicked, Button*, void );
DECL_LINK_TYPED( ClickByCharacterHdl, Button*, void );
@@ -237,7 +237,7 @@ namespace svx
bool m_bEntered;
DECL_LINK_TYPED( OKHdl, Button*, void );
- DECL_LINK( ModifyHdl, void* );
+ DECL_LINK_TYPED( ModifyHdl, Edit&, void );
public:
HangulHanjaNewDictDialog( vcl::Window* _pParent );
virtual ~HangulHanjaNewDictDialog();
@@ -291,12 +291,12 @@ namespace svx
bool m_bModifiedSuggestions;
bool m_bModifiedOriginal;
- DECL_LINK( OriginalModifyHdl, void* );
+ DECL_LINK_TYPED( OriginalModifyHdl, Edit&, void );
DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
- DECL_LINK( EditModifyHdl1, Edit* );
- DECL_LINK( EditModifyHdl2, Edit* );
- DECL_LINK( EditModifyHdl3, Edit* );
- DECL_LINK( EditModifyHdl4, Edit* );
+ DECL_LINK_TYPED( EditModifyHdl1, Edit&, void );
+ DECL_LINK_TYPED( EditModifyHdl2, Edit&, void );
+ DECL_LINK_TYPED( EditModifyHdl3, Edit&, void );
+ DECL_LINK_TYPED( EditModifyHdl4, Edit&, void );
DECL_LINK_TYPED( BookLBSelectHdl, ListBox&, void );
DECL_LINK_TYPED( NewPBPushHdl, Button*, void );
diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx
index 0aea2dc..4589c46 100644
--- a/cui/source/inc/hldoctp.hxx
+++ b/cui/source/inc/hldoctp.hxx
@@ -44,8 +44,8 @@ private:
DECL_LINK_TYPED (ClickFileopenHdl_Impl, Button*, void );
DECL_LINK_TYPED (ClickTargetHdl_Impl , Button*, void );
- DECL_LINK (ModifiedPathHdl_Impl , void * ); ///< Contens of combobox "Path" modified
- DECL_LINK (ModifiedTargetHdl_Impl, void * ); ///< Contens of editfield "Target" modified
+ DECL_LINK_TYPED (ModifiedPathHdl_Impl , Edit&, void ); ///< Contents of combobox "Path" modified
+ DECL_LINK_TYPED (ModifiedTargetHdl_Impl, Edit&, void ); ///< Contents of editfield "Target" modified
DECL_LINK_TYPED( LostFocusPathHdl_Impl, Control&, void ); ///< Combobox "path" lost its focus
diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index d964cae..f70b8f7 100644
--- a/cui/source/inc/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -50,9 +50,9 @@ private:
DECL_LINK_TYPED( Click_SmartProtocol_Impl , Button*, void ); ///< Radiobutton clicked: Type HTTP or FTP
DECL_LINK_TYPED( ClickAnonymousHdl_Impl , Button*, void ); ///< Checkbox : Anonymous User
DECL_LINK_TYPED( ClickBrowseHdl_Impl , Button*, void ); ///< Button : Browse
- DECL_LINK (ModifiedLoginHdl_Impl , void * ); ///< Contens of editfield "Login" modified
+ DECL_LINK_TYPED( ModifiedLoginHdl_Impl , Edit&, void ); ///< Contents of editfield "Login" modified
DECL_LINK_TYPED( LostFocusTargetHdl_Impl, Control&, void ); ///< Combobox "Target" lost its focus
- DECL_LINK (ModifiedTargetHdl_Impl , void * ); ///< Contens of editfield "Target" modified
+ DECL_LINK_TYPED( ModifiedTargetHdl_Impl , Edit&, void ); ///< Contents of editfield "Target" modified
DECL_LINK_TYPED( TimeoutHdl_Impl, Timer *, void); ///< Handler for timer -timeout
diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx
index 3c128ff..df5235e 100644
--- a/cui/source/inc/hlmailtp.hxx
+++ b/cui/source/inc/hlmailtp.hxx
@@ -37,7 +37,7 @@ private:
DECL_STATIC_LINK_TYPED(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, Button*, void);
///< Button : Address book
- DECL_LINK (ModifiedReceiverHdl_Impl, void * ); ///< Combobox "receiver" modified
+ DECL_LINK_TYPED (ModifiedReceiverHdl_Impl, Edit&, void ); ///< Combobox "receiver" modified
void SetScheme(const OUString& rScheme);
void RemoveImproperProtocol(const OUString& aProperScheme);
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index 6e985c3..bc1e5ce 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -61,9 +61,10 @@ private:
void FillUnitLB();
DECL_LINK_TYPED( ClickAutoPosHdl_Impl, Button*, void );
- DECL_LINK( ChangeAttrHdl_Impl, void * );
+ DECL_LINK_TYPED( ChangeAttrEditHdl_Impl, Edit&, void );
DECL_LINK_TYPED( ChangeAttrListBoxHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( ChangeAttrClickHdl_Impl, Button*, void );
+ void ChangeAttrHdl_Impl(void*);
public:
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 8fa5384..f936e1f 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -158,10 +158,12 @@ private:
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 * );
+ DECL_LINK_TYPED( EditModifyHdl_Impl, Edit&, void );
+ DECL_LINK_TYPED( OptEditHdl_Impl, Edit&, void );
DECL_LINK_TYPED( OptClickHdl_Impl, Button*, void );
DECL_LINK_TYPED( TimeHdl_Impl, Timer *, void);
+ void EditHdl_Impl(Edit*);
+ void OptHdl_Impl(void*);
};
#endif
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 8ffba71..8d83f10 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -325,17 +325,18 @@ class SvxNumOptionsTabPage : public SfxTabPage
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( SizeHdl_Impl, Edit&, void );
DECL_LINK_TYPED( RatioHdl_Impl, Button*, void );
DECL_LINK_TYPED( CharFmtHdl_Impl, ListBox&, void );
- DECL_LINK( EditModifyHdl_Impl, Edit* );
+ DECL_LINK_TYPED( EditModifyHdl_Impl, Edit&, void );
DECL_LINK_TYPED( EditListBoxHdl_Impl, ListBox&, void );
- DECL_LINK( AllLevelHdl_Impl, NumericField * );
+ DECL_LINK_TYPED( AllLevelHdl_Impl, Edit&, void );
DECL_LINK_TYPED( OrientHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( SameLevelHdl_Impl, Button*, void );
DECL_LINK_TYPED( BulColorHdl_Impl, ListBox&, void );
- DECL_LINK( BulRelSizeHdl_Impl, MetricField *);
+ DECL_LINK_TYPED( BulRelSizeHdl_Impl, Edit&, void);
DECL_LINK_TYPED( PreviewInvalidateHdl_Impl, Timer *, void);
+ void EditModifyHdl_Impl(Edit*);
public:
SvxNumOptionsTabPage(vcl::Window* pParent,
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index 5d5189f..d3cb614 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -50,7 +50,7 @@ class SvxAsianLayoutPage : public SfxTabPage
DECL_LINK_TYPED(LanguageHdl, ListBox&, void);
DECL_LINK_TYPED(ChangeStandardHdl, Button*, void);
- DECL_LINK(ModifyHdl, Edit*);
+ DECL_LINK_TYPED(ModifyHdl, Edit&, void);
public:
SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index d64d80b..7f4d665 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -60,7 +60,7 @@ private:
css::linguistic2::XDictionary > xNewDic;
DECL_LINK_TYPED(OKHdl_Impl, Button*, void);
- DECL_LINK(ModifyHdl_Impl, void *);
+ DECL_LINK_TYPED(ModifyHdl_Impl, Edit&, void);
public:
SvxNewDictionaryDialog( vcl::Window* pParent,
@@ -134,7 +134,7 @@ private:
DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void);
DECL_LINK_TYPED(NewDelButtonHdl, Button*, void);
DECL_LINK_TYPED(NewDelActionHdl, SvxDictEdit&, bool);
- DECL_LINK(ModifyHdl, Edit*);
+ DECL_LINK_TYPED(ModifyHdl, Edit&, void);
bool NewDelHdl(void*);
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 3da4a89..be03c3a 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -153,13 +153,13 @@ private:
DECL_LINK_TYPED( PaperBinHdl_Impl, Control&, void);
DECL_LINK_TYPED( SwapOrientation_Impl, Button*, void );
void SwapFirstValues_Impl( bool bSet );
- DECL_LINK( BorderModify_Impl, void *);
+ DECL_LINK_TYPED( BorderModify_Impl, Edit&, void);
void InitHeadFoot_Impl( const SfxItemSet& rSet );
DECL_LINK_TYPED( CenterHdl_Impl, Button*, void);
void UpdateExample_Impl( bool bResetbackground = false );
DECL_LINK_TYPED( PaperSizeSelect_Impl, ListBox&, void );
- DECL_LINK( PaperSizeModify_Impl, void *);
+ DECL_LINK_TYPED( PaperSizeModify_Impl, Edit&, void);
DECL_LINK_TYPED( FrameDirectionModify_Impl, ListBox&, void );
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index f71e9f4..df2f87b 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -91,7 +91,7 @@ private:
void UpdateExample_Impl();
DECL_LINK_TYPED( LineDistHdl_Impl, ListBox&, void );
- DECL_LINK(ModifyHdl_Impl, void *);
+ DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void );
DECL_LINK_TYPED( AutoHdl_Impl, Button*, void );
protected:
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index 12c6865..602dd55 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -106,7 +106,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage
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( ModifyHdl, Edit&, void );
DECL_LINK_TYPED(ProtectHdl, Button*, void);
void InitPos(short nAnchorType, sal_uInt16 nH, sal_uInt16 nHRel,
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 0aede59..82dbb83 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -108,14 +108,14 @@ private:
// Handler
DECL_LINK_TYPED( NewHdl_Impl, Button*, void );
- DECL_LINK_TYPED(DelHdl_Impl, Button*, void );
- DECL_LINK_TYPED(DelAllHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( DelHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( DelAllHdl_Impl, Button*, void );
DECL_LINK_TYPED( FillTypeCheckHdl_Impl, Button*, void );
DECL_LINK_TYPED( TabTypeCheckHdl_Impl, Button*, void );
DECL_LINK_TYPED( SelectHdl_Impl, ComboBox&, void );
- DECL_LINK(ModifyHdl_Impl, void *);
+ DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void );
DECL_LINK_TYPED( GetFillCharHdl_Impl, Control&, void );
DECL_LINK_TYPED( GetDezCharHdl_Impl, Control&, void );
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index f79897f..3490963 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -137,8 +137,8 @@ private:
void SetMinMaxPosition();
void GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange& rRange);
- DECL_LINK( ChangeWidthHdl, void * );
- DECL_LINK( ChangeHeightHdl, void * );
+ DECL_LINK_TYPED( ChangeWidthHdl, Edit&, void );
+ DECL_LINK_TYPED( ChangeHeightHdl, Edit&, void );
DECL_LINK_TYPED( ClickSizeProtectHdl, Button*, void );
DECL_LINK_TYPED( ClickAutoHdl, Button*, void );
diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx
index 818d381..6b6000e 100644
--- a/cui/source/inc/zoom.hxx
+++ b/cui/source/inc/zoom.hxx
@@ -49,9 +49,9 @@ private:
bool mbModified;
DECL_LINK_TYPED(UserHdl, Button*, void);
- DECL_LINK(SpinHdl, void*);
+ DECL_LINK_TYPED(SpinHdl, Edit&, void);
DECL_LINK_TYPED(ViewLayoutUserHdl, Button*, void);
- DECL_LINK(ViewLayoutSpinHdl, NumericField*);
+ DECL_LINK_TYPED(ViewLayoutSpinHdl, Edit&, void);
DECL_LINK_TYPED(ViewLayoutCheckHdl, Button*, void);
DECL_LINK_TYPED(OKHdl, Button*, void);
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index 1ed3125..5e08c75 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -204,10 +204,9 @@ namespace svx
}
- IMPL_LINK_NOARG(ODocumentLinkDialog, OnTextModified)
+ IMPL_LINK_NOARG_TYPED(ODocumentLinkDialog, OnTextModified, Edit&, void)
{
validate( );
- return 0L;
}
diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx
index a3f86c8..2ab3a88 100644
--- a/cui/source/options/doclinkdialog.hxx
+++ b/cui/source/options/doclinkdialog.hxx
@@ -59,7 +59,7 @@ namespace svx
void getLink( OUString& _rName, OUString& _rURL ) const;
protected:
- DECL_LINK(OnTextModified, void *);
+ DECL_LINK_TYPED( OnTextModified, Edit&, void );
DECL_LINK_TYPED( OnBrowseFile, Button*, void );
DECL_LINK_TYPED( OnOk, Button*, void );
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 9b65372..9a9e5eb 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -88,7 +88,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent,
m_pCheckLB->setColSizes();
aTextColor = m_pCheckLB->GetTextColor();
- Link<> aLink(LINK(this, SvxFontSubstTabPage, SelectHdl));
+ Link<Edit&,void> aLink(LINK(this, SvxFontSubstTabPage, SelectEditHdl));
Link<ComboBox&,void> aLink2(LINK(this, SvxFontSubstTabPage, SelectComboBoxHdl));
Link<Button*,void> aClickLink(LINK(this, SvxFontSubstTabPage, ClickHdl));
@@ -270,7 +270,11 @@ IMPL_LINK_TYPED(SvxFontSubstTabPage, SelectComboBoxHdl, ComboBox&, rBox, void)
{
SelectHdl(&rBox);
}
-IMPL_LINK(SvxFontSubstTabPage, SelectHdl, vcl::Window*, pWin)
+IMPL_LINK_TYPED(SvxFontSubstTabPage, SelectEditHdl, Edit&, rBox, void)
+{
+ SelectHdl(&rBox);
+}
+void SvxFontSubstTabPage::SelectHdl(vcl::Window* pWin)
{
if (pWin == m_pApply || pWin == m_pDelete)
{
@@ -342,8 +346,6 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, vcl::Window*, pWin)
}
CheckEnable();
-
- return 0;
}
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index 7615d94..215cd50 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -81,11 +81,12 @@ class SvxFontSubstTabPage : public SfxTabPage
SvLBoxButtonData* pCheckButtonData;
- DECL_LINK(SelectHdl, vcl::Window *);
+ DECL_LINK_TYPED(SelectEditHdl, Edit&, void);
DECL_LINK_TYPED(SelectComboBoxHdl, ComboBox&, void);
DECL_LINK_TYPED(ClickHdl, Button*, void);
DECL_LINK_TYPED(TreeListBoxSelectHdl, SvTreeListBox*, void);
DECL_LINK_TYPED(NonPropFontsHdl, Button*, void);
+ void SelectHdl(vcl::Window*);
SvTreeListEntry* CreateEntry(OUString& rFont1, OUString& rFont2);
void CheckEnable();
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 1ccc1ce..4f21f18 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -142,7 +142,7 @@ SvxAsianLayoutPage::SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet&
LanguageHdl(*m_pLanguageLB);
m_pLanguageLB->SetSelectHdl(LINK(this, SvxAsianLayoutPage, LanguageHdl));
m_pStandardCB->SetClickHdl(LINK(this, SvxAsianLayoutPage, ChangeStandardHdl));
- Link<> aLk(LINK(this, SvxAsianLayoutPage, ModifyHdl));
+ Link<Edit&,void> aLk(LINK(this, SvxAsianLayoutPage, ModifyHdl));
m_pStartED->SetModifyHdl(aLk);
m_pEndED->SetModifyHdl(aLk);
@@ -384,16 +384,16 @@ IMPL_LINK_TYPED(SvxAsianLayoutPage, ChangeStandardHdl, Button*, pBox, void)
m_pStartFT->Enable(!bCheck);
m_pEndFT->Enable(!bCheck);
- ModifyHdl(m_pStartED);
+ ModifyHdl(*m_pStartED);
}
-IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit)
+IMPL_LINK_TYPED(SvxAsianLayoutPage, ModifyHdl, Edit&, rEdit, void)
{
LanguageType eSelectLanguage = m_pLanguageLB->GetSelectLanguage();
Locale aLocale( LanguageTag::convertToLocale( eSelectLanguage ));
OUString sStart = m_pStartED->GetText();
OUString sEnd = m_pEndED->GetText();
- bool bEnable = pEdit->IsEnabled();
+ bool bEnable = rEdit.IsEnabled();
if(pImpl->xForbidden.is())
{
try
@@ -414,7 +414,6 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit)
}
}
pImpl->aConfig.SetStartEndChars( aLocale, bEnable ? &sStart : 0, bEnable ? &sEnd : 0);
- return 0;
}
const sal_uInt16* SvxAsianLayoutPage::GetRanges()
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 28535aa..d8ddc4e 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -206,13 +206,12 @@ IMPL_LINK_NOARG_TYPED(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void)
-IMPL_LINK_NOARG(SvxNewDictionaryDialog, ModifyHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxNewDictionaryDialog, ModifyHdl_Impl, Edit&, void)
{
if ( !pNameEdit->GetText().isEmpty() )
pOKBtn->Enable();
else
pOKBtn->Disable();
- return 0;
}
// class SvxEditDictionaryDialog -------------------------------------------
@@ -690,15 +689,15 @@ bool SvxEditDictionaryDialog::NewDelHdl(void* pBtn)
// which means EndDialog() - has to be evaluated in KeyInput
return false;
}
- ModifyHdl(pWordED);
+ ModifyHdl(*pWordED);
return true;
}
-IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt)
+IMPL_LINK_TYPED(SvxEditDictionaryDialog, ModifyHdl, Edit&, rEdt, void)
{
- OUString rEntry = pEdt->GetText();
+ OUString rEntry = rEdt.GetText();
sal_Int32 nWordLen = rEntry.getLength();
const OUString& rRepString = pReplaceED->GetText();
@@ -707,7 +706,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt)
bool bEnableDelete = false;
OUString aNewReplaceText = sNew;
- if(pEdt == pWordED)
+ if(&rEdt == pWordED)
{
if(nWordLen>0)
{
@@ -768,7 +767,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt)
bDoNothing=false;
}
}
- else if(pEdt == pReplaceED)
+ else if(&rEdt == pReplaceED)
{
OUString aReplaceText;
OUString aWordText;
@@ -791,8 +790,6 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt)
pNewReplacePB->SetText( aNewReplaceText );
pNewReplacePB->Enable( bEnableNewReplace && !IsDicReadonly_Impl() );
pDeletePB->Enable( bEnableDelete && !IsDicReadonly_Impl() );
-
- return 0;
}
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 4c216c9..6f14ea8 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -411,10 +411,8 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
m_pCollectUsageInfo->SaveValue();
}
-IMPL_LINK( OfaMiscTabPage, TwoFigureHdl, NumericField*, pEd )
+IMPL_LINK_NOARG_TYPED( OfaMiscTabPage, TwoFigureHdl, Edit&, void )
{
- (void)pEd;
-
OUString aOutput( m_aStrDateInfo );
OUString aStr( m_pYearValueField->GetText() );
OUString sSep( SvtSysLocale().GetLocaleData().getNumThousandSep() );
@@ -430,7 +428,6 @@ IMPL_LINK( OfaMiscTabPage, TwoFigureHdl, NumericField*, pEd )
aOutput += OUString::number( nNum );
}
m_pToYearFT->SetText( aOutput );
- return 0;
}
IMPL_LINK_TYPED( OfaMiscTabPage, TwoFigureConfigFocusHdl, Control&, rControl, void )
@@ -443,7 +440,7 @@ IMPL_LINK_TYPED( OfaMiscTabPage, TwoFigureConfigHdl, SpinField&, rEd, void )
OUString aOutput(OUString::number(nNum));
m_pYearValueField->SetText(aOutput);
m_pYearValueField->SetSelection( Selection( 0, aOutput.getLength() ) );
- TwoFigureHdl( static_cast<NumericField*>(&rEd) );
+ TwoFigureHdl( static_cast<Edit&>(rEd) );
}
class CanvasSettings
@@ -1699,9 +1696,9 @@ IMPL_LINK_TYPED( OfaLanguagesTabPage, LocaleSettingHdl, ListBox&, rListBox, void
m_pDatePatternsED->SetText( aDatePatternsString);
}
-IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit*, pEd )
+IMPL_LINK_TYPED( OfaLanguagesTabPage, DatePatternsHdl, Edit&, rEd, void )
{
- const OUString aPatterns( pEd->GetText());
+ const OUString aPatterns( rEd.GetText());
OUStringBuffer aBuf( aPatterns);
sal_Int32 nChar = 0;
bool bValid = true;
@@ -1787,26 +1784,25 @@ IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit*, pEd )
// Do not use SetText(...,GetSelection()) because internally the
// reference's pointer of the selection is obtained resulting in the
// entire text being selected at the end.
- Selection aSelection( pEd->GetSelection());
- pEd->SetText( aBuf.makeStringAndClear(), aSelection);
+ Selection aSelection( rEd.GetSelection());
+ rEd.SetText( aBuf.makeStringAndClear(), aSelection);
}
if (bValid)
{
- pEd->SetControlForeground();
- pEd->SetControlBackground();
+ rEd.SetControlForeground();
+ rEd.SetControlBackground();
}
else
{
#if 0
//! Gives white on white!?! instead of white on reddish.
- pEd->SetControlBackground( ::Color( RGB_COLORDATA( 0xff, 0x65, 0x63)));
- pEd->SetControlForeground( ::Color( COL_WHITE));
+ rEd.SetControlBackground( ::Color( RGB_COLORDATA( 0xff, 0x65, 0x63)));
+ rEd.SetControlForeground( ::Color( COL_WHITE));
#else
- pEd->SetControlForeground( ::Color( RGB_COLORDATA( 0xf0, 0, 0)));
+ rEd.SetControlForeground( ::Color( RGB_COLORDATA( 0xf0, 0, 0)));
#endif
}
m_bDatePatternsValid = bValid;
- return 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 4d803ba..695d03c 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -58,7 +58,7 @@ private:
VclPtr<CheckBox> m_pCollectUsageInfo;
- DECL_LINK( TwoFigureHdl, NumericField* );
+ DECL_LINK_TYPED( TwoFigureHdl, Edit&, void );
DECL_LINK_TYPED( TwoFigureConfigHdl, SpinField&, void );
DECL_LINK_TYPED( TwoFigureConfigFocusHdl, Control&, void );
#ifdef WNT
@@ -161,7 +161,7 @@ class OfaLanguagesTabPage : public SfxTabPage
DECL_LINK_TYPED( SupportHdl, Button*, void ) ;
DECL_LINK_TYPED( LocaleSettingHdl, ListBox&, void ) ;
- DECL_LINK( DatePatternsHdl, Edit* ) ;
+ DECL_LINK_TYPED( DatePatternsHdl, Edit&, void ) ;
public:
OfaLanguagesTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 7903b1c..7de37b3 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -290,7 +290,7 @@ void SvxGeneralTabPage::InitControls ()
void SvxGeneralTabPage::SetLinks ()
{
// link for updating the initials
- Link<> aLink = LINK( this, SvxGeneralTabPage, ModifyHdl_Impl );
+ Link<Edit&,void> aLink = LINK( this, SvxGeneralTabPage, ModifyHdl_Impl );
Row& rNameRow = *vRows[nNameRow];
for (unsigned i = rNameRow.nFirstField; i != rNameRow.nLastField - 1; ++i)
vFields[i]->pEdit->SetModifyHdl(aLink);
@@ -347,7 +347,7 @@ void SvxGeneralTabPage::Reset( const SfxItemSet* rSet )
// ModifyHdl_Impl()
// This handler updates the initials (short name)
// when one of the name fields was updated.
-IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit *, pEdit )
+IMPL_LINK_TYPED( SvxGeneralTabPage, ModifyHdl_Impl, Edit&, rEdit, void )
{
// short name field and row
Field& rShortName = *vFields[nShortNameField];
@@ -358,7 +358,7 @@ IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit *, pEdit )
unsigned nField = nInits;
for (unsigned i = 0; i != nInits; ++i)
{
- if (vFields[rNameRow.nFirstField + i]->pEdit == pEdit)
+ if (vFields[rNameRow.nFirstField + i]->pEdit == &rEdit)
nField = i;
}
// updating the initial
@@ -372,12 +372,11 @@ IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit *, pEdit )
}
while ((unsigned)sShortName.getLength() < nInits)
sShortName += " ";
- OUString sName = pEdit->GetText();
+ OUString sName = rEdit.GetText();
OUString sLetter = sName.isEmpty()
? OUString(sal_Unicode(' ')) : sName.copy(0, 1);
rShortName.pEdit->SetText(sShortName.replaceAt(nField, 1, sLetter).trim());
}
- return 0;
}
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index c3b6dcf..8d53c39 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -815,7 +815,7 @@ SvxJavaParameterDlg::SvxJavaParameterDlg( vcl::Window* pParent ) :
m_pAssignedList->SetSelectHdl( LINK( this, SvxJavaParameterDlg, SelectHdl_Impl ) );
m_pAssignedList->SetDoubleClickHdl( LINK( this, SvxJavaParameterDlg, DblClickHdl_Impl ) );
- ModifyHdl_Impl( m_pParameterEdit );
+ ModifyHdl_Impl( *m_pParameterEdit );
EnableRemoveButton();
}
@@ -834,12 +834,10 @@ void SvxJavaParameterDlg::dispose()
}
-IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, ModifyHdl_Impl, Edit&, void)
{
OUString sParam = comphelper::string::strip(m_pParameterEdit->GetText(), ' ');
m_pAssignBtn->Enable(!sParam.isEmpty());
-
- return 0;
}
@@ -854,7 +852,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, AssignHdl_Impl, Button*, void)
nPos = m_pAssignedList->InsertEntry( sParam );
m_pAssignedList->SelectEntryPos( nPos );
m_pParameterEdit->SetText( OUString() );
- ModifyHdl_Impl( m_pParameterEdit );
+ ModifyHdl_Impl( *m_pParameterEdit );
EnableRemoveButton();
}
}
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 271236d..84fdfa4 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -127,7 +127,7 @@ private:
VclPtr<ListBox> m_pAssignedList;
VclPtr<PushButton> m_pRemoveBtn;
- DECL_LINK(ModifyHdl_Impl, void *);
+ DECL_LINK_TYPED(ModifyHdl_Impl, Edit&, void);
DECL_LINK_TYPED(AssignHdl_Impl, Button*, void);
DECL_LINK_TYPED(SelectHdl_Impl, ListBox&, void);
DECL_LINK_TYPED(DblClickHdl_Impl, ListBox&, void);
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index d9b8431..8cd4298 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -229,7 +229,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet* rSet )
tools::Time aTime( (sal_uInt16)( nTime / 3600 ), (sal_uInt16)( ( nTime % 3600 ) / 60 ), (sal_uInt16)( ( nTime % 3600 ) % 60 ) );
m_pTfGraphicObjectTime->SetTime( aTime );
- GraphicCacheConfigHdl(m_pNfGraphicCache);
+ GraphicCacheConfigHdl(*m_pNfGraphicCache);
// OLECache
m_pNfOLECache->SetValue(
@@ -252,7 +252,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet* rSet )
-IMPL_LINK_NOARG(OfaMemoryOptionsPage, GraphicCacheConfigHdl)
+IMPL_LINK_NOARG_TYPED(OfaMemoryOptionsPage, GraphicCacheConfigHdl, Edit&, void)
{
sal_Int32 n = GetNfGraphicCacheVal();
SetNfGraphicObjectCacheMax( n );
@@ -260,8 +260,6 @@ IMPL_LINK_NOARG(OfaMemoryOptionsPage, GraphicCacheConfigHdl)
if( GetNfGraphicObjectCacheVal() > n )
SetNfGraphicObjectCacheVal( n );
-
- return 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx
index 5a8432d..e7b80b2 100644
--- a/cui/source/options/optmemory.hxx
+++ b/cui/source/options/optmemory.hxx
@@ -41,7 +41,7 @@ private:
VclPtr<VclContainer> m_pQuickStarterFrame;
VclPtr<CheckBox> m_pQuickLaunchCB;
- DECL_LINK(GraphicCacheConfigHdl, void *);
+ DECL_LINK_TYPED(GraphicCacheConfigHdl, Edit&, void);
sal_Int32 GetNfGraphicCacheVal() const; // returns # of Bytes
inline void SetNfGraphicCacheVal( long nSizeInBytes );
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index c6263ff..db508a2 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -220,7 +220,7 @@ public:
VclPtr<Edit> mpDriverVersion;
DECL_LINK_TYPED(OSSelectHdl, ListBox&, void);
- DECL_LINK(EditModifiedHdl, Edit*);
+ DECL_LINK_TYPED(EditModifiedHdl, Edit&, void);
ListEntryDialog(vcl::Window* pParent, const OpenCLConfig::ImplMatcher& rEntry, const OString& rTag);
virtual ~ListEntryDialog() { disposeOnce(); }
@@ -285,18 +285,16 @@ IMPL_LINK_TYPED(ListEntryDialog, OSSelectHdl, ListBox&, rListBox, void)
}
}
-IMPL_LINK(ListEntryDialog, EditModifiedHdl, Edit*, pEdit)
+IMPL_LINK_TYPED(ListEntryDialog, EditModifiedHdl, Edit&, rEdit, void)
{
- if (pEdit == mpOSVersion)
- maEntry.maOSVersion = pEdit->GetText();
- else if (pEdit == mpPlatformVendor)
- maEntry.maPlatformVendor = pEdit->GetText();
- else if (pEdit == mpDevice)
- maEntry.maDevice = pEdit->GetText();
- else if (pEdit == mpDriverVersion)
- maEntry.maDriverVersion = pEdit->GetText();
-
- return 0;
+ if (&rEdit == mpOSVersion)
+ maEntry.maOSVersion = rEdit.GetText();
+ else if (&rEdit == mpPlatformVendor)
+ maEntry.maPlatformVendor = rEdit.GetText();
+ else if (&rEdit == mpDevice)
+ maEntry.maDevice = rEdit.GetText();
+ else if (&rEdit == mpDriverVersion)
+ maEntry.maDriverVersion = rEdit.GetText();
}
void openListDialog(SvxOpenCLTabPage* pTabPage, OpenCLConfig::ImplMatcher& rEntry, const OString& rTag)
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 545988b..8292dbf 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1143,7 +1143,7 @@ void OfaAutocorrReplacePage::SetLanguage(LanguageType eSet)
pCompareClass = new CollatorWrapper( comphelper::getProcessComponentContext() );
pCompareClass->loadDefaultCollator( aLanguageTag.getLocale(), 0 );
pCharClass = new CharClass( aLanguageTag );
- ModifyHdl(m_pShortED);
+ ModifyHdl(*m_pShortED);
}
}
@@ -1256,7 +1256,7 @@ bool OfaAutocorrReplacePage::NewDelHdl(void* pBtn)
{
DeleteEntry(SvTabListBox::GetEntryText(pEntry, 0), SvTabListBox::GetEntryText(pEntry, 1));
m_pReplaceTLB->GetModel()->Remove(pEntry);
- ModifyHdl(m_pShortED);
+ ModifyHdl(*m_pShortED);
return false;
}
}
@@ -1313,15 +1313,15 @@ bool OfaAutocorrReplacePage::NewDelHdl(void* pBtn)
// which means EndDialog() - has to be evaluated in KeyInput
return false;
}
- ModifyHdl(m_pShortED);
+ ModifyHdl(*m_pShortED);
return true;
}
-IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt)
+IMPL_LINK_TYPED(OfaAutocorrReplacePage, ModifyHdl, Edit&, rEdt, void)
{
SvTreeListEntry* pFirstSel = m_pReplaceTLB->FirstSelected();
- bool bShort = pEdt == m_pShortED;
- const OUString rEntry = pEdt->GetText();
+ bool bShort = &rEdt == m_pShortED;
+ const OUString rEntry = rEdt.GetText();
const OUString rRepString = m_pReplaceED->GetText();
OUString aWordStr( pCharClass->lowercase( rEntry ));
@@ -1402,8 +1402,6 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt)
}
}
m_pNewReplacePB->Enable( bEnableNew );
-
- return 0;
}
static bool lcl_FindInArray(std::vector<OUString>& rStrings, const OUString& rString)
@@ -1613,8 +1611,8 @@ void OfaAutocorrExceptPage::SetLanguage(LanguageType eSet)
delete pCompareClass;
pCompareClass = new CollatorWrapper( comphelper::getProcessComponentContext() );
pCompareClass->loadDefaultCollator( LanguageTag::convertToLocale( eLastDialogLanguage ), 0 );
- ModifyHdl(m_pAbbrevED);
- ModifyHdl(m_pDoubleCapsED);
+ ModifyHdl(*m_pAbbrevED);
+ ModifyHdl(*m_pDoubleCapsED);
}
}
@@ -1706,23 +1704,23 @@ bool OfaAutocorrExceptPage::NewDelHdl(void* pBtn)
&& !m_pAbbrevED->GetText().isEmpty())
{
m_pAbbrevLB->InsertEntry(m_pAbbrevED->GetText());
- ModifyHdl(m_pAbbrevED);
+ ModifyHdl(*m_pAbbrevED);
}
else if(pBtn == m_pDelAbbrevPB)
{
m_pAbbrevLB->RemoveEntry(m_pAbbrevED->GetText());
- ModifyHdl(m_pAbbrevED);
+ ModifyHdl(*m_pAbbrevED);
}
else if((pBtn == m_pNewDoublePB || pBtn == m_pDoubleCapsED.get() )
&& !m_pDoubleCapsED->GetText().isEmpty())
{
m_pDoubleCapsLB->InsertEntry(m_pDoubleCapsED->GetText());
- ModifyHdl(m_pDoubleCapsED);
+ ModifyHdl(*m_pDoubleCapsED);
}
else if(pBtn == m_pDelDoublePB)
{
m_pDoubleCapsLB->RemoveEntry(m_pDoubleCapsED->GetText());
- ModifyHdl(m_pDoubleCapsED);
+ ModifyHdl(*m_pDoubleCapsED);
}
return false;
}
@@ -1743,16 +1741,16 @@ IMPL_LINK_TYPED(OfaAutocorrExceptPage, SelectHdl, ListBox&, rBox, void)
}
}
-IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt)
+IMPL_LINK_TYPED(OfaAutocorrExceptPage, ModifyHdl, Edit&, rEdt, void)
{
// sal_Bool bSame = pEdt->GetText() == ->GetSelectEntry();
- const OUString& sEntry = pEdt->GetText();
+ const OUString& sEntry = rEdt.GetText();
bool bEntryLen = !sEntry.isEmpty();
- if(pEdt == m_pAbbrevED)
+ if(&rEdt == m_pAbbrevED)
{
bool bSame = lcl_FindEntry(*m_pAbbrevLB, sEntry, *pCompareClass);
if(bSame && sEntry != m_pAbbrevLB->GetSelectEntry())
- pEdt->SetText(m_pAbbrevLB->GetSelectEntry());
+ rEdt.SetText(m_pAbbrevLB->GetSelectEntry());
m_pNewAbbrevPB->Enable(!bSame && bEntryLen);
m_pDelAbbrevPB->Enable(bSame && bEntryLen);
}
@@ -1760,11 +1758,10 @@ IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt)
{
bool bSame = lcl_FindEntry(*m_pDoubleCapsLB, sEntry, *pCompareClass);
if(bSame && sEntry != m_pDoubleCapsLB->GetSelectEntry())
- pEdt->SetText(m_pDoubleCapsLB->GetSelectEntry());
+ rEdt.SetText(m_pDoubleCapsLB->GetSelectEntry());
m_pNewDoublePB->Enable(!bSame && bEntryLen);
m_pDelDoublePB->Enable(bSame && bEntryLen);
}
- return 0;
}
VCL_BUILDER_FACTORY(AutoCorrEdit)
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 0dda1cd..c1fb557 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -870,7 +870,7 @@ IMPL_LINK_TYPED( SvxBorderTabPage, SelColHdl_Impl, ListBox&, rLb, void )
}
}
-IMPL_LINK_NOARG(SvxBorderTabPage, ModifyWidthHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, ModifyWidthHdl_Impl, Edit&, void)
{
sal_Int64 nVal = static_cast<sal_Int64>(MetricField::ConvertDoubleValue(
m_pLineWidthMF->GetValue( ),
@@ -880,8 +880,6 @@ IMPL_LINK_NOARG(SvxBorderTabPage, ModifyWidthHdl_Impl)
m_pFrameSel->SetStyleToSelection( nVal,
SvxBorderStyle( m_pLbLineStyle->GetSelectEntryStyle() ) );
-
- return 0;
}
@@ -1179,21 +1177,20 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, LinesChanged_Impl, LinkParamNone*, void)
-IMPL_LINK( SvxBorderTabPage, ModifyDistanceHdl_Impl, MetricField*, pField)
+IMPL_LINK_TYPED( SvxBorderTabPage, ModifyDistanceHdl_Impl, Edit&, rField, void)
{
if ( mbSync )
{
- sal_Int64 nVal = pField->GetValue();
- if(pField != m_pLeftMF)
+ sal_Int64 nVal = static_cast<MetricField&>(rField).GetValue();
+ if(&rField != m_pLeftMF)
m_pLeftMF->SetValue(nVal);
- if(pField != m_pRightMF)
+ if(&rField != m_pRightMF)
m_pRightMF->SetValue(nVal);
- if(pField != m_pTopMF)
+ if(&rField != m_pTopMF)
m_pTopMF->SetValue(nVal);
- if(pField != m_pBottomMF)
+ if(&rField != m_pBottomMF)
m_pBottomMF->SetValue(nVal);
}
- return 0;
}
IMPL_LINK_TYPED( SvxBorderTabPage, SyncHdl_Impl, Button*, pBox, void)
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 7efc88e..4fb8d04 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -423,7 +423,7 @@ void SvxCharNamePage::Initialize()
// to handle the changes of the other pages
SetExchangeSupport();
- Link<> aLink = LINK( this, SvxCharNamePage, FontModifyHdl_Impl );
+ Link<Edit&,void> aLink = LINK( this, SvxCharNamePage, FontModifyEditHdl_Impl );
m_pWestFontNameLB->SetModifyHdl( aLink );
m_pWestFontStyleLB->SetModifyHdl( aLink );
m_pWestFontSizeLB->SetModifyHdl( aLink );
@@ -1191,7 +1191,11 @@ IMPL_LINK_TYPED( SvxCharNamePage, FontModifyListBoxHdl_Impl, ListBox&, rBox, voi
{
FontModifyHdl_Impl(&rBox);
}
-IMPL_LINK( SvxCharNamePage, FontModifyHdl_Impl, void*, pNameBox )
+IMPL_LINK_TYPED( SvxCharNamePage, FontModifyEditHdl_Impl, Edit&, rBox, void )
+{
+ FontModifyHdl_Impl(&rBox);
+}
+void SvxCharNamePage::FontModifyHdl_Impl(void* pNameBox)
{
m_pImpl->m_aUpdateIdle.Start();
@@ -1200,7 +1204,6 @@ IMPL_LINK( SvxCharNamePage, FontModifyHdl_Impl, void*, pNameBox )
FillStyleBox_Impl( static_cast<FontNameBox*>(pNameBox) );
FillSizeBox_Impl( static_cast<FontNameBox*>(pNameBox) );
}
- return 0;
}
@@ -2724,7 +2727,7 @@ void SvxCharPositionPage::Initialize()
m_p90degRB->SetClickHdl( aLink2 );
m_p270degRB->SetClickHdl( aLink2 );
- Link<> aLink = LINK( this, SvxCharPositionPage, FontModifyHdl_Impl );
+ Link<Edit&,void> aLink = LINK( this, SvxCharPositionPage, FontModifyHdl_Impl );
m_pHighLowMF->SetModifyHdl( aLink );
m_pFontSizeMF->SetModifyHdl( aLink );
@@ -2820,13 +2823,12 @@ IMPL_LINK_TYPED( SvxCharPositionPage, RotationHdl_Impl, Button*, pBtn, void )
-IMPL_LINK_NOARG(SvxCharPositionPage, FontModifyHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, FontModifyHdl_Impl, Edit&, void)
{
sal_uInt8 nEscProp = (sal_uInt8)m_pFontSizeMF->GetValue();
short nEsc = (short)m_pHighLowMF->GetValue();
nEsc *= m_pLowPosBtn->IsChecked() ? -1 : 1;
UpdatePreview_Impl( 100, nEscProp, nEsc );
- return 0;
}
@@ -2889,12 +2891,12 @@ IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, KerningSelectHdl_Impl, ListBox&, void
m_pKerningMF->Disable();
}
- KerningModifyHdl_Impl( NULL );
+ KerningModifyHdl_Impl( *m_pKerningMF );
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list