--- psiconv/trunk/lib/psiconv/parse_routines.h 2001/07/16 17:51:40 127 +++ psiconv/trunk/lib/psiconv/parse_routines.h 2001/07/18 12:24:08 128 @@ -197,13 +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, - const psiconv_sheet_cell_layout default_layout); + 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, - const psiconv_sheet_cell_layout default_layout); + 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, @@ -217,11 +222,14 @@ extern int psiconv_parse_sheet_cell_layout(const psiconv_buffer buf, int lev, psiconv_u32 off, int *length, 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);