--- psiconv/trunk/lib/psiconv/data.c	2001/07/10 22:38:49	125
+++ psiconv/trunk/lib/psiconv/data.c	2001/07/18 12:24:08	128
@@ -324,6 +324,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 +615,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)