summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-03-13 12:44:10 +0000
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-03-14 13:19:39 +0000
commit445b719b8bbff9181cea3601649bb21c27acd7b5 (patch)
treee1e44f9c3ef5038fcea72f204d6030a62428ee3f
parent3a4d2433fbf2ef6f41b82482ea99ed79fb2d6735 (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
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx7
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)