sfx2/source/view/viewsh.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
New commits: commit 043cd5a5cd88ffb01dbf974e77b7ee60a038d8d5 Author: Stephan Bergmann <[email protected]> Date: Wed Sep 2 10:15:42 2015 +0200 Do not call external code with SolarMutex locked ...see mail thread starting at <http://lists.freedesktop.org/archives/libreoffice/2015-September/070102.html> "deadlock question" Change-Id: Ib2ae8d46e2ba25b42aab41916ff36fde4519cdc5 diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 4a0c3f7..aeb5fdb 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -1946,8 +1946,11 @@ bool SfxViewShell::TryContextMenuInterception( Menu& rIn, const OUString& rMenuI { try { - ui::ContextMenuInterceptorAction eAction = - static_cast<ui::XContextMenuInterceptor*>(aIt.next())->notifyContextMenuExecute( aEvent ); + ui::ContextMenuInterceptorAction eAction; + { + SolarMutexReleaser rel; + eAction = static_cast<ui::XContextMenuInterceptor*>(aIt.next())->notifyContextMenuExecute( aEvent ); + } switch ( eAction ) { case ui::ContextMenuInterceptorAction_CANCELLED : _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
