diff options
| author | Andras Timar <andras.timar@collabora.com> | 2018-11-06 11:51:45 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-11-06 14:32:00 +0100 |
| commit | bc089afb13029bae65b993992b3815430657ac24 (patch) | |
| tree | 77ccb7e13e065e6e0df077ba9ff21af8f0102a07 /vcl | |
| parent | d186ed09bcabe36f70e8a58b4f0b1c05c3c72218 (diff) | |
Use the backend SalInstance method IsMainThread for Application::IsMainThread
Change-Id: I3258268b12cb0914a5e8d1c9b57d7891e83080c6
Reviewed-on: https://gerrit.libreoffice.org/62951
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/svdata.hxx | 1 | ||||
| -rw-r--r-- | vcl/source/app/svapp.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/app/svmain.cxx | 3 |
3 files changed, 1 insertions, 5 deletions
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index b36ecf7e6a41..62f07929e031 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -363,7 +363,6 @@ struct ImplSVData std::unique_ptr<DockingManager> mpDockingManager; std::unique_ptr<BlendFrameCache> mpBlendFrameCache; - oslThreadIdentifier mnMainThreadId = 0; rtl::Reference< vcl::DisplayConnectionDispatch > mxDisplayConnection; css::uno::Reference< css::lang::XComponent > mxAccessBridge; diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 3221804607e3..0d9a2770aeb8 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -520,7 +520,7 @@ comphelper::SolarMutex& Application::GetSolarMutex() bool Application::IsMainThread() { - return ImplGetSVData()->mnMainThreadId == osl::Thread::getCurrentIdentifier(); + return ImplGetSVData()->mpDefInst->IsMainThread(); } sal_uInt32 Application::ReleaseSolarMutex() diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 673e800e4ac4..86db558da3e9 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -302,9 +302,6 @@ bool InitVCL() ImplSVData* pSVData = ImplGetSVData(); - // remember Main-Thread-Id - pSVData->mnMainThreadId = ::osl::Thread::getCurrentIdentifier(); - // Initialize Sal pSVData->mpDefInst = CreateSalInstance(); if ( !pSVData->mpDefInst ) |