lotuswordpro/source/filter/lwplayout.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5df326438fd3a5613a52b4de1935426911ff1301
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun Dec 13 00:06:37 2015 +0000
guard against infinite recursion
Change-Id: I7c55986fba87dea0c519f60240605db03262dfe9
diff --git a/lotuswordpro/source/filter/lwplayout.cxx
b/lotuswordpro/source/filter/lwplayout.cxx
index cf3742d..1bef408 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -139,7 +139,7 @@ bool LwpVirtualLayout::HonorProtection()
return false;
LwpVirtualLayout* pParent = dynamic_cast<LwpVirtualLayout*>
(GetParent().obj().get());
- if(pParent && !pParent->IsHeader())
+ if (pParent && !pParent->IsHeader() && pParent != this)
{
return pParent->HonorProtection();
}
@@ -199,7 +199,7 @@ bool LwpVirtualLayout::HasProtection()
return true;
LwpVirtualLayout* pParent = dynamic_cast<LwpVirtualLayout*>
(GetParent().obj().get());
- if(pParent && !pParent->IsHeader())
+ if (pParent && !pParent->IsHeader() && pParent != this)
{
return pParent->HasProtection();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
