[Libreoffice-commits] core.git: 2 commits - desktop/source vcl/headless

[Tor Lillqvist (via logerrit)]

 desktop/source/lib/init.cxx |    4 ++++
 vcl/headless/svpinst.cxx    |    5 +----
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 6e246024c8b7ad3d8b953f92a2e5a01686f3a00e
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Apr 24 13:25:08 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Apr 24 14:19:04 2019 +0300

    tdf#124923: Remove unneeded iOS ifdeffery
    
    Now with "Unipoll" this actually caused the app to hang. Unclear
    whether this ifdef had ever been strictly needed. (But before
    "Unipoll" it did not cause any harm.)
    
    Change-Id: I5cc399f76fcdb267eb96bf7790474c14f2ce9955

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 69353b104fc3..a9c3488114fc 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -173,9 +173,7 @@ void SvpSalInstance::Wakeup(SvpRequest const request)
         g_CheckedMutex = true;
     }
 #endif
-#ifdef IOS
-    (void)request;
-#else
+
     ImplSVData* pSVData = ImplGetSVData();
 
     if (pSVData->mpWakeCallback)
@@ -187,7 +185,6 @@ void SvpSalInstance::Wakeup(SvpRequest const request)
         pMutex->m_Request = request;
     pMutex->m_wakeUpMain = true;
     pMutex->m_WakeUpMainCond.notify_one();
-#endif
 }
 
 bool SvpSalInstance::CheckTimeout( bool bExecuteTimers )
commit 971cad365574267998e2a697441d42175ded61a3
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Apr 24 13:19:44 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Apr 24 14:19:04 2019 +0300

    tdf#124923: Need to call InitVCL() on iOS before using SolarMutexGuard
    
    Change-Id: If5781ae101e58c26368e57787cb301f84ffa82a5

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 7fcf018813d4..c4a36e9e182e 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4521,6 +4521,10 @@ static void lo_runLoop(LibreOfficeKit* /*pThis*/,
                        LibreOfficeKitWakeCallback pWakeCallback,
                        void* pData)
 {
+#ifdef IOS // Maybe ANDROID, too?
+    InitVCL();
+#endif
+
     SolarMutexGuard aGuard;
     vcl::lok::registerPollCallbacks(pPollCallback, pWakeCallback, pData);
     lo_startmain(nullptr);