Resolves: tdf#97879 loop in style hierarchy on odt loop

Change-Id: I0098c434b89b6a57e8b888a4d4f643e4d0865d29
2016-05-25 20:47:10 +01:00
parent e664254c3e
commit e954697a9d
2 changed files with 7 additions and 1 deletions
--- a/sw/qa/core/data/odt/pass/tdf97879.odt
+++ b/sw/qa/core/data/odt/pass/tdf97879.odt
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1380,7 +1380,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;
                }
            }
        }