diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-07-05 21:37:49 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-12-12 16:36:48 +0100 |
| commit | 8454a88e1818fa498c6860a2db434ad51591257c (patch) | |
| tree | 15f9e451f993bad23195f186be2dd8d61db3af17 | |
| parent | 1ca23f2674d1c46ad8629f657a0c9a67a5551679 (diff) | |
Resolves: fdo#49587 apparent loop in style hierarchy
Change-Id: I32317a1a6500377f7e7bb98d1dcc65ad86feb9a2
(cherry picked from commit 7e3923520c27ff139bc3abab35a1c01e1a785fb1)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 951d500bced5..2296761f4381 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -572,7 +572,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(); } |