[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - vcl/headless

[Tor Lillqvist (via logerrit)]

 vcl/headless/svpinst.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit a1f8bc9f610e7dd234d837202bfd24337d171fdc
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Apr 24 13:25:08 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Apr 30 12:22:08 2019 +0300

    Remove unneeded iOS ifdeffery
    
    Now with "Unipoll" this actually caused the app to hang in the master
    branch, and here in this branch it caused the combo boxes in tunnelled
    dialogs to stop working. 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 37cc0c9bda3c..96364ae07e54 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -170,9 +170,7 @@ void SvpSalInstance::Wakeup(SvpRequest const request)
         g_CheckedMutex = true;
     }
 #endif
-#ifdef IOS
-    (void)request;
-#else
+
     ImplSVData* pSVData = ImplGetSVData();
 
     if (pSVData->mpWakeCallback)
@@ -184,7 +182,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 )