diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-24 13:53:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-24 16:19:37 +0000 |
| commit | e85b2333bce7b1dcae73861df6d90b48b9f4efe5 (patch) | |
| tree | 21d066cecfbfda9ace96b26953ddcc3ae1764001 /formula | |
| parent | ff6462e6307e6924dc6c8178043ae9032f4b4152 (diff) | |
convert Link<> to typed
Change-Id: I59d325c3b051690303a5841907317122fa1ec98b
Reviewed-on: https://gerrit.libreoffice.org/18825
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/ui/dlg/ControlHelper.hxx | 4 | ||||
| -rw-r--r-- | formula/source/ui/dlg/funcutl.cxx | 12 | ||||
| -rw-r--r-- | formula/source/ui/dlg/parawin.cxx | 2 |
3 files changed, 7 insertions, 11 deletions
diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index d9e12173b290..18af2e9e5396 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -98,8 +98,8 @@ private: VclPtr<RefButton> pRefBtn; DECL_LINK_TYPED( FxBtnClickHdl, Button*, void ); - DECL_LINK( FxBtnFocusHdl, ImageButton* ); - DECL_LINK( EdFocusHdl, ArgEdit* ); + DECL_LINK_TYPED( FxBtnFocusHdl, Control&, void ); + DECL_LINK_TYPED( EdFocusHdl, Control&, void ); DECL_LINK( EdModifyHdl,ArgEdit* ); protected: diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 50d8b01f3df0..5c7d8ad170da 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -285,20 +285,16 @@ IMPL_LINK_TYPED( ArgInput, FxBtnClickHdl, Button*, pBtn, void ) FxClick(); } -IMPL_LINK( ArgInput, FxBtnFocusHdl, ImageButton*, pBtn ) +IMPL_LINK_TYPED( ArgInput, FxBtnFocusHdl, Control&, rControl, void ) { - if(pBtn == pBtnFx) + if(&rControl == pBtnFx) FxFocus(); - - return 0; } -IMPL_LINK( ArgInput, EdFocusHdl, ArgEdit*, pEd ) +IMPL_LINK_TYPED( ArgInput, EdFocusHdl, Control&, rControl, void ) { - if(pEd == pEdArg) + if(&rControl == pEdArg) EdFocus(); - - return 0; } IMPL_LINK( ArgInput, EdModifyHdl,ArgEdit*, pEd ) diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 05a0b71ef646..8c9b33a651ff 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -228,7 +228,7 @@ void ParaWin::dispose() { // #i66422# if the focus changes during destruction of the controls, // don't call the focus handlers - Link<> aEmptyLink; + Link<Control&,void> aEmptyLink; m_pBtnFx1->SetGetFocusHdl( aEmptyLink ); m_pBtnFx2->SetGetFocusHdl( aEmptyLink ); m_pBtnFx3->SetGetFocusHdl( aEmptyLink ); |