/[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 110 Revision 111
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); 37static void psiconv_free_formula_aux(void *data);
38static void psiconv_free_sheet_worksheet_aux (void *data);
38 39
39static psiconv_word_styles_section psiconv_empty_word_styles_section(void); 40static psiconv_word_styles_section psiconv_empty_word_styles_section(void);
40static psiconv_text_and_layout psiconv_empty_text_and_layout(void); 41static psiconv_text_and_layout psiconv_empty_text_and_layout(void);
41static psiconv_texted_section psiconv_empty_texted_section(void); 42static psiconv_texted_section psiconv_empty_texted_section(void);
42static psiconv_page_header psiconv_empty_page_header(void); 43static psiconv_page_header psiconv_empty_page_header(void);
547{ 548{
548 if (section) 549 if (section)
549 free(section); 550 free(section);
550} 551}
551 552
552void psiconv_free_numberformat(psiconv_numberformat numberformat) 553void psiconv_free_sheet_numberformat(psiconv_sheet_numberformat numberformat)
553{ 554{
554 if (numberformat) 555 if (numberformat)
555 free(numberformat); 556 free(numberformat);
556} 557}
557 558
559void psiconv_free_sheet_cell_layout(psiconv_sheet_cell_layout layout)
560{
561 psiconv_free_paragraph_layout(layout->paragraph);
562 psiconv_free_character_layout(layout->character);
563 psiconv_free_sheet_numberformat(layout->numberformat);
564}
565
558void psiconv_free_sheet_cell(psiconv_sheet_cell cell) 566void psiconv_free_sheet_cell(psiconv_sheet_cell cell)
559{ 567{
560 if (cell) { 568 if (cell) {
561 psiconv_free_paragraph_layout(cell->paragraph); 569 psiconv_free_sheet_cell_layout(cell->layout);
562 psiconv_free_character_layout(cell->character);
563 psiconv_free_numberformat(cell->numberformat);
564 570
565 if ((cell->type == psiconv_cell_string) && (cell->data.dat_string)) 571 if ((cell->type == psiconv_cell_string) && (cell->data.dat_string))
566 free(cell->data.dat_string); 572 free(cell->data.dat_string);
567
568 free(cell); 573 free(cell);
569 } 574 }
570} 575}
571 576
572void psiconv_free_sheet_cell_aux(void *data) 577void psiconv_free_sheet_cell_aux(void *data)
573{ 578{
580{ 585{
581 if (list) 586 if (list)
582 psiconv_list_free_el(list,psiconv_free_sheet_cell_aux); 587 psiconv_list_free_el(list,psiconv_free_sheet_cell_aux);
583} 588}
584 589
585void psiconv_free_sheet_worksheet_section( 590void psiconv_free_sheet_worksheet_aux (void *data)
586 psiconv_sheet_worksheet_section section)
587{ 591{
588 if (section) { 592 psiconv_sheet_worksheet section = data;
589 psiconv_free_paragraph_layout(section->paragraph); 593 psiconv_free_sheet_cell_layout(section->default_layout);
590 psiconv_free_character_layout(section->character);
591 psiconv_free_numberformat(section->numberformat);
592 psiconv_free_sheet_cell_list(section->cells); 594 psiconv_free_sheet_cell_list(section->cells);
595}
596
597void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet)
598{
599 if (sheet) {
600 psiconv_free_sheet_worksheet_aux(sheet);
593 free(section); 601 free(sheet);
594 } 602 }
603}
604
605void psiconv_free_sheet_worksheet_list(psiconv_sheet_worksheet_list list)
606{
607 if (list)
608 psiconv_list_free_el(list,psiconv_free_sheet_worksheet_aux);
595} 609}
596 610
597void psiconv_free_formula_aux(void *data) 611void psiconv_free_formula_aux(void *data)
598{ 612{
599 psiconv_formula formula; 613 psiconv_formula formula;
629 643
630void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section) 644void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section)
631{ 645{
632 if (section) { 646 if (section) {
633 psiconv_free_formula_list(section->formulas); 647 psiconv_free_formula_list(section->formulas);
634 psiconv_free_sheet_worksheet_section(section->worksheet); 648 psiconv_free_sheet_worksheet_list(section->worksheets);
635 free(section); 649 free(section);
636 } 650 }
637} 651}
638 652
639void psiconv_free_sheet_f(psiconv_sheet_f file) 653void psiconv_free_sheet_f(psiconv_sheet_f file)

Legend:
Removed from v.110  
changed lines
  Added in v.111

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