diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-09-02 10:15:42 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-09-02 10:15:42 +0200 |
| commit | 043cd5a5cd88ffb01dbf974e77b7ee60a038d8d5 (patch) | |
| tree | db289652f1d505f5e720edb769b28662a45c5992 /sfx2 | |
| parent | 452b1872af72d7fb31101aa2fa35aeaf18e41a10 (diff) | |
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
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 4a0c3f743a99..aeb5fdb71300 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 : |