[gnumeric] xml: fix problem saving column/row widths.

[Morten Welinder <mortenw src gnome org>]

commit 7447976980b6dc04a54f21905a74f66be3e973f1
Author: Morten Welinder <terra gnome org>
Date:   Wed Mar 2 19:53:38 2022 -0500

    xml: fix problem saving column/row widths.
    
    We would see two identical columns separated by one or more prinstine,
    default columns as a span of 2.

 ChangeLog           | 6 ++++++
 NEWS                | 1 +
 src/xml-sax-write.c | 4 +++-
 3 files changed, 10 insertions(+), 1 deletion(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7f7932cdd..2b8037e9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-03-02  Morten Welinder  <terra gnome org>
+
+       * src/xml-sax-write.c (xml_write_colrow_info): Fix problem writing
+       identical columns separated by pristine default columns.  Fixes
+       #619.
+
 2022-02-26  Morten Welinder  <terra gnome org>
 
        * src/expr-name.c (expr_name_set_expr): Plug leak.
diff --git a/NEWS b/NEWS
index ee3bbfc1e..166ae3603 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@ Morten:
        * Test improvements.
        * Fix xlsx write for sheet objects with text contents.  [#617]
        * Fix leak.
+       * Fix old problem saving column widths.  [#619]
 
 --------------------------------------------------------------------------
 Gnumeric 1.12.51
diff --git a/src/xml-sax-write.c b/src/xml-sax-write.c
index c0f18cb7b..7467bf307 100644
--- a/src/xml-sax-write.c
+++ b/src/xml-sax-write.c
@@ -743,7 +743,9 @@ xml_write_colrow_info (GnmColRowIter const *iter, closure_write_colrow *closure)
                                          closure->is_column);
 
        closure->rle_count++;
-       if (NULL != iter && col_row_info_equal (prev, iter->cri))
+       if (NULL != iter &&
+           iter->pos == closure->prev_pos + 1 &&
+           col_row_info_equal (prev, iter->cri))
                return FALSE;
 
        if (closure->prev_pos != -1 && !col_row_info_equal (prev, def)) {