[gnumeric] Excel: rename fields to indicate that all auto combos are ignored.

[Morten Welinder <mortenw src gnome org>]

commit d9db44a918bee95ea0648126a7284651cad52416
Author: Morten Welinder <terra gnome org>
Date:   Tue Dec 22 15:37:11 2015 -0500

    Excel: rename fields to indicate that all auto combos are ignored.

 plugins/excel/ChangeLog       |    5 +++++
 plugins/excel/ms-excel-read.c |    2 +-
 plugins/excel/ms-obj.c        |    8 ++++----
 plugins/excel/ms-obj.h        |    2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index ed880c5..ce9243e 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-22  Morten Welinder  <terra gnome org>
+
+       * ms-obj.h (MSObj): Rename field combo_in_autofilter to
+       auto_combo.
+
 2015-10-17  Morten Welinder  <terra gnome org>
 
        * ms-excel-read.c (excel_read_NAME): Handle deleted and selfref
diff --git a/plugins/excel/ms-excel-read.c b/plugins/excel/ms-excel-read.c
index 30bcdc7..12396dc 100644
--- a/plugins/excel/ms-excel-read.c
+++ b/plugins/excel/ms-excel-read.c
@@ -807,7 +807,7 @@ ms_sheet_create_obj (MSContainer *container, MSObj *obj)
        case MSOT_COMBO: {
                ExcelReadSheet *esheet = (ExcelReadSheet *)container;
 
-               if (!obj->combo_in_autofilter)
+               if (!obj->auto_combo)
                        so = g_object_new (sheet_widget_combo_get_type (), NULL);
 
                /* ok, there are combos to go with the autofilter it can stay */
diff --git a/plugins/excel/ms-obj.c b/plugins/excel/ms-obj.c
index ed4f66b..1885a26 100644
--- a/plugins/excel/ms-obj.c
+++ b/plugins/excel/ms-obj.c
@@ -365,7 +365,7 @@ ms_obj_new (MSObjAttrBag *attrs)
        obj->id = -1;
        obj->gnum_obj = NULL;
        obj->attrs = (attrs != NULL) ? attrs : ms_obj_attr_bag_new ();
-       obj->combo_in_autofilter        = FALSE;
+       obj->auto_combo = FALSE;
        obj->is_linked                  = FALSE;
        obj->comment_pos.col = obj->comment_pos.row = -1;
 
@@ -871,7 +871,7 @@ ms_obj_read_pre_biff8_obj (BiffQuery *q, MSContainer *c, MSObj *obj)
                break;
        case MSOT_COMBO:
 /* 110 name len, name, cbfmla1 (IGNORE cbMacro), fmla1, cbfmla2, fmla2, cbfmla3, fmla3 */
-               obj->combo_in_autofilter =
+               obj->auto_combo =
                        (GSF_LE_GET_GUINT16 (q->data + 8) & 0x8000) ? TRUE : FALSE;
                break;
        default :
@@ -1108,7 +1108,7 @@ ms_obj_read_biff8_obj (BiffQuery *q, MSContainer *c, MSObj *obj)
                        break;
 
                case GR_LISTBOX_DATA :
-                       if (!obj->combo_in_autofilter)
+                       if (!obj->auto_combo)
                                ms_obj_read_expr (obj, MS_OBJ_ATTR_INPUT_FROM, c,
                                        data+6, data + data_len_left);
 
@@ -1142,7 +1142,7 @@ ms_obj_read_biff8_obj (BiffQuery *q, MSContainer *c, MSObj *obj)
                        /* Undocumented.  It appears that combos for filters are marked
                         * with flag 0x100
                         */
-                       obj->combo_in_autofilter =
+                       obj->auto_combo =
                                (obj->excel_type == 0x14) && (options & 0x100);
 
 #ifndef NO_DEBUG_EXCEL
diff --git a/plugins/excel/ms-obj.h b/plugins/excel/ms-obj.h
index 043d612..a9e38b4 100644
--- a/plugins/excel/ms-obj.h
+++ b/plugins/excel/ms-obj.h
@@ -169,7 +169,7 @@ struct _MSObj {
 
        /* a kludge for now until the indicator and the box have distinct objects */
        GnmCellPos       comment_pos;
-       gboolean         combo_in_autofilter;
+       gboolean         auto_combo;
        gboolean         is_linked;
        MSObjAttrBag    *attrs;
 };