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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/dialog/charmap.cxx | 3 | ||||
| -rw-r--r-- | svx/source/dialog/dlgctl3d.cxx | 4 | ||||
| -rw-r--r-- | svx/source/dialog/rubydialog.cxx | 5 |
3 files changed, 4 insertions, 8 deletions
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 730d120402b8..9413edc82755 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -692,7 +692,7 @@ void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, bool bFocus ) -IMPL_LINK_NOARG(SvxShowCharSet, VscrollHdl) +IMPL_LINK_NOARG_TYPED(SvxShowCharSet, VscrollHdl, ScrollBar*, void) { if( nSelectedIndex < FirstInView() ) { @@ -714,7 +714,6 @@ IMPL_LINK_NOARG(SvxShowCharSet, VscrollHdl) } Invalidate(); - return 0; } diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index ea9bc0f8a405..c0be0e8fe1d5 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -1224,7 +1224,7 @@ void SvxLightCtl3D::LoseFocus() maLightControl->HideFocus(); } -IMPL_LINK_NOARG(SvxLightCtl3D, ScrollBarMove) +IMPL_LINK_NOARG_TYPED(SvxLightCtl3D, ScrollBarMove, ScrollBar*, void) { const sal_Int32 nHor(maHorScroller->GetThumbPos()); const sal_Int32 nVer(maVerScroller->GetThumbPos()); @@ -1237,8 +1237,6 @@ IMPL_LINK_NOARG(SvxLightCtl3D, ScrollBarMove) { maUserInteractiveChangeCallback.Call(this); } - - return 0; } IMPL_LINK_NOARG_TYPED(SvxLightCtl3D, ButtonPress, Button*, void) diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index d6dc088dfd54..6c416d83c614 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -244,7 +244,7 @@ SvxRubyDialog::SvxRubyDialog(SfxBindings* pBind, SfxChildWindow* pCW, vcl::Windo m_pPositionLB->SetSelectHdl(LINK(this, SvxRubyDialog, PositionHdl_Impl)); m_pCharStyleLB->SetSelectHdl(LINK(this, SvxRubyDialog, CharStyleHdl_Impl)); - Link<> aScrLk(LINK(this, SvxRubyDialog, ScrollHdl_Impl)); + Link<ScrollBar*,void> aScrLk(LINK(this, SvxRubyDialog, ScrollHdl_Impl)); m_pScrollSB->SetScrollHdl(aScrLk); m_pScrollSB->SetEndScrollHdl(aScrLk); @@ -548,7 +548,7 @@ void SvxRubyDialog::GetCurrentText(OUString& rBase, OUString& rRuby) rRuby = aEditArr[nCurrentEdit * 2 + 1]->GetText(); } -IMPL_LINK(SvxRubyDialog, ScrollHdl_Impl, ScrollBar*, pScroll) +IMPL_LINK_TYPED(SvxRubyDialog, ScrollHdl_Impl, ScrollBar*, pScroll, void) { long nPos = pScroll->GetThumbPos(); if (GetLastPos() != nPos) @@ -561,7 +561,6 @@ IMPL_LINK(SvxRubyDialog, ScrollHdl_Impl, ScrollBar*, pScroll) SetRubyText(nPos, *m_pLeft4ED, *m_pRight4ED); SetLastPos(nPos - 3); m_pPreviewWin->Invalidate(); - return 0; } IMPL_LINK_NOARG_TYPED(SvxRubyDialog, ApplyHdl_Impl, Button*, void) |