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

Resolves: fdo#49587 apparent loop in style hierarchy

Browse source 
Change-Id: I32317a1a6500377f7e7bb98d1dcc65ad86feb9a2
This commit is contained in:
Caolán McNamara 2012-07-05 21:37:49 +01:00
parent 5218c0d6a8
commit 7e3923520c
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
writerfilter/source/dmapper/DomainMapper_Impl.cxx
View file

@ -561,7 +561,14 @@ uno::Any DomainMapper_Impl::GetPropertyFromStyleSheet(PropertyIds eId)
}
}
//search until the property is set or no parent is available
pEntry = GetStyleSheetTable()->FindParentStyleSheet(pEntry->sBaseStyleIdentifier);
StyleSheetEntryPtr pNewEntry = GetStyleSheetTable()->FindParentStyleSheet(pEntry->sBaseStyleIdentifier);
SAL_WARN_IF( pEntry == pNewEntry, "writerfilter", "circular loop in style hierarchy?");
if (pEntry == pNewEntry) //fdo#49587
break;
pEntry = pNewEntry;
}
return uno::Any();
}