[Libreoffice-commits] .: Branch 'libreoffice-4-0' - vcl/android vcl/headless

[Libreoffice Gerrit user]

 vcl/android/androidinst.cxx   |    1 +
 vcl/headless/headlessinst.cxx |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit 8795bbb146f6061ba69bf5646a1af1c3749d302b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Dec 12 15:38:17 2012 +0100

    Consistently acquire solar mutex in all CreateSalInstance variants
    
    ...where all but the variants for Android and --enable-headless already did so
    (and curiously the DestroySalInstance variants for Android and --enable-headless
    already contained code to release the solar mutex).  See the thread at
    <http://lists.freedesktop.org/archives/libreoffice/2012-December/042535.html>
    "--headless broken with --enable-headless" for further details.
    
    Change-Id: I01be2e237e203a151ea8b1f3adfbcb3e63247cd7
    (cherry picked from commit 5613bcfc6dc0ea45f8baeef9a8469a77c31365f5)

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index c563646..9eba26e 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -151,6 +151,7 @@ SalInstance *CreateSalInstance()
     fprintf (stderr, "Android: CreateSalInstance!\n");
     AndroidSalInstance* pInstance = new AndroidSalInstance( new SalYieldMutex() );
     new AndroidSalData( pInstance );
+    pInstance->AcquireYieldMutex(1);
     return pInstance;
 }
 
diff --git a/vcl/headless/headlessinst.cxx b/vcl/headless/headlessinst.cxx
index 439de86..7793d85 100644
--- a/vcl/headless/headlessinst.cxx
+++ b/vcl/headless/headlessinst.cxx
@@ -121,6 +121,7 @@ SalInstance *CreateSalInstance()
 {
     HeadlessSalInstance* pInstance = new HeadlessSalInstance( new SalYieldMutex() );
     new HeadlessSalData( pInstance );
+    pInstance->AcquireYieldMutex(1);
     return pInstance;
 }