From 6f3642986f819430c16c8c804ac62aab47778245 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Wed, 2 Nov 2016 19:29:23 +0100
Subject: check only Row elements when computing row index

Change-Id: I3bd1b0749f8889cbd1d92a0edfa84d754e888f03
---
 filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'filter')

diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
index 41b37e951970..2916dc17e86f 100644
--- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
+++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
@@ -5255,15 +5255,15 @@
 			<xsl:choose>
 				<xsl:when test="@ss:Index"><xsl:value-of select="@ss:Index -1 + $simple-span-value"/></xsl:when>
 				<xsl:otherwise>
-					<xsl:variable name="recent-index" select="preceding-sibling::*[@ss:Index][last()]"></xsl:variable>
+					<xsl:variable name="recent-index" select="preceding-sibling::ss:Row[@ss:Index][last()]"></xsl:variable>
 					<xsl:choose>
 						<xsl:when test="$recent-index">
-							<xsl:variable name="nodes-up-to-current" select="set:intersection(preceding-sibling::*, $recent-index/following-sibling::*)"></xsl:variable>
+							<xsl:variable name="nodes-up-to-current" select="set:intersection(preceding-sibling::ss:Row, $recent-index/following-sibling::ss:Row)"></xsl:variable>
 							<xsl:variable name="allSpans" select="$nodes-up-to-current/@ss:Span"/>
 							<xsl:value-of select="$recent-index/@ss:Index + count($nodes-up-to-current) + sum($allSpans) + count($allSpans)"/>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:variable name="allSpans" select="preceding-sibling::*/@ss:Span"/>
+							<xsl:variable name="allSpans" select="preceding-sibling::ss:Row/@ss:Span"/>
 							<xsl:value-of select="position() + sum($allSpans) + count($allSpans)"/>
 						</xsl:otherwise>
 					</xsl:choose>
-- 
cgit