summaryrefslogtreecommitdiff
path: root/sw
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:41:30 +0100
commitf995ccc3d5d39f382ad278434ff0fc30de8b0ccb (patch)
treeff9b8a31b37e5df0b8f8b2ee0571993d0e506a30 /sw
parenteeca244139eec880f0eb0141243de98c3d85be9a (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 (cherry picked from commit 4c9ddd594e26c517b8515f77206bfeb2fb063e03)
Diffstat (limited to 'sw')
-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 d0a0de9d6731..35f969fe1b27 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -86,6 +86,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();