From 6f1313b3d44ea54e9a331e0fc00871081fa662fe Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 15 Oct 2015 08:13:49 +0200 Subject: convert Link<> to typed Change-Id: Icbba339dac0be31e30dff021bba06a219f8aecd6 Reviewed-on: https://gerrit.libreoffice.org/19405 Tested-by: Jenkins Reviewed-by: Noel Grandin --- basctl/source/basicide/brkdlg.cxx | 9 ++++----- basctl/source/basicide/brkdlg.hxx | 2 +- basctl/source/basicide/macrodlg.cxx | 5 +---- basctl/source/basicide/macrodlg.hxx | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) (limited to 'basctl') diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx index 81ebd05589fe..0ca7e8e2dc2d 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 9ae8e3678d67..3a0eccf2b963 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 2e417c12e222..97598ff9dff7 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 96394545d78c..7b446fedf320 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(); -- cgit