--- psiconv/trunk/lib/psiconv/data.h	2001/07/10 22:38:49	125
+++ psiconv/trunk/lib/psiconv/data.h	2001/07/18 12:24:08	128
@@ -513,7 +513,6 @@
 } *psiconv_sheet_cell;
 
 typedef psiconv_list psiconv_sheet_cell_list;
-                                        /* Of struct psiconv_sheet_cell_s */
 
 typedef struct psiconv_sheet_status_section_s
 {
@@ -683,11 +682,22 @@
   } data;
 } *psiconv_formula;
 
+typedef struct psiconv_sheet_line_s
+{
+  psiconv_u32 position;
+  psiconv_sheet_cell_layout layout;
+} *psiconv_sheet_line;
+
+typedef psiconv_list psiconv_sheet_line_list; 
+                     /* Of struct psiconv_sheet_line_s */
+
 typedef struct psiconv_sheet_worksheet_s
 {
   psiconv_sheet_cell_layout default_layout;
   psiconv_sheet_cell_list cells;
   psiconv_bool_t show_zeros;
+  psiconv_sheet_line_list row_default_layouts;
+  psiconv_sheet_line_list col_default_layouts;
 } *psiconv_sheet_worksheet;
 
 typedef psiconv_list psiconv_sheet_worksheet_list; 
@@ -769,8 +779,16 @@
 
 /* Get a numbered style. Returns NULL if the style is unknown. */
 extern psiconv_word_style psiconv_get_style (psiconv_word_styles_section ss, int nr);
+/* Get a numbered formula. Returns NULL if the style is unknown. */
 extern psiconv_formula psiconv_get_formula (psiconv_formula_list ss, int nr);
 
+/* Return the default layout */
+extern 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);
+
 extern void psiconv_free_color(psiconv_color color);
 extern void psiconv_free_border(psiconv_border border);
 extern void psiconv_free_bullet(psiconv_bullet bullet);
@@ -796,6 +814,8 @@
 extern void psiconv_free_sheet_cell_list(psiconv_sheet_cell_list list);
 extern void psiconv_free_sheet_numberformat
                                     (psiconv_sheet_numberformat numberformat);
+extern void psiconv_free_sheet_line_list(psiconv_sheet_line_list list);
+extern void psiconv_free_sheet_line(psiconv_sheet_line line);
 extern void psiconv_free_header_section(psiconv_header_section header);
 extern void psiconv_free_section_table_entry(psiconv_section_table_entry entry);
 extern void psiconv_free_section_table_section