--- psiconv/trunk/lib/psiconv/data.c	2001/07/01 13:14:19	121
+++ psiconv/trunk/lib/psiconv/data.c	2003/11/22 22:17:04	163
@@ -24,6 +24,10 @@
 #include "data.h"
 #include "list.h"
 
+#ifdef DMALLOC
+#include <dmalloc.h>
+#endif
+
 static psiconv_color clone_color(psiconv_color color);
 static psiconv_font clone_font(psiconv_font font);
 static psiconv_border clone_border(psiconv_border border);
@@ -36,6 +40,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);
@@ -319,6 +324,34 @@
     return psiconv_list_get(ss->styles,0xff - nr);
 }
 
+psiconv_formula psiconv_get_formula (psiconv_formula_list ss, int nr)
+{
+  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)
 {
   if (color)
@@ -411,6 +444,7 @@
     psiconv_free_word_style(styles->normal);
     if (styles->styles) 
       psiconv_list_free_el(styles->styles,psiconv_free_style_aux);
+    free(styles);
   }
 }
 
@@ -441,9 +475,35 @@
   }
 }
 
+void psiconv_free_object_icon_section(psiconv_object_icon_section section)
+{
+  if (section) {
+    if (section->icon_name)
+      free(section->icon_name);
+    free(section);
+  }
+}
+
+void psiconv_free_object_display_section(psiconv_object_display_section section)
+{
+  if (section)
+    free(section);
+}
+
+void psiconv_free_object(psiconv_object object)
+{
+  if (object) {
+    psiconv_free_object_icon_section(object->icon);
+    psiconv_free_object_display_section(object->display);
+    psiconv_free_file(object->object);
+    free(object);
+  }
+}
+
 void psiconv_free_in_line_layout_aux(void * layout)
 {
   psiconv_free_character_layout(((psiconv_in_line_layout) layout)->layout);
+  psiconv_free_object(((psiconv_in_line_layout) layout)->object);
 }
 
 void psiconv_free_in_line_layout(psiconv_in_line_layout layout)
@@ -587,11 +647,65 @@
     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_grid_break_list(psiconv_sheet_grid_break_list list)
+{
+  if (list)
+    psiconv_list_free(list);
+}
+
+void psiconv_free_sheet_grid_size(psiconv_sheet_grid_size s)
+{
+  if (s)
+    free(s);
+}
+
+void psiconv_free_sheet_grid_size_list(psiconv_sheet_grid_size_list list)
+{
+  if (list)
+    psiconv_list_free(list);
+}
+
+void psiconv_free_sheet_grid_section(psiconv_sheet_grid_section sec)
+{
+  if (sec) {
+    psiconv_free_sheet_grid_size_list(sec->row_heights);
+    psiconv_free_sheet_grid_size_list(sec->column_heights);
+    psiconv_free_sheet_grid_break_list(sec->row_page_breaks);
+    psiconv_free_sheet_grid_break_list(sec->column_page_breaks);
+    free(sec);
+  }
+}
+
 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);
+  psiconv_free_sheet_grid_section(section->grid);
 }
 
 void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet)
@@ -641,11 +755,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);
   }
 }
@@ -1187,10 +1343,11 @@
   psiconv_sketch_section result;
   if (!(result = malloc(sizeof(*result))))
     goto ERROR1;
-  result->form_xsize = 320;
-  result->form_ysize = 200;
-  result->picture_x_offset = result->picture_y_offset = result->picture_xsize =
-          result->picture_ysize = 0;
+  result->displayed_xsize = 320;
+  result->displayed_ysize = 200;
+  result->picture_data_x_offset = result->picture_data_y_offset = 
+          result->form_xsize = result->form_ysize =
+          result->displayed_size_x_offset = result->displayed_size_y_offset = 0;
   result->magnification_x = result->magnification_y = 1.0;
   result->cut_left = result->cut_right = result->cut_top = 
           result->cut_bottom = 0.0;