summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2015-09-03 11:10:57 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-09-04 06:31:30 +0000
commit4ea70f87f7a2b61eda6e5ab1f48debf6fcfadc1f (patch)
tree83ba4d72bdf86a5fa252b14d32345fdf91fffe09 /toolkit
parent5338d2abe4078626d2cfa38cde99dfa1d4eb2f6b (diff)
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>
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/awt/scrollabledialog.cxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/toolkit/source/awt/scrollabledialog.cxx b/toolkit/source/awt/scrollabledialog.cxx
index b1d898d573a9..4d6fc4df55c6 100644
--- a/toolkit/source/awt/scrollabledialog.cxx
+++ b/toolkit/source/awt/scrollabledialog.cxx
@@ -39,7 +39,7 @@ ScrollableWrapper<T>::ScrollableWrapper( vcl::Window* pParent, WinBits nStyle, D
mbHasVertBar( false ),
maScrollVis( None )
{
- Link<> aLink( LINK( this, ScrollableWrapper, ScrollBarHdl ) );
+ Link<ScrollBar*,void> aLink( LINK( this, ScrollableWrapper, ScrollBarHdl ) );
maVScrollBar->SetScrollHdl( aLink );
maHScrollBar->SetScrollHdl( aLink );
@@ -119,20 +119,19 @@ void ScrollableWrapper<T>::lcl_Scroll( long nX, long nY )
//IMPL_LINK( ScrollableWrapper, ScrollBarHdl, ScrollBar*, pSB )
template< class T>
-sal_IntPtr ScrollableWrapper<T>::LinkStubScrollBarHdl( void* pThis, void* pCaller)
+void ScrollableWrapper<T>::LinkStubScrollBarHdl( void* pThis, ScrollBar* pCaller)
{
- return static_cast<ScrollableWrapper<T>*>(pThis)->ScrollBarHdl( static_cast<ScrollBar*>(pCaller) );
+ static_cast<ScrollableWrapper<T>*>(pThis)->ScrollBarHdl( static_cast<ScrollBar*>(pCaller) );
}
template< class T>
-sal_IntPtr ScrollableWrapper<T>::ScrollBarHdl( ScrollBar* pSB )
+void ScrollableWrapper<T>::ScrollBarHdl( ScrollBar* pSB )
{
sal_uInt16 nPos = (sal_uInt16) pSB->GetThumbPos();
if( pSB == maVScrollBar.get() )
lcl_Scroll(mnScrollPos.X(), nPos );
else if( pSB == maHScrollBar.get() )
lcl_Scroll(nPos, mnScrollPos.Y() );
- return 1;
}
template< class T>