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/miscdlgs/conflictsdlg.cxx | |
| parent | 46a27805fb707544a844a961a3743b8b992282f0 (diff) | |
Convert vcl Button Link<> click handler to typed Link<Button*,void>
Change-Id: Ie80dfb003118d40741549c41ebcc7eda4819f05b
Diffstat (limited to 'sc/source/ui/miscdlgs/conflictsdlg.cxx')
| -rw-r--r-- | sc/source/ui/miscdlgs/conflictsdlg.cxx | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 23704b345a29..907938dc27db 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -653,32 +653,24 @@ void ScConflictsDlg::KeepAllHandler( bool bMine ) EndDialog( RET_OK ); } -IMPL_LINK_NOARG(ScConflictsDlg, KeepMineHandle) +IMPL_LINK_NOARG_TYPED(ScConflictsDlg, KeepMineHandle, Button*, void) { KeepHandler( true ); - - return 0; } -IMPL_LINK_NOARG(ScConflictsDlg, KeepOtherHandle) +IMPL_LINK_NOARG_TYPED(ScConflictsDlg, KeepOtherHandle, Button*, void) { KeepHandler( false ); - - return 0; } -IMPL_LINK_NOARG(ScConflictsDlg, KeepAllMineHandle) +IMPL_LINK_NOARG_TYPED(ScConflictsDlg, KeepAllMineHandle, Button*, void) { KeepAllHandler( true ); - - return 0; } -IMPL_LINK_NOARG(ScConflictsDlg, KeepAllOthersHandle) +IMPL_LINK_NOARG_TYPED(ScConflictsDlg, KeepAllOthersHandle, Button*, void) { KeepAllHandler( false ); - - return 0; } void ScConflictsDlg::UpdateView() |