diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
commit | 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch) | |
tree | bdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /sfx2/source/control | |
parent | 57d254d42b6e1d836bd21e6fb2e968af2b511c7d (diff) |
Gradually typed Link
Turn the Link class into a template abstracting over the link's argument and
return types, but provide default template arguments that keep the generic,
unsafe "void* in, sal_IntPtr out" behvior. That way, individual uses of the
Link class can be updated over time.
All the related macros are duplicated with ..._TYPED counterparts, that
additionally take the RetType (except for LINK_TYPED, which manages to infer the
relevant types from the supplied Member).
(It would have been attractive to change the "untyped" LinkStubs from taking a
void* to a properly typed ArgType parameter, too, but that would cause
-fsanitize=function to flag uses of "untyped" Link::Call.)
Change-Id: I3b0140378bad99abbf240140ebb4a46a05d2d2f8
Diffstat (limited to 'sfx2/source/control')
-rw-r--r-- | sfx2/source/control/dispatch.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/itemdel.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/shell.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/control/templateabstractview.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/control/templatesearchview.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/thumbnailviewitem.cxx | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 51644e7d80ad..2e54af5e9838 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -376,7 +376,7 @@ SfxDispatcher::~SfxDispatcher() // So that no timer by Reschedule in PlugComm strikes the LeaveRegistrations xImp->aIdle.Stop(); - xImp->xPoster->SetEventHdl( Link() ); + xImp->xPoster->SetEventHdl( Link<>() ); // Notify the stack varialbles in Call_Impl if ( xImp->pInCallAliveFlag ) diff --git a/sfx2/source/control/itemdel.cxx b/sfx2/source/control/itemdel.cxx index 9ba81f7050ca..9166d4b14ff5 100644 --- a/sfx2/source/control/itemdel.cxx +++ b/sfx2/source/control/itemdel.cxx @@ -31,7 +31,7 @@ class SfxItemDisruptor_Impl: private boost::noncopyable { SfxPoolItem *pItem; - Link aLink; + Link<> aLink; private: DECL_LINK( Delete, void* ); diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 351dc0704429..520ba71c4fdf 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -420,7 +420,7 @@ const SfxPoolItem* SfxShell::ExecuteSlot( SfxRequest& rReq, bool bAsync ) { if( !pImp->pExecuter ) pImp->pExecuter = new svtools::AsynchronLink( - Link( this, ShellCall_Impl ) ); + Link<>( this, ShellCall_Impl ) ); pImp->pExecuter->Call( new SfxRequest( rReq ) ); return 0; } @@ -686,7 +686,7 @@ void SfxShell::UIFeatureChanged() // something my get stuck in the bunkered tools. Asynchronous call to // prevent recursion. if ( !pImp->pUpdater ) - pImp->pUpdater = new svtools::AsynchronLink( Link( this, DispatcherUpdate_Impl ) ); + pImp->pUpdater = new svtools::AsynchronLink( Link<>( this, DispatcherUpdate_Impl ) ); // Multiple views allowed pImp->pUpdater->Call( pFrame->GetDispatcher(), true ); diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx index ccf1aa756777..3ffb69c599be 100644 --- a/sfx2/source/control/templateabstractview.cxx +++ b/sfx2/source/control/templateabstractview.cxx @@ -218,12 +218,12 @@ void TemplateAbstractView::insertItems(const std::vector<TemplateItemProperties> -void TemplateAbstractView::setOpenRegionHdl(const Link &rLink) +void TemplateAbstractView::setOpenRegionHdl(const Link<> &rLink) { maOpenRegionHdl = rLink; } -void TemplateAbstractView::setOpenTemplateHdl(const Link &rLink) +void TemplateAbstractView::setOpenTemplateHdl(const Link<> &rLink) { maOpenTemplateHdl = rLink; } diff --git a/sfx2/source/control/templatesearchview.cxx b/sfx2/source/control/templatesearchview.cxx index 582dd5ad2c2f..7ba4e8248548 100644 --- a/sfx2/source/control/templatesearchview.cxx +++ b/sfx2/source/control/templatesearchview.cxx @@ -22,7 +22,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTemplateSearchView(vcl return new TemplateSearchView(pParent); } -void TemplateSearchView::setOpenTemplateHdl(const Link &rLink) +void TemplateSearchView::setOpenTemplateHdl(const Link<> &rLink) { maOpenTemplateHdl = rLink; } diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index c6543906639c..7d4cbed2dbe2 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -260,7 +260,7 @@ void ThumbnailViewItem::calculateItemsPosition (const long nThumbnailHeight, con maTextEditMaxArea = Rectangle( aPos, aEditSize ); } -void ThumbnailViewItem::setSelectClickHdl (const Link &link) +void ThumbnailViewItem::setSelectClickHdl (const Link<> &link) { maClickHdl = link; } |