[gnumeric] Fix export/import of CONCATENATEminoraxis divisors to and from ODF.

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

commit f09c7959add35a617b36bcc88e1533cb4c534085
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Mon Oct 16 16:59:20 2017 -0600

    Fix export/import of CONCATENATEminoraxis divisors to and from ODF.
    
    2017-10-16  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * openoffice-write.c (odf_write_axis_style): fix export of interval-minor-divisor
        * openoffice-read.c (oo_prop_list_apply_to_axis): fix import of interval-minor-divisor
    
    2

 NEWS                                  |    1 +
 plugins/openoffice/ChangeLog          |    5 +++++
 plugins/openoffice/openoffice-read.c  |    5 ++---
 plugins/openoffice/openoffice-write.c |    2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/NEWS b/NEWS
index eab760b..d46107e 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Andreas:
        * Improve contour plot import of Excel generated ODF. [#788801]
        * Improve surface plot export to ODF. [#788447]
        * Fix export/import of CONCATENATE to and from ODF.
+       * Fix export/import of CONCATENATEminoraxis divisors to and from ODF.
 
 Morten:
        * Convert all xpm files to png.
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 8f225b2..367b9ec 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-16  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+       * openoffice-write.c (odf_write_axis_style): fix export of interval-minor-divisor
+       * openoffice-read.c (oo_prop_list_apply_to_axis): fix import of interval-minor-divisor
+
 2017-10-15  Andreas J. Guelzow <aguelzow pyrshep ca>
 
        * openoffice-read.c (oo_func_map_in): import some instances of CONCATENATE as
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 732ec69..af06d15 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -6977,12 +6977,11 @@ oo_prop_list_apply_to_axis (GsfXMLIn *xin, GSList *props, GObject *obj)
                        (state->chart.src_sheet, gnm_expr_top_new_constant
                         (value_new_float(interval_major)));
                gog_dataset_set_dim (GOG_DATASET (obj), 2, data, NULL);
-               if (interval_minor_divisor > 0) {
+               if (interval_minor_divisor > 1) {
                        data = gnm_go_data_scalar_new_expr
                                (state->chart.src_sheet,
                                 gnm_expr_top_new_constant
-                                (value_new_float (interval_major/
-                                                  interval_minor_divisor)));
+                                (value_new_float (interval_minor_divisor - 1)));
                        gog_dataset_set_dim (GOG_DATASET (obj), 3, data, NULL);
                }
        }
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 7d69701..cd4559f 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -7276,7 +7276,7 @@ odf_write_axis_style (GnmOOExport *state, GOStyle const *style,
                                                gsf_xml_out_add_float
                                                        (state->xml,
                                                         CHART "interval-minor-divisor",
-                                                        val/val_minor, 0);
+                                                        gnm_floor(val_minor + 1.5), 0);
                                }
                        }
                }