strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ofz#57800 Timeout

Browse source 
Change-Id: I14b4906ce61b3d8a86cb9a766986c49e0b0e6abc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150171
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2023-04-09 19:30:56 +01:00
parent 60bce1af8a
commit ffdee63185
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
lotuswordpro/qa/cppunit/data/pass/ofz57800-1.lwp Normal file
View file

Binary file not shown.

7
lotuswordpro/source/filter/lwplayout.cxx
View file

@ -370,7 +370,7 @@ bool LwpVirtualLayout::IsStyleLayout()
LwpVirtualLayout* LwpVirtualLayout::FindChildByType(LWP_LAYOUT_TYPE eType)
{
LwpObjectID* pID = &GetChildHead();
LwpVirtualLayout* pPrevLayout = nullptr;
o3tl::sorted_vector<LwpVirtualLayout*> aSeen;
while (pID && !pID->IsNull())
{
@ -378,14 +378,13 @@ LwpVirtualLayout* LwpVirtualLayout::FindChildByType(LWP_LAYOUT_TYPE eType)
if (!pLayout)
break;
if (pPrevLayout && pLayout == pPrevLayout)
bool bAlreadySeen = !aSeen.insert(pLayout).second;
if (bAlreadySeen)
{
SAL_WARN("lwp", "loop in layout");
break;
}
pPrevLayout = pLayout;
if (pLayout->GetLayoutType() == eType)
return pLayout;