diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-06-16 16:52:55 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-06-16 17:12:11 +0100 |
| commit | 1c0d1199fe02666de0d162f071ce7e6e812a23df (patch) | |
| tree | 8ef1f918cb1fda9f4302999ca69cf6edc1b8e3cd /include | |
| parent | fe4dbade94c1170da402348aa8ade9885c5f4e3f (diff) | |
Resolves: tdf#82532 parent mutex dtored before child dtor uses it
Mutex belonged to DisposeListenerGridBridge which inherits from
FmXDisposeListener, FmXDisposeListener dtor accesses a reference
to the parent mutex in its dtor, but the mutex has been destroyed
at this point.
Move the mutex from parent to child. FWIW these classes are on
the candidate list to merge.
(cherry picked from commit e841ed93d6c6d817be1f7fdc18ff971325c861cc)
Change-Id: Ic639eaed97c2b0625c368ed249f09920af37f94e
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/fmtools.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index e029b9913cda..99ff0577e0da 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -158,10 +158,10 @@ class SAL_WARN_UNUSED FmXDisposeListener friend class FmXDisposeMultiplexer; FmXDisposeMultiplexer* m_pAdapter; - ::osl::Mutex& m_rMutex; + osl::Mutex m_aMutex; public: - FmXDisposeListener(::osl::Mutex& _rMutex) : m_pAdapter(nullptr), m_rMutex(_rMutex) { } + FmXDisposeListener() : m_pAdapter(nullptr) { } virtual ~FmXDisposeListener(); virtual void disposing(const css::lang::EventObject& _rEvent, sal_Int16 _nId) throw( css::uno::RuntimeException ) = 0; |