diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-05 09:59:27 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-05 12:05:38 +0200 |
| commit | c9b4c5681194a1cd3297a36d4a1f4e4cc3aac55a (patch) | |
| tree | 2cb864a67b556f807ba175507296f7dfc5254944 /sw/source/ui | |
| parent | 8c4a1663f5d93380268365d35a5581d8065df897 (diff) | |
Use typed Idle::SetIdleHdl Link
Change-Id: I189937950325dc4ef663f7f49cb45f38f8537de9
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/dbui/mmoutputpage.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmoutputtypepage.cxx | 3 | ||||
| -rw-r--r-- | sw/source/ui/envelp/labfmt.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/envelp/labfmt.hxx | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx index 470a72e04689..6ca57d1f1c93 100644 --- a/sw/source/ui/dbui/mmoutputpage.hxx +++ b/sw/source/ui/dbui/mmoutputpage.hxx @@ -182,7 +182,7 @@ class SwSendMailDialog : public ModelessDialog //SfxModalDialog SAL_DLLPRIVATE DECL_LINK( CloseHdl_Impl, void* ); SAL_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, StartSendMails, SwSendMailDialog* ); SAL_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, StopSendMails, SwSendMailDialog* ); - SAL_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, RemoveThis, Timer* ); + SAL_DLLPRIVATE DECL_STATIC_LINK_TYPED( SwSendMailDialog, RemoveThis, Idle*, void ); SAL_DLLPRIVATE void IterateMails(); SAL_DLLPRIVATE void SendMails(); diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 4b7bbfe27794..72c84ccd66df 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -397,7 +397,7 @@ IMPL_STATIC_LINK_NOINSTANCE( SwSendMailDialog, StartSendMails, SwSendMailDialog* return 0; } -IMPL_STATIC_LINK( SwSendMailDialog, RemoveThis, Timer*, pTimer ) +IMPL_STATIC_LINK_TYPED( SwSendMailDialog, RemoveThis, Idle*, pTimer, void ) { if( pThis->m_pImpl->xMailDispatcher.is() ) { @@ -417,7 +417,6 @@ IMPL_STATIC_LINK( SwSendMailDialog, RemoveThis, Timer*, pTimer ) { pTimer->Start(); } - return 0; } IMPL_STATIC_LINK_NOINSTANCE( SwSendMailDialog, StopSendMails, SwSendMailDialog*, pDialog ) diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index cba7b7082166..be2171bdde8e 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -385,14 +385,12 @@ IMPL_LINK_NOARG(SwLabFmtPage, ModifyHdl) } // Invalidate preview -IMPL_LINK_NOARG(SwLabFmtPage, PreviewHdl) +IMPL_LINK_NOARG_TYPED(SwLabFmtPage, PreviewHdl, Idle *, void) { aPreviewIdle.Stop(); ChangeMinMax(); FillItem( aItem ); m_pPreview->UpdateItem( aItem ); - - return 0; } // LoseFocus-Handler: Update on change diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index c81acc1b2180..9b409be04aab 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -90,7 +90,7 @@ class SwLabFmtPage : public SfxTabPage SwLabItem aItem; DECL_LINK(ModifyHdl, void *); - DECL_LINK(PreviewHdl, void *); + DECL_LINK_TYPED(PreviewHdl, Idle *, void); DECL_LINK( LoseFocusHdl, Control * ); DECL_LINK(SaveHdl, void *); |