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 /sc/source/ui/condformat/condformatmgr.cxx | |
| parent | 46a27805fb707544a844a961a3743b8b992282f0 (diff) | |
Convert vcl Button Link<> click handler to typed Link<Button*,void>
Change-Id: Ie80dfb003118d40741549c41ebcc7eda4819f05b
Diffstat (limited to 'sc/source/ui/condformat/condformatmgr.cxx')
| -rw-r--r-- | sc/source/ui/condformat/condformatmgr.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index 4b36a95378d1..0b0ab2ed1d80 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -119,7 +119,7 @@ ScCondFormatManagerDlg::ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* get(m_pBtnEdit, "edit"); m_pBtnRemove->SetClickHdl(LINK(this, ScCondFormatManagerDlg, RemoveBtnHdl)); - m_pBtnEdit->SetClickHdl(LINK(this, ScCondFormatManagerDlg, EditBtnHdl)); + m_pBtnEdit->SetClickHdl(LINK(this, ScCondFormatManagerDlg, EditBtnClickHdl)); m_pBtnAdd->SetClickHdl(LINK(this, ScCondFormatManagerDlg, AddBtnHdl)); m_pCtrlManager->SetDoubleClickHdl(LINK(this, ScCondFormatManagerDlg, EditBtnHdl)); } @@ -155,13 +155,16 @@ ScConditionalFormat* ScCondFormatManagerDlg::GetCondFormatSelected() return m_pCtrlManager->GetSelection(); } -IMPL_LINK_NOARG(ScCondFormatManagerDlg, RemoveBtnHdl) +IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, RemoveBtnHdl, Button*, void) { m_pCtrlManager->DeleteSelection(); mbModified = true; - return 0; } +IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, EditBtnClickHdl, Button*, void) +{ + EditBtnHdl(nullptr); +} IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl) { ScConditionalFormat* pFormat = m_pCtrlManager->GetSelection(); @@ -174,11 +177,9 @@ IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl) return 0; } -IMPL_LINK_NOARG(ScCondFormatManagerDlg, AddBtnHdl) +IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, AddBtnHdl, Button*, void) { EndDialog( DLG_RET_ADD ); - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |