[goffice] Plots: more marker-colour preservation.

[Morten Welinder <mortenw src gnome org>]

commit eb0615a0f649842cd2168692d2a2117b55c5c654
Author: Morten Welinder <terra gnome org>
Date:   Wed Feb 4 14:27:17 2015 -0500

    Plots: more marker-colour preservation.

 ChangeLog                        |    5 +++++
 plugins/plot_barcol/gog-minmax.c |    2 +-
 plugins/plot_xy/gog-xy-minmax.c  |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index bea2c76..d45adc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
        * plugins/plot_barcol/gog-line.c (gog_line_series_init_style):
        Don't wipe out marker colours just because the shape auto.
 
+       * plugins/plot_barcol/gog-minmax.c (gog_minmax_series_init_style): Ditto.
+
+       * plugins/plot_xy/gog-xy-minmax.c
+       (gog_xy_minmax_series_init_style): Ditto.
+
 2015-01-26  Jean Brefort  <jean brefort normalesup org>
 
        * plugins/reg_linear/gog-lin-reg.c: ensure that the dims number is correct
diff --git a/plugins/plot_barcol/gog-minmax.c b/plugins/plot_barcol/gog-minmax.c
index 98469f8..ccf7d7e 100644
--- a/plugins/plot_barcol/gog-minmax.c
+++ b/plugins/plot_barcol/gog-minmax.c
@@ -68,7 +68,7 @@ gog_minmax_series_init_style (GogStyledObject *gso, GOStyle *style)
        if (!plot->default_style_has_markers) {
                style->disable_theming |= GO_STYLE_MARKER;
                if (style->marker.auto_shape) {
-                       GOMarker *m = go_marker_new ();
+                       GOMarker *m = go_marker_dup (style->marker.mark);
                        go_marker_set_shape (m, GO_MARKER_NONE);
                        go_style_set_marker (style, m);
                }
diff --git a/plugins/plot_xy/gog-xy-minmax.c b/plugins/plot_xy/gog-xy-minmax.c
index a934449..c81326a 100644
--- a/plugins/plot_xy/gog-xy-minmax.c
+++ b/plugins/plot_xy/gog-xy-minmax.c
@@ -68,7 +68,7 @@ gog_xy_minmax_series_init_style (GogStyledObject *gso, GOStyle *style)
        if (!plot->default_style_has_markers) {
                style->disable_theming |= GO_STYLE_MARKER;
                if (style->marker.auto_shape) {
-                       GOMarker *m = go_marker_new ();
+                       GOMarker *m = go_marker_dup (style->marker.mark);
                        go_marker_set_shape (m, GO_MARKER_NONE);
                        go_style_set_marker (style, m);
                }