diff options
author | Noel Grandin <noel@peralex.com> | 2015-08-28 15:51:24 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-08-31 09:50:10 +0200 |
commit | 68ddda0f3fff8bc435c2a5fd60d1e7eff5359916 (patch) | |
tree | 06d730e9a30d3f2e4fb7ae333642d5ad6b350e3b /svtools | |
parent | 7b096a6da180bb11ffbff15c9a5358c63596cc34 (diff) |
convert Link<> to typed
Change-Id: I53b0a7a9875a3ebcca915c8f2d8c53face6f9509
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/brwbox/brwbox2.cxx | 3 | ||||
-rw-r--r-- | svtools/source/contnr/fileview.cxx | 7 | ||||
-rw-r--r-- | svtools/source/contnr/simptabl.cxx | 15 | ||||
-rw-r--r-- | svtools/source/contnr/svtabbx.cxx | 3 |
4 files changed, 9 insertions, 19 deletions
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index ed237b46ca6d..d891e8d0d7c2 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -1367,10 +1367,9 @@ IMPL_LINK_NOARG(BrowseBox, EndScrollHdl) -IMPL_LINK( BrowseBox, StartDragHdl, HeaderBar*, pBar ) +IMPL_LINK_TYPED( BrowseBox, StartDragHdl, HeaderBar*, pBar, void ) { pBar->SetDragSize( pDataWin->GetOutputSizePixel().Height() ); - return 0; } diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 6f7b8c4eeb5c..874b98304f22 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -1301,7 +1301,7 @@ void SvtFileView::EndInplaceEditing( bool _bCancel ) return mpImp->EndEditing( _bCancel ); } -IMPL_LINK( SvtFileView, HeaderSelect_Impl, HeaderBar*, pBar ) +IMPL_LINK_TYPED( SvtFileView, HeaderSelect_Impl, HeaderBar*, pBar, void ) { DBG_ASSERT( pBar, "no headerbar" ); sal_uInt16 nItemID = pBar->GetCurItemId(); @@ -1340,11 +1340,10 @@ IMPL_LINK( SvtFileView, HeaderSelect_Impl, HeaderBar*, pBar ) pBar->SetItemBits( nItemID, nBits ); mpImp->Resort_Impl( nItemID, !bUp ); - return 1; } -IMPL_LINK( SvtFileView, HeaderEndDrag_Impl, HeaderBar*, pBar ) +IMPL_LINK_TYPED( SvtFileView, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) { if ( !pBar->IsItemMode() ) { @@ -1360,8 +1359,6 @@ IMPL_LINK( SvtFileView, HeaderEndDrag_Impl, HeaderBar*, pBar ) mpImp->mpView->SetTab( i, aSize.Width(), MAP_PIXEL ); } } - - return 0; } diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx index dccfb017a79b..b2515d1fe8d6 100644 --- a/svtools/source/contnr/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -394,49 +394,44 @@ void SvSimpleTable::Command( const CommandEvent& rCEvt ) SvHeaderTabListBox::Command(rCEvt); } -IMPL_LINK( SvSimpleTable, StartDragHdl, HeaderBar*, pCtr) +IMPL_LINK_TYPED( SvSimpleTable, StartDragHdl, HeaderBar*, pCtr, void) { if(pCtr==aHeaderBar.get()) { HBarStartDrag(); } - return 0; } -IMPL_LINK( SvSimpleTable, DragHdl, HeaderBar*, pCtr) +IMPL_LINK_TYPED( SvSimpleTable, DragHdl, HeaderBar*, pCtr, void) { if(pCtr==aHeaderBar.get()) { HBarDrag(); } - return 0; } -IMPL_LINK( SvSimpleTable, EndDragHdl, HeaderBar*, pCtr) +IMPL_LINK_TYPED( SvSimpleTable, EndDragHdl, HeaderBar*, pCtr, void) { if(pCtr==aHeaderBar.get()) { HBarEndDrag(); } - return 0; } -IMPL_LINK( SvSimpleTable, HeaderBarClick, HeaderBar*, pCtr) +IMPL_LINK_TYPED( SvSimpleTable, HeaderBarClick, HeaderBar*, pCtr, void) { if(pCtr==aHeaderBar.get()) { HBarClick(); } - return 0; } -IMPL_LINK( SvSimpleTable, HeaderBarDblClick, HeaderBar*, pCtr) +IMPL_LINK_TYPED( SvSimpleTable, HeaderBarDblClick, HeaderBar*, pCtr, void) { if(pCtr==aHeaderBar.get()) { HBarDblClick(); } - return 0; } SvLBoxItem* SvSimpleTable::GetEntryAtPos( SvTreeListEntry* pEntry, sal_uInt16 nPos ) const diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index d15253ee52cd..08a29ddb35a5 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -615,7 +615,7 @@ IMPL_LINK_NOARG(SvHeaderTabListBox, ScrollHdl_Impl) return 0; } -IMPL_LINK_NOARG(SvHeaderTabListBox, CreateAccessibleHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvHeaderTabListBox, CreateAccessibleHdl_Impl, HeaderBar*, void) { vcl::Window* pParent = m_pImpl->m_pHeaderBar->GetAccessibleParentWindow(); DBG_ASSERT( pParent, "SvHeaderTabListBox..CreateAccessibleHdl_Impl - accessible parent not found" ); @@ -629,7 +629,6 @@ IMPL_LINK_NOARG(SvHeaderTabListBox, CreateAccessibleHdl_Impl) m_pImpl->m_pHeaderBar->SetAccessible( xAccessible ); } } - return 0; } void SvHeaderTabListBox::RecalculateAccessibleChildren() |