summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-12-03 12:28:42 +0100
committerMichael Stahl <mstahl@redhat.com>2013-12-03 13:29:35 +0100
commit4c9ddd594e26c517b8515f77206bfeb2fb063e03 (patch)
treeae828d177c6ed31fda9ef7a0b07a82c67860cc1f
parentc6f3d909f8e5c64b6bc36a13dfd0d46eb0e1d88d (diff)
SwAccessibleFrameBase::Modify(): avoid accessing deleted mpFrm
In ~SwDoc when a SwFmt is deleted, SwAccessibleNoTextFrame::GetNoTxtNode() would access the mpFrm which at that point was already deleted too; avoid that by returning early. This can be reproduced by closing the bugdoc from fdo#71450. Change-Id: Ide4d42511ccad116fa0362c23ced299d8430d08a
-rw-r--r--sw/source/core/access/accnotextframe.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index f50b19d24cc1..f9c6dace4c1c 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -98,6 +98,8 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem
msTitle.isEmpty() )
{
SwAccessibleFrameBase::Modify( pOld, pNew );
+ if (!GetRegisteredIn())
+ return; // probably was deleted - avoid doing anything
}
const SwNoTxtNode *pNd = GetNoTxtNode();