… | |
… | |
32 | static void psiconv_free_style_aux(void *style); |
32 | static void psiconv_free_style_aux(void *style); |
33 | static void psiconv_free_in_line_layout_aux(void * layout); |
33 | static void psiconv_free_in_line_layout_aux(void * layout); |
34 | static void psiconv_free_paragraph_aux(void * paragraph); |
34 | static void psiconv_free_paragraph_aux(void * paragraph); |
35 | static void psiconv_free_paint_data_section_aux(void * section); |
35 | static void psiconv_free_paint_data_section_aux(void * section); |
36 | static void psiconv_free_clipart_section_aux(void * section); |
36 | static void psiconv_free_clipart_section_aux(void * section); |
|
|
37 | static void psiconv_free_formula_aux(void *data); |
37 | |
38 | |
38 | static psiconv_word_styles_section psiconv_empty_word_styles_section(void); |
39 | static psiconv_word_styles_section psiconv_empty_word_styles_section(void); |
39 | static psiconv_text_and_layout psiconv_empty_text_and_layout(void); |
40 | static psiconv_text_and_layout psiconv_empty_text_and_layout(void); |
40 | static psiconv_texted_section psiconv_empty_texted_section(void); |
41 | static psiconv_texted_section psiconv_empty_texted_section(void); |
41 | static psiconv_page_header psiconv_empty_page_header(void); |
42 | static psiconv_page_header psiconv_empty_page_header(void); |
… | |
… | |
150 | 0.0, /* space_below */ |
151 | 0.0, /* space_below */ |
151 | psiconv_bool_false, /* keep_together */ |
152 | psiconv_bool_false, /* keep_together */ |
152 | psiconv_bool_false, /* keep_with_next */ |
153 | psiconv_bool_false, /* keep_with_next */ |
153 | psiconv_bool_false, /* on_next_page */ |
154 | psiconv_bool_false, /* on_next_page */ |
154 | psiconv_bool_false, /* no_widow_protection */ |
155 | psiconv_bool_false, /* no_widow_protection */ |
|
|
156 | psiconv_bool_false, /* wrap_to_fit_cell */ |
155 | 0.0, /* left_margin */ |
157 | 0.0, /* left_margin */ |
156 | &bullet, /* bullet */ |
158 | &bullet, /* bullet */ |
157 | &no_border, /* left_border */ |
159 | &no_border, /* left_border */ |
158 | &no_border, /* right_border */ |
160 | &no_border, /* right_border */ |
159 | &no_border, /* top_border */ |
161 | &no_border, /* top_border */ |
… | |
… | |
545 | { |
547 | { |
546 | if (section) |
548 | if (section) |
547 | free(section); |
549 | free(section); |
548 | } |
550 | } |
549 | |
551 | |
550 | /* TODO: Free sublists, strings etc. depending on formula->type */ |
552 | void psiconv_free_formula_aux(void *data) |
|
|
553 | { |
|
|
554 | psiconv_formula formula; |
|
|
555 | formula = data; |
|
|
556 | if (formula->type == psiconv_formula_dat_string) |
|
|
557 | free(formula->data.dat_string); |
|
|
558 | else if ((formula->type != psiconv_formula_dat_int) && |
|
|
559 | (formula->type != psiconv_formula_dat_var) && |
|
|
560 | (formula->type != psiconv_formula_dat_float) && |
|
|
561 | (formula->type != psiconv_formula_dat_cellref) && |
|
|
562 | (formula->type != psiconv_formula_dat_cellblock) && |
|
|
563 | (formula->type != psiconv_formula_dat_vcellblock) && |
|
|
564 | (formula->type != psiconv_formula_mark_opsep) && |
|
|
565 | (formula->type != psiconv_formula_mark_opend) && |
|
|
566 | (formula->type != psiconv_formula_mark_eof) && |
|
|
567 | (formula->type != psiconv_formula_unknown)) |
|
|
568 | psiconv_free_formula_list(formula->data.fun_operands); |
|
|
569 | } |
|
|
570 | |
551 | void psiconv_free_formula(psiconv_formula formula) |
571 | void psiconv_free_formula(psiconv_formula formula) |
552 | { |
572 | { |
553 | if (formula) |
573 | if (formula) { |
|
|
574 | psiconv_free_formula_aux(formula); |
554 | free(formula); |
575 | free(formula); |
|
|
576 | } |
555 | } |
577 | } |
556 | |
578 | |
557 | void psiconv_free_formula_list(psiconv_formula_list list) |
579 | void psiconv_free_formula_list(psiconv_formula_list list) |
558 | { |
580 | { |
559 | if (list) |
581 | if (list) |
560 | psiconv_list_free(list); |
582 | psiconv_list_free_el(list,psiconv_free_formula_aux); |
561 | } |
583 | } |
562 | |
584 | |
563 | void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section) |
585 | void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section) |
564 | { |
586 | { |
565 | if (section) { |
587 | if (section) { |