[gnumeric] xls: fix ABR saving marker shape.

[Morten Welinder <mortenw src gnome org>]

commit 229a5206859645834bac21a7b343b9f3d37b6d35
Author: Morten Welinder <terra gnome org>
Date:   Sun May 10 15:22:54 2015 -0400

    xls: fix ABR saving marker shape.

 NEWS                     |    1 +
 plugins/excel/ChangeLog  |    3 +++
 plugins/excel/ms-chart.c |   19 +++++++++++++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index f0fdf37..b75c332 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ Morten:
        * Fuzzed file fixes.  [#748595] [#748597] [#749031] [#749030]
          [#749069] [#748533] [#749118] [#749166] [#749181]
        * Make solver check linearity of model.
+       * Fix xls saving of marker style.  [#749185]
 
 --------------------------------------------------------------------------
 Gnumeric 1.12.22
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 8459048..8566ae9 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,5 +1,8 @@
 2015-05-10  Morten Welinder  <terra gnome org>
 
+       * ms-chart.c (chart_write_MARKERFORMAT): Shape map was missing an
+       item.
+
        * xlsx-read-drawing.c (xlsx_data_label_pos): Terminate enum list.
        (xlsx_ser_labels_pos): Ditto.
        (xlsx_ser_trendline_type): Ditto.
diff --git a/plugins/excel/ms-chart.c b/plugins/excel/ms-chart.c
index e90d9e5..982b471 100644
--- a/plugins/excel/ms-chart.c
+++ b/plugins/excel/ms-chart.c
@@ -4087,8 +4087,23 @@ chart_write_MARKERFORMAT (XLChartWriteState *s, GOStyle const *style,
        guint32 size;
        GOColor fore, back;
        static int const shape_map[] = {
-               0, 1, 2, 3, 3, 3, 3, 8, 4, 9, 5, 7, 6, 1, 1};
-               /* use square for butterfly and hourglass */
+               0,    /* GO_MARKER_NONE          */
+               1,    /* GO_MARKER_SQUARE        */
+               2,    /* GO_MARKER_DIAMOND       */
+               3,    /* GO_MARKER_TRIANGLE_DOWN */
+               3,    /* GO_MARKER_TRIANGLE_UP   */
+               3,    /* GO_MARKER_TRIANGLE_RIGHT*/
+               3,    /* GO_MARKER_TRIANGLE_LEFT */
+               8,    /* GO_MARKER_CIRCLE        */
+               4,    /* GO_MARKER_X             */
+               9,    /* GO_MARKER_CROSS         */
+               5,    /* GO_MARKER_ASTERISK      */
+               7,    /* GO_MARKER_BAR           */
+               6,    /* GO_MARKER_HALF_BAR      */
+               1,    /* GO_MARKER_BUTTERFLY     */
+               1,    /* GO_MARKER_HOURGLASS     */
+               6     /* GO_MARKER_LEFT_HALF_BAR */
+       };
 
        if (style != NULL) {
                fore = go_marker_get_outline_color (style->marker.mark);