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 /sw/source/ui | |
| 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 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/dbui/createaddresslistdialog.cxx | 8 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.cxx | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 598694fb3d89..ee30e49e9e7d 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -60,7 +60,7 @@ class SwAddressControl_Impl : public Control bool m_bNoDataSet; - DECL_LINK(ScrollHdl_Impl, ScrollBar*); + DECL_LINK_TYPED(ScrollHdl_Impl, ScrollBar*, void); DECL_LINK(GotFocusHdl_Impl, Edit*); DECL_LINK(EditModifyHdl_Impl, Edit*); @@ -102,7 +102,7 @@ SwAddressControl_Impl::SwAddressControl_Impl(vcl::Window* pParent, WinBits nBits m_pWindow->Show(); m_pScrollBar->Show(); - Link<> aScrollLink = LINK(this, SwAddressControl_Impl, ScrollHdl_Impl); + Link<ScrollBar*,void> aScrollLink = LINK(this, SwAddressControl_Impl, ScrollHdl_Impl); m_pScrollBar->SetScrollHdl(aScrollLink); m_pScrollBar->SetEndScrollHdl(aScrollLink); m_pScrollBar->EnableDrag(); @@ -262,12 +262,10 @@ void SwAddressControl_Impl::SetCurrentDataSet(sal_uInt32 nSet) } } -IMPL_LINK(SwAddressControl_Impl, ScrollHdl_Impl, ScrollBar*, pScroll) +IMPL_LINK_TYPED(SwAddressControl_Impl, ScrollHdl_Impl, ScrollBar*, pScroll, void) { long nThumb = pScroll->GetThumbPos(); m_pWindow->SetPosPixel(Point(0, - (m_nLineHeight * nThumb))); - - return 0; } IMPL_LINK(SwAddressControl_Impl, GotFocusHdl_Impl, Edit*, pEdit) diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index ed3096b74a04..c4219fc243cf 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -812,7 +812,7 @@ class SwAssignFieldsControl : public Control long m_nYOffset; long m_nFirstYPos; - DECL_LINK(ScrollHdl_Impl, ScrollBar*); + DECL_LINK_TYPED(ScrollHdl_Impl, ScrollBar*, void); DECL_LINK(MatchHdl_Impl, ListBox*); DECL_LINK(GotFocusHdl_Impl, ListBox*); @@ -1082,7 +1082,7 @@ void SwAssignFieldsControl::MakeVisible( sal_Int32 nIndex ) ScrollHdl_Impl( m_aVScroll.get() ); } -IMPL_LINK(SwAssignFieldsControl, ScrollHdl_Impl, ScrollBar*, pScroll) +IMPL_LINK_TYPED(SwAssignFieldsControl, ScrollHdl_Impl, ScrollBar*, pScroll, void) { long nThumb = pScroll->GetThumbPos(); // the scrollbar moves on a per line basis @@ -1099,8 +1099,6 @@ IMPL_LINK(SwAssignFieldsControl, ScrollHdl_Impl, ScrollBar*, pScroll) for(auto aFIIter = m_aPreviews.begin(); aFIIter != m_aPreviews.end(); ++aFIIter) lcl_Move(*aFIIter, nMove); SetUpdateMode(true); - - return 0; } IMPL_LINK(SwAssignFieldsControl, MatchHdl_Impl, ListBox*, pBox) |