diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-12-15 13:27:48 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-15 13:46:33 +0000 |
| commit | f9eff2a402a4cd28d7dbfb6ce27cbf96b31e576f (patch) | |
| tree | 5e4f163e3f21c21549f124d47054cd8dbf583da2 /sw/source | |
| parent | 8cc1e7a7c3ec897129cc6318b254e8dafc682435 (diff) | |
Resolves: fdo#87199 deregister during destroy as lower of upper
Change-Id: I7e52bba78a0fbe32814510b44ad049d3504e7164
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/layout/ssfrm.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx index 02f834f4a5d8..f4831edb2464 100644 --- a/sw/source/core/layout/ssfrm.cxx +++ b/sw/source/core/layout/ssfrm.cxx @@ -367,6 +367,12 @@ void SwFrm::Destroy() delete mpDrawObjs; mpDrawObjs = 0; } + + SwLayoutFrm *pFrm = GetUpper(); + if (pFrm && pFrm->pLower == this) + { + pFrm->pLower = NULL; + } } SwFrm::~SwFrm() |