diff options
| author | Noel Grandin <noel@peralex.com> | 2015-08-27 13:08:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-08-28 09:49:56 +0200 |
| commit | bd8b93fdff93ff7b2b7e493a7bcef6a59f299dae (patch) | |
| tree | f05be9665737f0667faf95702d96fbf3f0a103c5 /sw/source/uibase/app/apphdl.cxx | |
| parent | 1b9c3a17e8496aedfb80528c5275e6658154789d (diff) | |
make PostUserEvent Link<> typed
Change-Id: I13f10bda985d55d419a5bff481130a456ae2db8a
Diffstat (limited to 'sw/source/uibase/app/apphdl.cxx')
| -rw-r--r-- | sw/source/uibase/app/apphdl.cxx | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 387e28f23bed..3caad9da0d2c 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -268,11 +268,10 @@ class SwMailMergeWizardExecutor : public salhelper::SimpleReferenceObject AbstractMailMergeWizard* m_pWizard; // always owner DECL_LINK( EndDialogHdl, AbstractMailMergeWizard* ); - DECL_LINK( DestroyDialogHdl, void* ); - DECL_STATIC_LINK( - SwMailMergeWizardExecutor, DestroyWizardHdl, AbstractMailMergeWizard* ); - DECL_LINK( CancelHdl, void* ); - DECL_LINK( CloseFrameHdl, void* ); + DECL_LINK_TYPED( DestroyDialogHdl, void*, void ); + DECL_STATIC_LINK_TYPED( SwMailMergeWizardExecutor, DestroyWizardHdl, void*, void ); + DECL_LINK_TYPED( CancelHdl, void*, void ); + DECL_LINK_TYPED( CloseFrameHdl, void*, void ); void ExecutionFinished( bool bDeleteConfigItem ); void ExecuteWizard(); @@ -575,24 +574,20 @@ IMPL_LINK( SwMailMergeWizardExecutor, EndDialogHdl, AbstractMailMergeWizard*, pD return 0L; } -IMPL_LINK_NOARG(SwMailMergeWizardExecutor, DestroyDialogHdl) +IMPL_LINK_NOARG_TYPED(SwMailMergeWizardExecutor, DestroyDialogHdl, void*, void) { delete m_pWizard; m_pWizard = 0; release(); - return 0L; } -IMPL_STATIC_LINK( - SwMailMergeWizardExecutor, DestroyWizardHdl, AbstractMailMergeWizard*, - pDialog ) +IMPL_STATIC_LINK_TYPED(SwMailMergeWizardExecutor, DestroyWizardHdl, void*, pDialog, void ) { - delete pDialog; - return 0L; + delete static_cast<AbstractMailMergeWizard*>(pDialog); } -IMPL_LINK_NOARG(SwMailMergeWizardExecutor, CancelHdl) +IMPL_LINK_NOARG_TYPED(SwMailMergeWizardExecutor, CancelHdl, void*, void) { if(m_pMMConfig->GetTargetView()) { @@ -608,19 +603,15 @@ IMPL_LINK_NOARG(SwMailMergeWizardExecutor, CancelHdl) // m_pWizard already deleted by closing the target view m_pWizard = 0; release(); - - return 0L; } -IMPL_LINK_NOARG(SwMailMergeWizardExecutor, CloseFrameHdl) +IMPL_LINK_NOARG_TYPED(SwMailMergeWizardExecutor, CloseFrameHdl, void*, void) { if ( m_pView2Close ) { m_pView2Close->GetViewFrame()->DoClose(); m_pView2Close = NULL; } - - return 0L; } } // namespace |