sw/source/core/layout/ssfrm.cxx | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit f9eff2a402a4cd28d7dbfb6ce27cbf96b31e576f
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Dec 15 13:27:48 2014 +0000
Resolves: fdo#87199 deregister during destroy as lower of upper
Change-Id: I7e52bba78a0fbe32814510b44ad049d3504e7164
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 02f834f..f4831ed 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()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
