[gnumeric] Fix export to ODF of empty cells with default column styles. [#704563]

[Andreas J. Guelzow <guelzow src gnome org>]

commit f977b0598a78bfa5ef1f44e941c275a98b20abb0
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Fri Jul 19 10:34:48 2013 -0600

    Fix export to ODF of empty cells with default column styles. [#704563]
    
    2013-07-19  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * openoffice-write.c (odf_write_content_rows): write enough cells
        in empty rows

 NEWS                                  |    1 +
 plugins/openoffice/ChangeLog          |    7 ++++++-
 plugins/openoffice/openoffice-write.c |    3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index cf71ab2..809be6c 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Andreas:
        * Fix import of multi-paragraph text from ODF. [#704391]
        * Fix ODF export of empt rows. [#704438]
        * Export custom shapes. [#704421]
+       * Fix export to ODF of empty cells with default column styles. [#704563]
 
 Jean:
        * Fix text wrap inside sheet objects. [#704417]
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 83c1973..fbca67b 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,6 +1,11 @@
+2013-07-19  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+       * openoffice-write.c (odf_write_content_rows): write enough cells
+       in empty rows
+
 2013-07-18  Andreas J. Guelzow <aguelzow pyrshep ca>
 
-       * openoffice-write.c (odf_write_custom_shape): write teh correct
+       * openoffice-write.c (odf_write_custom_shape): write the correct
        viewbox
 
 2013-07-17  Andreas J. Guelzow <aguelzow pyrshep ca>
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index c6081a6..33a35fb 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -3757,7 +3757,8 @@ odf_write_content_rows (GnmOOExport *state, Sheet const *sheet, int from, int to
                                
                        }
                } else
-                       ++null_cell; /* We must write at least one cell per row */
+                       null_cell = row_length;
+
                odf_write_empty_cell (state, null_cell, null_style, NULL);
                null_cell = 0;
                if (covered_cell > 0)