diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-03-07 09:25:54 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-03-10 19:36:55 +0100 |
| commit | 2cc2e1c56b2e51bb54c7e3922824cf096323b656 (patch) | |
| tree | 534263f42b7fb89cbc8c1ce09881657096057718 | |
| parent | f8921264481a2ec6974c5e254727dafceb967f74 (diff) | |
lwp: fix infinite recurse
Change-Id: Ibd17c0f68a9bac92e591fd2c998de45a84b372aa
(cherry picked from commit 0c9c5911b6df0226ef5c8d5465fd02a2bb581eb6)
Reviewed-on: https://gerrit.libreoffice.org/22976
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 9a618946ececbfb975c6a069b4db407646afb853)
| -rw-r--r-- | lotuswordpro/qa/cppunit/data/pass/loop-1.lwp | bin | 0 -> 24085 bytes | |||
| -rw-r--r-- | lotuswordpro/source/filter/lwpframelayout.cxx | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lotuswordpro/qa/cppunit/data/pass/loop-1.lwp b/lotuswordpro/qa/cppunit/data/pass/loop-1.lwp Binary files differnew file mode 100644 index 000000000000..d610a3ed6534 --- /dev/null +++ b/lotuswordpro/qa/cppunit/data/pass/loop-1.lwp diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx b/lotuswordpro/source/filter/lwpframelayout.cxx index 19944f74f76c..5599e8531e1f 100644 --- a/lotuswordpro/source/filter/lwpframelayout.cxx +++ b/lotuswordpro/source/filter/lwpframelayout.cxx @@ -1105,7 +1105,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()); |