Kaydet (Commit) eeab393f authored tarafından Michael Stahl's avatar Michael Stahl

Revert "tdf#114025 - avoid deadlock between x11 clipboard and ...

... the lock dialog."

SolarMutexReleaser hack can be avoided with the rtl_Instance fix
from commit fa9c083c.

This reverts commit b0e37303.

Change-Id: Ib90cdec1420807afbadfd526a1ddb68d58db79c1
Reviewed-on: https://gerrit.libreoffice.org/45624Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
(cherry picked from commit a246dc11)
Reviewed-on: https://gerrit.libreoffice.org/45655Tested-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 7dc7c347
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment