[gnumeric] Fix ODF import/export of fill colour and type. [#744051]

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

commit 6ec839350821ec7df79114d6619c94bffdc59766
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Sat Feb 7 16:18:47 2015 -0700

    Fix ODF import/export of fill colour and type. [#744051]
    
    2015-02-07  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * openoffice-read.c (odf_apply_style_props): apply gnm-auto-type
        (od_style_prop_chart): use a name indicative of it being an extension

 NEWS                                 |    2 +-
 plugins/openoffice/ChangeLog         |    5 +++++
 plugins/openoffice/openoffice-read.c |    4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index 129230f..d764735 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@ Andreas:
        * ODF import/export general plot data specifications. [#743818]
        * ODF import/export the z-index for line objects.
        * Fix ODF import of stroke colours of sheet objects.
-       * Fix ODF export of fill colour and type.
+       * Fix ODF import/export of fill colour and type. [#744051]
 
 Morten:
        * Initial xlsx import of sheet widgets.
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 7ae5fab..8b7c54e 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,10 @@
 2015-02-07  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+       * openoffice-read.c (odf_apply_style_props): apply gnm-auto-type
+       (od_style_prop_chart): use a name indicative of it being an extension
+
+2015-02-07  Andreas J. Guelzow <aguelzow pyrshep ca>
+
        * openoffice-write.c (odf_write_gog_style_graphic): we need to write fill colour
        info even if auto-type == TRUE since nobody else understands auto-type
 
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 1fcd480..49b1d95 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -980,6 +980,8 @@ odf_apply_style_props (GsfXMLIn *xin, GSList *props, GOStyle *style, gboolean in
                        style->line.auto_width = g_value_get_boolean (&prop->value);
                } else if (0 == strcmp (prop->name, "repeat"))
                        style->fill.image.type = g_value_get_int (&prop->value);
+               else if (0 == strcmp (prop->name, "gnm-auto-type"))
+                       style->fill.auto_type = g_value_get_boolean (&prop->value);
        }
        if (desc_changed)
                go_style_set_font_desc  (style, desc);
@@ -7243,7 +7245,7 @@ od_style_prop_chart (GsfXMLIn *xin, xmlChar const **attrs)
                else if (oo_attr_bool (xin, attrs, OO_GNUM_NS_EXT, "auto-type", &btmp))
                        style->style_props = g_slist_prepend
                                (style->style_props,
-                                oo_prop_new_bool ("auto-type", btmp));
+                                oo_prop_new_bool ("gnm-auto-type", btmp));
                else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_DRAW, "fill-color"))
                        style->style_props = g_slist_prepend
                                (style->style_props,