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>

12 files changed, 27 insertions, 35 deletions

diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index b3a62474f4cd..8208d2a330e5 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -189,7 +189,7 @@ class SwSidebarWin : public vcl::Window
         SfxItemSet  DefaultItem();
 
         DECL_LINK(ModifyHdl, void*);
-        DECL_LINK(ScrollHdl, ScrollBar*);
+        DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void);
         DECL_LINK_TYPED(DeleteHdl, void*, void);
 
         inline SwView& DocView() { return mrView;}
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 62f3748d6a01..3892e4086246 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -290,9 +290,9 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
     SAL_DLLPRIVATE long          PhyPageUp();
     SAL_DLLPRIVATE long          PhyPageDown();
 
-    SAL_DLLPRIVATE int               _CreateScrollbar( bool bHori );
-    DECL_DLLPRIVATE_LINK( ScrollHdl, SwScrollbar * );
-    DECL_DLLPRIVATE_LINK( EndScrollHdl, SwScrollbar * );
+    SAL_DLLPRIVATE int           _CreateScrollbar( bool bHori );
+    DECL_DLLPRIVATE_LINK_TYPED(  ScrollHdl, ScrollBar*, void );
+    DECL_DLLPRIVATE_LINK_TYPED(  EndScrollHdl, ScrollBar*, void );
     SAL_DLLPRIVATE bool          UpdateScrollbars();
     DECL_DLLPRIVATE_LINK( WindowChildEventListener, VclSimpleEvent* );
     SAL_DLLPRIVATE void          CalcVisArea( const Size &rPixelSz );
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 598694fb3d89..ee30e49e9e7d 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -60,7 +60,7 @@ class SwAddressControl_Impl : public Control
 
     bool                            m_bNoDataSet;
 
-    DECL_LINK(ScrollHdl_Impl, ScrollBar*);
+    DECL_LINK_TYPED(ScrollHdl_Impl, ScrollBar*, void);
     DECL_LINK(GotFocusHdl_Impl, Edit*);
     DECL_LINK(EditModifyHdl_Impl, Edit*);
 
@@ -102,7 +102,7 @@ SwAddressControl_Impl::SwAddressControl_Impl(vcl::Window* pParent, WinBits nBits
     m_pWindow->Show();
     m_pScrollBar->Show();
 
-    Link<> aScrollLink = LINK(this, SwAddressControl_Impl, ScrollHdl_Impl);
+    Link<ScrollBar*,void> aScrollLink = LINK(this, SwAddressControl_Impl, ScrollHdl_Impl);
     m_pScrollBar->SetScrollHdl(aScrollLink);
     m_pScrollBar->SetEndScrollHdl(aScrollLink);
     m_pScrollBar->EnableDrag();
@@ -262,12 +262,10 @@ void SwAddressControl_Impl::SetCurrentDataSet(sal_uInt32 nSet)
     }
 }
 
-IMPL_LINK(SwAddressControl_Impl, ScrollHdl_Impl, ScrollBar*, pScroll)
+IMPL_LINK_TYPED(SwAddressControl_Impl, ScrollHdl_Impl, ScrollBar*, pScroll, void)
 {
     long nThumb = pScroll->GetThumbPos();
     m_pWindow->SetPosPixel(Point(0, - (m_nLineHeight * nThumb)));
-
-    return 0;
 }
 
 IMPL_LINK(SwAddressControl_Impl, GotFocusHdl_Impl, Edit*, pEdit)
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index ed3096b74a04..c4219fc243cf 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -812,7 +812,7 @@ class SwAssignFieldsControl : public Control
     long                        m_nYOffset;
     long                        m_nFirstYPos;
 
-    DECL_LINK(ScrollHdl_Impl, ScrollBar*);
+    DECL_LINK_TYPED(ScrollHdl_Impl, ScrollBar*, void);
     DECL_LINK(MatchHdl_Impl, ListBox*);
     DECL_LINK(GotFocusHdl_Impl, ListBox*);
 
@@ -1082,7 +1082,7 @@ void SwAssignFieldsControl::MakeVisible( sal_Int32 nIndex )
     ScrollHdl_Impl( m_aVScroll.get() );
 }
 
-IMPL_LINK(SwAssignFieldsControl, ScrollHdl_Impl, ScrollBar*, pScroll)
+IMPL_LINK_TYPED(SwAssignFieldsControl, ScrollHdl_Impl, ScrollBar*, pScroll, void)
 {
     long nThumb = pScroll->GetThumbPos();
     // the scrollbar moves on a per line basis
@@ -1099,8 +1099,6 @@ IMPL_LINK(SwAssignFieldsControl, ScrollHdl_Impl, ScrollBar*, pScroll)
     for(auto aFIIter = m_aPreviews.begin(); aFIIter != m_aPreviews.end(); ++aFIIter)
         lcl_Move(*aFIIter, nMove);
     SetUpdateMode(true);
-
-    return 0;
 }
 
 IMPL_LINK(SwAssignFieldsControl, MatchHdl_Impl, ListBox*, pBox)
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
index 1021428b903c..3901058e6232 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -231,10 +231,9 @@ void SwAddressPreview::Resize()
     positionScrollBar();
 }
 
-IMPL_LINK_NOARG(SwAddressPreview, ScrollHdl)
+IMPL_LINK_NOARG_TYPED(SwAddressPreview, ScrollHdl, ScrollBar*, void)
 {
     Invalidate();
-    return 0;
 }
 
 void SwAddressPreview::AddAddress(const OUString& rAddress)
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
index 7023c79dca78..18098655fc26 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -1176,11 +1176,10 @@ void SwSidebarWin::Delete()
     }
 }
 
-IMPL_LINK(SwSidebarWin, ScrollHdl, ScrollBar*, pScroll)
+IMPL_LINK_TYPED(SwSidebarWin, ScrollHdl, ScrollBar*, pScroll, void)
 {
     long nDiff = GetOutlinerView()->GetEditView().GetVisArea().Top() - pScroll->GetThumbPos();
     GetOutlinerView()->Scroll( 0, nDiff );
-    return 0;
 }
 
 IMPL_LINK_NOARG(SwSidebarWin, ModifyHdl)
diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx
index 1b585cd15a34..a5db5cb80a82 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -574,7 +574,7 @@ void SwSrcEditWindow::InitScrollBars()
 
 }
 
-IMPL_LINK(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll)
+IMPL_LINK_TYPED(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll, void)
 {
     if(pScroll == pVScrollbar)
     {
@@ -591,7 +591,6 @@ IMPL_LINK(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll)
         pScroll->SetThumbPos( pTextView->GetStartDocPos().X() );
     }
     GetSrcView()->GetViewFrame()->GetBindings().Invalidate( SID_TABLE_CELL );
-    return 0;
 }
 
 IMPL_LINK_TYPED( SwSrcEditWindow, SyntaxTimerHdl, Idle *, pIdle, void )
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx
index 49edd57f5164..eb0eed5ee5db 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.hxx
@@ -73,7 +73,7 @@ class SW_DLLPUBLIC SwAddressPreview : public vcl::Window
     virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
     void UpdateScrollBar();
 
-    DECL_LINK(ScrollHdl, void*);
+    DECL_LINK_TYPED(ScrollHdl, ScrollBar*,void);
 
 public:
     SwAddressPreview(vcl::Window* pParent, WinBits nStyle=WB_BORDER);
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index 0e63261101f9..851e08862d5d 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -196,8 +196,8 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell
     SAL_DLLPRIVATE Point AlignToPixel(const Point& rPt) const;
 
     SAL_DLLPRIVATE int _CreateScrollbar( bool bHori);
-    DECL_DLLPRIVATE_LINK(ScrollHdl, SwScrollbar*);
-    DECL_DLLPRIVATE_LINK(EndScrollHdl, SwScrollbar*);
+    DECL_DLLPRIVATE_LINK_TYPED(ScrollHdl, ScrollBar*, void);
+    DECL_DLLPRIVATE_LINK_TYPED(EndScrollHdl, ScrollBar*, void);
     SAL_DLLPRIVATE bool ChgPage( int eMvMode, bool bUpdateScrollbar = true );
 
     SAL_DLLPRIVATE virtual SfxPrinter*     GetPrinter( bool bCreate = false ) SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx
index e6c2ab5c73be..1fdd395228e0 100644
--- a/sw/source/uibase/inc/srcedtw.hxx
+++ b/sw/source/uibase/inc/srcedtw.hxx
@@ -112,7 +112,7 @@ protected:
 
     virtual void    Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
 
-    DECL_LINK(ScrollHdl, ScrollBar*);
+    DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void);
 
 public:
                     SwSrcEditWindow( vcl::Window* pParent, SwSrcView* pParentView );
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 6f16f8bcdbcd..06e059c24392 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -1403,10 +1403,11 @@ void SwPagePreview::SetVisArea( const Rectangle &rRect, bool bUpdateScrollbar )
     pViewWin->Invalidate();
 }
 
-IMPL_LINK( SwPagePreview, ScrollHdl, SwScrollbar *, pScrollbar )
+IMPL_LINK_TYPED( SwPagePreview, ScrollHdl, ScrollBar *, p, void )
 {
+    SwScrollbar* pScrollbar = static_cast<SwScrollbar*>(p);
     if(!GetViewShell())
-        return 0;
+        return;
     if( !pScrollbar->IsHoriScroll() &&
         pScrollbar->GetType() == SCROLL_DRAG &&
         Help::IsQuickHelpEnabled() &&
@@ -1433,13 +1434,13 @@ IMPL_LINK( SwPagePreview, ScrollHdl, SwScrollbar *, pScrollbar )
     }
     else
         EndScrollHdl( pScrollbar );
-    return 0;
 }
 
-IMPL_LINK( SwPagePreview, EndScrollHdl, SwScrollbar *, pScrollbar )
+IMPL_LINK_TYPED( SwPagePreview, EndScrollHdl, ScrollBar *, p, void )
 {
+    SwScrollbar* pScrollbar = static_cast<SwScrollbar*>(p);
     if(!GetViewShell())
-        return 0;
+        return;
 
     // boolean to avoid unnecessary invalidation of the window.
     bool bInvalidateWin = true;
@@ -1524,7 +1525,6 @@ IMPL_LINK( SwPagePreview, EndScrollHdl, SwScrollbar *, pScrollbar )
     {
         pViewWin->Invalidate();
     }
-    return 0;
 }
 
 Point SwPagePreview::AlignToPixel(const Point &rPt) const
diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx
index 231ef09ae9ba..d86aac3e90e3 100644
--- a/sw/source/uibase/uiview/viewport.cxx
+++ b/sw/source/uibase/uiview/viewport.cxx
@@ -661,10 +661,11 @@ bool SwView::PageDownCrsr(bool bSelect)
 
 // Handler of the scrollbars
 
-IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar )
+IMPL_LINK_TYPED( SwView, ScrollHdl, ScrollBar *, p, void )
 {
+    SwScrollbar* pScrollbar = static_cast<SwScrollbar*>(p);
     if ( GetWrtShell().ActionPend() )
-        return 0;
+        return;
 
     if ( pScrollbar->GetType() == SCROLL_DRAG )
         m_pWrtShell->EnableSmooth( false );
@@ -728,14 +729,13 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar )
 
     if ( pScrollbar->GetType() == SCROLL_DRAG )
         m_pWrtShell->EnableSmooth( true );
-
-    return 0;
 }
 
 // Handler of the scrollbars
 
-IMPL_LINK( SwView, EndScrollHdl, SwScrollbar *, pScrollbar )
+IMPL_LINK_TYPED( SwView, EndScrollHdl, ScrollBar *, p, void )
 {
+    SwScrollbar* pScrollbar = static_cast<SwScrollbar*>(p);
     if ( !GetWrtShell().ActionPend() )
     {
         if(nPgNum)
@@ -753,7 +753,6 @@ IMPL_LINK( SwView, EndScrollHdl, SwScrollbar *, pScrollbar )
 
         GetViewFrame()->GetBindings().Update(FN_STAT_PAGE);
     }
-    return 0;
 }
 
 // Calculates the size of the m_aVisArea in dependency of the size of