[gnumeric] ods: another marker fix.

[Morten Welinder <mortenw src gnome org>]

commit 3f2893bfd6f4e2f3947112a9a91779127117d7a7
Author: Morten Welinder <terra gnome org>
Date:   Sun May 18 10:50:59 2014 -0400

    ods: another marker fix.

 plugins/openoffice/ChangeLog         |    5 +++++
 plugins/openoffice/openoffice-read.c |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 107e32f..c33dbf1 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-18  Morten Welinder  <terra gnome org>
+
+       * openoffice-read.c (odf_apply_style_props): For markers, map only
+       "none" to "auto" when the plot doesn't have markers by default.
+
 2014-05-15  Andreas J. Guelzow <aguelzow pyrshep ca>
 
        * openoffice-write.c (odf_write_interpolation_attribute): correctly write
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 8e35477..53e2841 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -1134,9 +1134,9 @@ odf_apply_style_props (GsfXMLIn *xin, GSList *props, GOStyle *style)
                                                  "default-style-has-markers",
                                                  G_TYPE_BOOLEAN,
                                                  &dshm) &&
-                   !dshm) {
+                   !dshm &&
+                   go_marker_get_shape (m) == GO_MARKER_NONE) {
                        style->marker.auto_shape = TRUE;
-                       go_marker_set_shape (m, GO_MARKER_NONE);
                }
 
                go_style_set_marker (style, m);