[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - filter/source

[Шиповський Роман]

 filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4d23095123788928324976efda6a9a612a2fd9ef
Author: Шиповський Роман <roman.shipovs...@gmail.com>
Date:   Fri Oct 28 18:01:44 2016 +0300

    tdf#103552: Decrease SpreadsheetML import time to prevent "General 
input/output error"
    
    Change-Id: I39ed8fff7ba88042c74a11ddc58eec014c0bc6bd
    Reviewed-on: https://gerrit.libreoffice.org/30361
    Tested-by: Jenkins <c...@libreoffice.org>
    Tested-by: Julien Nabet <serval2...@yahoo.fr>
    Reviewed-by: jan iversen <j...@documentfoundation.org>
    (cherry picked from commit 458a9fd8065737af212bb6bbba285ecb9aad1bb8)
    Reviewed-on: https://gerrit.libreoffice.org/30458
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl 
b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
index f48a7a5..6ee9114 100644
--- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
+++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
@@ -6921,7 +6921,7 @@
        <xsl:template name="create-data-content">
                <xsl:param name="style-id" select="@ss:StyleID"/>
                <xsl:choose>
-                       <xsl:when test="ss:Data//text()[string-length(.) != 0]">
+                       <xsl:when test="ss:Data//text()[string-length(.) != 0] 
and ss:Data[count(*)>0]">
                                <xsl:for-each 
select="ss:Data//text()[string-length(.) != 0]">
                                        <xsl:sort select="position(  )" 
order="ascending" data-type="number"/>
                                        <text:span 
text:style-name="{concat($style-id, 'T', 
count(preceding::ss:Data[child::html:*]), '_', position())}">
@@ -7168,7 +7168,7 @@
                        <xsl:value-of select="concat($last,$current)"/>
                </xsl:if>
        </xsl:template>
-       <xsl:template match="ss:Data">
+       <xsl:template match="ss:Data[count(*)>0]">
                <xsl:for-each select=".//text()[string-length(.) != 0]">
                        <style:style 
style:name="{concat(ancestor::ss:Cell/@ss:StyleID,'T',count(preceding::ss:Data[child::html:*]),
 '_', position())}" style:family="text">
                                <xsl:element name="style:text-properties">

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits