diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-07-27 14:51:08 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-07-28 10:23:11 +0000 |
| commit | bc3de19411e0966bbcdc9e247b2af96bff4333b2 (patch) | |
| tree | 89497b503f255f4c07f9269d8769d305aa4195b4 /ucb/source/ucp/tdoc/tdoc_docmgr.hxx | |
| parent | ffa1c7bc86093b8445656bab1538939b9d3a6d88 (diff) | |
ucb: fix deadlocks in tdoc UCP OfficeDocumentsManager
Reduce scope of MutexGuards so that UNO methods are called without the
mutex locked.
This avoids deadlocks in CppunitTest_sw_mailmerge after using SolarMutex
in dbaccess' ModelMethodGuard.
Change-Id: I0229ebc2983c85e2003d51053a6bd130240274c7
Reviewed-on: https://gerrit.libreoffice.org/27582
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'ucb/source/ucp/tdoc/tdoc_docmgr.hxx')
| -rw-r--r-- | ucb/source/ucp/tdoc/tdoc_docmgr.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx index a98411cf25ab..2568c2a8953e 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx @@ -157,8 +157,8 @@ namespace tdoc_ucp { css::uno::Reference< css::frame::XGlobalEventBroadcaster > m_xDocEvtNotifier; css::uno::Reference< css::frame::XModuleManager2 > m_xModuleMgr; DocumentList m_aDocs; - ContentProvider * m_pDocEventListener; - ::rtl::Reference<OfficeDocumentsCloseListener> m_xDocCloseListener; + ContentProvider * const m_pDocEventListener; + ::rtl::Reference<OfficeDocumentsCloseListener> const m_xDocCloseListener; }; } // namespace tdoc_ucp |