[gnumeric] ODF import/export axis positions.

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

commit e57e4485d058838590c59063f64acb6d410a23f2
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Sat Jan 31 00:43:26 2015 -0700

    ODF import/export axis positions.
    
    2015-01-31  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * openoffice-read.c (oo_prop_list_apply_to_axis): handle pos-str
        (od_style_prop_chart): read axis-position and friends

 NEWS                                 |    2 +-
 plugins/openoffice/ChangeLog         |    5 ++++
 plugins/openoffice/openoffice-read.c |   37 +++++++++++++++++++++++++++++++++-
 3 files changed, 42 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index ac6351a..0987581 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Andreas:
        * ODF import/export series fill types. [#743613]
        * ODF import/export marker outline colour.
        * ODF export all charts in a graph. (part 1)
-       * ODF export axis positions.
+       * ODF import/export axis positions.
 
 Morten:
        * xlsx chart import: fix font family name.
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 8e69539..cecbd52 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-31  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+       * openoffice-read.c (oo_prop_list_apply_to_axis): handle pos-str
+       (od_style_prop_chart): read axis-position and friends
+
 2015-01-30  Andreas J. Guelzow <aguelzow pyrshep ca>
 
        * openoffice-write.c (odf_write_data_attribute): alsoe handle constant
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 4152a4a..2927008 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -6770,6 +6770,8 @@ oo_prop_list_apply_to_axis (GsfXMLIn *xin, GSList *props, GObject *obj)
        double interval_minor_divisor = 0.;
        gchar const *minimum_expression = NULL;
        gchar const *maximum_expression = NULL;
+       gchar const *pos_str_expression = NULL;
+       gchar const *pos_str_val = NULL;
 
        oo_prop_list_apply (props, obj);
 
@@ -6788,6 +6790,10 @@ oo_prop_list_apply_to_axis (GsfXMLIn *xin, GSList *props, GObject *obj)
                        minimum_expression = g_value_get_string (&prop->value);
                else if (0 == strcmp ("maximum-expression", prop->name))
                        maximum_expression = g_value_get_string (&prop->value);
+               else if (0 == strcmp ("pos-str-expr", prop->name))
+                       pos_str_expression = g_value_get_string (&prop->value);
+               else if (0 == strcmp ("pos-str-val", prop->name))
+                       pos_str_val = g_value_get_string (&prop->value);
        }
 
        gog_axis_set_bounds (GOG_AXIS (obj), minimum, maximum);
@@ -6795,6 +6801,10 @@ oo_prop_list_apply_to_axis (GsfXMLIn *xin, GSList *props, GObject *obj)
                odf_apply_expression (xin, 0, obj, minimum_expression);
        if (maximum_expression)
                odf_apply_expression (xin, 1, obj, maximum_expression);
+       if (pos_str_expression)
+               odf_apply_expression (xin, 4, obj, pos_str_expression);
+       else if (pos_str_val)
+               odf_apply_expression (xin, 4, obj, pos_str_val);
 
        if (interval_major > 0) {
                data = gnm_go_data_scalar_new_expr
@@ -7005,7 +7015,32 @@ od_style_prop_chart (GsfXMLIn *xin, xmlChar const **attrs)
                                (style->axis_props,
                                 oo_prop_new_double ("interval-minor-divisor",
                                                     ftmp));
-               else if (oo_attr_float (xin, attrs, OO_GNUM_NS_EXT,
+               else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_CHART,
+                                            "axis-position")) {
+                       if (0 == strcmp (CXML2C(attrs[1]), "start"))
+                               style->axis_props = g_slist_prepend
+                                       (style->axis_props,
+                                        oo_prop_new_string ("pos-str",
+                                                            "low"));
+                       else if (0 == strcmp (CXML2C(attrs[1]), "end")) 
+                               style->axis_props = g_slist_prepend
+                                       (style->axis_props,
+                                        oo_prop_new_string ("pos-str",
+                                                            "high"));
+                       else {
+                               style->axis_props = g_slist_prepend
+                                       (style->axis_props,
+                                        oo_prop_new_string ("pos-str", "cross"));
+                               style->axis_props = g_slist_prepend
+                                       (style->axis_props, oo_prop_new_string ("pos-str-val",
+                                                                               CXML2C(attrs[1])));
+                       }
+               } else if (gsf_xml_in_namecmp  (xin, CXML2C (attrs[0]), OO_GNUM_NS_EXT,
+                                               "axis-position-expression"))
+                       style->axis_props = g_slist_prepend (style->axis_props,
+                                                            oo_prop_new_string ("pos-str-expr",
+                                                                                CXML2C(attrs[1])));
+                else if (oo_attr_float (xin, attrs, OO_GNUM_NS_EXT,
                                          "radius-ratio", &ftmp))
                        style->plot_props = g_slist_prepend (style->plot_props,
                                oo_prop_new_double ("radius-ratio", ftmp));