[Libreoffice-commits] core.git: 2 commits - Repository.mk uui/source

[Noel Grandin (via logerrit)]

 Repository.mk         |    1 -
 uui/source/iahndl.cxx |   10 ++++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit c728c9df75344f431817d876b73ec867c7d449f6
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Apr 10 09:31:54 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Apr 10 11:55:23 2020 +0200

    Revert "use SolarMutexReleaser in UUIInteractionHelper"
    
    This reverts commit 3705a2904d50210e3515723ad24bbbb6a72eb37f.
    
    which breaks update of extensions.
    SolarMutexReleaser requires that we already hold the mutex which is not always true at this spot.
    
    Thanks to Julien Nabert for debugging this.
    
    Change-Id: I6d54d4db63e8694f3dfb9d15d84f47101ded1edc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92007
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 0c9b9397aeeb..f3c7c3b94088 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -164,8 +164,11 @@ UUIInteractionHelper::handleRequest(
         HandleData aHD(rRequest);
         Link<void*,void> aLink(&aHD,handlerequest);
         Application::PostUserEvent(aLink,this);
-        SolarMutexReleaser aReleaser;
+        comphelper::SolarMutex& rSolarMutex = Application::GetSolarMutex();
+        sal_uInt32 nLockCount = (rSolarMutex.IsCurrentThread()) ? rSolarMutex.release(true) : 0;
         aHD.wait();
+        if (nLockCount)
+            rSolarMutex.acquire(nLockCount);
         return aHD.bHandled;
     }
     else
@@ -212,8 +215,11 @@ UUIInteractionHelper::getStringFromRequest(
         HandleData aHD(rRequest);
         Link<void*,void> aLink(&aHD,getstringfromrequest);
         Application::PostUserEvent(aLink,this);
-        SolarMutexReleaser aReleaser;
+        comphelper::SolarMutex& rSolarMutex = Application::GetSolarMutex();
+        sal_uInt32 nLockCount = (rSolarMutex.IsCurrentThread()) ? rSolarMutex.release(true) : 0;
         aHD.wait();
+        if (nLockCount)
+            rSolarMutex.acquire(nLockCount);
         return aHD.m_aResult;
     }
     else
commit cdadd1a0c5d94a1c92ffd431080c60f65d4abe0d
Author:     Heiko Tietze <tietze.heiko at gmail.com>
AuthorDate: Thu Apr 9 09:27:13 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Apr 10 11:55:08 2020 +0200

    Resolves build error from patch I7868900d3dceb39497896bcef529fafef3bf268a
    
    Change-Id: Idfe76b8ca6fac9d93cc16ccaec40191d96092ad1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91946
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/Repository.mk b/Repository.mk
index cf905c970723..c80fe356d6e1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -878,7 +878,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 	extras_database \
 	extras_databasebiblio \
 	extras_gallbullets \
-	extras_gallhtmlexpo \
 	extras_gallmytheme \
 	extras_gallroot \
 	extras_gallsystem \