diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-03-13 12:44:10 +0000 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2017-03-16 14:43:56 +0100 |
commit | e5e54ce14ff5b4da05af49de6a1623bb37fab3e5 (patch) | |
tree | 4acfb7432461e3aaceca7b81479e1ed7565de2f9 /sw | |
parent | b3173ad9e28f29a8b9e5a5aac1aa6bd04e46a66e (diff) |
Resolves: rhbz#1431540 crash in SwDBManager::releaseRevokeListener
Change-Id: I8e61163de7e6192bdf613ab6b58906326499d6c2
Reviewed-on: https://gerrit.libreoffice.org/35137
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit e1f36eddf4596901a51de42322ccbf8d1df9d139)
Reviewed-on: https://gerrit.libreoffice.org/35138
(cherry picked from commit 445b719b8bbff9181cea3601649bb21c27acd7b5)
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 2d85ff75a1eb..9adf98c24340 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -3118,8 +3118,11 @@ SwDoc* SwDBManager::getDoc() const void SwDBManager::releaseRevokeListener() { - pImpl->m_xDataSourceRemovedListener->Dispose(); - pImpl->m_xDataSourceRemovedListener.clear(); + if (pImpl->m_xDataSourceRemovedListener.is()) + { + pImpl->m_xDataSourceRemovedListener->Dispose(); + pImpl->m_xDataSourceRemovedListener.clear(); + } } SwConnectionDisposedListener_Impl::SwConnectionDisposedListener_Impl(SwDBManager& rManager) |