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, 25 insertions, 41 deletions

diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index d891e8d0d7c2..5d3b0254e93e 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -1331,38 +1331,34 @@ sal_uInt16 BrowseBox::FrozenColCount() const
 
 
 
-IMPL_LINK(BrowseBox,ScrollHdl,ScrollBar*,pBar)
+IMPL_LINK_TYPED(BrowseBox, ScrollHdl, ScrollBar*, pBar, void)
 {
 
     if ( pBar->GetDelta() == 0 )
-        return 0;
+        return;
 
     if ( pBar->GetDelta() < 0 && getDataWindow()->bNoScrollBack )
     {
         UpdateScrollbars();
-        return 0;
+        return;
     }
 
     if ( pBar == aHScroll.get() )
         ScrollColumns( aHScroll->GetDelta() );
     if ( pBar == pVScroll )
         ScrollRows( pVScroll->GetDelta() );
-
-    return 0;
 }
 
 
 
-IMPL_LINK_NOARG(BrowseBox, EndScrollHdl)
+IMPL_LINK_NOARG_TYPED(BrowseBox, EndScrollHdl, ScrollBar*, void)
 {
 
     if ( getDataWindow()->bNoScrollBack )
     {
         EndScroll();
-        return 0;
+        return;
     }
-
-    return 0;
 }
 
 
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index cc777f3e112c..183376908b0d 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -224,8 +224,8 @@ class SvxIconChoiceCtrl_Impl
     void                ResetVirtSize();
     void                CheckScrollBars();
 
-                        DECL_LINK( ScrollUpDownHdl, ScrollBar * );
-                        DECL_LINK( ScrollLeftRightHdl, ScrollBar * );
+                        DECL_LINK_TYPED( ScrollUpDownHdl, ScrollBar*, void );
+                        DECL_LINK_TYPED( ScrollLeftRightHdl, ScrollBar*, void );
                         DECL_LINK_TYPED( EditTimeoutHdl, Idle *, void);
                         DECL_LINK_TYPED( UserEventHdl, void*, void );
                         DECL_LINK_TYPED( AutoArrangeHdl, Idle*, void );
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index dedeaf88c630..81fb69675e3b 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -232,22 +232,20 @@ void SvxIconChoiceCtrl_Impl::SetStyle( WinBits nWinStyle )
     }
 }
 
-IMPL_LINK( SvxIconChoiceCtrl_Impl, ScrollUpDownHdl, ScrollBar*, pScrollBar )
+IMPL_LINK_TYPED( SvxIconChoiceCtrl_Impl, ScrollUpDownHdl, ScrollBar*, pScrollBar, void )
 {
     StopEntryEditing( true );
     // arrow up: delta=-1; arrow down: delta=+1
     Scroll( 0, pScrollBar->GetDelta(), true );
     bEndScrollInvalidate = true;
-    return 0;
 }
 
-IMPL_LINK( SvxIconChoiceCtrl_Impl, ScrollLeftRightHdl, ScrollBar*, pScrollBar )
+IMPL_LINK_TYPED( SvxIconChoiceCtrl_Impl, ScrollLeftRightHdl, ScrollBar*, pScrollBar, void )
 {
     StopEntryEditing( true );
     // arrow left: delta=-1; arrow right: delta=+1
     Scroll( pScrollBar->GetDelta(), 0, true );
     bEndScrollInvalidate = true;
-    return 0;
 }
 
 void SvxIconChoiceCtrl_Impl::FontModified()
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 5206c1bdb70d..35eae008cb7c 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -300,7 +300,7 @@ void SvImpLBox::Clear()
 // Paint, navigate, scroll
 // *********************************************************************
 
-IMPL_LINK_NOARG(SvImpLBox, EndScrollHdl)
+IMPL_LINK_NOARG_TYPED(SvImpLBox, EndScrollHdl, ScrollBar*, void)
 {
     if( nFlags & F_ENDSCROLL_SET_VIS_SIZE )
     {
@@ -308,17 +308,16 @@ IMPL_LINK_NOARG(SvImpLBox, EndScrollHdl)
         nFlags &= ~F_ENDSCROLL_SET_VIS_SIZE;
     }
     EndScroll();
-    return 0;
 }
 
 // handler for vertical scrollbar
 
-IMPL_LINK( SvImpLBox, ScrollUpDownHdl, ScrollBar *, pScrollBar )
+IMPL_LINK_TYPED( SvImpLBox, ScrollUpDownHdl, ScrollBar *, pScrollBar, void )
 {
     DBG_ASSERT(!bInVScrollHdl,"Scroll handler out-paces itself!");
     long nDelta = pScrollBar->GetDelta();
     if( !nDelta )
-        return 0;
+        return;
 
     nFlags &= (~F_FILLING);
 
@@ -347,7 +346,6 @@ IMPL_LINK( SvImpLBox, ScrollUpDownHdl, ScrollBar *, pScrollBar )
             PageUp( (sal_uInt16) nDelta );
     }
     bInVScrollHdl = false;
-    return 0;
 }
 
 
@@ -722,7 +720,7 @@ void SvImpLBox::UpdateAll(
         pView->Invalidate( GetVisibleArea() );
 }
 
-IMPL_LINK( SvImpLBox, ScrollLeftRightHdl, ScrollBar *, pScrollBar )
+IMPL_LINK_TYPED( SvImpLBox, ScrollLeftRightHdl, ScrollBar *, pScrollBar, void )
 {
     long nDelta = pScrollBar->GetDelta();
     if( nDelta )
@@ -735,7 +733,6 @@ IMPL_LINK( SvImpLBox, ScrollLeftRightHdl, ScrollBar *, pScrollBar )
         pView->nFocusWidth = -1;
         KeyLeftRight( nDelta );
     }
-    return 0;
 }
 
 void SvImpLBox::KeyLeftRight( long nDelta )
diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx
index f91234f7c4c7..c7fe5c767c06 100644
--- a/svtools/source/control/scrwin.cxx
+++ b/svtools/source/control/scrwin.cxx
@@ -118,7 +118,7 @@ Size ScrollableWindow::GetOutputSizePixel() const
 
 
 
-IMPL_LINK( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll )
+IMPL_LINK_TYPED( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll, void )
 {
     // notify the start of scrolling, if not already scrolling
     if ( !bScrolling )
@@ -138,12 +138,11 @@ IMPL_LINK( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll )
 
     // notify the end of scrolling
     bScrolling = false;
-    return 0;
 }
 
 
 
-IMPL_LINK( ScrollableWindow, ScrollHdl, ScrollBar *, pScroll )
+IMPL_LINK_TYPED( ScrollableWindow, ScrollHdl, ScrollBar *, pScroll, void )
 {
     // notify the start of scrolling, if not already scrolling
     if ( !bScrolling )
@@ -159,7 +158,6 @@ IMPL_LINK( ScrollableWindow, ScrollHdl, ScrollBar *, pScroll )
         else
             Scroll( 0, aDelta.Height() );
     }
-    return 0;
 }
 
 
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index c43a7c5bd398..f05e6be9a073 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1115,7 +1115,7 @@ bool ValueSet::ImplHasAccessibleListeners()
     return( pAcc && pAcc->HasAccessibleListeners() );
 }
 
-IMPL_LINK( ValueSet,ImplScrollHdl, ScrollBar*, pScrollBar )
+IMPL_LINK_TYPED( ValueSet,ImplScrollHdl, ScrollBar*, pScrollBar, void )
 {
     sal_uInt16 nNewFirstLine = (sal_uInt16)pScrollBar->GetThumbPos();
     if ( nNewFirstLine != mnFirstLine )
@@ -1124,7 +1124,6 @@ IMPL_LINK( ValueSet,ImplScrollHdl, ScrollBar*, pScrollBar )
         mbFormat = true;
         Invalidate();
     }
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(ValueSet, ImplTimerHdl, Timer *, void)
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 539d33703eef..b39546f6cce5 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -786,10 +786,9 @@ void AssignmentPersistentData::ImplCommit()
     }
 
 
-    IMPL_LINK(AddressBookSourceDialog, OnFieldScroll, ScrollBar*, _pScrollBar)
+    IMPL_LINK_TYPED(AddressBookSourceDialog, OnFieldScroll, ScrollBar*, _pScrollBar, void)
     {
         implScrollFields( _pScrollBar->GetThumbPos(), true, true );
-        return 0L;
     }
 
 
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index 5f5f85e8659f..35998633b37b 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -1120,11 +1120,10 @@ IMPL_LINK_NOARG(ExportDialog, UpdateHdlNfResolution)
     return 0;
 }
 
-IMPL_LINK_NOARG(ExportDialog, SbCompressionUpdateHdl)
+IMPL_LINK_NOARG_TYPED(ExportDialog, SbCompressionUpdateHdl, ScrollBar*, void)
 {
     mpNfCompression->SetValue( mpSbCompression->GetThumbPos() );
     updateControls();
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(ExportDialog, OK, Button*, void)
diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx
index 898e6aaf6f16..0dc3dd05c054 100644
--- a/svtools/source/filter/exportdialog.hxx
+++ b/svtools/source/filter/exportdialog.hxx
@@ -147,7 +147,7 @@ private:
                         DECL_LINK( UpdateHdlMtfSizeX, void* );
                         DECL_LINK( UpdateHdlMtfSizeY, void* );
                         DECL_LINK( UpdateHdlNfResolution, void* );
-                        DECL_LINK( SbCompressionUpdateHdl, void* );
+                        DECL_LINK_TYPED( SbCompressionUpdateHdl, ScrollBar*, void );
 
                         DECL_LINK_TYPED( OK, Button*, void );
 
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index 72a75379d7fc..6b9a375083c1 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -186,9 +186,9 @@ private:
     void                DrawNet(vcl::RenderContext& rRenderContext);
 
     // ScrollBar-Handler
-    DECL_LINK( ScrollUpDownHdl, ScrollBar * );
-    DECL_LINK( ScrollLeftRightHdl, ScrollBar * );
-    DECL_LINK( EndScrollHdl, void * );
+    DECL_LINK_TYPED( ScrollUpDownHdl, ScrollBar*, void );
+    DECL_LINK_TYPED( ScrollLeftRightHdl, ScrollBar*, void );
+    DECL_LINK_TYPED( EndScrollHdl, ScrollBar*, void );
 
     void                SetNodeBmpYOffset( const Image& );
     void                SetNodeBmpTabDistance();
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index a6491b64613e..94215e202a7b 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -629,7 +629,7 @@ namespace svt { namespace table
         bool lcl_updateScrollbar( vcl::Window& _rParent, VclPtr<ScrollBar>& _rpBar,
             bool const i_needBar, long _nVisibleUnits,
             long _nPosition, long _nLineSize, long _nRange,
-            bool _bHorizontal, const Link<>& _rScrollHandler )
+            bool _bHorizontal, const Link<ScrollBar*,void>& _rScrollHandler )
         {
             // do we currently have the scrollbar?
             bool bHaveBar = _rpBar != nullptr;
@@ -2394,7 +2394,7 @@ namespace svt { namespace table
     }
 
 
-    IMPL_LINK( TableControl_Impl, OnScroll, ScrollBar*, _pScrollbar )
+    IMPL_LINK_TYPED( TableControl_Impl, OnScroll, ScrollBar*, _pScrollbar, void )
     {
         DBG_ASSERT( ( _pScrollbar == m_pVScroll ) || ( _pScrollbar == m_pHScroll ),
             "TableControl_Impl::OnScroll: where did this come from?" );
@@ -2403,8 +2403,6 @@ namespace svt { namespace table
             impl_ni_ScrollRows( _pScrollbar->GetDelta() );
         else
             impl_ni_ScrollColumns( _pScrollbar->GetDelta() );
-
-        return 0L;
     }
 
 
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index 574042a8ca87..59f329999aed 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -458,7 +458,7 @@ namespace svt { namespace table
         /// invalidates the window area occupied by the given column
         void        impl_invalidateColumn( ColPos const i_column );
 
-        DECL_LINK( OnScroll, ScrollBar* );
+        DECL_LINK_TYPED( OnScroll, ScrollBar*, void );
         DECL_LINK_TYPED( OnUpdateScrollbars, void*, void );
     };