diff options
| -rw-r--r-- | include/svtools/transfer.hxx | 2 | ||||
| -rw-r--r-- | include/svtools/treelistbox.hxx | 4 | ||||
| -rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 7 | ||||
| -rw-r--r-- | svtools/source/misc/transfer2.cxx | 6 | ||||
| -rw-r--r-- | sw/source/uibase/dbui/dbtree.cxx | 2 |
5 files changed, 10 insertions, 11 deletions
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index 675b191a5980..b58031d8c430 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -515,7 +515,7 @@ public: using TransferableHelper::StartDrag; void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, - const Link<>& rCallbck, + const Link<sal_Int8,void>& rCallbck, sal_Int32 nDragPointer = DND_POINTER_NONE, sal_Int32 nDragImage = DND_IMAGE_NONE ); }; diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 76113ad610ad..b64b4ad7af3b 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -307,7 +307,7 @@ private: // called for a deleted object. SVT_DLLPRIVATE static void AddBoxToDDList_Impl( const SvTreeListBox& rB ); SVT_DLLPRIVATE static void RemoveBoxFromDDList_Impl( const SvTreeListBox& rB ); - DECL_DLLPRIVATE_LINK( DragFinishHdl_Impl, sal_Int8* ); + DECL_DLLPRIVATE_LINK_TYPED( DragFinishHdl_Impl, sal_Int8, void ); protected: @@ -347,7 +347,7 @@ protected: // The Remove will be called from the handler, which then calls DragFinish. // The Remove is also called in the DTOR of the SvTreeListBox - // so it can't be called for a deleted object. - Link<> GetDragFinishedHdl() const; + Link<sal_Int8,void> GetDragFinishedHdl() const; // For asynchronous D'n'D sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, SvTreeListBox* pSourceView ); 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: */ diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index 0defde03f0a5..290aa7f4128f 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -512,7 +512,7 @@ void SwDBTreeList::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ ) pContainer->CopyString( SotClipboardFormatId::STRING, sDBName ); pContainer->StartDrag( this, DND_ACTION_COPY | DND_ACTION_LINK, - Link<>() ); + Link<sal_Int8,void>() ); } } |