summaryrefslogtreecommitdiff
path: root/uui
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2018-11-06 11:28:52 +0100
committerAndras Timar <andras.timar@collabora.com>2018-11-06 14:31:44 +0100
commitd186ed09bcabe36f70e8a58b4f0b1c05c3c72218 (patch)
tree9dd5227bf638e2fba37d4d070160223d470f386b /uui
parent4d9dda3fd096b9bffba5a07243a86208affd893f (diff)
replace Application::GetMainThreadIdentifier to Application::IsMainThread
Change-Id: I2b9ea77b48673af3575a3142feea5bed84f75d74 Reviewed-on: https://gerrit.libreoffice.org/62950 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Jenkins
Diffstat (limited to 'uui')
-rw-r--r--uui/source/iahndl.cxx16
1 files changed, 4 insertions, 12 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 2ec7bb5496a3..6680ea4feae7 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -162,12 +162,8 @@ bool
UUIInteractionHelper::handleRequest(
uno::Reference< task::XInteractionRequest > const & rRequest)
{
- if(
- Application::GetMainThreadIdentifier()
- != osl::Thread::getCurrentIdentifier()
- &&
- GetpApp()
- ) {
+ if(!Application::IsMainThread() && GetpApp())
+ {
// we are not in the main thread, let it handle that stuff
HandleData aHD(rRequest);
Link<void*,void> aLink(&aHD,handlerequest);
@@ -217,12 +213,8 @@ beans::Optional< OUString >
UUIInteractionHelper::getStringFromRequest(
uno::Reference< task::XInteractionRequest > const & rRequest)
{
- if(
- Application::GetMainThreadIdentifier()
- != osl::Thread::getCurrentIdentifier()
- &&
- GetpApp()
- ) {
+ if(!Application::IsMainThread() && GetpApp())
+ {
// we are not in the main thread, let it handle that stuff
HandleData aHD(rRequest);
Link<void*,void> aLink(&aHD,getstringfromrequest);