filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl | 18 +++++-----
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit b68ed302830fd1c44212eeb6c23d5a08b7dc97ec
Author: David Tardon <dtar...@redhat.com>
Date: Wed Nov 2 19:30:20 2016 +0100
check only Column elements when computing column index
Change-Id: I4856227c05e97daefbae7e98c0e9d70f84e1a2b4
diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
index 2916dc1..00b3cc9 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>
commit 6f3642986f819430c16c8c804ac62aab47778245
Author: David Tardon <dtar...@redhat.com>
Date: Wed Nov 2 19:29:23 2016 +0100
check only Row elements when computing row index
Change-Id: I3bd1b0749f8889cbd1d92a0edfa84d754e888f03
diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
index 41b37e9..2916dc1 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>
commit 30e2171b6eac8e373e31f20de4a0cee6d5d64a08
Author: David Tardon <dtar...@redhat.com>
Date: Wed Nov 2 19:26:45 2016 +0100
rhbz#1390776 check only Row elements when computing row index
Change-Id: Ic5ef3971829597170acfdc0606b3c0f16c42be04
diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
index 6ee9114..41b37e9 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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
