Resolves: fdo#87199 deregister during destroy as lower of upper

Change-Id: I7e52bba78a0fbe32814510b44ad049d3504e7164
2014-12-15 13:27:48 +00:00
parent 8cc1e7a7c3
commit f9eff2a402
1 changed files with 6 additions and 0 deletions
--- 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()