[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - desktop/source include/vcl vcl/source

[Libreoffice Gerrit user]

 desktop/source/lib/init.cxx |    2 ++
 include/vcl/svapp.hxx       |    3 +++
 vcl/source/app/svapp.cxx    |    7 +++++++
 3 files changed, 12 insertions(+)

New commits:
commit 6f076e75b2adb4628ee3cea311781c40f219bba7
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Nov 5 18:17:05 2018 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Nov 6 15:55:00 2018 +0100

    LOK: update main thread
    
    Change-Id: I75df6ae9f9fb41b08a8774ce026f79fdd120b629
    Reviewed-on: https://gerrit.libreoffice.org/62921
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 10e81de091e5..7637f764b46d 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3630,6 +3630,8 @@ static void lo_startmain(void*)
     if (GetpApp())
         Application::GetSolarMutex().tryToAcquire();
 
+    Application::UpdateMainThread();
+
     soffice_main();
 }
 
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 9b930b3127d9..014850eba019 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1355,6 +1355,9 @@ public:
     static void                 ShowNativeErrorBox(const OUString& sTitle  ,
                                                    const OUString& sMessage);
 
+    /** Update main thread identifier */
+    static void                 UpdateMainThread();
+
     /** Do we have a native / system file selector available?
 
      @returns True if native file selector is available, false otherwise.
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index e08adff710e3..c412728cd6a4 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1383,6 +1383,13 @@ void Application::SetHelp( Help* pHelp )
     ImplGetSVData()->maAppData.mpHelp = pHelp;
 }
 
+void Application::UpdateMainThread()
+{
+    ImplSVData* pSVData = ImplGetSVData();
+    if (pSVData)
+        pSVData->mnMainThreadId = osl::Thread::getCurrentIdentifier();
+}
+
 Help* Application::GetHelp()
 {
     return ImplGetSVData()->maAppData.mpHelp;