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>
This commit is contained in:
Olivier Hallot
2018-08-24 14:15:41 -03:00
parent 6ebdc6aaf3
commit e2bf234e63

View File

@ -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>