convert Link<> to typed

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

3 files changed, 18 insertions, 22 deletions

diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx
index 0159a6687f55..9dfeed34058b 100644
--- a/framework/inc/uielement/statusbarmanager.hxx
+++ b/framework/inc/uielement/statusbarmanager.hxx
@@ -86,8 +86,8 @@ class StatusBarManager : public ::cppu::WeakImplHelper<
         void MouseMove( const MouseEvent& rMEvt );
         void MouseButtonDown( const MouseEvent& rMEvt );
         void MouseButtonUp( const MouseEvent& rMEvt );
-        DECL_LINK(Click, void *);
-        DECL_LINK(DoubleClick, void *);
+        DECL_LINK_TYPED(Click, StatusBar*, void);
+        DECL_LINK_TYPED(DoubleClick, StatusBar*, void);
 
         void RemoveControllers();
         OUString RetrieveLabelFromCommand( const OUString& aCmdURL );
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 5a034bb95c87..cd44aa1e34ca 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -654,12 +654,12 @@ void StatusBarManager::MouseButtonUp( const MouseEvent& rMEvt )
     MouseButton(rMEvt,&frame::XStatusbarController::mouseButtonUp);
 }
 
-IMPL_LINK_NOARG(StatusBarManager, Click)
+IMPL_LINK_NOARG_TYPED(StatusBarManager, Click, StatusBar*, void)
 {
     SolarMutexGuard g;
 
     if ( m_bDisposed )
-        return 1;
+        return;
 
     sal_uInt16 nId = m_pStatusBar->GetCurItemId();
     StatusBarControllerMap::const_iterator it = m_aControllerMap.find( nId );
@@ -673,16 +673,14 @@ IMPL_LINK_NOARG(StatusBarManager, Click)
             xController->click( aAWTPoint );
         }
     }
-
-    return 1;
 }
 
-IMPL_LINK_NOARG(StatusBarManager, DoubleClick)
+IMPL_LINK_NOARG_TYPED(StatusBarManager, DoubleClick, StatusBar*, void)
 {
     SolarMutexGuard g;
 
     if ( m_bDisposed )
-        return 1;
+        return;
 
     sal_uInt16 nId = m_pStatusBar->GetCurItemId();
     StatusBarControllerMap::const_iterator it = m_aControllerMap.find( nId );
@@ -696,8 +694,6 @@ IMPL_LINK_NOARG(StatusBarManager, DoubleClick)
             xController->doubleClick( aAWTPoint );
         }
     }
-
-    return 1;
 }
 
 }
diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx
index fda3c31a6e96..33670651c0a6 100644
--- a/include/vcl/status.hxx
+++ b/include/vcl/status.hxx
@@ -91,8 +91,8 @@ private:
     bool                mbProgressMode;
     bool                mbInUserDraw;
     bool                mbAdjustHiDPI;
-    Link<>              maClickHdl;
-    Link<>              maDoubleClickHdl;
+    Link<StatusBar*,void>  maClickHdl;
+    Link<StatusBar*,void>  maDoubleClickHdl;
 
     using Window::ImplInit;
     SAL_DLLPRIVATE void      ImplInit( vcl::Window* pParent, WinBits nStyle );
@@ -149,21 +149,21 @@ public:
 
     void                Clear();
 
-    sal_uInt16              GetItemCount() const;
-    sal_uInt16              GetItemId( sal_uInt16 nPos ) const;
-    sal_uInt16              GetItemId( const Point& rPos ) const;
-    sal_uInt16              GetItemPos( sal_uInt16 nItemId ) const;
+    sal_uInt16          GetItemCount() const;
+    sal_uInt16          GetItemId( sal_uInt16 nPos ) const;
+    sal_uInt16          GetItemId( const Point& rPos ) const;
+    sal_uInt16          GetItemPos( sal_uInt16 nItemId ) const;
     Rectangle           GetItemRect( sal_uInt16 nItemId ) const;
     Point               GetItemTextPos( sal_uInt16 nItemId ) const;
-    sal_uInt16              GetCurItemId() const { return mnCurItemId; }
+    sal_uInt16          GetCurItemId() const { return mnCurItemId; }
 
-    sal_uLong               GetItemWidth( sal_uInt16 nItemId ) const;
+    sal_uLong           GetItemWidth( sal_uInt16 nItemId ) const;
     StatusBarItemBits   GetItemBits( sal_uInt16 nItemId ) const;
 
     long                GetItemOffset( sal_uInt16 nItemId ) const;
 
     void                SetItemText( sal_uInt16 nItemId, const OUString& rText );
-    const OUString&    GetItemText( sal_uInt16 nItemId ) const;
+    const OUString&     GetItemText( sal_uInt16 nItemId ) const;
 
     void                SetItemData( sal_uInt16 nItemId, void* pNewData );
     void*               GetItemData( sal_uInt16 nItemId ) const;
@@ -172,7 +172,7 @@ public:
     const OUString      GetItemCommand( sal_uInt16 nItemId );
 
     void                SetHelpText( sal_uInt16 nItemId, const OUString& rText );
-    const OUString&    GetHelpText( sal_uInt16 nItemId ) const;
+    const OUString&     GetHelpText( sal_uInt16 nItemId ) const;
 
     using Window::SetQuickHelpText;
     void                SetQuickHelpText( sal_uInt16 nItemId, const OUString& rText );
@@ -191,8 +191,8 @@ public:
 
     Size                CalcWindowSizePixel() const;
 
-    void                SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; }
-    void                SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; }
+    void                SetClickHdl( const Link<StatusBar*,void>& rLink ) { maClickHdl = rLink; }
+    void                SetDoubleClickHdl( const Link<StatusBar*,void>& rLink ) { maDoubleClickHdl = rLink; }
 
     using Window::SetAccessibleName;
     void                SetAccessibleName( sal_uInt16 nItemId, const OUString& rName );