Fixed bug rendering joined columns

[pspp-builds.git] / src / output / odt.c

diff --git a/src/output/odt.c b/src/output/odt.c
index 31f389fd496e5d5cc8eca6bbeb01b0ab61220cc3..8cc3da9ae72324fc6a38be4cf4e47bedf6d4af1c 100644 (file)
--- 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);
        }