You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by ch...@apache.org on 2004/09/10 20:31:41 UTC
svn commit: rev 43681 - in forrest/trunk: . src/core/context/resources/stylesheets
Author: cheche
Date: Fri Sep 10 11:31:40 2004
New Revision: 43681
Modified:
forrest/trunk/src/core/context/resources/stylesheets/openoffice-writer2forrest.xsl
forrest/trunk/status.xml
Log:
<action dev="JJP" type="fix" context="core" fixes-bug="FOR-262">
Openoffice2forrest: add support for merged cells in tables.
</action>
Modified: forrest/trunk/src/core/context/resources/stylesheets/openoffice-writer2forrest.xsl
==============================================================================
--- forrest/trunk/src/core/context/resources/stylesheets/openoffice-writer2forrest.xsl (original)
+++ forrest/trunk/src/core/context/resources/stylesheets/openoffice-writer2forrest.xsl Fri Sep 10 11:31:40 2004
@@ -214,6 +214,15 @@
<xsl:apply-templates select="text:p" mode="in-element"/>
</td>
</xsl:template>
+ <xsl:template match="table:table-cell[@table:number-columns-spanned]">
+ <td>
+ <xsl:attribute name="colspan">
+ <xsl:value-of select="@table:number-columns-spanned"/>
+ </xsl:attribute>
+ <xsl:apply-templates select="text:p" mode="in-element"/>
+ </td>
+ </xsl:template>
+
<!--+
| Images
+-->
Modified: forrest/trunk/status.xml
==============================================================================
--- forrest/trunk/status.xml (original)
+++ forrest/trunk/status.xml Fri Sep 10 11:31:40 2004
@@ -49,6 +49,9 @@
Added new document to facilitate
<link href="site:upgrading_06">upgrading to v0.6</link>
</action>
+ <action dev="JJP" type="fix" context="core" fixes-bug="FOR-262">
+ Openoffice2forrest: add support for merged cells in tables.
+ </action>
<action context="skins" dev="TS" type="fix">
Fixed the domain bug of the searchbox in pelt.
</action>