diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-07-18 17:23:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-20 08:01:58 +0000 |
| commit | 91b1f300cf7f357c3a39d0d5810326cc78d78f16 (patch) | |
| tree | a89ef37ce86d8fe5babde77a43a098001ca3c164 /sfx2/source/control | |
| parent | bca4d6f896fb12ceff37476c43ea8892898dd385 (diff) | |
convert to typed Link<> in sfx2
Change-Id: Ifa42bd14d7329ff1043fa736513c468dda30485e
Reviewed-on: https://gerrit.libreoffice.org/17195
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sfx2/source/control')
| -rw-r--r-- | sfx2/source/control/dispatch.cxx | 7 | ||||
| -rw-r--r-- | sfx2/source/control/templateabstractview.cxx | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 9f3de39ff70a..8d14270c937c 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -329,7 +329,7 @@ void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent ) for (sal_uInt16 n=0; n<SFX_OBJECTBAR_MAX; n++) xImp->aObjBars[n].nResId = 0; - Link<> aGenLink( LINK(this, SfxDispatcher, PostMsgHandler) ); + Link<SfxRequest*,void> aGenLink( LINK(this, SfxDispatcher, PostMsgHandler) ); xImp->xPoster = new SfxHintPoster(aGenLink); @@ -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<SfxRequest*,void>() ); // Notify the stack varialbles in Call_Impl if ( xImp->pInCallAliveFlag ) @@ -1071,7 +1071,7 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall, /** Helper method to receive the asynchronously executed <SfxRequest>s. */ -IMPL_LINK(SfxDispatcher, PostMsgHandler, SfxRequest*, pReq) +IMPL_LINK_TYPED(SfxDispatcher, PostMsgHandler, SfxRequest*, pReq, void) { DBG_ASSERT( !xImp->bFlushing, "recursive call to dispatcher" ); SFX_STACK(SfxDispatcher::PostMsgHandler); @@ -1104,7 +1104,6 @@ IMPL_LINK(SfxDispatcher, PostMsgHandler, SfxRequest*, pReq) } delete pReq; - return 0; } void SfxDispatcher::SetMenu_Impl() diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx index 11b985dd5e15..3be294cee78d 100644 --- a/sfx2/source/control/templateabstractview.cxx +++ b/sfx2/source/control/templateabstractview.cxx @@ -219,7 +219,7 @@ void TemplateAbstractView::insertItems(const std::vector<TemplateItemProperties> -void TemplateAbstractView::setOpenRegionHdl(const Link<> &rLink) +void TemplateAbstractView::setOpenRegionHdl(const Link<void*,void> &rLink) { maOpenRegionHdl = rLink; } |