--- psiconv/trunk/lib/psiconv/parse_routines.h	2001/03/06 23:59:46	111
+++ psiconv/trunk/lib/psiconv/parse_routines.h	2001/07/18 12:24:08	128
@@ -197,11 +197,18 @@
                                         psiconv_u32 off, int *length, 
                                         psiconv_sheet_workbook_section *result);
 extern int psiconv_parse_sheet_cell(const psiconv_buffer buf, int lev,
-                                    psiconv_u32 off, int *length,
-                                    psiconv_sheet_cell *result);
+                             psiconv_u32 off, int *length,
+                             psiconv_sheet_cell *result,
+                             const psiconv_sheet_cell_layout default_layout,
+                             const psiconv_sheet_line_list row_default_layouts,
+                             const psiconv_sheet_line_list col_default_layouts);
+
 extern int psiconv_parse_sheet_cell_list(const psiconv_buffer buf, int lev,
-                                         psiconv_u32 off, int *length,
-                                         psiconv_sheet_cell_list *result);
+                             psiconv_u32 off, int *length,
+                             psiconv_sheet_cell_list *result,
+                             const psiconv_sheet_cell_layout default_layout,
+                             const psiconv_sheet_line_list row_default_layouts,
+                             const psiconv_sheet_line_list col_default_layouts);
 extern int psiconv_parse_sheet_worksheet_list( const psiconv_buffer buf,
                                         int lev,
                                         psiconv_u32 off, int *length,
@@ -211,15 +218,18 @@
                                          psiconv_sheet_worksheet *result);
 extern int psiconv_parse_sheet_numberformat(const psiconv_buffer buf, int lev,
                                      psiconv_u32 off, int *length,
-                                     psiconv_sheet_numberformat *result);
+                                     psiconv_sheet_numberformat result);
 extern int psiconv_parse_sheet_cell_layout(const psiconv_buffer buf, int lev,
                                     psiconv_u32 off, int *length,
-                                    psiconv_sheet_cell_layout *result);
-
-
-
-
-
+                                    psiconv_sheet_cell_layout result);
+extern int psiconv_parse_sheet_line(const psiconv_buffer buf, int lev,
+                                psiconv_u32 off, int *length,
+                                psiconv_sheet_line *result,
+                                const psiconv_sheet_cell_layout default_layout);
+extern int psiconv_parse_sheet_line_list(const psiconv_buffer buf, int lev,
+                                psiconv_u32 off, int *length,
+                                psiconv_sheet_line_list *result,
+                                const psiconv_sheet_cell_layout default_layout);