diff options
| author | Justin Luth <justin_luth@sil.org> | 2018-08-07 21:10:59 +0300 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2018-08-08 09:02:00 +0200 |
| commit | b9a739e0d3909e0fa4b76d5c0087d92a505e95fa (patch) | |
| tree | 9459d62e5cb1a2eae43020bd9dc1821025feb5ba /writerfilter/source/dmapper/DomainMapper_Impl.cxx | |
| parent | 69a81eea210447a976d33ee161cc3a7dadf19b5e (diff) | |
tdf#119136 GetPropertyFromStyleSheet infinite loop
So, apparently we accept a style that has no styleId and
define it as such. Due to some reworkings, this function
was called instead. Since we can "find" a style without a
name, now every parentless style thought it inherited from
this nameless style.
Change-Id: I47b4119abd37ece94a39e636ddb7798b809ccb04
Reviewed-on: https://gerrit.libreoffice.org/58705
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapper_Impl.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 636153e8633f..48b43aa52849 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -713,7 +713,9 @@ uno::Any DomainMapper_Impl::GetPropertyFromStyleSheet(PropertyIds eId) } } //search until the property is set or no parent is available - StyleSheetEntryPtr pNewEntry = GetStyleSheetTable()->FindStyleSheetByISTD(pEntry->sBaseStyleIdentifier); + StyleSheetEntryPtr pNewEntry; + if ( !pEntry->sBaseStyleIdentifier.isEmpty() ) + pNewEntry = GetStyleSheetTable()->FindStyleSheetByISTD(pEntry->sBaseStyleIdentifier); SAL_WARN_IF( pEntry == pNewEntry, "writerfilter.dmapper", "circular loop in style hierarchy?"); |