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 /uui/source/iahndl.cxx | |
| parent | 1b9c3a17e8496aedfb80528c5275e6658154789d (diff) | |
make PostUserEvent Link<> typed
Change-Id: I13f10bda985d55d419a5bff481130a456ae2db8a
Diffstat (limited to 'uui/source/iahndl.cxx')
| -rw-r--r-- | uui/source/iahndl.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index d16935bedd8e..5a9ad912cd7b 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -146,8 +146,7 @@ UUIInteractionHelper::~UUIInteractionHelper() { } -sal_IntPtr -UUIInteractionHelper::handlerequest( +void UUIInteractionHelper::handlerequest( void* pHandleData, void* pInteractionHelper) { HandleData* pHND @@ -159,7 +158,6 @@ UUIInteractionHelper::handlerequest( pHND->bHandled = pUUI->handleRequest_impl(pHND->m_rRequest, false, bDummy, aDummy); pHND->set(); - return 0; } bool @@ -176,7 +174,7 @@ UUIInteractionHelper::handleRequest( ) { // we are not in the main thread, let it handle that stuff HandleData aHD(rRequest); - Link<> aLink(&aHD,handlerequest); + Link<void*,void> aLink(&aHD,handlerequest); Application::PostUserEvent(aLink,this); SolarMutexReleaser aReleaser; aHD.wait(); @@ -190,15 +188,13 @@ UUIInteractionHelper::handleRequest( } } -sal_IntPtr -UUIInteractionHelper::getstringfromrequest( +void UUIInteractionHelper::getstringfromrequest( void* pHandleData,void* pInteractionHelper) { HandleData* pHND = static_cast<HandleData*>(pHandleData); UUIInteractionHelper* pUUI = static_cast<UUIInteractionHelper*>(pInteractionHelper); pHND->m_aResult = pUUI->getStringFromRequest_impl(pHND->m_rRequest); pHND->set(); - return 0; } beans::Optional< OUString > @@ -232,7 +228,7 @@ UUIInteractionHelper::getStringFromRequest( ) { // we are not in the main thread, let it handle that stuff HandleData aHD(rRequest); - Link<> aLink(&aHD,getstringfromrequest); + Link<void*,void> aLink(&aHD,getstringfromrequest); Application::PostUserEvent(aLink,this); SolarMutexReleaser aReleaser; aHD.wait(); |