From 4ea70f87f7a2b61eda6e5ab1f48debf6fcfadc1f Mon Sep 17 00:00:00 2001
From: Noel Grandin <noelgrandin@gmail.com>
Date: Thu, 3 Sep 2015 11:10:57 +0200
Subject: convert Link<> to typed

Change-Id: I2136c3db2742afcb4722f69297276bea1e0119f4
Reviewed-on: https://gerrit.libreoffice.org/18306
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
---
 basctl/source/basicide/baside2.hxx  | 2 +-
 basctl/source/basicide/baside2b.cxx | 4 +---
 basctl/source/basicide/bastypes.cxx | 7 +++----
 basctl/source/inc/bastypes.hxx      | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'basctl')

diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index ab0ec278edcb..c97480b1132c 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -281,7 +281,7 @@ private:
 
 protected:
     virtual void        Resize() SAL_OVERRIDE;
-    DECL_LINK( ScrollHdl, ScrollBar * );
+    DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
 
 public:
     explicit ComplexEditorWindow( ModulWindow* pParent );
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 168d441e92bd..5de9144aeb87 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2054,7 +2054,7 @@ void ComplexEditorWindow::Resize()
     aEWVScrollBar->SetPosSizePixel( Point( aOutSz.Width() - DWBORDER - nSBWidth, DWBORDER ), Size( nSBWidth, aSz.Height() ) );
 }
 
-IMPL_LINK(ComplexEditorWindow, ScrollHdl, ScrollBar *, pCurScrollBar )
+IMPL_LINK_TYPED(ComplexEditorWindow, ScrollHdl, ScrollBar *, pCurScrollBar, void )
 {
     if (aEdtWindow->GetEditView())
     {
@@ -2066,8 +2066,6 @@ IMPL_LINK(ComplexEditorWindow, ScrollHdl, ScrollBar *, pCurScrollBar )
         aEdtWindow->GetEditView()->ShowCursor(false);
         pCurScrollBar->SetThumbPos( aEdtWindow->GetEditView()->GetStartDocPos().Y() );
     }
-
-    return 0;
 }
 
 void ComplexEditorWindow::DataChanged(DataChangedEvent const & rDCEvt)
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 8072fe397e7f..8b88008adc5e 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -61,9 +61,9 @@ BaseWindow::~BaseWindow()
 void BaseWindow::dispose()
 {
     if ( pShellVScrollBar )
-        pShellVScrollBar->SetScrollHdl( Link<>() );
+        pShellVScrollBar->SetScrollHdl( Link<ScrollBar*,void>() );
     if ( pShellHScrollBar )
-        pShellHScrollBar->SetScrollHdl( Link<>() );
+        pShellHScrollBar->SetScrollHdl( Link<ScrollBar*,void>() );
     pShellVScrollBar.clear();
     pShellHScrollBar.clear();
     vcl::Window::dispose();
@@ -96,10 +96,9 @@ void BaseWindow::GrabScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll )
 
 
 
-IMPL_LINK( BaseWindow, ScrollHdl, ScrollBar *, pCurScrollBar )
+IMPL_LINK_TYPED( BaseWindow, ScrollHdl, ScrollBar *, pCurScrollBar, void )
 {
     DoScroll( pCurScrollBar );
-    return 0;
 }
 
 void BaseWindow::ExecuteCommand (SfxRequest&)
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 6b32a2d1d76a..7a98027dbfd5 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -153,7 +153,7 @@ private:
     VclPtr<ScrollBar>      pShellHScrollBar;
     VclPtr<ScrollBar>      pShellVScrollBar;
 
-    DECL_LINK( ScrollHdl, ScrollBar * );
+    DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
     int nStatus;
 
     ScriptDocument      m_aDocument;
-- 
cgit