diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-15 08:13:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-16 09:11:29 +0000 |
| commit | 6f1313b3d44ea54e9a331e0fc00871081fa662fe (patch) | |
| tree | fa6d9b6da04daedcb63ea2a0bc8c414288ed8bc6 /formula | |
| parent | 14bf708ef586b15dffed66ffaf524baf4d8fcbfa (diff) | |
convert Link<> to typed
Change-Id: Icbba339dac0be31e30dff021bba06a219f8aecd6
Reviewed-on: https://gerrit.libreoffice.org/19405
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 | 2 | ||||
| -rw-r--r-- | formula/source/ui/dlg/formula.cxx | 11 | ||||
| -rw-r--r-- | formula/source/ui/dlg/funcutl.cxx | 6 |
3 files changed, 8 insertions, 11 deletions
diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index 7e875b6bfe7e..62bcfeb43300 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -100,7 +100,7 @@ private: DECL_LINK_TYPED( FxBtnClickHdl, Button*, void ); DECL_LINK_TYPED( FxBtnFocusHdl, Control&, void ); DECL_LINK_TYPED( EdFocusHdl, Control&, void ); - DECL_LINK( EdModifyHdl,ArgEdit* ); + DECL_LINK_TYPED( EdModifyHdl, Edit&, void ); protected: diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 2e1f4959cf66..a114fac92eda 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -125,7 +125,7 @@ public: DECL_LINK_TYPED( FxHdl, ParaWin&, void ); DECL_LINK_TYPED( MatrixHdl, Button*, void ); - DECL_LINK(FormulaHdl, void *); + DECL_LINK_TYPED( FormulaHdl, Edit&, void); DECL_LINK_TYPED( FormulaCursorHdl, EditBox&, void ); DECL_LINK_TYPED( BtnHdl, Button*, void ); DECL_LINK_TYPED( DblClkHdl, FuncPage&, void ); @@ -1092,7 +1092,7 @@ IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, DblClkHdl, FuncPage&, void) aSel.Max()=aSel.Max()-1; pMEdit->SetSelection(aSel); - FormulaHdl(pMEdit); + FormulaHdl(*pMEdit); aSel.Min()=aSel.Max(); pMEdit->SetSelection(aSel); @@ -1285,11 +1285,11 @@ IMPL_LINK_TYPED( FormulaDlg_Impl, ModifyHdl, ParaWin&, rPtr, void ) } } -IMPL_LINK_NOARG(FormulaDlg_Impl, FormulaHdl) +IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, FormulaHdl, Edit&, void) { FormEditData* pData = m_pHelper->getFormEditData(); - if (!pData) return 0; + if (!pData) return; bEditFlag=true; OUString aInputFormula=m_pHelper->getCurrentFormula(); @@ -1347,7 +1347,6 @@ IMPL_LINK_NOARG(FormulaDlg_Impl, FormulaHdl) m_pHelper->setSelection(aSel.Min(), aSel.Max()); bEditFlag=false; - return 0; } IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, FormulaCursorHdl, EditBox&, void) @@ -1669,7 +1668,7 @@ void FormulaDlg_Impl::SetEdSelection() Selection theSel = m_pEdRef->GetSelection(); // Edit may have the focus -> call ModifyHdl in addition // to what's happening in GetFocus - pEd->GetModifyHdl().Call(pEd); + pEd->GetModifyHdl().Call(*pEd); pEd->GrabFocus(); pEd->SetSelection(theSel); } // if( pEd ) diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 8cb281f58bc9..15275820983c 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -297,12 +297,10 @@ IMPL_LINK_TYPED( ArgInput, EdFocusHdl, Control&, rControl, void ) EdFocus(); } -IMPL_LINK( ArgInput, EdModifyHdl,ArgEdit*, pEd ) +IMPL_LINK_TYPED( ArgInput, EdModifyHdl, Edit&, rEdit, void ) { - if(pEd == pEdArg) + if(&rEdit == pEdArg) EdModify(); - - return 0; } // class EditBox |