[gnumeric] xls: do validation and conditions for biff5 also.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] xls: do validation and conditions for biff5 also.
- Date: Wed, 5 Jun 2013 19:45:05 +0000 (UTC)
commit 3bed3a0c3f9419e8c46c0897826abb779a41ac17
Author: Morten Welinder <terra gnome org>
Date: Wed Jun 5 15:44:41 2013 -0400
xls: do validation and conditions for biff5 also.
plugins/excel/ms-excel-write.c | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
---
diff --git a/plugins/excel/ms-excel-write.c b/plugins/excel/ms-excel-write.c
index 55eb976..098f5a6 100644
--- a/plugins/excel/ms-excel-write.c
+++ b/plugins/excel/ms-excel-write.c
@@ -1161,8 +1161,6 @@ excel_write_conditions (BiffPut *bp, ExcelWriteSheet *esheet)
g_hash_table_foreach (group, (GHFunc) cb_write_condition, esheet);
g_hash_table_destroy (group);
- style_list_free (esheet->conditions);
- esheet->conditions = NULL;
}
static void
@@ -1438,8 +1436,6 @@ excel_write_DVALs (BiffPut *bp, ExcelWriteSheet *esheet)
g_hash_table_foreach (group, (GHFunc) excel_write_DV, esheet);
g_hash_table_destroy (group);
- style_list_free (esheet->validations);
- esheet->validations = NULL;
}
static void
@@ -5519,11 +5515,8 @@ excel_sheet_new (ExcelWriteState *ewb, Sheet *sheet,
* cannot handle.
*/
esheet->hlinks = sheet_style_collect_hlinks (sheet, NULL);
-
- if (biff8) {
- esheet->conditions = sheet_style_collect_conditions (sheet, NULL);
- esheet->validations = sheet_style_collect_validations (sheet, NULL);
- }
+ esheet->conditions = sheet_style_collect_conditions (sheet, NULL);
+ esheet->validations = sheet_style_collect_validations (sheet, NULL);
esheet->cur_obj = esheet->num_objs = 0;
@@ -6470,10 +6463,8 @@ excel_write_state_new (GOIOContext *context, WorkbookView const *wb_view,
if (sheet->sheet_type != GNM_SHEET_DATA)
continue;
- if (esheet->conditions != NULL)
- excel_write_prep_conditions (esheet);
- if (esheet->validations != NULL)
- excel_write_prep_validations (esheet);
+ excel_write_prep_conditions (esheet);
+ excel_write_prep_validations (esheet);
if (sheet->filters != NULL)
excel_write_prep_sheet (ewb, sheet);
for (ptr = esheet->graphs ; ptr != NULL ; ptr = ptr->next)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]