forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r168301 - in /forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org: resources/stylesheets/openoffice-common2forrest.xsl src/documentation/content/xdocs/samples/openoffice-writer.sxw status.xml
Date Thu, 05 May 2005 09:31:24 GMT
Author: rgardler
Date: Thu May  5 02:31:23 2005
New Revision: 168301

URL: http://svn.apache.org/viewcvs?rev=168301&view=rev
Log:
handle merged table cells. Fix for FOR-2621. Thanks to Charles Palmer

Modified:
    forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/resources/stylesheets/openoffice-common2forrest.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/src/documentation/content/xdocs/samples/openoffice-writer.sxw
    forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/status.xml

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/resources/stylesheets/openoffice-common2forrest.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/resources/stylesheets/openoffice-common2forrest.xsl?rev=168301&r1=168300&r2=168301&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/resources/stylesheets/openoffice-common2forrest.xsl
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/resources/stylesheets/openoffice-common2forrest.xsl
Thu May  5 02:31:23 2005
@@ -197,7 +197,21 @@
     <td>
       <xsl:apply-templates select="text:p" mode="in-element"/>
     </td>
+  </xsl:template> 
+  <!-- cells spanning several columns look like this: 
+  <table:table-cell table:number-columns-spanned="2" -->  
+  <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="table:sub-table" />
+	  <xsl:apply-templates select="text:p" mode="in-element"/>
+    </td>
   </xsl:template>
+
+
   
   <!--+
       | Links

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/src/documentation/content/xdocs/samples/openoffice-writer.sxw
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/src/documentation/content/xdocs/samples/openoffice-writer.sxw?rev=168301&r1=168300&r2=168301&view=diff
==============================================================================
Binary files - no diff available.

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/status.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/status.xml?rev=168301&r1=168300&r2=168301&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/status.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/status.xml Thu May
 5 02:31:23 2005
@@ -19,6 +19,10 @@
 
   <changes>
     <release version="0.1" date="unreleased">
+      <action dev="RDG" type="update" context="code" 
+        due-to="Charles Palmer" fixes-bug="FOR-262">
+        Handle merged table cells.
+      </action>
       <action dev="RDG" type="update" context="admin">
         Renamed to bing into line with naming conventions.
       </action>



Mime
View raw message