[gnumeric] xlsx: fix critical.



commit 0ead93d52b5b5b804d90b688e4a2c29b16699efc
Author: Morten Welinder <terra gnome org>
Date:   Tue Feb 24 12:39:06 2015 -0500

    xlsx: fix critical.

 plugins/excel/ChangeLog           |    5 +++++
 plugins/excel/xlsx-read-drawing.c |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 48d97ba..7067650 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-24  Morten Welinder  <terra gnome org>
+
+       * xlsx-read-drawing.c (xlsx_create_axis_object): Move setting of
+       "invisible" here.
+
 2015-02-23  Morten Welinder  <terra gnome org>
 
        * xlsx-read-drawing.c (xlsx_chart_dtd): Handle gostyle extension
diff --git a/plugins/excel/xlsx-read-drawing.c b/plugins/excel/xlsx-read-drawing.c
index 42cb374..e0f34bd 100644
--- a/plugins/excel/xlsx-read-drawing.c
+++ b/plugins/excel/xlsx-read-drawing.c
@@ -742,9 +742,8 @@ xlsx_axis_delete (GsfXMLIn *xin, xmlChar const **attrs)
        int del = 0;
        if (state->axis.info && simple_bool (xin, attrs, &del))
                state->axis.info->deleted = del;
-       if (state->axis.info && del)
-               g_object_set (state->axis.info->axis, "invisible", TRUE, NULL);
 }
+
 static void
 xlsx_axis_orientation (GsfXMLIn *xin, xmlChar const **attrs)
 {
@@ -855,6 +854,7 @@ xlsx_create_axis_object (XLSXReadState *state)
                g_hash_table_replace (state->axis.by_obj, axis, state->axis.info);
 
                g_object_set (G_OBJECT (state->axis.obj),
+                             "invisible", state->axis.info->deleted,
                              "invert-axis", state->axis.info->invert_axis, NULL);
        }
 }


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