diff options
| author | David Tardon <dtardon@redhat.com> | 2016-11-02 19:30:20 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-11-02 19:33:33 +0100 |
| commit | b68ed302830fd1c44212eeb6c23d5a08b7dc97ec (patch) | |
| tree | dec118af11b0a35f36b17716c7feb3c7165aa433 /filter | |
| parent | 6f3642986f819430c16c8c804ac62aab47778245 (diff) | |
check only Column elements when computing column index
Change-Id: I4856227c05e97daefbae7e98c0e9d70f84e1a2b4
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 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> |