[gnumeric] Improve ODF export of additional axislines. [#746321]

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

commit c8fb159a79e09986627ce07b5975a4896e0e6657
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Tue Mar 17 19:39:26 2015 -0600

    Improve ODF export of additional axislines. [#746321]
    
    2015-02-25  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * openoffice-write.c (odf_write_axis_full): the ODF schema allows multiple
        chart:axis with the same dimension

 NEWS                                  |    3 +++
 plugins/openoffice/ChangeLog          |    5 +++++
 plugins/openoffice/openoffice-write.c |   26 ++++++++++++--------------
 3 files changed, 20 insertions(+), 14 deletions(-)
---
diff --git a/NEWS b/NEWS
index a9a1e7e..56f0976 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 Gnumeric 1.12.22
 
+Andreas:
+       * Improve ODF export of additional axislines. [#746321]
+
 Morten:
        * xlsx import/export of log axis.
        * xlsx export of multiple plots in chart.
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 760e9e0..581cfbd 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-25  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+       * openoffice-write.c (odf_write_axis_full): the ODF schema allows multiple
+       chart:axis with the same dimension
+
 2015-03-07  Morten Welinder  <terra gnome org>
 
        * openoffice-write.c: Use new go_xml_out_add_double.
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 8c34541..f5b6cf6 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -7853,20 +7853,18 @@ odf_write_axis_full (GnmOOExport *state,
                GogObject const *axis = l->data;
                if (axis != NULL) {
                        int id = gog_object_get_id (GOG_OBJECT (axis));
-                       if (state->with_extension || id == 1) {
-                               gsf_xml_out_start_element (state->xml, 
-                                                          (id == 1) ? CHART "axis" : GNMSTYLE "axis");
-                               gsf_xml_out_add_cstr (state->xml, CHART "dimension", dimension);
-                               if (state->with_extension)
-                                       gsf_xml_out_add_int (state->xml, GNMSTYLE "id", id);
-                               gsf_xml_out_add_cstr (state->xml, CHART "style-name", style_label);
-                               odf_write_label (state, axis);
-                               if (include_cats)
-                                       odf_write_axis_categories (state, series);
-                               odf_write_axis_grid (state, axis);
-                               odf_write_axislines (state, axis);
-                               gsf_xml_out_end_element (state->xml); /* </chart:axis> or </gnm:axis>*/
-                       }
+
+                       gsf_xml_out_start_element (state->xml, CHART "axis");
+                       gsf_xml_out_add_cstr (state->xml, CHART "dimension", dimension);
+                       if (state->with_extension)
+                               gsf_xml_out_add_int (state->xml, GNMSTYLE "id", id);
+                       gsf_xml_out_add_cstr (state->xml, CHART "style-name", style_label);
+                       odf_write_label (state, axis);
+                       if (include_cats)
+                               odf_write_axis_categories (state, series);
+                       odf_write_axis_grid (state, axis);
+                       odf_write_axislines (state, axis);
+                       gsf_xml_out_end_element (state->xml); /* </chart:axis> */
                }
        }
        g_slist_free (children);