diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-15 11:51:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-16 08:38:53 +0200 |
| commit | 91d06b09ae019f09bca54718c1c24907762aa3ea (patch) | |
| tree | 098e048d30c2e9d073d0a4999e6bfbb1d6b6a309 /svtools | |
| parent | 44404a0c8ae8a7a12e7d9133323d0f7e32061c03 (diff) | |
convert Link<> to typed
Change-Id: I58b31530b4a29851abe9eccdf8f832b9d0348c2c
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 7 | ||||
| -rw-r--r-- | svtools/source/misc/transfer2.cxx | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index f86ff4a8ea9b..66d3a4931e7d 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -1364,20 +1364,19 @@ void SvTreeListBox::RemoveBoxFromDDList_Impl( const SvTreeListBox& rB ) SortLBoxes::get().erase( nVal ); } -IMPL_LINK( SvTreeListBox, DragFinishHdl_Impl, sal_Int8*, pAction ) +IMPL_LINK_TYPED( SvTreeListBox, DragFinishHdl_Impl, sal_Int8, nAction, void ) { sal_uLong nVal = reinterpret_cast<sal_uLong>(this); std::set<sal_uLong> &rSortLBoxes = SortLBoxes::get(); std::set<sal_uLong>::const_iterator it = rSortLBoxes.find(nVal); if( it != rSortLBoxes.end() ) { - DragFinished( *pAction ); + DragFinished( nAction ); rSortLBoxes.erase( it ); } - return 0; } -Link<> SvTreeListBox::GetDragFinishedHdl() const +Link<sal_Int8,void> SvTreeListBox::GetDragFinishedHdl() const { AddBoxToDDList_Impl( *this ); return LINK( const_cast<SvTreeListBox*>(this), SvTreeListBox, DragFinishHdl_Impl ); diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index b74bcd50223c..dc4122f6e7f8 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -358,7 +358,7 @@ typedef ::std::list< TDataCntnrEntry_Impl > TDataCntnrEntryList; struct TransferDataContainer_Impl { TDataCntnrEntryList aFmtList; - Link<> aFinshedLnk; + Link<sal_Int8,void> aFinshedLnk; INetBookmark* pBookmk; Graphic* pGrf; @@ -579,7 +579,7 @@ bool TransferDataContainer::HasAnyData() const void TransferDataContainer::StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, - const Link<>& rLnk, sal_Int32 nDragPointer, sal_Int32 nDragImage ) + const Link<sal_Int8,void>& rLnk, sal_Int32 nDragPointer, sal_Int32 nDragImage ) { pImpl->aFinshedLnk = rLnk; TransferableHelper::StartDrag( pWindow, nDragSourceActions, @@ -591,7 +591,7 @@ void TransferDataContainer::StartDrag( void TransferDataContainer::DragFinished( sal_Int8 nDropAction ) { if( pImpl->aFinshedLnk.IsSet() ) - pImpl->aFinshedLnk.Call( &nDropAction ); + pImpl->aFinshedLnk.Call( nDropAction ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |