--- psiconv/trunk/lib/psiconv/data.c	2000/12/31 01:36:30	88
+++ psiconv/trunk/lib/psiconv/data.c	2001/03/04 22:10:45	110
@@ -34,6 +34,7 @@
 static void psiconv_free_paragraph_aux(void * paragraph);
 static void psiconv_free_paint_data_section_aux(void * section);
 static void psiconv_free_clipart_section_aux(void * section);
+static void psiconv_free_formula_aux(void *data);
 
 static psiconv_word_styles_section psiconv_empty_word_styles_section(void);
 static psiconv_text_and_layout psiconv_empty_text_and_layout(void);
@@ -42,6 +43,11 @@
 static psiconv_page_layout_section psiconv_empty_page_layout_section(void);
 static psiconv_word_status_section psiconv_empty_word_status_section(void);
 static psiconv_word_f psiconv_empty_word_f(void);
+static psiconv_sheet_status_section psiconv_empty_sheet_status_section(void);
+static psiconv_formula_list psiconv_empty_formula_list(void);
+static psiconv_sheet_workbook_section 
+                                  psiconv_empty_sheet_workbook_section(void);
+static psiconv_sheet_f psiconv_empty_sheet_f(void);
 static psiconv_texted_f psiconv_empty_texted_f(void);
 static psiconv_paint_data_section psiconv_empty_paint_data_section(void);
 static psiconv_pictures psiconv_empty_pictures(void);
@@ -147,6 +153,7 @@
     psiconv_bool_false,    /* keep_with_next      */
     psiconv_bool_false,    /* on_next_page        */
     psiconv_bool_false,    /* no_widow_protection */
+    psiconv_bool_false,    /* wrap_to_fit_cell    */
     0.0,                   /* left_margin         */
     &bullet,               /* bullet              */
     &no_border,            /* left_border         */
@@ -536,6 +543,109 @@
   }
 }
 
+void psiconv_free_sheet_status_section(psiconv_sheet_status_section section)
+{
+  if (section) 
+    free(section);
+}
+
+void psiconv_free_numberformat(psiconv_numberformat numberformat)
+{
+  if (numberformat)
+    free(numberformat);
+}
+
+void psiconv_free_sheet_cell(psiconv_sheet_cell cell)
+{
+  if (cell) {
+    psiconv_free_paragraph_layout(cell->paragraph);
+    psiconv_free_character_layout(cell->character);
+    psiconv_free_numberformat(cell->numberformat);
+
+	if ((cell->type == psiconv_cell_string) && (cell->data.dat_string))
+    	free(cell->data.dat_string);
+
+	free(cell);
+  }
+}
+
+void psiconv_free_sheet_cell_aux(void *data)
+{
+  psiconv_sheet_cell cell;
+  cell = data;
+  psiconv_free_sheet_cell(cell);
+}
+
+void psiconv_free_sheet_cell_list(psiconv_sheet_cell_list list)
+{
+  if (list) 
+    psiconv_list_free_el(list,psiconv_free_sheet_cell_aux);
+}
+
+void psiconv_free_sheet_worksheet_section(
+									psiconv_sheet_worksheet_section section)
+{
+  if (section) {
+    psiconv_free_paragraph_layout(section->paragraph);
+    psiconv_free_character_layout(section->character);
+    psiconv_free_numberformat(section->numberformat);
+	psiconv_free_sheet_cell_list(section->cells);
+    free(section);
+  }
+}
+
+void psiconv_free_formula_aux(void *data)
+{
+  psiconv_formula formula;
+  formula = data;
+  if (formula->type == psiconv_formula_dat_string) 
+    free(formula->data.dat_string);
+  else if ((formula->type != psiconv_formula_dat_int) &&
+           (formula->type != psiconv_formula_dat_var) &&
+           (formula->type != psiconv_formula_dat_float) &&
+           (formula->type != psiconv_formula_dat_cellref) &&
+           (formula->type != psiconv_formula_dat_cellblock) &&
+           (formula->type != psiconv_formula_dat_vcellblock) &&
+           (formula->type != psiconv_formula_mark_opsep) &&
+           (formula->type != psiconv_formula_mark_opend) &&
+           (formula->type != psiconv_formula_mark_eof)  &&
+           (formula->type != psiconv_formula_unknown)) 
+    psiconv_free_formula_list(formula->data.fun_operands);
+}
+
+void psiconv_free_formula(psiconv_formula formula)
+{
+  if (formula) {
+    psiconv_free_formula_aux(formula);
+    free(formula);
+  }
+}
+
+void psiconv_free_formula_list(psiconv_formula_list list)
+{
+  if (list) 
+    psiconv_list_free_el(list,psiconv_free_formula_aux);
+}
+
+void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section)
+{
+  if (section) {
+    psiconv_free_formula_list(section->formulas);
+	psiconv_free_sheet_worksheet_section(section->worksheet);
+    free(section);
+  }
+}
+
+void psiconv_free_sheet_f(psiconv_sheet_f file)
+{
+  if (file) { 
+    psiconv_free_page_layout_section(file->page_sec);
+    psiconv_free_sheet_status_section(file->status_sec);
+    psiconv_free_sheet_workbook_section(file->workbook_sec);
+    free(file);
+  }
+}
+
 void psiconv_free_texted_f(psiconv_texted_f file)
 {
   if (file) {
@@ -640,6 +750,8 @@
       psiconv_free_sketch_f((psiconv_sketch_f) file->file);
     else if (file->type == psiconv_clipart_file)
       psiconv_free_clipart_f((psiconv_clipart_f) file->file);
+    else if (file->type == psiconv_sheet_file)
+      psiconv_free_sheet_f((psiconv_sheet_f) file->file);
     free(file);
   }
 }
@@ -920,6 +1032,64 @@
   return NULL;
 }
 
+psiconv_sheet_status_section psiconv_empty_sheet_status_section(void)
+{
+  psiconv_sheet_status_section result;
+  if (!(result = malloc(sizeof(*result))))
+    return NULL;
+  result->show_horizontal_scrollbar = result->show_vertical_scrollbar = 
+        psiconv_triple_auto;
+  result->show_graph = psiconv_bool_false;
+  result->show_top_sheet_toolbar = result->show_side_sheet_toolbar = 
+        result->show_top_graph_toolbar = result->show_side_graph_toolbar = 
+        psiconv_bool_true;
+  result->cursor_row = result->cursor_column = 0;
+  result->sheet_display_size = result->graph_display_size = 1000;
+  return result;
+}
+
+psiconv_formula_list psiconv_empty_formula_list(void)
+{
+  return psiconv_list_new(sizeof(struct psiconv_formula_s));
+}
+
+psiconv_sheet_workbook_section psiconv_empty_sheet_workbook_section(void)
+{
+  psiconv_sheet_workbook_section result;
+  if (!(result = malloc(sizeof(*result))))
+    goto ERROR1;
+  if (!(result->formulas = psiconv_empty_formula_list()))
+    goto ERROR2;
+  return result;
+ERROR2:
+  free(result);
+ERROR1:
+  return NULL;
+}
+
+
+psiconv_sheet_f psiconv_empty_sheet_f(void)
+{
+  psiconv_sheet_f result;
+  if (!(result = malloc(sizeof(*result))))
+    goto ERROR1;
+  if (!(result->page_sec = psiconv_empty_page_layout_section()))
+    goto ERROR2;
+  if (!(result->status_sec = psiconv_empty_sheet_status_section()))
+    goto ERROR3;
+  if (!(result->workbook_sec = psiconv_empty_sheet_workbook_section()))
+    goto ERROR4;
+  return result;
+ERROR4:
+  psiconv_free_sheet_status_section(result->status_sec);
+ERROR3:
+  psiconv_free_page_layout_section(result->page_sec);
+ERROR2:
+  free(result);
+ERROR1:
+  return NULL;
+}
+
 psiconv_texted_f psiconv_empty_texted_f(void)
 {
   psiconv_texted_f result;
@@ -1062,6 +1232,9 @@
   if (type == psiconv_word_file) {
     if (!(result->file =  psiconv_empty_word_f()))
       goto ERROR;
+  } else if (type == psiconv_sheet_file) {
+    if (!(result->file =  psiconv_empty_sheet_f()))
+      goto ERROR;
   } else if (type == psiconv_texted_file) {
     if (!(result->file =  psiconv_empty_texted_f()))
       goto ERROR;