From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 1 Aug 2009 13:50:23 +0000 (+0200)
Subject: Fixed bug rendering joined columns
X-Git-Tag: sid-i386-build98~20
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c1d80a71e11e8678dc96bc49e69a13fd0f499fa;p=pspp-builds.git

Fixed bug rendering joined columns
---

diff --git a/src/output/odt.c b/src/output/odt.c
index 31f389fd..8cc3da9a 100644
--- a/src/output/odt.c
+++ b/src/output/odt.c
@@ -403,7 +403,6 @@ odt_submit (struct outp_driver *this, struct som_entity *e)
       /* Start row definition */
       xmlTextWriterStartElement (x->content_wtr, _xml("table:table-row"));
 
-
       /* Write all the columns */
       for (c = 0 ; c < tab->nc ; ++c)
 	{
@@ -460,8 +459,9 @@ odt_submit (struct outp_driver *this, struct som_entity *e)
 	    {
 	      xmlTextWriterStartElement (x->content_wtr, _xml("table:covered-table-cell"));
 	      xmlTextWriterEndElement (x->content_wtr);
-	      spanned_columns --;
 	    }
+	  if ( opts & TAB_JOIN )
+	    spanned_columns --;
 
 	  free (s);
 	}