[gnumeric] xlsx: fix enum mixing.



commit e8f18492645e0d134be0c38a80017214caa79f0a
Author: Morten Welinder <terra gnome org>
Date:   Wed Mar 19 14:01:42 2014 -0400

    xlsx: fix enum mixing.

 plugins/excel/ChangeLog   |    4 ++++
 plugins/excel/xlsx-read.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 6f1ad42..2404f9f 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-19  Morten Welinder  <terra gnome org>
+
+       * xlsx-read.c (xlsx_CT_CustomFilter): Avoid mixing enums.
+
 2014-03-18  Morten Welinder <terra gnome org>
 
        * Release 1.12.13
diff --git a/plugins/excel/xlsx-read.c b/plugins/excel/xlsx-read.c
index 1073231..da2d08f 100644
--- a/plugins/excel/xlsx-read.c
+++ b/plugins/excel/xlsx-read.c
@@ -2280,7 +2280,7 @@ xlsx_CT_CustomFilter (G_GNUC_UNUSED GsfXMLIn *xin, G_GNUC_UNUSED xmlChar const *
        };
        XLSXReadState *state = (XLSXReadState *)xin->user_state;
        int tmp;
-       GnmFilterOp op = GNM_STYLE_COND_EQUAL;
+       GnmFilterOp op = GNM_FILTER_OP_EQUAL;
        GnmValue *v = NULL;
        GnmFilterCondition *cond;
        GODateConventions const *date_conv = workbook_date_conv (state->wb);


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