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 /cui | |
| 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 'cui')
| -rw-r--r-- | cui/source/dialogs/hangulhanjadlg.cxx | 6 | ||||
| -rw-r--r-- | cui/source/inc/hangulhanjadlg.hxx | 2 | ||||
| -rw-r--r-- | cui/source/options/optcolor.cxx | 7 |
3 files changed, 6 insertions, 9 deletions
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index fbcb8ea56c98..789c3fa235c5 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -1494,11 +1494,9 @@ namespace svx } - IMPL_LINK_NOARG( HangulHanjaEditDictDialog, ScrollHdl ) + IMPL_LINK_NOARG_TYPED( HangulHanjaEditDictDialog, ScrollHdl, ScrollBar*, void ) { UpdateScrollbar(); - - return 0; } IMPL_LINK_NOARG( HangulHanjaEditDictDialog, OriginalModifyHdl ) @@ -1781,7 +1779,7 @@ namespace svx #error number of suggestions should not under-run the value of 5 #endif - Link<> aScrLk( LINK( this, HangulHanjaEditDictDialog, ScrollHdl ) ); + Link<ScrollBar*,void> aScrLk( LINK( this, HangulHanjaEditDictDialog, ScrollHdl ) ); m_aScrollSB->SetScrollHdl( aScrLk ); m_aScrollSB->SetEndScrollHdl( aScrLk ); m_aScrollSB->SetRangeMin( 0 ); diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index e60d723c3eec..ca8fadfd0a2a 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -290,7 +290,7 @@ namespace svx bool m_bModifiedOriginal; DECL_LINK( OriginalModifyHdl, void* ); - DECL_LINK( ScrollHdl, void* ); + DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); DECL_LINK( EditModifyHdl1, Edit* ); DECL_LINK( EditModifyHdl2, Edit* ); DECL_LINK( EditModifyHdl3, Edit* ); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 1f90dcf72efc..a6c58658056b 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -846,7 +846,7 @@ class ColorConfigCtrl_Impl : public VclVBox EditableColorConfig* pColorConfig; EditableExtendedColorConfig* pExtColorConfig; - DECL_LINK(ScrollHdl, ScrollBar*); + DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void); DECL_LINK_TYPED(ClickHdl, Button*, void); DECL_LINK(ColorHdl, ColorListBox*); DECL_LINK(ControlFocusHdl, Control*); @@ -897,7 +897,7 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(vcl::Window* pParent) m_pScrollWindow->set_expand(true); m_pScrollWindow->set_fill(true); - Link<> aScrollLink = LINK(this, ColorConfigCtrl_Impl, ScrollHdl); + Link<ScrollBar*,void> aScrollLink = LINK(this, ColorConfigCtrl_Impl, ScrollHdl); m_pVScroll->SetScrollHdl(aScrollLink); m_pVScroll->SetEndScrollHdl(aScrollLink); @@ -950,10 +950,9 @@ void ColorConfigCtrl_Impl::Update () m_pScrollWindow->Update(pColorConfig, pExtColorConfig); } -IMPL_LINK(ColorConfigCtrl_Impl, ScrollHdl, ScrollBar*, pScrollBar) +IMPL_LINK_TYPED(ColorConfigCtrl_Impl, ScrollHdl, ScrollBar*, pScrollBar, void) { m_pScrollWindow->ScrollHdl(*pScrollBar); - return 0; } bool ColorConfigCtrl_Impl::PreNotify( NotifyEvent& rNEvt ) |