Return-Path: 
 <svn-return-625-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 8424 invoked from network); 10 Sep 2004 18:31:44 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 10 Sep 2004 18:31:44 -0000
Received: (qmail 79180 invoked by uid 500); 10 Sep 2004 18:31:44 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 79092 invoked by uid 500); 10 Sep 2004 18:31:43 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
list-post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 79078 invoked by uid 99); 10 Sep 2004 18:31:42 -0000
X-ASF-Spam-Status: No, hits=-2.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Fri, 10 Sep 2004 11:31:42 -0700
Received: (qmail 8349 invoked by uid 65534); 10 Sep 2004 18:31:41 -0000
Date: 10 Sep 2004 18:31:41 -0000
Message-ID: <20040910183141.8345.qmail@minotaur.apache.org>
From: cheche@apache.org
To: svn@forrest.apache.org
Subject: svn commit: rev 43681 - in forrest/trunk: .
 src/core/context/resources/stylesheets
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

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>