mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check only Column elements when computing column index

Browse Source 
Change-Id: I4856227c05e97daefbae7e98c0e9d70f84e1a2b4
This commit is contained in:
David Tardon
2016-11-02 19:30:20 +01:00
parent 6f3642986f
commit b68ed30283
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
View File

@@ -5122,18 +5122,18 @@
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:variable name="recent-index" <xsl:variable name="recent-index"
select="preceding-sibling::*[@ss:Index][last()]"/> select="preceding-sibling::ss:Column[@ss:Index][last()]"/>
<xsl:choose> <xsl:choose>
<xsl:when test="$recent-index"> <xsl:when test="$recent-index">
<xsl:variable name="nodes-up-to-current" <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:variable name="allSpans" select="$nodes-up-to-current/@ss:Span"/>
<xsl:value-of <xsl:value-of
select="$recent-index/@ss:Index + count($nodes-up-to-current) + sum($allSpans) + count($allSpans)" select="$recent-index/@ss:Index + count($nodes-up-to-current) + sum($allSpans) + count($allSpans)"
/> />
</xsl:when> </xsl:when>
<xsl:otherwise> <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:value-of select="$currentCount + sum($allSpans) + count($allSpans)"/>
</xsl:otherwise> </xsl:otherwise>