vcl/source/window/dialog.cxx | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
New commits: commit daa60794e6030d48b08717b93b231fea1396801a Author: Michael Stahl <[email protected]> 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 <[email protected]> Reviewed-by: Michael Stahl <[email protected]> Signed-off-by: Michael Meeks <[email protected]> diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index bf975b465cbb..8383e29eed4d 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -941,15 +941,12 @@ short Dialog::Execute() VclPtr<vcl::Window> xWindow = this; - { - 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::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); // Yield util EndDialog is called or dialog gets destroyed // (the latter should not happen, but better safe than sorry _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
