convert Link<> to typed

Change-Id: I59d325c3b051690303a5841907317122fa1ec98b
Reviewed-on: https://gerrit.libreoffice.org/18825
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

9 files changed, 19 insertions, 14 deletions

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 5629902b60cb..c33120863f34 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -428,8 +428,8 @@ private:
 
     DECL_STATIC_LINK( CustomPropertiesWindow, TypeHdl, CustomPropertiesTypeBox* );
     DECL_LINK_TYPED(  RemoveHdl, Button*, void );
-    DECL_LINK(  EditLoseFocusHdl, CustomPropertiesEdit* );
-    DECL_LINK(  BoxLoseFocusHdl, CustomPropertiesTypeBox* );
+    DECL_LINK_TYPED(  EditLoseFocusHdl, Control&, void );
+    DECL_LINK_TYPED(  BoxLoseFocusHdl, Control&, void );
     //add lose focus handlers of Date/TimeField?
 
     DECL_LINK_TYPED(EditTimeoutHdl, Idle *, void);
diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index 607833f66af8..f719b721a95e 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -69,8 +69,8 @@ class SfxManageStyleSheetPage : public SfxTabPage
 private:
 friend class SfxStyleDialog;
 
-    DECL_LINK( GetFocusHdl, Edit * );
-    DECL_LINK( LoseFocusHdl, Edit * );
+    DECL_LINK_TYPED( GetFocusHdl, Control&, void );
+    DECL_LINK_TYPED( LoseFocusHdl, Control&, void );
     DECL_LINK( EditStyleSelectHdl_Impl, void * );
     DECL_LINK_TYPED( EditStyleHdl_Impl, Button*, void );
     DECL_LINK( EditLinkStyleSelectHdl_Impl, void * );
diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx
index be355f34ec6a..00b532a0ba3a 100644
--- a/include/svtools/addresstemplate.hxx
+++ b/include/svtools/addresstemplate.hxx
@@ -128,8 +128,8 @@ namespace svt
         DECL_LINK_TYPED(OnFieldScroll, ScrollBar*, void);
         DECL_LINK(OnFieldSelect, ListBox*);
         DECL_LINK_TYPED(OnAdministrateDatasources, Button*, void);
-        DECL_STATIC_LINK(AddressBookSourceDialog, OnComboGetFocus, ComboBox*);
-        DECL_LINK(OnComboLoseFocus, ComboBox*);
+        DECL_STATIC_LINK_TYPED(AddressBookSourceDialog, OnComboGetFocus, Control&, void);
+        DECL_LINK_TYPED(OnComboLoseFocus, Control&, void);
         DECL_LINK(OnComboSelect, ComboBox*);
         DECL_LINK_TYPED(OnOkClicked, Button*, void);
         DECL_LINK_TYPED(OnDelayedInitialize, void*, void);
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index b11ec1607f87..89908719bcd7 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -160,6 +160,8 @@ private:
 
 
     DECL_LINK( LinkedFieldModifyHdl, NumericField* );
+    DECL_LINK_TYPED( LinkedFieldFocusHdl, Control&, void );
+    void LinkedFieldModifyHdl();
 };
 
 /** Wrapper for usage of a DialControl in item connections. */
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index 7e0b45d31dac..d26ef8d470a0 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -102,6 +102,8 @@ protected:
 
     void            UpdateExample();
     DECL_LINK(RangeHdl, void *);
+    DECL_LINK_TYPED(RangeFocusHdl, Control&, void);
+    void RangeHdl();
 
 private:
     SVX_DLLPRIVATE void         ResetBackground_Impl( const SfxItemSet& rSet );
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index 223e5eb62b33..405ab411910c 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -123,7 +123,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
     DECL_LINK_TYPED( MousePosHdl, GraphCtrl*, void );
     DECL_LINK_TYPED( GraphSizeHdl, GraphCtrl*, void );
     DECL_LINK( URLModifyHdl, void* );
-    DECL_LINK( URLLoseFocusHdl, void* );
+    DECL_LINK_TYPED( URLLoseFocusHdl, Control&, void );
     DECL_LINK_TYPED( UpdateHdl, Idle *, void );
     DECL_LINK_TYPED( StateHdl, GraphCtrl*, void );
     DECL_LINK_TYPED( MiscHdl, LinkParamNone*, void );
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 1403fafa4510..1d1286358dc7 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -234,9 +234,9 @@ private:
     DECL_LINK_TYPED( FlagHdl_Impl, Button*, void );
     DECL_LINK_TYPED( CommandHdl_Impl, Button*, void );
     DECL_LINK_TYPED(TemplateHdl_Impl, Button*, void);
-    DECL_LINK( FocusHdl_Impl, Control* );
+    DECL_LINK_TYPED( FocusHdl_Impl, Control&, void );
     DECL_LINK( LBSelectHdl_Impl, Control* );
-    DECL_LINK(LoseFocusHdl_Impl, void *);
+    DECL_LINK_TYPED(LoseFocusHdl_Impl, Control&, void);
     DECL_LINK_TYPED(FormatHdl_Impl, Button*, void);
     DECL_LINK_TYPED(NoFormatHdl_Impl, Button*, void);
     DECL_LINK_TYPED(AttributeHdl_Impl, Button*, void);
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index 115d9dd87ea5..28bf572b54ac 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -42,8 +42,8 @@ protected:
 private:
     bool                    mbHasControlFocus;
     bool                    mbShowAccelerator;
-    Link<>                  maGetFocusHdl;
-    Link<>                  maLoseFocusHdl;
+    Link<Control&,void>     maGetFocusHdl;
+    Link<Control&,void>     maLoseFocusHdl;
 
     SAL_DLLPRIVATE void     ImplInitControlData();
 
@@ -161,9 +161,9 @@ public:
     */
     long ToRelativeLineIndex( long nIndex ) const;
 
-    void            SetGetFocusHdl( const Link<>& rLink ) { maGetFocusHdl = rLink; }
-    void            SetLoseFocusHdl( const Link<>& rLink ) { maLoseFocusHdl = rLink; }
-    const Link<>&   GetLoseFocusHdl() const { return maLoseFocusHdl; }
+    void            SetGetFocusHdl( const Link<Control&,void>& rLink ) { maGetFocusHdl = rLink; }
+    void            SetLoseFocusHdl( const Link<Control&,void>& rLink ) { maLoseFocusHdl = rLink; }
+    const Link<Control&,void>& GetLoseFocusHdl() const { return maLoseFocusHdl; }
 
     /** determines whether the control currently has the focus
     */
diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx
index 46ab0f30c7d3..9423936f60ae 100644
--- a/include/vcl/slider.hxx
+++ b/include/vcl/slider.hxx
@@ -58,6 +58,7 @@ private:
     Link<Slider*,void>   maEndSlideHdl;
 
     DECL_LINK(LinkedFieldModifyHdl, NumericField*);
+    DECL_LINK_TYPED(LinkedFieldLoseFocusHdl, Control&, void);
 
     using Control::ImplInitSettings;
     using Window::ImplInit;