vcl/source/window/dialog.cxx | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
New commits:
commit a246dc116a534cacef34c0e376a54391341b36e8
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Nov 29 15:24:50 2017 +0100
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 <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index e0bfc6cc1b06..59fcf1518eff 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -939,15 +939,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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
