[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwplayout.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fa02fa99e0e818cf8600c63110abf1cff741e594
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Dec 13 00:06:37 2015 +0000

    guard against infinite recursion
    
    Change-Id: I7c55986fba87dea0c519f60240605db03262dfe9
    (cherry picked from commit 5df326438fd3a5613a52b4de1935426911ff1301)

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