diff options
| author | David Tardon <dtardon@redhat.com> | 2016-11-02 19:26:45 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-11-02 19:33:32 +0100 |
| commit | 30e2171b6eac8e373e31f20de4a0cee6d5d64a08 (patch) | |
| tree | 326dadbdf053c8bd0f4680add5865ccd328e1e38 /filter | |
| parent | 079610f6ca215817bfff93b753e07a4a3e35ecc6 (diff) | |
rhbz#1390776 check only Row elements when computing row index
Change-Id: Ic5ef3971829597170acfdc0606b3c0f16c42be04
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl index 6ee9114cad59..41b37e951970 100644 --- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl +++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl @@ -5960,15 +5960,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="$rowNodeIndex + sum($allSpans) + count($allSpans)"/> </xsl:otherwise> </xsl:choose> |