summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/qa/core/data/odt/pass/tdf97879.odtbin0 -> 20275 bytes
-rw-r--r--xmloff/source/text/txtimp.cxx8
2 files changed, 7 insertions, 1 deletions
diff --git a/sw/qa/core/data/odt/pass/tdf97879.odt b/sw/qa/core/data/odt/pass/tdf97879.odt
new file mode 100644
index 000000000000..b34526763509
--- /dev/null
+++ b/sw/qa/core/data/odt/pass/tdf97879.odt
Binary files differ
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 76c71273f768..5b740f1b6717 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1382,7 +1382,13 @@ static bool lcl_HasListStyle( const OUString& sStyleName,
else
{
// search list style at parent
- xStyle.set( xPropState, UNO_QUERY );
+ Reference<XStyle> xParentStyle(xPropState, UNO_QUERY);
+ if (xStyle == xParentStyle)
+ {
+ // error case
+ return true;
+ }
+ xStyle = xParentStyle;
}
}
}