[gnumeric] xlsx: fix ABRs.



commit 13ddbe11634cba257ba20953ce02f0fb4f934f6b
Author: Morten Welinder <terra gnome org>
Date:   Sun May 10 15:09:04 2015 -0400

    xlsx: fix ABRs.

 NEWS                              |    2 +-
 plugins/excel/ChangeLog           |    9 +++++++++
 plugins/excel/xlsx-read-drawing.c |   14 ++++++++++----
 3 files changed, 20 insertions(+), 5 deletions(-)
---
diff --git a/NEWS b/NEWS
index a5d8203..f0fdf37 100644
--- a/NEWS
+++ b/NEWS
@@ -15,7 +15,7 @@ Morten:
        * Solver code refactoring.
        * Plug leaks.
        * Fuzzed file fixes.  [#748595] [#748597] [#749031] [#749030]
-         [#749069] [#748533] [#749118] [#749166]
+         [#749069] [#748533] [#749118] [#749166] [#749181]
        * Make solver check linearity of model.
 
 --------------------------------------------------------------------------
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 8ec2bab..8459048 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,12 @@
+2015-05-10  Morten Welinder  <terra gnome org>
+
+       * xlsx-read-drawing.c (xlsx_data_label_pos): Terminate enum list.
+       (xlsx_ser_labels_pos): Ditto.
+       (xlsx_ser_trendline_type): Ditto.
+       (xlsx_axis_mark): Ditto.
+       (xslx_chart_tick_label_pos): Ditto.
+       (xlsx_scatter_style): Ditto.
+
 2015-05-09  Morten Welinder  <terra gnome org>
 
        * xlsx-read-drawing.c (xlsx_read_chart): Handle missing series.
diff --git a/plugins/excel/xlsx-read-drawing.c b/plugins/excel/xlsx-read-drawing.c
index d2a877d..61ac0cc 100644
--- a/plugins/excel/xlsx-read-drawing.c
+++ b/plugins/excel/xlsx-read-drawing.c
@@ -1133,6 +1133,7 @@ xlsx_axis_mark (GsfXMLIn *xin, xmlChar const **attrs)
                {"in",          1},
                {"out",         2},
                {"cross",       3},
+               {NULL, 0}
        };
        int res = 3;
 
@@ -1152,6 +1153,7 @@ xslx_chart_tick_label_pos (GsfXMLIn *xin, xmlChar const **attrs)
                {"low",         1},
                {"nextTo",      2},
                {"none",        3},
+               {NULL, 0}
        };
        int res = 2;
 
@@ -1253,7 +1255,8 @@ xlsx_scatter_style (GsfXMLIn *xin, xmlChar const **attrs)
                {"markers",     SCATTER_MARKERS }, /* We used to write this erroneously */
                {"none",        0 },
                {"smooth",      SCATTER_SPLINES },
-               {"smoothMarker", SCATTER_SPLINES | SCATTER_MARKERS }
+               {"smoothMarker", SCATTER_SPLINES | SCATTER_MARKERS },
+               {NULL, 0}
        };
        XLSXReadState *state = (XLSXReadState *)xin->user_state;
        int style = SCATTER_MARKERS;
@@ -1335,7 +1338,8 @@ xlsx_ser_trendline_type (GsfXMLIn *xin, G_GNUC_UNUSED  xmlChar const **attrs)
                {"log", 2 },
                {"movingAvg", 3 },
                {"poly", 4 },
-               {"power", 5 }
+               {"power", 5 },
+               {NULL, 0}
        };
        static const char *types[] = {
                "GogExpRegCurve", "GogLinRegCurve", "GogLogRegCurve",
@@ -1482,7 +1486,8 @@ xlsx_ser_labels_pos (GsfXMLIn *xin, xmlChar const **attrs)
                {"l", GOG_SERIES_LABELS_LEFT},
                {"outEnd", GOG_SERIES_LABELS_OUTSIDE},
                {"r", GOG_SERIES_LABELS_RIGHT},
-               {"t", GOG_SERIES_LABELS_TOP}
+               {"t", GOG_SERIES_LABELS_TOP},
+               {NULL, 0}
        };
        XLSXReadState *state = (XLSXReadState *)xin->user_state;
        int position = GOG_SERIES_LABELS_DEFAULT_POS;
@@ -1531,7 +1536,8 @@ xlsx_data_label_pos (GsfXMLIn *xin, xmlChar const **attrs)
                {"l", GOG_SERIES_LABELS_LEFT},
                {"outEnd", GOG_SERIES_LABELS_OUTSIDE},
                {"r", GOG_SERIES_LABELS_RIGHT},
-               {"t", GOG_SERIES_LABELS_TOP}
+               {"t", GOG_SERIES_LABELS_TOP},
+               {NULL, 0}
        };
        XLSXReadState *state = (XLSXReadState *)xin->user_state;
        int position = GOG_SERIES_LABELS_DEFAULT_POS;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]