/[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 128 Revision 143
… …
21#include "compat.h" 21#include "compat.h"
22#include <stdlib.h> 22#include <stdlib.h>
23#include <string.h> 23#include <string.h>
24#include "data.h" 24#include "data.h"
25#include "list.h" 25#include "list.h"
26
27#ifdef DMALLOC
28#include <dmalloc.h>
29#endif
26 30
27static psiconv_color clone_color(psiconv_color color); 31static psiconv_color clone_color(psiconv_color color);
28static psiconv_font clone_font(psiconv_font font); 32static psiconv_font clone_font(psiconv_font font);
29static psiconv_border clone_border(psiconv_border border); 33static psiconv_border clone_border(psiconv_border border);
30static psiconv_bullet clone_bullet(psiconv_bullet bullet); 34static psiconv_bullet clone_bullet(psiconv_bullet bullet);
… …
34static void psiconv_free_paragraph_aux(void * paragraph); 38static void psiconv_free_paragraph_aux(void * paragraph);
35static void psiconv_free_paint_data_section_aux(void * section); 39static void psiconv_free_paint_data_section_aux(void * section);
36static void psiconv_free_clipart_section_aux(void * section); 40static void psiconv_free_clipart_section_aux(void * section);
37static void psiconv_free_formula_aux(void *data); 41static void psiconv_free_formula_aux(void *data);
38static void psiconv_free_sheet_worksheet_aux (void *data); 42static void psiconv_free_sheet_worksheet_aux (void *data);
43static void psiconv_free_sheet_variable_aux(void * variable);
39 44
40static psiconv_word_styles_section psiconv_empty_word_styles_section(void); 45static psiconv_word_styles_section psiconv_empty_word_styles_section(void);
41static psiconv_text_and_layout psiconv_empty_text_and_layout(void); 46static psiconv_text_and_layout psiconv_empty_text_and_layout(void);
42static psiconv_texted_section psiconv_empty_texted_section(void); 47static psiconv_texted_section psiconv_empty_texted_section(void);
43static psiconv_page_header psiconv_empty_page_header(void); 48static psiconv_page_header psiconv_empty_page_header(void);
… …
437{ 442{
438 if (styles) { 443 if (styles) {
439 psiconv_free_word_style(styles->normal); 444 psiconv_free_word_style(styles->normal);
440 if (styles->styles) 445 if (styles->styles)
441 psiconv_list_free_el(styles->styles,psiconv_free_style_aux); 446 psiconv_list_free_el(styles->styles,psiconv_free_style_aux);
447 free(styles);
442 } 448 }
443} 449}
444 450
445void psiconv_free_header_section(psiconv_header_section header) 451void psiconv_free_header_section(psiconv_header_section header)
446{ 452{
… …
628 psiconv_free_sheet_line_aux(line); 634 psiconv_free_sheet_line_aux(line);
629 free(line); 635 free(line);
630 } 636 }
631} 637}
632 638
639
633void psiconv_free_sheet_line_list(psiconv_sheet_line_list list) 640void psiconv_free_sheet_line_list(psiconv_sheet_line_list list)
634{ 641{
635 if (list) 642 if (list)
636 psiconv_list_free_el(list,psiconv_free_sheet_line_aux); 643 psiconv_list_free_el(list,psiconv_free_sheet_line_aux);
644}
645
646void psiconv_free_sheet_grid_break_list(psiconv_sheet_grid_break_list list)
647{
648 if (list)
649 psiconv_list_free(list);
650}
651
652void psiconv_free_sheet_grid_size(psiconv_sheet_grid_size s)
653{
654 if (s)
655 free(s);
656}
657
658void psiconv_free_sheet_grid_size_list(psiconv_sheet_grid_size_list list)
659{
660 if (list)
661 psiconv_list_free(list);
662}
663
664void psiconv_free_sheet_grid_section(psiconv_sheet_grid_section sec)
665{
666 if (sec) {
667 psiconv_free_sheet_grid_size_list(sec->row_heights);
668 psiconv_free_sheet_grid_size_list(sec->column_heights);
669 psiconv_free_sheet_grid_break_list(sec->row_page_breaks);
670 psiconv_free_sheet_grid_break_list(sec->column_page_breaks);
671 free(sec);
672 }
637} 673}
638 674
639void psiconv_free_sheet_worksheet_aux (void *data) 675void psiconv_free_sheet_worksheet_aux (void *data)
640{ 676{
641 psiconv_sheet_worksheet section = data; 677 psiconv_sheet_worksheet section = data;
642 psiconv_free_sheet_cell_layout(section->default_layout); 678 psiconv_free_sheet_cell_layout(section->default_layout);
643 psiconv_free_sheet_cell_list(section->cells); 679 psiconv_free_sheet_cell_list(section->cells);
644 psiconv_free_sheet_line_list(section->row_default_layouts); 680 psiconv_free_sheet_line_list(section->row_default_layouts);
645 psiconv_free_sheet_line_list(section->col_default_layouts); 681 psiconv_free_sheet_line_list(section->col_default_layouts);
682 psiconv_free_sheet_grid_section(section->grid);
646} 683}
647 684
648void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet) 685void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet)
649{ 686{
650 if (sheet) { 687 if (sheet) {
… …
690{ 727{
691 if (list) 728 if (list)
692 psiconv_list_free_el(list,psiconv_free_formula_aux); 729 psiconv_list_free_el(list,psiconv_free_formula_aux);
693} 730}
694 731
732void psiconv_free_sheet_name_section(psiconv_sheet_name_section section)
733{
734 if (section) {
735 if(section->name)
736 free(section->name);
737 free(section);
738 }
739}
740
741void psiconv_free_sheet_info_section(psiconv_sheet_info_section section)
742{
743 if (section) {
744 free(section);
745 }
746}
747
748void psiconv_free_sheet_variable_aux(void * variable)
749{
750 psiconv_sheet_variable var = variable;
751 if (var->name)
752 free(var->name);
753 if (var->type == psiconv_var_string)
754 free(var->data.dat_string);
755}
756
757void psiconv_free_sheet_variable(psiconv_sheet_variable var)
758{
759 if (var) {
760 psiconv_free_sheet_variable_aux(var);
761 free(var);
762 }
763}
764
765void psiconv_free_sheet_variable_list(psiconv_sheet_variable_list list)
766{
767 if (list)
768 psiconv_list_free_el(list,psiconv_free_sheet_variable_aux);
769}
770
695void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section) 771void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section)
696{ 772{
697 if (section) { 773 if (section) {
698 psiconv_free_formula_list(section->formulas); 774 psiconv_free_formula_list(section->formulas);
699 psiconv_free_sheet_worksheet_list(section->worksheets); 775 psiconv_free_sheet_worksheet_list(section->worksheets);
776 psiconv_free_sheet_name_section(section->name);
777 psiconv_free_sheet_info_section(section->info);
778 psiconv_free_sheet_variable_list(section->variables);
700 free(section); 779 free(section);
701 } 780 }
702} 781}
703 782
704void psiconv_free_sheet_f(psiconv_sheet_f file) 783void psiconv_free_sheet_f(psiconv_sheet_f file)
Legend:
Removed from v.128  
changed lines
  Added in v.143
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26