/[public]/psiconv/trunk/lib/psiconv/data.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/data.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 95 Revision 97
41static psiconv_page_header psiconv_empty_page_header(void); 41static psiconv_page_header psiconv_empty_page_header(void);
42static psiconv_page_layout_section psiconv_empty_page_layout_section(void); 42static psiconv_page_layout_section psiconv_empty_page_layout_section(void);
43static psiconv_word_status_section psiconv_empty_word_status_section(void); 43static psiconv_word_status_section psiconv_empty_word_status_section(void);
44static psiconv_word_f psiconv_empty_word_f(void); 44static psiconv_word_f psiconv_empty_word_f(void);
45static psiconv_sheet_status_section psiconv_empty_sheet_status_section(void); 45static psiconv_sheet_status_section psiconv_empty_sheet_status_section(void);
46static psiconv_sheet_formula_list psiconv_empty_sheet_formula_list(void);
46static psiconv_sheet_workbook_section 47static psiconv_sheet_workbook_section
47 psiconv_empty_sheet_workbook_section(void); 48 psiconv_empty_sheet_workbook_section(void);
48static psiconv_sheet_f psiconv_empty_sheet_f(void); 49static psiconv_sheet_f psiconv_empty_sheet_f(void);
49static psiconv_texted_f psiconv_empty_texted_f(void); 50static psiconv_texted_f psiconv_empty_texted_f(void);
50static psiconv_paint_data_section psiconv_empty_paint_data_section(void); 51static psiconv_paint_data_section psiconv_empty_paint_data_section(void);
544{ 545{
545 if (section) 546 if (section)
546 free(section); 547 free(section);
547} 548}
548 549
550void psiconv_free_sheet_formula(psiconv_sheet_formula formula)
551{
552 if (formula)
553 free(formula);
554}
555
556void psiconv_free_sheet_formula_list(psiconv_sheet_formula_list list)
557{
558 if (list)
559 psiconv_list_free(list);
560}
561
549void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section) 562void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section)
550{ 563{
551 if (section) 564 if (section) {
565 psiconv_free_sheet_formula_list(section->formulas);
552 free(section); 566 free(section);
567 }
553} 568}
554 569
555void psiconv_free_sheet_f(psiconv_sheet_f file) 570void psiconv_free_sheet_f(psiconv_sheet_f file)
556{ 571{
557 if (file) { 572 if (file) {
962 result->cursor_row = result->cursor_column = 0; 977 result->cursor_row = result->cursor_column = 0;
963 result->sheet_display_size = result->graph_display_size = 1000; 978 result->sheet_display_size = result->graph_display_size = 1000;
964 return result; 979 return result;
965} 980}
966 981
982psiconv_sheet_formula_list psiconv_empty_sheet_formula_list(void)
983{
984 return psiconv_list_new(sizeof(struct psiconv_sheet_formula_s));
985}
986
967psiconv_sheet_workbook_section psiconv_empty_sheet_workbook_section(void) 987psiconv_sheet_workbook_section psiconv_empty_sheet_workbook_section(void)
968{ 988{
969 psiconv_sheet_workbook_section result; 989 psiconv_sheet_workbook_section result;
970 if (!(result = malloc(sizeof(*result)))) 990 if (!(result = malloc(sizeof(*result))))
991 goto ERROR1;
992 if (!(result->formulas = psiconv_empty_sheet_formula_list()))
993 goto ERROR2;
994 return result;
995ERROR2:
996 free(result);
997ERROR1:
971 return NULL; 998 return NULL;
972 return result;
973} 999}
1000
974 1001
975psiconv_sheet_f psiconv_empty_sheet_f(void) 1002psiconv_sheet_f psiconv_empty_sheet_f(void)
976{ 1003{
977 psiconv_sheet_f result; 1004 psiconv_sheet_f result;
978 if (!(result = malloc(sizeof(*result)))) 1005 if (!(result = malloc(sizeof(*result))))

Legend:
Removed from v.95  
changed lines
  Added in v.97

frodo@frodo.looijaard.name
ViewVC Help
Powered by ViewVC 1.1.26