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

[Michael Meeks]

 sfx2/source/appl/appinit.cxx |    1 +
 vcl/source/window/dialog.cxx |   14 ++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit b0e37303df56472fdc7782b977326c2391fdab07
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Nov 24 13:43:03 2017 +0000

    tdf#114025 - avoid deadlock between x11 clipboard and the lock dialog.
    
    Change-Id: I06e66f59531e7ff6a2e0bf874ebcf2a882d89b63
    Reviewed-on: https://gerrit.libreoffice.org/45228
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 4db7c9674a83..a55dc52705a4 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1063,13 +1063,15 @@ short Dialog::Execute()
         return 0;
 
     VclPtr<vcl::Window> xWindow = this;
-
-    css::uno::Reference< css::uno::XComponentContext > xContext(
+    {
+        SolarMutexReleaser aReleaser; // tdf#114025
+        css::uno::Reference< css::uno::XComponentContext > xContext(
             comphelper::getProcessComponentContext() );
-    css::uno::Reference<css::frame::XGlobalEventBroadcaster> xEventBroadcaster(css::frame::theGlobalEventBroadcaster::get(xContext), css::uno::UNO_QUERY_THROW);
-    css::document::DocumentEvent aObject;
-    aObject.EventName = "DialogExecute";
-    xEventBroadcaster->documentEventOccured(aObject);
+        css::uno::Reference<css::frame::XGlobalEventBroadcaster> xEventBroadcaster(css::frame::theGlobalEventBroadcaster::get(xContext), css::uno::UNO_QUERY_THROW);
+        css::document::DocumentEvent aObject;
+        aObject.EventName = "DialogExecute";
+        xEventBroadcaster->documentEventOccured(aObject);
+    }
     UITestLogger::getInstance().log("DialogExecute");
     // Yield util EndDialog is called or dialog gets destroyed
     // (the latter should not happen, but better safe than sorry
commit 4271a447cbc9f517e6cbd257790d08672f973b0a
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Nov 24 14:46:21 2017 +0000

    tdf#114025 - minimal and not entirely convincing fix for assertion failure.
    
    Almost certainly most of the sfx code needs guarding with the SolarMutex.
    
    Change-Id: Ied52f1e57c44c20486777e08a901060c191043a2
    Reviewed-on: https://gerrit.libreoffice.org/45233
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index a026765176b4..43f4131ddc5f 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -218,6 +218,7 @@ void SfxApplication::Initialize_Impl()
 
     if (!utl::ConfigManager::IsFuzzing())
     {
+        SolarMutexGuard aGuard;
         //ensure instantiation of listener that manages the internal recently-used
         //list
         SfxPickList::ensure();