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 /sw/source/ui/table/convert.cxx | |
| parent | 46a27805fb707544a844a961a3743b8b992282f0 (diff) | |
Convert vcl Button Link<> click handler to typed Link<Button*,void>
Change-Id: Ie80dfb003118d40741549c41ebcc7eda4819f05b
Diffstat (limited to 'sw/source/ui/table/convert.cxx')
| -rw-r--r-- | sw/source/ui/table/convert.cxx | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index 866c2f006e76..e8f166506de4 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -147,7 +147,7 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable ) } mpKeepColumn->SaveValue(); - Link<> aLk( LINK(this, SwConvertTableDlg, BtnHdl) ); + Link<Button*,void> aLk( LINK(this, SwConvertTableDlg, BtnHdl) ); mpTabBtn->SetClickHdl( aLk ); mpSemiBtn->SetClickHdl( aLk ); mpParaBtn->SetClickHdl( aLk ); @@ -197,7 +197,7 @@ void SwConvertTableDlg::dispose() SfxModalDialog::dispose(); } -IMPL_LINK( SwConvertTableDlg, AutoFormatHdl, PushButton*, pButton ) +IMPL_LINK_TYPED( SwConvertTableDlg, AutoFormatHdl, Button*, pButton, void ) { SwAbstractDialogFactory* pFact = swui::GetFactory(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); @@ -206,10 +206,9 @@ IMPL_LINK( SwConvertTableDlg, AutoFormatHdl, PushButton*, pButton ) OSL_ENSURE(pDlg, "Dialog creation failed!"); if( RET_OK == pDlg->Execute()) pDlg->FillAutoFormatOfIndex( pTAutoFormat ); - return 0; } -IMPL_LINK( SwConvertTableDlg, BtnHdl, Button*, pButton ) +IMPL_LINK_TYPED( SwConvertTableDlg, BtnHdl, Button*, pButton, void ) { if( pButton == mpTabBtn ) mpKeepColumn->SetState( mpKeepColumn->GetSavedValue() ); @@ -221,22 +220,18 @@ IMPL_LINK( SwConvertTableDlg, BtnHdl, Button*, pButton ) } mpKeepColumn->Enable( mpTabBtn->IsChecked() ); mpOtherEd->Enable( mpOtherBtn->IsChecked() ); - return 0; } -IMPL_LINK_NOARG(SwConvertTableDlg, CheckBoxHdl) +IMPL_LINK_NOARG_TYPED(SwConvertTableDlg, CheckBoxHdl, Button*, void) { mpRepeatHeaderCB->Enable(mpHeaderCB->IsChecked()); ReapeatHeaderCheckBoxHdl(); - - return 0; } -IMPL_LINK_NOARG(SwConvertTableDlg, ReapeatHeaderCheckBoxHdl) +IMPL_LINK_NOARG_TYPED(SwConvertTableDlg, ReapeatHeaderCheckBoxHdl, Button*, void) { bool bEnable = mpHeaderCB->IsChecked() && mpRepeatHeaderCB->IsChecked(); mpRepeatRows->Enable(bEnable); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |