--- psiconv/trunk/lib/psiconv/data.c 2000/12/31 01:36:30 88 +++ psiconv/trunk/lib/psiconv/data.c 2001/01/17 00:05:08 94 @@ -42,6 +42,8 @@ static psiconv_page_layout_section psiconv_empty_page_layout_section(void); static psiconv_word_status_section psiconv_empty_word_status_section(void); static psiconv_word_f psiconv_empty_word_f(void); +static psiconv_sheet_status_section psiconv_empty_sheet_status_section(void); +static psiconv_sheet_f psiconv_empty_sheet_f(void); static psiconv_texted_f psiconv_empty_texted_f(void); static psiconv_paint_data_section psiconv_empty_paint_data_section(void); static psiconv_pictures psiconv_empty_pictures(void); @@ -536,6 +538,21 @@ } } +void psiconv_free_sheet_status_section(psiconv_sheet_status_section section) +{ + if (section) + free(section); +} + +void psiconv_free_sheet_f(psiconv_sheet_f file) +{ + if (file) { + psiconv_free_page_layout_section(file->page_sec); + psiconv_free_sheet_status_section(file->status_sec); + free(file); + } +} + void psiconv_free_texted_f(psiconv_texted_f file) { if (file) { @@ -640,6 +657,8 @@ psiconv_free_sketch_f((psiconv_sketch_f) file->file); else if (file->type == psiconv_clipart_file) psiconv_free_clipart_f((psiconv_clipart_f) file->file); + else if (file->type == psiconv_sheet_file) + psiconv_free_sheet_f((psiconv_sheet_f) file->file); free(file); } } @@ -920,6 +939,40 @@ return NULL; } +psiconv_sheet_status_section psiconv_empty_sheet_status_section(void) +{ + psiconv_sheet_status_section result; + if (!(result = malloc(sizeof(*result)))) + return NULL; + result->show_horizontal_scrollbar = result->show_vertical_scrollbar = + psiconv_triple_auto; + result->show_graph = psiconv_bool_false; + result->show_top_sheet_toolbar = result->show_side_sheet_toolbar = + result->show_top_graph_toolbar = result->show_side_graph_toolbar = + psiconv_bool_true; + result->cursor_row = result->cursor_column = 0; + result->sheet_display_size = result->graph_display_size = 1000; + return result; +} + +psiconv_sheet_f psiconv_empty_sheet_f(void) +{ + psiconv_sheet_f result; + if (!(result = malloc(sizeof(*result)))) + goto ERROR1; + if (!(result->page_sec = psiconv_empty_page_layout_section())) + goto ERROR2; + if (!(result->status_sec = psiconv_empty_sheet_status_section())) + goto ERROR3; + return result; +ERROR3: + psiconv_free_page_layout_section(result->page_sec); +ERROR2: + free(result); +ERROR1: + return NULL; +} + psiconv_texted_f psiconv_empty_texted_f(void) { psiconv_texted_f result; @@ -1062,6 +1115,9 @@ if (type == psiconv_word_file) { if (!(result->file = psiconv_empty_word_f())) goto ERROR; + } else if (type == psiconv_sheet_file) { + if (!(result->file = psiconv_empty_sheet_f())) + goto ERROR; } else if (type == psiconv_texted_file) { if (!(result->file = psiconv_empty_texted_f())) goto ERROR;