summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-11-29 15:24:50 +0100
committerMichael Stahl <mstahl@redhat.com>2017-12-02 16:00:55 +0100
commiteeab393fe392dd558beadb89ed7b1b541481b732 (patch)
tree7e4a0b40b91a7a9390db1e44858ab54eafb71ada /vcl/source
parent7dc7c347e2deedf41eddfd1c821981533e45192f (diff)
Revert "tdf#114025 - avoid deadlock between x11 clipboard and ...
... the lock dialog." SolarMutexReleaser hack can be avoided with the rtl_Instance fix from commit fa9c083c6071a0a4dc812f3c34731f347ddbabf7. This reverts commit b0e37303df56472fdc7782b977326c2391fdab07. Change-Id: Ib90cdec1420807afbadfd526a1ddb68d58db79c1 Reviewed-on: https://gerrit.libreoffice.org/45624 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit a246dc116a534cacef34c0e376a54391341b36e8) Reviewed-on: https://gerrit.libreoffice.org/45655 Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/window/dialog.cxx14
1 files changed, 6 insertions, 8 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index a55dc52705a4..4db7c9674a83 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1063,15 +1063,13 @@ short Dialog::Execute()
return 0;
VclPtr<vcl::Window> xWindow = this;
- {
- SolarMutexReleaser aReleaser; // tdf#114025
- css::uno::Reference< css::uno::XComponentContext > xContext(
+
+ 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