filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 14 ++++++++++++--
filter/source/xslt/odf2xhtml/export/xhtml/header.xsl | 2 +-
2 files changed, 13 insertions(+), 3 deletions(-)
New commits:
commit 83def17aa0c861b05582dc37c8a9d4ed39e3ba33
Author: Svante Schubert <svante.schub...@gmail.com>
AuthorDate: Mon Aug 24 11:20:32 2020 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue Mar 2 13:20:24 2021 +0100
HTML XSLT: Set default to 0 in case of not-a-number: min-width:NaNcm
This had a conflict with commit 9804cb2f195451811eff8924d7997a3cbd6d679d
Fixing bodx.xsl: Invalid min-width:NaN check (Michael's GitHub Review)
Change-Id: I0bd5bbae1411c6b4892bf332e6ff3c7027f8c341
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111609
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 9408d971f9c6..09d4ed43c5e2 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -2042,7 +2042,12 @@
<xsl:with-param
name="paraStyleName" select="descendant-or-self::*/@text:style-name"/>
</xsl:call-template>
<xsl:text>;min-width:</xsl:text>
- <xsl:value-of
select="translate($listLabelWidth,',','.')"/>
+ <xsl:choose>
+ <xsl:when
test="$listLabelWidth and not($listLabelWidth='') and
not($listLabelWidth='NaN')">
+ <xsl:value-of
select="translate($listLabelWidth,',','.')"/>
+ </xsl:when>
+
<xsl:otherwise>0</xsl:otherwise>
+ </xsl:choose>
<xsl:text>cm;</xsl:text>
</xsl:attribute>
<xsl:variable name="labelContent">
@@ -2104,7 +2109,12 @@
<xsl:with-param name="paraStyleName"
select="descendant-or-self::*/@text:style-name"/>
</xsl:call-template>
<xsl:text>;min-width:</xsl:text>
- <xsl:value-of
select="translate($listLabelWidth,',','.')"/>
+ <xsl:choose>
+ <xsl:when test="$listLabelWidth and
not($listLabelWidth='') and not($listLabelWidth='NaN')">
+ <xsl:value-of
select="translate($listLabelWidth,',','.')"/>
+ </xsl:when>
+ <xsl:otherwise>0</xsl:otherwise>
+ </xsl:choose>
<xsl:text>cm</xsl:text>
</xsl:attribute>
<xsl:comment> </xsl:comment>
commit 7f2eb7b641a9864d2335ed4abdaaee1b79dd1028
Author: Svante Schubert <svante.schub...@gmail.com>
AuthorDate: Mon Aug 24 09:30:58 2020 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue Mar 2 13:19:59 2021 +0100
HTML XSLT: Fixing CSS selector
Change-Id: I4c26f71936e6df655bb5c11bf9137b91ca894cce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111608
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index 4eeb9b0b9837..8264aa50ad67 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -108,7 +108,7 @@
<xsl:text>/* "li span.odfLiEnd" - IE 7 issue*/</xsl:text>
<xsl:text>
</xsl:text>
-<xsl:text>li span. { clear: both; line-height:0; width:0; height:0; margin:0;
padding:0; }
+<xsl:text>li span { clear: both; line-height:0; width:0; height:0; margin:0;
padding:0; }
</xsl:text>
<xsl:text>span.footnodeNumber { padding-right:1em; }
</xsl:text>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
