[gnumeric] Fix ODF import/export of axes label visibility. [#743788]

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

commit 9f86daa03e70021389642c108db94e9cc7247724
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Sun Feb 8 21:51:13 2015 -0700

    Fix ODF import/export of axes label visibility. [#743788]
    
    2015-02-08  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * openoffice-read.c (od_style_prop_chart): read chart:display-label
        * openoffice-write.c (odf_write_axis_style): write the correct chart:display-label

 NEWS                                  |    1 +
 plugins/openoffice/ChangeLog          |    5 +++++
 plugins/openoffice/openoffice-read.c  |    3 +++
 plugins/openoffice/openoffice-write.c |    3 ++-
 4 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index 1c8718d..1355efb 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Andreas:
        * Improve ODF export of manually positioned charts in multi-chart
          graphs. [#743789]
        * Fix ODF export of serieslines styles.
+       * Fix ODF import/export of axes label visibility. [#743788]
 
 Morten:
        * Initial xlsx import of sheet widgets.
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 3f7027a..3ab7cf3 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,10 @@
 2015-02-08  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+       * openoffice-read.c (od_style_prop_chart): read chart:display-label
+       * openoffice-write.c (odf_write_axis_style): write the correct chart:display-label
+
+2015-02-08  Andreas J. Guelzow <aguelzow pyrshep ca>
+
        * openoffice-write.c (odf_write_series_lines): don't use
        gog_object_get_child_by_name since it may return the wrong objects. Get teh correct
        style name.
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index f279a69..5a295ea 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -7473,6 +7473,9 @@ od_style_prop_chart (GsfXMLIn *xin, xmlChar const **attrs)
                else if (oo_attr_bool (xin, attrs, OO_NS_CHART, "tick-marks-minor-outer", &btmp))
                        style->axis_props = g_slist_prepend (style->axis_props,
                                oo_prop_new_bool ("minor-tick-out", btmp));
+               else if (oo_attr_bool (xin, attrs, OO_NS_CHART, "display-label", &btmp))
+                       style->axis_props = g_slist_prepend (style->axis_props,
+                               oo_prop_new_bool ("major-tick-labeled", btmp));
        }
 
        if ((stacked_set && !overlap_set) ||
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 3c15927..57f9b6c 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -7006,7 +7006,6 @@ odf_write_axis_style (GnmOOExport *state, GOStyle const *style,
        char *map_name_str = NULL;
 
        odf_write_axis_position (state, style, axis);
-       odf_add_bool (state->xml, CHART "display-label", TRUE);
 
        if (gnm_object_has_readable_prop (axis, "map-name",
                                          G_TYPE_STRING, &map_name_str)) {
@@ -7068,6 +7067,8 @@ odf_write_axis_style (GnmOOExport *state, GOStyle const *style,
                (state->xml, axis, "minor-tick-in", CHART "tick-marks-minor-inner");
        odf_write_plot_style_bool
                (state->xml, axis, "minor-tick-out", CHART "tick-marks-minor-outer");
+       odf_write_plot_style_bool
+               (state->xml, axis, "major-tick-labeled", CHART "display-label");
 
        if (state->odf_version > 101)
                odf_write_plot_style_bool