[Libreoffice-commits] help.git: help3xsl/online_transform.xsl

[Libreoffice Gerrit user]

 help3xsl/online_transform.xsl |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e2bf234e63c1ecf7971c2be2e50cfe0c7baa5dcf
Author:     Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Fri Aug 24 14:15:41 2018 -0300
Commit:     Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Fri Aug 24 21:01:05 2018 +0200

    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 at libreoffice.org>

diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index dc57f0772..a22c384eb 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>