From e2bf234e63c1ecf7971c2be2e50cfe0c7baa5dcf Mon Sep 17 00:00:00 2001
From: Olivier Hallot <olivier.hallot@libreoffice.org>
Date: Fri, 24 Aug 2018 14:15:41 -0300
Subject: [PATCH] Honor colspan and rowspan in tablecells

Previously not implemented

Change-Id: I8867d82bc12a6c4312fcc6aa49c6b31e360a524e
Reviewed-on: https://gerrit.libreoffice.org/59580
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
---
 help3xsl/online_transform.xsl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index dc57f07720..a22c384eb6 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -723,10 +723,10 @@
 <xsl:template match="tablecell">
     <xsl:choose>
         <xsl:when test="paragraph[@role='tablehead']">
-            <td class='tableheadcell'><xsl:apply-templates /></td>
+            <td rowspan="{@rowspan}" colspan="{@colspan}" class='tableheadcell'><xsl:apply-templates /></td>
         </xsl:when>
         <xsl:otherwise>
-            <td><xsl:apply-templates /></td>
+            <td rowspan="{@rowspan}" colspan="{@colspan}"><xsl:apply-templates /></td>
         </xsl:otherwise>
     </xsl:choose>
 </xsl:template>
@@ -735,10 +735,10 @@
 <xsl:template match="tablecell" mode="embedded">
     <xsl:choose>
         <xsl:when test="paragraph[@role='tablehead']">
-            <td class='tableheadcell'><xsl:apply-templates mode="embedded"/></td>
+            <td rowspan="{@rowspan}" colspan="{@colspan}" class='tableheadcell'><xsl:apply-templates mode="embedded"/></td>
         </xsl:when>
         <xsl:otherwise>
-            <td><xsl:apply-templates mode="embedded"/></td>
+            <td rowspan="{@rowspan}" colspan="{@colspan}"><xsl:apply-templates mode="embedded"/></td>
         </xsl:otherwise>
     </xsl:choose>
 </xsl:template>