diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-03 11:10:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-04 06:31:30 +0000 |
| commit | 4ea70f87f7a2b61eda6e5ab1f48debf6fcfadc1f (patch) | |
| tree | 83ba4d72bdf86a5fa252b14d32345fdf91fffe09 /sfx2 | |
| parent | 5338d2abe4078626d2cfa38cde99dfa1d4eb2f6b (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 'sfx2')
| -rw-r--r-- | sfx2/source/control/thumbnailview.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 10 | ||||
| -rw-r--r-- | sfx2/source/sidebar/Deck.cxx | 3 |
3 files changed, 6 insertions, 10 deletions
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 0279d9bd1ec3..d679263f5590 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -491,7 +491,7 @@ bool ThumbnailView::ImplHasAccessibleListeners() return( pAcc && pAcc->HasAccessibleListeners() ); } -IMPL_LINK( ThumbnailView,ImplScrollHdl, ScrollBar*, pScrollBar ) +IMPL_LINK_TYPED( ThumbnailView,ImplScrollHdl, ScrollBar*, pScrollBar, void ) { if ( pScrollBar->GetDelta() ) { @@ -500,7 +500,6 @@ IMPL_LINK( ThumbnailView,ImplScrollHdl, ScrollBar*, pScrollBar ) if ( IsReallyVisible() && IsUpdateMode() ) Invalidate(); } - return 0; } IMPL_LINK (ThumbnailView, OnItemSelected, ThumbnailViewItem*, pItem) diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 43fd167fbe6e..078b9c821191 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -2096,7 +2096,7 @@ void CustomPropertiesControl::Init(VclBuilderContainer& rBuilder) m_pVertScroll->SetRangeMax( 0 ); m_pVertScroll->SetVisibleSize( 0xFFFF ); - Link<> aScrollLink = LINK( this, CustomPropertiesControl, ScrollHdl ); + Link<ScrollBar*,void> aScrollLink = LINK( this, CustomPropertiesControl, ScrollHdl ); m_pVertScroll->SetScrollHdl( aScrollLink ); } @@ -2137,13 +2137,12 @@ void CustomPropertiesControl::dispose() vcl::Window::dispose(); } -IMPL_LINK( CustomPropertiesControl, ScrollHdl, ScrollBar*, pScrollBar ) +IMPL_LINK_TYPED( CustomPropertiesControl, ScrollHdl, ScrollBar*, pScrollBar, void ) { sal_Int32 nOffset = m_pPropertiesWin->GetLineHeight(); nOffset *= ( m_nThumbPos - pScrollBar->GetThumbPos() ); m_nThumbPos = pScrollBar->GetThumbPos(); m_pPropertiesWin->DoScroll( nOffset ); - return 0; } IMPL_LINK_NOARG_TYPED(CustomPropertiesControl, RemovedHdl, void*, void) @@ -2601,7 +2600,7 @@ CmisPropertiesControl::CmisPropertiesControl(SfxTabPage* pParent) m_rVertScroll.SetRangeMin(0); m_rVertScroll.SetVisibleSize( 0xFFFF ); - Link<> aScrollLink = LINK( this, CmisPropertiesControl, ScrollHdl ); + Link<ScrollBar*,void> aScrollLink = LINK( this, CmisPropertiesControl, ScrollHdl ); m_rVertScroll.SetScrollHdl( aScrollLink ); } @@ -2610,12 +2609,11 @@ void CmisPropertiesControl::ClearAllLines() m_pPropertiesWin.ClearAllLines(); } -IMPL_LINK( CmisPropertiesControl, ScrollHdl, ScrollBar*, pScrollBar ) +IMPL_LINK_TYPED( CmisPropertiesControl, ScrollHdl, ScrollBar*, pScrollBar, void ) { sal_Int32 nOffset = m_pPropertiesWin.GetItemHeight(); nOffset *= ( pScrollBar->GetThumbPos() ); m_pPropertiesWin.DoScroll( -nOffset ); - return 0; } void CmisPropertiesControl::checkAutoVScroll() diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index 9866f4d4252d..5982b9f2f8f9 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -296,12 +296,11 @@ void Deck::PrintWindowSubTree(vcl::Window* pRoot, int nIndentation) PrintWindowSubTree(pRoot->GetChild(nIndex), nIndentation + 1); } -IMPL_LINK_NOARG(Deck, HandleVerticalScrollBarChange) +IMPL_LINK_NOARG_TYPED(Deck, HandleVerticalScrollBarChange, ScrollBar*, void) { const sal_Int32 nYOffset (-mpVerticalScrollBar->GetThumbPos()); mpScrollContainer->SetPosPixel(Point(mpScrollContainer->GetPosPixel().X(), nYOffset)); - return sal_IntPtr(true); } //----- Deck::ScrollContainerWindow ------------------------------------------- |