summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-05-25 20:47:10 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-05-30 08:33:06 +0000
commit3c4c153f596e3b378a01bdabb78008c02a1d2ff6 (patch)
tree587309a7616a5c7c43cbdb42085cb4e14790d651 /xmloff
parent358663c3201b5f5d4e31cf719cd4649333903667 (diff)
Resolves: tdf#97879 loop in style hierarchy on odt loop
Change-Id: I0098c434b89b6a57e8b888a4d4f643e4d0865d29 (cherry picked from commit e954697a9d39e40473fb9f59a791ccb7129e763c) Reviewed-on: https://gerrit.libreoffice.org/25498 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/text/txtimp.cxx8
1 files changed, 7 insertions, 1 deletions
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;
}
}
}