diff options
| author | Noel Grandin <noel@peralex.com> | 2015-08-19 09:11:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-08-26 11:15:35 +0200 |
| commit | 167bc621ef825ed5b961502fe9324a675ee34e42 (patch) | |
| tree | 523838d8adc14a62f846529ee6eab3343b2fe87b /formula | |
| parent | 46a27805fb707544a844a961a3743b8b992282f0 (diff) | |
Convert vcl Button Link<> click handler to typed Link<Button*,void>
Change-Id: Ie80dfb003118d40741549c41ebcc7eda4819f05b
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/ui/dlg/ControlHelper.hxx | 4 | ||||
| -rw-r--r-- | formula/source/ui/dlg/formula.cxx | 12 | ||||
| -rw-r--r-- | formula/source/ui/dlg/funcutl.cxx | 8 |
3 files changed, 8 insertions, 16 deletions
diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index d6c1e797bc92..0788de46a203 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -100,8 +100,8 @@ private: VclPtr<ArgEdit> pEdArg; VclPtr<RefButton> pRefBtn; - DECL_LINK( FxBtnClickHdl, ImageButton* ); - DECL_LINK( RefBtnClickHdl,RefButton* ); + DECL_LINK_TYPED( FxBtnClickHdl, Button*, void ); + DECL_LINK_TYPED( RefBtnClickHdl,Button*, void ); DECL_LINK( FxBtnFocusHdl, ImageButton* ); DECL_LINK( RefBtnFocusHdl,RefButton* ); DECL_LINK( EdFocusHdl, ArgEdit* ); diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 95d112c6b438..6d043230898f 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -125,10 +125,10 @@ public: DECL_LINK( ModifyHdl, ParaWin* ); DECL_LINK( FxHdl, ParaWin* ); - DECL_LINK(MatrixHdl, void *); + DECL_LINK_TYPED(MatrixHdl, Button*, void); DECL_LINK(FormulaHdl, void *); DECL_LINK(FormulaCursorHdl, void *); - DECL_LINK( BtnHdl, PushButton* ); + DECL_LINK_TYPED( BtnHdl, Button*, void ); DECL_LINK(DblClkHdl, void *); DECL_LINK(FuncSelHdl, void *); DECL_LINK(StructSelHdl, void *); @@ -1035,7 +1035,7 @@ void FormulaDlg_Impl::DoEnter(bool bOk) } -IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( FormulaDlg_Impl, BtnHdl, Button*, pBtn, void ) { if ( pBtn == m_pBtnCancel ) { @@ -1065,9 +1065,6 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn ) m_pMEFormula->Invalidate(); m_pMEFormula->Update(); } - - - return 0; } @@ -1597,10 +1594,9 @@ IMPL_LINK_NOARG(FormulaDlg_Impl, StructSelHdl) bStructUpdate=true; return 0; } -IMPL_LINK_NOARG(FormulaDlg_Impl, MatrixHdl) +IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, MatrixHdl, Button*, void) { bUserMatrixFlag=true; - return 0; } IMPL_LINK_NOARG(FormulaDlg_Impl, FuncSelHdl) diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index dc2c1603a314..8763389da9cc 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -294,20 +294,16 @@ void ArgInput::EdModify() aEdModifyLink.Call(this); } -IMPL_LINK( ArgInput, FxBtnClickHdl, ImageButton*, pBtn ) +IMPL_LINK_TYPED( ArgInput, FxBtnClickHdl, Button*, pBtn, void ) { if(pBtn == pBtnFx) FxClick(); - - return 0; } -IMPL_LINK( ArgInput, RefBtnClickHdl,RefButton*, pBtn ) +IMPL_LINK_TYPED( ArgInput, RefBtnClickHdl, Button*, pBtn, void ) { if(pRefBtn == pBtn) RefClick(); - - return 0; } IMPL_LINK( ArgInput, FxBtnFocusHdl, ImageButton*, pBtn ) |