summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2020-11-26 23:12:46 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-12-01 10:19:34 +0100
commitb700cd9509895ade747d7cd5ee0b628307fb08de (patch)
tree2db9a36398b321fb80c17a8caf642215b417f554
parentAdapt solenv/flatpak-manifest.in to312a33b7636334f6ce3b6d1702bc5d3e45215601 (diff)
downloadcore-b700cd9509895ade747d7cd5ee0b628307fb08de.tar.gz
core-b700cd9509895ade747d7cd5ee0b628307fb08de.zip
tdf#137745: crash, when deleting tables and changed relationship isn't changed
bt here: https://bugs.documentfoundation.org/attachment.cgi?id=166782 some explanations here: https://bugs.documentfoundation.org/show_bug.cgi?id=137745#c8 Change-Id: I1d9dc8d2e3ad7e3e36c4687cb9b2c5990f2d2c8d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106715 (cherry picked from commit 4335810b00abb9b00a9d81caa5ffe09a3ea927fd) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106743 Reviewed-by: Lionel Mamane <lionel@mamane.lu> Tested-by: Jenkins (cherry picked from commit d9c84029c18ea0964705ed8c56e40784a1c556df) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106819 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--connectivity/source/commontools/TTableHelper.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index e86af9673052..03724d669704 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -72,6 +72,11 @@ public:
}
virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override
{
+ // tdf#137745, perhaps connectivity::OTableHelper::disposing() has been called
+ // which called OTableContainerListener::clear(), so m_pComponent may be null
+ if (m_pComponent == nullptr)
+ return;
+
OUString sName;
Event.Accessor >>= sName;
if ( m_aRefNames.find(sName) != m_aRefNames.end() )