ofz#57800 Timeout
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:
Binary file not shown.
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user