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 /starmath | |
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 'starmath')
-rw-r--r-- | starmath/inc/dialog.hxx | 2 | ||||
-rw-r--r-- | starmath/source/dialog.cxx | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 9e09118bc91e..d09aabe38042 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -222,7 +222,7 @@ class SmDistanceDialog : public ModalDialog sal_uInt16 nActiveCategory; bool bScaleAllBrackets; - DECL_LINK(GetFocusHdl, Control *); + DECL_LINK_TYPED(GetFocusHdl, Control&, void); DECL_LINK_TYPED(MenuSelectHdl, Menu *, bool); DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void); DECL_LINK_TYPED(CheckBoxClickHdl, Button *, void); diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index ff8ed3a060bf..8ada350c6309 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -689,25 +689,24 @@ SmCategoryDesc::~SmCategoryDesc() /**************************************************************************/ -IMPL_LINK( SmDistanceDialog, GetFocusHdl, Control *, pControl ) +IMPL_LINK_TYPED( SmDistanceDialog, GetFocusHdl, Control&, rControl, void ) { if (Categories[nActiveCategory]) { sal_uInt16 i; - if (pControl == m_pMetricField1) + if (&rControl == m_pMetricField1) i = 0; - else if (pControl == m_pMetricField2) + else if (&rControl == m_pMetricField2) i = 1; - else if (pControl == m_pMetricField3) + else if (&rControl == m_pMetricField3) i = 2; - else if (pControl == m_pMetricField4) + else if (&rControl == m_pMetricField4) i = 3; else - return 0; + return; m_pBitmap->SetImage(*(Categories[nActiveCategory]->GetGraphic(i))); } - return 0; } IMPL_LINK_TYPED( SmDistanceDialog, MenuSelectHdl, Menu *, pMenu, bool ) |