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>

5 files changed, 9 insertions, 11 deletions

diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index 37bf731a357a..a2f2c59ee74e 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -485,7 +485,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK( OBrowserLine, OnButtonFocus, PushButton*, /*pPB*/ )
+    IMPL_LINK_NOARG_TYPED( OBrowserLine, OnButtonFocus, Control&, void )
     {
         if ( m_xControl.is() )
         {
@@ -499,7 +499,6 @@ namespace pcr
                 DBG_UNHANDLED_EXCEPTION();
             }
         }
-        return 0;
     }
 
 } // namespace pcr
diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx
index c28c7861a775..7dc1f846a9e1 100644
--- a/extensions/source/propctrlr/browserline.hxx
+++ b/extensions/source/propctrlr/browserline.hxx
@@ -115,7 +115,7 @@ namespace pcr
 
     private:
         DECL_LINK_TYPED( OnButtonClicked, Button*, void );
-        DECL_LINK( OnButtonFocus, PushButton* );
+        DECL_LINK_TYPED( OnButtonFocus, Control&, void );
 
         void    implHideBrowseButton( bool _bPrimary, bool _bReLayout );
         void    implUpdateEnabledDisabled();
diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx
index 1bfeed319853..5ac12303a6ae 100644
--- a/extensions/source/propctrlr/commoncontrol.cxx
+++ b/extensions/source/propctrlr/commoncontrol.cxx
@@ -126,7 +126,7 @@ namespace pcr
 
             if (nKey == KEY_RETURN && !aKeyCode.IsShift())
             {
-                LoseFocusHdl(m_pControlWindow);
+                notifyModifiedValue();
                 impl_activateNextControl_nothrow();
                 return true;
             }
@@ -143,7 +143,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK( ControlHelper, GetFocusHdl, vcl::Window*, /*_pWin*/ )
+    IMPL_LINK_NOARG_TYPED( ControlHelper, GetFocusHdl, Control&, void )
     {
         try
         {
@@ -154,17 +154,15 @@ namespace pcr
         {
             DBG_UNHANDLED_EXCEPTION();
         }
-        return 0;
     }
 
 
-    IMPL_LINK( ControlHelper, LoseFocusHdl, vcl::Window*, /*_pWin*/ )
+    IMPL_LINK_NOARG_TYPED( ControlHelper, LoseFocusHdl, Control&, void )
     {
         // TODO/UNOize: should this be outside the default control's implementations? If somebody
         // has an own control implementation, which does *not* do this - would this be allowed?
         // If not, then we must move this logic out of here.
         notifyModifiedValue();
-        return 0;
     }
 
 
diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx
index 7b631a7965db..b74e985a766e 100644
--- a/extensions/source/propctrlr/commoncontrol.hxx
+++ b/extensions/source/propctrlr/commoncontrol.hxx
@@ -28,6 +28,7 @@
 #include <vcl/window.hxx>
 
 class NotifyEvent;
+class Control;
 
 namespace pcr
 {
@@ -152,8 +153,8 @@ namespace pcr
 
         /// may be used by derived classes, they forward the event to the PropCtrListener
         DECL_LINK( ModifiedHdl, vcl::Window* );
-        DECL_LINK( GetFocusHdl, vcl::Window* );
-        DECL_LINK( LoseFocusHdl, vcl::Window* );
+        DECL_LINK_TYPED( GetFocusHdl, Control&, void );
+        DECL_LINK_TYPED( LoseFocusHdl, Control&, void );
 
     private:
         /** fail-safe wrapper around calling our context's activateNextControl
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 9ffb0daeee66..3d1c199a4b07 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -1112,7 +1112,7 @@ namespace pcr
             {
                 if ( m_pHelper )
                 {
-                    m_pHelper->LoseFocusHdl( m_pImplEdit.get() );
+                    m_pHelper->LoseFocusHdl( *m_pImplEdit.get() );
                     m_pHelper->activateNextControl();
                 }
             }