--- psiconv/trunk/lib/psiconv/data.c	2001/07/10 22:38:49	125
+++ psiconv/trunk/lib/psiconv/data.c	2001/07/24 20:32:51	129
@@ -36,6 +36,7 @@
 static void psiconv_free_clipart_section_aux(void * section);
 static void psiconv_free_formula_aux(void *data);
 static void psiconv_free_sheet_worksheet_aux (void *data);
+static void psiconv_free_sheet_variable_aux(void * variable);
 
 static psiconv_word_styles_section psiconv_empty_word_styles_section(void);
 static psiconv_text_and_layout psiconv_empty_text_and_layout(void);
@@ -324,6 +325,28 @@
   return psiconv_list_get(ss,psiconv_list_length(ss)-nr-1);
 }
 
+/* TODO: What if a cell is both in a default row and a default column?!? */
+psiconv_sheet_cell_layout psiconv_get_default_layout 
+                                       (psiconv_sheet_line_list row_defaults,
+                                        psiconv_sheet_line_list col_defaults,
+                                        psiconv_sheet_cell_layout cell_default,
+                                        int row,int col)
+{
+  int i;
+  psiconv_sheet_line line;
+  for (i = 0;i < psiconv_list_length(row_defaults);i++) {
+    line = psiconv_list_get(row_defaults,i);
+    if (line->position == row)
+      return line->layout;
+  }
+  for (i = 0;i < psiconv_list_length(col_defaults);i++) {
+    line = psiconv_list_get(col_defaults,i);
+    if (line->position == col)
+      return line->layout;
+  }
+  return cell_default;
+}
+
 
 void psiconv_free_color (psiconv_color color)
 {
@@ -593,11 +616,34 @@
     psiconv_list_free_el(list,psiconv_free_sheet_cell_aux);
 }
 
+void psiconv_free_sheet_line_aux(void *line)
+{
+  psiconv_sheet_line data = line;
+
+  psiconv_free_sheet_cell_layout(data->layout);
+}
+
+void psiconv_free_sheet_line(psiconv_sheet_line line)
+{
+  if (line) {
+    psiconv_free_sheet_line_aux(line);
+    free(line);
+  }
+}
+
+void psiconv_free_sheet_line_list(psiconv_sheet_line_list list)
+{
+  if (list) 
+    psiconv_list_free_el(list,psiconv_free_sheet_line_aux);
+}
+
 void psiconv_free_sheet_worksheet_aux (void *data)
 {
   psiconv_sheet_worksheet section = data;
   psiconv_free_sheet_cell_layout(section->default_layout);
   psiconv_free_sheet_cell_list(section->cells);
+  psiconv_free_sheet_line_list(section->row_default_layouts);
+  psiconv_free_sheet_line_list(section->col_default_layouts);
 }
 
 void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet)
@@ -647,11 +693,53 @@
     psiconv_list_free_el(list,psiconv_free_formula_aux);
 }
 
+void psiconv_free_sheet_name_section(psiconv_sheet_name_section section)
+{
+  if (section) {
+    if(section->name)
+      free(section->name);
+    free(section);
+  }
+}
+
+void psiconv_free_sheet_info_section(psiconv_sheet_info_section section)
+{
+  if (section) {
+    free(section);
+  }
+}
+
+void psiconv_free_sheet_variable_aux(void * variable)
+{
+  psiconv_sheet_variable var = variable;
+  if (var->name)
+    free(var->name);
+  if (var->type == psiconv_var_string)
+    free(var->data.dat_string);
+}
+
+void psiconv_free_sheet_variable(psiconv_sheet_variable var)
+{
+  if (var) {
+    psiconv_free_sheet_variable_aux(var);
+    free(var);
+  }
+}
+
+void psiconv_free_sheet_variable_list(psiconv_sheet_variable_list list)
+{
+  if (list) 
+    psiconv_list_free_el(list,psiconv_free_sheet_variable_aux);
+}
+
 void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section)
 {
   if (section) {
     psiconv_free_formula_list(section->formulas);
     psiconv_free_sheet_worksheet_list(section->worksheets);
+    psiconv_free_sheet_name_section(section->name);
+    psiconv_free_sheet_info_section(section->info);
+    psiconv_free_sheet_variable_list(section->variables);
     free(section);
   }
 }