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 /desktop | |
| 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 'desktop')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.cxx | 6 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 6 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 4 |
3 files changed, 6 insertions, 10 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 0c876826b330..fea7d6b0ccec 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -129,7 +129,7 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl MENU_COMMAND ShowPopupMenu( const Point &rPos, const long nPos ); - DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * ); + DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void ); DECL_DLLPRIVATE_LINK_TYPED( HandleOptionsBtn, Button*, void ); DECL_DLLPRIVATE_LINK_TYPED( HandleEnableBtn, Button*, void ); @@ -468,7 +468,7 @@ void ExtBoxWithBtns_Impl::enableButtons( bool bEnable ) } -IMPL_LINK( ExtBoxWithBtns_Impl, ScrollHdl, ScrollBar*, pScrBar ) +IMPL_LINK_TYPED( ExtBoxWithBtns_Impl, ScrollHdl, ScrollBar*, pScrBar, void ) { long nDelta = pScrBar->GetDelta(); @@ -481,8 +481,6 @@ IMPL_LINK( ExtBoxWithBtns_Impl, ScrollHdl, ScrollBar*, pScrBar ) m_pOptionsBtn->SetPosPixel( aNewOptPt ); m_pRemoveBtn->SetPosPixel( aNewRemPt ); m_pEnableBtn->SetPosPixel( aNewEnPt ); - - return 1; } diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 3ff477c7afbb..c5885a50b052 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -1238,7 +1238,7 @@ void ExtensionBox_Impl::checkEntries() } -void ExtensionBox_Impl::SetScrollHdl( const Link<>& rLink ) +void ExtensionBox_Impl::SetScrollHdl( const Link<ScrollBar*,void>& rLink ) { if ( m_pScrollBar ) m_pScrollBar->SetScrollHdl( rLink ); @@ -1258,11 +1258,9 @@ void ExtensionBox_Impl::DoScroll( long nDelta ) } -IMPL_LINK( ExtensionBox_Impl, ScrollHdl, ScrollBar*, pScrBar ) +IMPL_LINK_TYPED( ExtensionBox_Impl, ScrollHdl, ScrollBar*, pScrBar, void ) { DoScroll( pScrBar->GetDelta() ); - - return 1; } } //namespace dp_gui diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 433f557a40b5..befa6d0a58e0 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -163,7 +163,7 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox void DeleteRemoved(); - DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * ); + DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void ); //Index starts with 1. //Throws an com::sun::star::lang::IllegalArgumentException, when the index is invalid. @@ -188,7 +188,7 @@ public: Rectangle GetEntryRect( const long nPos ) const; bool HasActive() { return m_bHasActive; } long PointToPos( const Point& rPos ); - void SetScrollHdl( const Link<>& rLink ); + void SetScrollHdl( const Link<ScrollBar*,void>& rLink ); void DoScroll( long nDelta ); void SetHyperlinkHdl( const Link<>& rLink ){ m_aClickHdl = rLink; } virtual void RecalcAll(); |