… | |
… | |
561 | psiconv_free_paragraph_layout(layout->paragraph); |
561 | psiconv_free_paragraph_layout(layout->paragraph); |
562 | psiconv_free_character_layout(layout->character); |
562 | psiconv_free_character_layout(layout->character); |
563 | psiconv_free_sheet_numberformat(layout->numberformat); |
563 | psiconv_free_sheet_numberformat(layout->numberformat); |
564 | } |
564 | } |
565 | |
565 | |
|
|
566 | void psiconv_free_sheet_cell_aux(void *cell) |
|
|
567 | { |
|
|
568 | psiconv_sheet_cell data = cell; |
|
|
569 | |
|
|
570 | psiconv_free_sheet_cell_layout(data->layout); |
|
|
571 | |
|
|
572 | if ((data->type == psiconv_cell_string) && (data->data.dat_string)) |
|
|
573 | free(data->data.dat_string); |
|
|
574 | } |
|
|
575 | |
566 | void psiconv_free_sheet_cell(psiconv_sheet_cell cell) |
576 | void psiconv_free_sheet_cell(psiconv_sheet_cell cell) |
567 | { |
577 | { |
568 | if (cell) { |
578 | if (cell) { |
569 | psiconv_free_sheet_cell_layout(cell->layout); |
579 | psiconv_free_sheet_cell_aux(cell); |
570 | |
|
|
571 | if ((cell->type == psiconv_cell_string) && (cell->data.dat_string)) |
|
|
572 | free(cell->data.dat_string); |
|
|
573 | free(cell); |
580 | free(cell); |
574 | } |
581 | } |
575 | } |
|
|
576 | |
|
|
577 | void psiconv_free_sheet_cell_aux(void *data) |
|
|
578 | { |
|
|
579 | psiconv_sheet_cell cell; |
|
|
580 | cell = data; |
|
|
581 | psiconv_free_sheet_cell(cell); |
|
|
582 | } |
582 | } |
583 | |
583 | |
584 | void psiconv_free_sheet_cell_list(psiconv_sheet_cell_list list) |
584 | void psiconv_free_sheet_cell_list(psiconv_sheet_cell_list list) |
585 | { |
585 | { |
586 | if (list) |
586 | if (list) |
… | |
… | |
643 | |
643 | |
644 | void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section) |
644 | void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section) |
645 | { |
645 | { |
646 | if (section) { |
646 | if (section) { |
647 | psiconv_free_formula_list(section->formulas); |
647 | psiconv_free_formula_list(section->formulas); |
648 | psiconv_free_sheet_worksheet_list(section->worksheets); |
648 | psiconv_free_sheet_worksheet_list(section->worksheets); |
649 | free(section); |
649 | free(section); |
650 | } |
650 | } |
651 | } |
651 | } |
652 | |
652 | |
653 | void psiconv_free_sheet_f(psiconv_sheet_f file) |
653 | void psiconv_free_sheet_f(psiconv_sheet_f file) |