diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-07-05 21:37:49 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-12-21 16:30:05 +0100 |
| commit | 296715365d70e8ffef6b9824ef6ec1bd684b12c0 (patch) | |
| tree | 22f3709112bb04c721aa54784c2e59b8434d831d /writerfilter | |
| parent | fdo#57780: sw: lcl_ArrangeLowers: register drawing ... (diff) | |
| download | core-296715365d70e8ffef6b9824ef6ec1bd684b12c0.tar.gz core-296715365d70e8ffef6b9824ef6ec1bd684b12c0.zip | |
Resolves: fdo#49587 apparent loop in style hierarchy
Change-Id: I32317a1a6500377f7e7bb98d1dcc65ad86feb9a2
(cherry picked from commit 7e3923520c27ff139bc3abab35a1c01e1a785fb1)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'writerfilter')
| -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 4cc997bb7890..5c760e4ce431 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -588,7 +588,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(); } |