[gnumeric] Fix axis sub-element order in ODF export. [part of #730397]

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

commit 7b35b7b55258fdc2770272711a88ec0fac3db025
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Mon May 19 13:49:52 2014 -0600

    Fix axis sub-element order in ODF export. [part of #730397]
    
    2014-05-19  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * openoffice-write.c (odf_write_axis_full): fix element order

 NEWS                                  |    1 +
 plugins/openoffice/ChangeLog          |    4 ++++
 plugins/openoffice/openoffice-write.c |    2 +-
 3 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index a2467f3..c65091a 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Andreas:
        * Improve chart roundtrip through ODF. [#728197]
        * Fix export of non-ODF interpolation types to ODF.
        * Fix export of titles and subtitles to ODF. [part of #730397]
+       * Fix axis sub-element order in ODF export. [part of #730397]
 
 Morten:
        * Start moving off GtkUIManager.
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index fd4e7e5..7107832 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,9 @@
 2014-05-19  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+       * openoffice-write.c (odf_write_axis_full): fix element order
+
+2014-05-19  Andreas J. Guelzow <aguelzow pyrshep ca>
+
        * openoffice-write.c (odf_write_title): do not write table:cell-address
 
 2014-05-19  Andreas J. Guelzow <aguelzow pyrshep ca>
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 3edcc27..86b3093 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -7406,9 +7406,9 @@ odf_write_axis_full (GnmOOExport *state,
                gsf_xml_out_add_cstr (state->xml, CHART "dimension", dimension);
                gsf_xml_out_add_cstr (state->xml, CHART "style-name", style_label);
                odf_write_label (state, axis);
-               odf_write_axis_grid (state, axis);
                if (include_cats)
                        odf_write_axis_categories (state, series);
+               odf_write_axis_grid (state, axis);
                gsf_xml_out_end_element (state->xml); /* </chart:axis> */
        }