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

[Caolán McNamara]

 lotuswordpro/qa/cppunit/data/pass/loop-1.lwp  |binary
 lotuswordpro/source/filter/lwpframelayout.cxx |    3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 432a05e749660ebcfd11ebd2aedbde169ce03f0b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 7 09:25:54 2016 +0000

    lwp: fix infinite recurse
    
    Change-Id: Ibd17c0f68a9bac92e591fd2c998de45a84b372aa
    (cherry picked from commit 0c9c5911b6df0226ef5c8d5465fd02a2bb581eb6)
    Reviewed-on: https://gerrit.libreoffice.org/22975
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/lotuswordpro/qa/cppunit/data/pass/loop-1.lwp b/lotuswordpro/qa/cppunit/data/pass/loop-1.lwp
new file mode 100644
index 0000000..d610a3e
Binary files /dev/null and b/lotuswordpro/qa/cppunit/data/pass/loop-1.lwp differ
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx b/lotuswordpro/source/filter/lwpframelayout.cxx
index e0baf18..c209cab 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -1100,7 +1100,8 @@ void LwpGroupLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart
 
         //add child frame into group
         LwpVirtualLayout* pLayout = dynamic_cast<LwpVirtualLayout*>(GetChildHead().obj().get());
-        while(pLayout)
+
+        while (pLayout && pLayout != this)
         {
             pLayout->XFConvert(pXFFrame);
             pLayout = dynamic_cast<LwpVirtualLayout*>(pLayout->GetNext().obj().get());