diff options
| author | Noel Grandin <noel@peralex.com> | 2015-08-27 13:08:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-08-28 09:49:56 +0200 |
| commit | bd8b93fdff93ff7b2b7e493a7bcef6a59f299dae (patch) | |
| tree | f05be9665737f0667faf95702d96fbf3f0a103c5 /vcl/source/app/svapp.cxx | |
| parent | 1b9c3a17e8496aedfb80528c5275e6658154789d (diff) | |
make PostUserEvent Link<> typed
Change-Id: I13f10bda985d55d419a5bff481130a456ae2db8a
Diffstat (limited to 'vcl/source/app/svapp.cxx')
| -rw-r--r-- | vcl/source/app/svapp.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 2c8f41d8cdd1..7b87430e1a4a 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -411,10 +411,9 @@ void Application::ReAcquireSolarMutex(sal_uLong const nReleased) #endif } -IMPL_STATIC_LINK_NOARG( ImplSVAppData, ImplQuitMsg ) +IMPL_STATIC_LINK_NOARG_TYPED( ImplSVAppData, ImplQuitMsg, void*, void ) { ImplGetSVData()->maAppData.mbAppQuit = true; - return 0; } void Application::Quit() @@ -777,12 +776,12 @@ ImplSVEvent * Application::PostMouseEvent( sal_uLong nEvent, vcl::Window *pWin, } -IMPL_STATIC_LINK( Application, PostEventHandler, void*, pCallData ) +IMPL_STATIC_LINK_TYPED( Application, PostEventHandler, void*, pCallData, void ) { const SolarMutexGuard aGuard; ImplPostEventData* pData = static_cast< ImplPostEventData * >( pCallData ); const void* pEventData; - sal_uLong nEvent; + sal_uLong nEvent; ImplSVEvent * const nEventId = pData->mnEventId; switch( pData->mnEvent ) @@ -844,8 +843,6 @@ IMPL_STATIC_LINK( Application, PostEventHandler, void*, pCallData ) else ++aIter; } - - return 0; } void Application::RemoveMouseAndKeyEvents( vcl::Window* pWin ) @@ -870,12 +867,12 @@ void Application::RemoveMouseAndKeyEvents( vcl::Window* pWin ) } } -ImplSVEvent * Application::PostUserEvent( const Link<>& rLink, void* pCaller, +ImplSVEvent * Application::PostUserEvent( const Link<void*,void>& rLink, void* pCaller, bool bReferenceLink ) { ImplSVEvent* pSVEvent = new ImplSVEvent; pSVEvent->mpData = pCaller; - pSVEvent->mpLink = new Link<>( rLink ); + pSVEvent->maLink = rLink; pSVEvent->mpWindow = NULL; pSVEvent->mbCall = true; if (bReferenceLink) @@ -891,7 +888,6 @@ ImplSVEvent * Application::PostUserEvent( const Link<>& rLink, void* pCaller, vcl::Window* pDefWindow = ImplGetDefaultWindow(); if ( pDefWindow == 0 || !pDefWindow->ImplGetFrame()->PostEvent( pSVEvent ) ) { - delete pSVEvent->mpLink; delete pSVEvent; pSVEvent = 0; } |