[goffice] Make box plots look like bar plots in legends. [#773825]

[Jean Bréfort <jbrefort src gnome org>]

commit 9b14744e56ce64be111f9f30cf7fba5ed834aaf1
Author: Jean Brefort <jean brefort normalesup org>
Date:   Wed Nov 2 18:45:37 2016 +0100

    Make box plots look like bar plots in legends. [#773825]

 ChangeLog                          |    6 ++++++
 NEWS                               |    3 +++
 goffice/graph/gog-legend.c         |    2 +-
 plugins/plot_distrib/gog-boxplot.c |    2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5b19fe7..c08584a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-11-02  Jean Brefort  <jean brefort normalesup org>
+
+       * goffice/graph/gog-legend.c (cb_render_elements): allow box plots look
+       like bar plots in legends. [#773825]
+       * plugins/plot_distrib/gog-boxplot.c (gog_box_plot_class_init): ditto.
+
 2016-10-02  Morten Welinder  <terra gnome org>
 
        * goffice/utils/go-format.c (go_render_general): Fix warning.
diff --git a/NEWS b/NEWS
index 66eedf5..a54e856 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 goffice 0.10.33:
 
+Jean:
+       * Make box plots look like bar plots in legends. [#773825]
+
 Morten:
        * Introspection fixes.
 
diff --git a/goffice/graph/gog-legend.c b/goffice/graph/gog-legend.c
index f234300..d9085d5 100644
--- a/goffice/graph/gog-legend.c
+++ b/goffice/graph/gog-legend.c
@@ -461,7 +461,7 @@ cb_render_elements (unsigned index, GOStyle const *base_style, char const *name,
        }
        data->count++;
 
-       if (base_style->interesting_fields & GO_STYLE_LINE) { /* line and marker */
+       if ((base_style->interesting_fields & (GO_STYLE_LINE | GO_STYLE_OUTLINE)) == GO_STYLE_LINE) { /* line 
and marker */
                style = go_style_dup (base_style);
                g_return_if_fail (style != NULL);
                if (style->line.width > data->hairline_width)
diff --git a/plugins/plot_distrib/gog-boxplot.c b/plugins/plot_distrib/gog-boxplot.c
index 99b4a2e..6105922 100644
--- a/plugins/plot_distrib/gog-boxplot.c
+++ b/plugins/plot_distrib/gog-boxplot.c
@@ -434,7 +434,7 @@ gog_box_plot_class_init (GogPlotClass *gog_plot_klass)
        plot_klass->desc.num_series_max = G_MAXINT;
        plot_klass->series_type = gog_box_plot_series_get_type ();
        plot_klass->axis_set = GOG_AXIS_SET_XY;
-       plot_klass->desc.series.style_fields    = GO_STYLE_LINE | GO_STYLE_FILL;
+       plot_klass->desc.series.style_fields    = GO_STYLE_LINE | GO_STYLE_OUTLINE | GO_STYLE_FILL;
        plot_klass->axis_get_bounds             = gog_box_plot_axis_get_bounds;
 }