filter/source/xslt/odf2xhtml/export/common/table/table.xsl | 2 +-
filter/source/xslt/odf2xhtml/export/xhtml/header.xsl | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 35fe68188e984d32d3f21db81e633743ca06f67c
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Wed May 3 16:00:17 2023 +0200
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Tue May 9 18:28:26 2023 +0200
tdf#153839 XHTML export: do not add newlines to attribute values
(regression from commit d2e8705c9cc503afdaed366b1f71ed012b0c568f)
Change-Id: I5e841b1db195b0646c5a2244061f93b97344c3dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151465
Tested-by: Michael Stahl <michael.st...@allotropia.de>
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit 84d798a9cfd8da090c68340838102fc8704febb3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151388
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index 581b8b8d3421..8ee38796ebdf 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -267,7 +267,6 @@
</xsl:when>
<xsl:otherwise>en-US</xsl:otherwise>
</xsl:choose>
- <xsl:text>
</xsl:text>
</xsl:variable>
<xsl:variable name="prov">
@@ -277,7 +276,6 @@
</xsl:when>
<xsl:otherwise />
</xsl:choose>
- <xsl:text>
</xsl:text>
</xsl:variable>
<xsl:variable name="keywords">
@@ -287,7 +285,6 @@
<xsl:text>, </xsl:text>
</xsl:if>
</xsl:for-each>
- <xsl:text>
</xsl:text>
</xsl:variable>
<xsl:text>
</xsl:text>
commit fc4b4d007e41192c21d2979e45ac73541935c00e
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Wed May 3 15:02:30 2023 +0200
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Tue May 9 18:28:15 2023 +0200
tdf#153839 XHTML export: fix syntax error in table.xsl
Static error at xsl:param on line 67 column 40 of table.xsl:
XTSE0010: xsl:param must not be preceded by other instructions
(regression from commit ce4272c25426f0084e53735e80870b9339239078)
Change-Id: I5bed9a8ad81edc5ec016618cb9fd5d75209a2809
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151464
Tested-by: Michael Stahl <michael.st...@allotropia.de>
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit 63ac36893ad7f3b1c73cb46667fbfd5384a747dc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151389
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/filter/source/xslt/odf2xhtml/export/common/table/table.xsl
b/filter/source/xslt/odf2xhtml/export/common/table/table.xsl
index d55948cab5b9..1e9baa5703f2 100644
--- a/filter/source/xslt/odf2xhtml/export/common/table/table.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/table/table.xsl
@@ -63,9 +63,9 @@
<xsl:template match="table:table" name="table:table">
- <xsl:text>
</xsl:text>
<xsl:param name="globalData" />
+ <xsl:text>
</xsl:text>
<!-- The table will only be created if the table:scenario is active -->
<xsl:if test="not(table:scenario) or table:scenario/@table:is-active">
<xsl:call-template name="create-table">
