From b68ed302830fd1c44212eeb6c23d5a08b7dc97ec Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Wed, 2 Nov 2016 19:30:20 +0100
Subject: check only Column elements when computing column index

Change-Id: I4856227c05e97daefbae7e98c0e9d70f84e1a2b4
---
 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 2916dc17e86f..00b3cc98adda 100644
--- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
+++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
@@ -5122,18 +5122,18 @@
 				</xsl:when>
 				<xsl:otherwise>
 					<xsl:variable name="recent-index"
-						select="preceding-sibling::*[@ss:Index][last()]"/>
+						select="preceding-sibling::ss:Column[@ss:Index][last()]"/>
 					<xsl:choose>
 						<xsl:when test="$recent-index">
 							<xsl:variable name="nodes-up-to-current"
-								select="set:intersection(preceding-sibling::*, $recent-index/following-sibling::*)"/>
+								select="set:intersection(preceding-sibling::ss:Column, $recent-index/following-sibling::ss:Column)"/>
 							<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:Column/@ss:Span"/>
 
 							<xsl:value-of select="$currentCount + sum($allSpans) + count($allSpans)"/>
 						</xsl:otherwise>
-- 
cgit v1.2.3