/[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 98 Revision 99
32static void psiconv_free_style_aux(void *style); 32static void psiconv_free_style_aux(void *style);
33static void psiconv_free_in_line_layout_aux(void * layout); 33static void psiconv_free_in_line_layout_aux(void * layout);
34static void psiconv_free_paragraph_aux(void * paragraph); 34static void psiconv_free_paragraph_aux(void * paragraph);
35static void psiconv_free_paint_data_section_aux(void * section); 35static void psiconv_free_paint_data_section_aux(void * section);
36static void psiconv_free_clipart_section_aux(void * section); 36static void psiconv_free_clipart_section_aux(void * section);
37static void psiconv_free_formula_aux(void *data);
37 38
38static psiconv_word_styles_section psiconv_empty_word_styles_section(void); 39static psiconv_word_styles_section psiconv_empty_word_styles_section(void);
39static psiconv_text_and_layout psiconv_empty_text_and_layout(void); 40static psiconv_text_and_layout psiconv_empty_text_and_layout(void);
40static psiconv_texted_section psiconv_empty_texted_section(void); 41static psiconv_texted_section psiconv_empty_texted_section(void);
41static psiconv_page_header psiconv_empty_page_header(void); 42static psiconv_page_header psiconv_empty_page_header(void);
545{ 546{
546 if (section) 547 if (section)
547 free(section); 548 free(section);
548} 549}
549 550
550/* TODO: Free sublists, strings etc. depending on formula->type */ 551void psiconv_free_formula_aux(void *data)
552{
553 psiconv_formula formula;
554 formula = data;
555 if (formula->type == psiconv_formula_dat_string)
556 free(formula->data.dat_string);
557 else if ((formula->type != psiconv_formula_dat_int) &&
558 (formula->type != psiconv_formula_dat_var) &&
559 (formula->type != psiconv_formula_dat_float) &&
560 (formula->type != psiconv_formula_dat_cellref) &&
561 (formula->type != psiconv_formula_dat_cellblock) &&
562 (formula->type != psiconv_formula_dat_vcellblock) &&
563 (formula->type != psiconv_formula_mark_opsep) &&
564 (formula->type != psiconv_formula_mark_opend) &&
565 (formula->type != psiconv_formula_mark_eof) &&
566 (formula->type != psiconv_formula_unknown))
567 psiconv_free_formula_list(formula->data.fun_operands);
568}
569
551void psiconv_free_formula(psiconv_formula formula) 570void psiconv_free_formula(psiconv_formula formula)
552{ 571{
553 if (formula) 572 if (formula) {
573 psiconv_free_formula_aux(formula);
554 free(formula); 574 free(formula);
575 }
555} 576}
556 577
557void psiconv_free_formula_list(psiconv_formula_list list) 578void psiconv_free_formula_list(psiconv_formula_list list)
558{ 579{
559 if (list) 580 if (list)
560 psiconv_list_free(list); 581 psiconv_list_free_el(list,psiconv_free_formula_aux);
561} 582}
562 583
563void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section) 584void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section)
564{ 585{
565 if (section) { 586 if (section) {

Legend:
Removed from v.98  
changed lines
  Added in v.99

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