diff options
author | Noel Grandin <noel@peralex.com> | 2015-09-07 14:26:19 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-09-08 08:16:47 +0200 |
commit | 20646c4c0115a298560f9cff4aeaba9503f65977 (patch) | |
tree | 7ce71a9aec29bc2a7560cb619bdc36be8f6ef570 | |
parent | 8ad9cc042416c7b4ef89644b60928588f0505798 (diff) |
convert Link<> to typed
Change-Id: I7c7a4bbaa4670e873599ad2533a1c2de713cf53f
-rw-r--r-- | include/svx/ctredlin.hxx | 20 | ||||
-rw-r--r-- | sc/source/ui/inc/acredlin.hxx | 8 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/acredlin.cxx | 15 | ||||
-rw-r--r-- | sw/source/uibase/inc/redlndlg.hxx | 10 | ||||
-rw-r--r-- | sw/source/uibase/misc/redlndlg.cxx | 16 |
5 files changed, 28 insertions, 41 deletions
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index 2a225cb09f74..130ff107a160 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -275,11 +275,11 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxTPView : public TabPage { private: - Link<> AcceptClickLk; - Link<> AcceptAllClickLk; - Link<> RejectClickLk; - Link<> RejectAllClickLk; - Link<> UndoClickLk; + Link<SvxTPView*,void> AcceptClickLk; + Link<SvxTPView*,void> AcceptAllClickLk; + Link<SvxTPView*,void> RejectClickLk; + Link<SvxTPView*,void> RejectAllClickLk; + Link<SvxTPView*,void> UndoClickLk; VclPtr<SvxRedlinTable> m_pViewData; VclPtr<PushButton> m_pAccept; @@ -313,15 +313,15 @@ public: void DisableUndo() {EnableUndo(false);} void ShowUndo(bool nFlag=true); - void SetAcceptClickHdl( const Link<>& rLink ) { AcceptClickLk = rLink; } + void SetAcceptClickHdl( const Link<SvxTPView*,void>& rLink ) { AcceptClickLk = rLink; } - void SetAcceptAllClickHdl( const Link<>& rLink ) { AcceptAllClickLk = rLink; } + void SetAcceptAllClickHdl( const Link<SvxTPView*,void>& rLink ) { AcceptAllClickLk = rLink; } - void SetRejectClickHdl( const Link<>& rLink ) { RejectClickLk = rLink; } + void SetRejectClickHdl( const Link<SvxTPView*,void>& rLink ) { RejectClickLk = rLink; } - void SetRejectAllClickHdl( const Link<>& rLink ) { RejectAllClickLk = rLink; } + void SetRejectAllClickHdl( const Link<SvxTPView*,void>& rLink ) { RejectAllClickLk = rLink; } - void SetUndoClickHdl( const Link<>& rLink ) { UndoClickLk = rLink; } + void SetUndoClickHdl( const Link<SvxTPView*,void>& rLink ) { UndoClickLk = rLink; } virtual void ActivatePage() SAL_OVERRIDE; virtual void DeactivatePage() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 23de841bb427..7397a2043430 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -99,10 +99,10 @@ private: DECL_LINK_TYPED( FilterHandle, SvxTPFilter*, void ); DECL_LINK_TYPED( RefHandle, SvxTPFilter*, void ); - DECL_LINK( RejectHandle, SvxTPView*); - DECL_LINK( AcceptHandle, SvxTPView*); - DECL_LINK( RejectAllHandle, void*); - DECL_LINK( AcceptAllHandle, void*); + DECL_LINK_TYPED( RejectHandle, SvxTPView*, void); + DECL_LINK_TYPED( AcceptHandle, SvxTPView*, void); + DECL_LINK_TYPED( RejectAllHandle, SvxTPView*, void); + DECL_LINK_TYPED( AcceptAllHandle, SvxTPView*, void); DECL_LINK_TYPED( ExpandingHandle, SvTreeListBox*, bool); DECL_LINK_TYPED( SelectHandle, SvTreeListBox*, void); DECL_LINK( RefInfoHandle, OUString*); diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 8a086f57e3c7..42e636a53258 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -935,7 +935,7 @@ IMPL_LINK_TYPED( ScAcceptChgDlg, FilterHandle, SvxTPFilter*, pRef, void ) } } -IMPL_LINK( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef ) +IMPL_LINK_TYPED( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef, void ) { SetPointer(Pointer(PointerStyle::Wait)); @@ -971,9 +971,8 @@ IMPL_LINK( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef ) SetPointer(Pointer(PointerStyle::Arrow)); bIgnoreMsg=false; - return 0; } -IMPL_LINK( ScAcceptChgDlg, AcceptHandle, SvxTPView*, pRef ) +IMPL_LINK_TYPED( ScAcceptChgDlg, AcceptHandle, SvxTPView*, pRef, void ) { SetPointer(Pointer(PointerStyle::Wait)); @@ -1009,8 +1008,6 @@ IMPL_LINK( ScAcceptChgDlg, AcceptHandle, SvxTPView*, pRef ) UpdateView(); } bIgnoreMsg=false; - - return 0; } void ScAcceptChgDlg::RejectFiltered() @@ -1052,7 +1049,7 @@ void ScAcceptChgDlg::AcceptFiltered() } } -IMPL_LINK_NOARG(ScAcceptChgDlg, RejectAllHandle) +IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, RejectAllHandle, SvxTPView*, void) { SetPointer(Pointer(PointerStyle::Wait)); bIgnoreMsg=true; @@ -1077,11 +1074,9 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, RejectAllHandle) SetPointer(Pointer(PointerStyle::Arrow)); bIgnoreMsg=false; - - return 0; } -IMPL_LINK_NOARG(ScAcceptChgDlg, AcceptAllHandle) +IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, AcceptAllHandle, SvxTPView*, void) { SetPointer(Pointer(PointerStyle::Wait)); @@ -1103,8 +1098,6 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, AcceptAllHandle) } bIgnoreMsg=false; SetPointer(Pointer(PointerStyle::Arrow)); - - return 0; } IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, SelectHandle, SvTreeListBox*, void) diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 93350fc0ed46..db8128f869ff 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -88,11 +88,11 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg // prevent update dialog data during longer operations (cf #102657#) bool bInhibitActivate; - DECL_DLLPRIVATE_LINK( AcceptHdl, void* ); - DECL_DLLPRIVATE_LINK( AcceptAllHdl, void* ); - DECL_DLLPRIVATE_LINK( RejectHdl, void* ); - DECL_DLLPRIVATE_LINK( RejectAllHdl, void* ); - DECL_DLLPRIVATE_LINK( UndoHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( AcceptHdl, SvxTPView*, void ); + DECL_DLLPRIVATE_LINK_TYPED( AcceptAllHdl, SvxTPView*, void ); + DECL_DLLPRIVATE_LINK_TYPED( RejectHdl, SvxTPView*, void ); + DECL_DLLPRIVATE_LINK_TYPED( RejectAllHdl, SvxTPView*, void ); + DECL_DLLPRIVATE_LINK_TYPED( UndoHdl, SvxTPView*, void ); DECL_DLLPRIVATE_LINK_TYPED( DeselectHdl, SvTreeListBox*, void ); DECL_DLLPRIVATE_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); DECL_DLLPRIVATE_LINK_TYPED( SelectTimerHdl, Timer*, void ); diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index f6cd7eb36264..d0b544a59b84 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -883,31 +883,27 @@ sal_uInt16 SwRedlineAcceptDlg::GetRedlinePos( const SvTreeListEntry& rEntry ) co rEntry.GetUserData())->pData)->pData ); } -IMPL_LINK_NOARG(SwRedlineAcceptDlg, AcceptHdl) +IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, AcceptHdl, SvxTPView*, void) { CallAcceptReject( true, true ); - return 0; } -IMPL_LINK_NOARG(SwRedlineAcceptDlg, AcceptAllHdl) +IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, AcceptAllHdl, SvxTPView*, void) { CallAcceptReject( false, true ); - return 0; } -IMPL_LINK_NOARG(SwRedlineAcceptDlg, RejectHdl) +IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, RejectHdl, SvxTPView*, void) { CallAcceptReject( true, false ); - return 0; } -IMPL_LINK_NOARG(SwRedlineAcceptDlg, RejectAllHdl) +IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, RejectAllHdl, SvxTPView*, void) { CallAcceptReject( false, false ); - return 0; } -IMPL_LINK_NOARG(SwRedlineAcceptDlg, UndoHdl) +IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, UndoHdl, SvxTPView*, void) { SwView * pView = ::GetActiveView(); pView->GetViewFrame()->GetDispatcher()-> @@ -915,8 +911,6 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, UndoHdl) pTPView->EnableUndo(pView->GetSlotState(SID_UNDO) != 0); Activate(); - - return 0; } IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, FilterChangedHdl, SvxTPFilter*, void) |