diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-09 07:23:12 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-09 08:10:11 +0000 |
commit | be73c1602dbe4d0f09d0e9c4853ec89df3eb37ad (patch) | |
tree | 90fea0177273fd5a9499fa66e84f3316de3fe6d7 /include | |
parent | 61afb4bebafe6e615611e74b17ce0fc43648813f (diff) |
convert Link<> to typed
Change-Id: I3127752785b77672d37f99bc9eaa881377dabe7c
Reviewed-on: https://gerrit.libreoffice.org/18431
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/sfx2/tbxctrl.hxx | 2 | ||||
-rw-r--r-- | include/svtools/calendar.hxx | 2 | ||||
-rw-r--r-- | include/svx/lboxctrl.hxx | 2 | ||||
-rw-r--r-- | include/svx/sidebar/Popup.hxx | 2 | ||||
-rw-r--r-- | include/vcl/dockwin.hxx | 2 | ||||
-rw-r--r-- | include/vcl/floatwin.hxx | 4 | ||||
-rw-r--r-- | include/vcl/lstbox.hxx | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index 2ceb70485e21..2fbbcbfc20ad 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -173,7 +173,7 @@ friend struct SfxTbxCtrlFactory; SfxToolBoxControl_Impl* pImpl; protected: - DECL_LINK( PopupModeEndHdl, void * ); + DECL_LINK_TYPED( PopupModeEndHdl, FloatingWindow*, void ); DECL_LINK_TYPED( ClosePopupWindow, SfxPopupWindow *, void ); // old SfxToolBoxControl methods diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index a9546b529a3b..6bb8bf365123 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -360,7 +360,7 @@ private: DECL_DLLPRIVATE_LINK_TYPED( ImplSelectHdl, Calendar*, void ); DECL_DLLPRIVATE_LINK_TYPED( ImplClickHdl, Button*, void ); - DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplPopupModeEndHdl, FloatingWindow*, void ); public: CalendarField( vcl::Window* pParent, WinBits nWinStyle ); diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx index a782530c7a84..a6ab60dd5d05 100644 --- a/include/svx/lboxctrl.hxx +++ b/include/svx/lboxctrl.hxx @@ -38,7 +38,7 @@ protected: void Impl_SetInfo( sal_uInt16 nCount ); - DECL_LINK( PopupModeEndHdl, void * ); + DECL_LINK_TYPED( PopupModeEndHdl, FloatingWindow*, void ); DECL_LINK( SelectHdl, void * ); public: diff --git a/include/svx/sidebar/Popup.hxx b/include/svx/sidebar/Popup.hxx index 7b44492e0c63..6b0c7879905a 100644 --- a/include/svx/sidebar/Popup.hxx +++ b/include/svx/sidebar/Popup.hxx @@ -97,7 +97,7 @@ private: const ::rtl::OUString msAccessibleName; VclPtr<PopupContainer> mxContainer; - DECL_LINK(PopupModeEndHandler, void*); + DECL_LINK_TYPED(PopupModeEndHandler, FloatingWindow*, void); }; } } // end of namespace svx::sidebar diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 07905fdc469c..49021e4fd605 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -118,7 +118,7 @@ private: mbStartDockingEnabled:1, mbLocked:1; - DECL_LINK( PopupModeEnd, void* ); + DECL_LINK_TYPED( PopupModeEnd, FloatingWindow*, void ); void ImplEnableStartDocking( bool bEnable = true ) { mbStartDockingEnabled = bEnable; } bool ImplStartDockingEnabled() { return mbStartDockingEnabled; } diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index 9c64ada7c50c..68c43dde59c9 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -109,7 +109,7 @@ private: bool mbOldSaveBackMode; bool mbGrabFocus; // act as key input window, although focus is not set bool mbInCleanUp; - Link<> maPopupModeEndHdl; + Link<FloatingWindow*,void> maPopupModeEndHdl; SAL_DLLPRIVATE void ImplCallPopupModeEnd(); DECL_DLLPRIVATE_LINK_TYPED( ImplEndPopupModeHdl, void*, void ); @@ -166,7 +166,7 @@ public: bool IsPopupModeCanceled() const { return mbPopupModeCanceled; } bool IsPopupModeTearOff() const { return mbPopupModeTearOff; } - void SetPopupModeEndHdl( const Link<>& rLink ) { maPopupModeEndHdl = rLink; } + void SetPopupModeEndHdl( const Link<FloatingWindow*,void>& rLink ) { maPopupModeEndHdl = rLink; } bool GrabsFocus() const { return mbGrabFocus; } diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index 92072a0d0188..78a3b889788e 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -59,7 +59,7 @@ private: DECL_DLLPRIVATE_LINK( ImplScrollHdl, void* ); DECL_DLLPRIVATE_LINK( ImplCancelHdl, void* ); DECL_DLLPRIVATE_LINK( ImplDoubleClickHdl, void* ); - DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplPopupModeEndHdl, FloatingWindow*, void ); DECL_DLLPRIVATE_LINK( ImplSelectionChangedHdl, void* ); DECL_DLLPRIVATE_LINK( ImplFocusHdl, void* ); DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl, void* ); |