diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-17 13:45:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-17 14:41:58 +0200 |
| commit | 0fd07e53efbe6ff73db51711d36f9aeaf893479e (patch) | |
| tree | 9b0522e4ff30628d0ccd1f528e3a28cc1e4ae6dc | |
| parent | 54a5ae1b35680f54979890f62aae96d79b4f9874 (diff) | |
convert Link<> to typed
Change-Id: I2f5b962da2d14f68b34029cac4ec7a7ed51937c6
| -rw-r--r-- | sd/source/ui/dlg/dlgass.cxx | 5 | ||||
| -rw-r--r-- | sd/source/ui/dlg/docprev.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/inc/docprev.hxx | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 6d53335105be..82a83a630e67 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -235,7 +235,7 @@ public: DECL_LINK_TYPED( LastPageHdl, Button*, void ); DECL_LINK_TYPED( PreviewFlagHdl, Button*, void ); DECL_LINK_TYPED( EffectPreviewIdleHdl, Idle *, void ); - DECL_LINK( EffectPreviewClickHdl, void * ); + DECL_LINK_TYPED( EffectPreviewClickHdl, SdDocPreviewWin&, void ); DECL_LINK( SelectLayoutHdl, void * ); DECL_LINK_TYPED( PageSelectHdl, SvTreeListBox*, void ); DECL_LINK_TYPED( PresTypeHdl, Button*, void ); @@ -1128,10 +1128,9 @@ IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, EffectPreviewIdleHdl, Idle *, void) } } -IMPL_LINK_NOARG(AssistentDlgImpl, EffectPreviewClickHdl) +IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, EffectPreviewClickHdl, SdDocPreviewWin&, void) { EffectPreviewIdleHdl(nullptr); - return 0; } IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, PreviewFlagHdl, Button*, void) diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index 4d6325384ab8..688f578a831e 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -204,7 +204,7 @@ bool SdDocPreviewWin::Notify( NotifyEvent& rNEvt ) if( rNEvt.GetWindow() == this ) { if(aClickHdl.IsSet()) - aClickHdl.Call(this); + aClickHdl.Call(*this); } } } diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index f28e7a7d3dfe..8abb261d888b 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -43,7 +43,7 @@ class SD_DLLPUBLIC SdDocPreviewWin : public Control, public SfxListener protected: GDIMetaFile* pMetaFile; bool bInEffect; - Link<> aClickHdl; + Link<SdDocPreviewWin&,void> aClickHdl; SfxObjectShell* mpObj; sal_uInt16 mnShowPage; Color maDocumentColor; @@ -72,7 +72,7 @@ public: virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void SetClickHdl( const Link<>& rLink ) { aClickHdl = rLink; } + void SetClickHdl( const Link<SdDocPreviewWin&,void>& rLink ) { aClickHdl = rLink; } virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; |