From f9eff2a402a4cd28d7dbfb6ce27cbf96b31e576f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 15 Dec 2014 13:27:48 +0000
Subject: [PATCH] Resolves: fdo#87199 deregister during destroy as lower of
 upper

Change-Id: I7e52bba78a0fbe32814510b44ad049d3504e7164
---
 sw/source/core/layout/ssfrm.cxx | 6 ++++++
 1 file changed, 6 insertions(+)

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()