[Libreoffice-commits] core.git: lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpfnlayout.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit e9f521d409845a0824752a39d7574f4fad7989d4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 15 09:22:30 2018 +0000

    ofz#5313 Timeout
    
    Change-Id: I80d0a013f5e88493ef539ee5a8435b9ad2217678

diff --git a/lotuswordpro/source/filter/lwpfnlayout.cxx b/lotuswordpro/source/filter/lwpfnlayout.cxx
index 7183d5fde286..c2ac01055119 100644
--- a/lotuswordpro/source/filter/lwpfnlayout.cxx
+++ b/lotuswordpro/source/filter/lwpfnlayout.cxx
@@ -252,14 +252,15 @@ void LwpEnSuperTableLayout::XFConvert(XFContentContainer * /*pCont*/)
  * @short   Get child endnote layout
  * @return pointer to endnote layout
  */
- LwpVirtualLayout* LwpEnSuperTableLayout::GetMainTableLayout()
+LwpVirtualLayout* LwpEnSuperTableLayout::GetMainTableLayout()
 {
     LwpObjectID& rID = GetChildTail();
 
+    LwpVirtualLayout *pPrevLayout = nullptr;
     while(!rID.IsNull())
     {
-        LwpVirtualLayout * pLayout = dynamic_cast<LwpVirtualLayout*>(rID.obj().get());
-        if(!pLayout)
+        LwpVirtualLayout* pLayout = dynamic_cast<LwpVirtualLayout*>(rID.obj().get());
+        if (!pLayout || pLayout == pPrevLayout)
         {
             break;
         }
@@ -268,6 +269,7 @@ void LwpEnSuperTableLayout::XFConvert(XFContentContainer * /*pCont*/)
             return pLayout;
         }
         rID = pLayout->GetPrevious();
+        pPrevLayout = pLayout;
     }
 
     return nullptr;