diff options
Diffstat (limited to 'include/svtools')
| -rw-r--r-- | include/svtools/PlaceEditDialog.hxx | 4 | ||||
| -rw-r--r-- | include/svtools/ServerDetailsControls.hxx | 2 | ||||
| -rw-r--r-- | include/svtools/addresstemplate.hxx | 4 | ||||
| -rw-r--r-- | include/svtools/calendar.hxx | 3 | ||||
| -rw-r--r-- | include/svtools/editbrowsebox.hxx | 2 | ||||
| -rw-r--r-- | include/svtools/filectrl.hxx | 2 | ||||
| -rw-r--r-- | include/svtools/prnsetup.hxx | 4 | ||||
| -rw-r--r-- | include/svtools/tabbar.hxx | 5 | ||||
| -rw-r--r-- | include/svtools/wizardmachine.hxx | 6 |
9 files changed, 17 insertions, 15 deletions
diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx index 066689ed211e..992c5e8afb45 100644 --- a/include/svtools/PlaceEditDialog.hxx +++ b/include/svtools/PlaceEditDialog.hxx @@ -81,8 +81,8 @@ private: void InitDetails( ); void UpdateLabel( ); - DECL_LINK ( OKHdl, Button * ); - DECL_LINK ( DelHdl, Button * ); + DECL_LINK_TYPED ( OKHdl, Button *, void ); + DECL_LINK_TYPED ( DelHdl, Button *, void ); DECL_LINK_TYPED ( EditHdl, DetailsContainer*, void ); DECL_LINK ( ModifyHdl, void* ); DECL_LINK ( SelectTypeHdl, void * ); diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx index de35aa7ea68c..6fe3363a0dcb 100644 --- a/include/svtools/ServerDetailsControls.hxx +++ b/include/svtools/ServerDetailsControls.hxx @@ -146,7 +146,7 @@ class CmisDetailsContainer : public DetailsContainer private: void selectRepository( ); - DECL_LINK ( RefreshReposHdl, void * ); + DECL_LINK_TYPED ( RefreshReposHdl, Button*, void ); DECL_LINK ( SelectRepoHdl, void * ); }; diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 815d57d36468..f7fa977f7a2f 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -127,11 +127,11 @@ namespace svt DECL_LINK(OnFieldScroll, ScrollBar*); DECL_LINK(OnFieldSelect, ListBox*); - DECL_LINK(OnAdministrateDatasources, void*); + DECL_LINK_TYPED(OnAdministrateDatasources, Button*, void); DECL_STATIC_LINK(AddressBookSourceDialog, OnComboGetFocus, ComboBox*); DECL_LINK(OnComboLoseFocus, ComboBox*); DECL_LINK(OnComboSelect, ComboBox*); - DECL_LINK(OnOkClicked, void*); + DECL_LINK_TYPED(OnOkClicked, Button*, void); DECL_LINK(OnDelayedInitialize, void*); }; diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index ef4e48bf4eed..a9546b529a3b 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -37,6 +37,7 @@ class DataChangedEvent; class FloatingWindow; class PushButton; class ImplCFieldFloatWin; +class Button; /************************************************************************* @@ -358,7 +359,7 @@ private: bool mbNone; DECL_DLLPRIVATE_LINK_TYPED( ImplSelectHdl, Calendar*, void ); - DECL_DLLPRIVATE_LINK( ImplClickHdl, PushButton* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplClickHdl, Button*, void ); DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, void* ); public: diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 262d9c180f4c..62d0aeabbb93 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -302,7 +302,7 @@ namespace svt CheckBox& GetBox() {return *pBox;}; private: - DECL_LINK( OnClick, void* ); + DECL_LINK_TYPED( OnClick, Button*, void ); }; diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx index f82f67b5155d..c3b58a6c0c76 100644 --- a/include/svtools/filectrl.hxx +++ b/include/svtools/filectrl.hxx @@ -71,7 +71,7 @@ protected: SVT_DLLPRIVATE void GetFocus() SAL_OVERRIDE; SVT_DLLPRIVATE void StateChanged( StateChangedType nType ) SAL_OVERRIDE; SVT_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); - DECL_DLLPRIVATE_LINK( ButtonHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ButtonHdl, Button*, void ); public: FileControl( vcl::Window* pParent, WinBits nStyle, FileControlMode = FileControlMode::NONE ); diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index e1ca5db312c6..3c7c5848a788 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -53,7 +53,7 @@ private: SVT_DLLPRIVATE void ImplSetInfo(); - DECL_DLLPRIVATE_LINK( ImplPropertiesHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplPropertiesHdl, Button*, void ); DECL_DLLPRIVATE_LINK( ImplChangePrinterHdl, void* ); DECL_DLLPRIVATE_LINK_TYPED( ImplStatusHdl, Timer*, void ); @@ -70,7 +70,7 @@ public: virtual short Execute() SAL_OVERRIDE; - void SetOptionsHdl( const Link<>& rLink ); + void SetOptionsHdl( const Link<Button*,void>& rLink ); }; diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index 664738fbc857..99539e054ad6 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -260,6 +260,7 @@ carried out over an item resp. over which item the mouse click has been carried out. */ +class Button; // - WinBits - @@ -370,9 +371,9 @@ private: SVT_DLLPRIVATE void ImplPrePaint(vcl::RenderContext& rRenderContext); SVT_DLLPRIVATE ImplTabBarItem* ImplGetLastTabBarItem( sal_uInt16 nItemCount ); - DECL_DLLPRIVATE_LINK(ImplClickHdl, ImplTabButton*); + DECL_DLLPRIVATE_LINK_TYPED(ImplClickHdl, Button*, void); - DECL_DLLPRIVATE_LINK(ImplAddClickHandler, void*); + DECL_DLLPRIVATE_LINK_TYPED(ImplAddClickHandler, Button*, void); ImplTabBarItem* seek( size_t i ); ImplTabBarItem* prev(); diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx index 673f3f8717d6..7f6f35992222 100644 --- a/include/svtools/wizardmachine.hxx +++ b/include/svtools/wizardmachine.hxx @@ -350,9 +350,9 @@ namespace svt TabPage* GetOrCreatePage( const WizardState i_nState ); private: - DECL_DLLPRIVATE_LINK(OnNextPage, void*); - DECL_DLLPRIVATE_LINK(OnPrevPage, void*); - DECL_DLLPRIVATE_LINK(OnFinish, void*); + DECL_DLLPRIVATE_LINK_TYPED(OnNextPage, Button*, void); + DECL_DLLPRIVATE_LINK_TYPED(OnPrevPage, Button*, void); + DECL_DLLPRIVATE_LINK_TYPED(OnFinish, Button*, void); SVT_DLLPRIVATE void implResetDefault(vcl::Window* _pWindow); SVT_DLLPRIVATE void implUpdateTitle(); |