/[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 142
… …
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);
… …
628 psiconv_free_sheet_line_aux(line); 633 psiconv_free_sheet_line_aux(line);
629 free(line); 634 free(line);
630 } 635 }
631} 636}
632 637
638
633void psiconv_free_sheet_line_list(psiconv_sheet_line_list list) 639void psiconv_free_sheet_line_list(psiconv_sheet_line_list list)
634{ 640{
635 if (list) 641 if (list)
636 psiconv_list_free_el(list,psiconv_free_sheet_line_aux); 642 psiconv_list_free_el(list,psiconv_free_sheet_line_aux);
643}
644
645void psiconv_free_sheet_grid_break_list(psiconv_sheet_grid_break_list list)
646{
647 if (list)
648 psiconv_list_free(list);
649}
650
651void psiconv_free_sheet_grid_size(psiconv_sheet_grid_size s)
652{
653 if (s)
654 free(s);
655}
656
657void psiconv_free_sheet_grid_size_list(psiconv_sheet_grid_size_list list)
658{
659 if (list)
660 psiconv_list_free(list);
661}
662
663void psiconv_free_sheet_grid_section(psiconv_sheet_grid_section sec)
664{
665 if (sec) {
666 psiconv_free_sheet_grid_size_list(sec->row_heights);
667 psiconv_free_sheet_grid_size_list(sec->column_heights);
668 psiconv_free_sheet_grid_break_list(sec->row_page_breaks);
669 psiconv_free_sheet_grid_break_list(sec->column_page_breaks);
670 free(sec);
671 }
637} 672}
638 673
639void psiconv_free_sheet_worksheet_aux (void *data) 674void psiconv_free_sheet_worksheet_aux (void *data)
640{ 675{
641 psiconv_sheet_worksheet section = data; 676 psiconv_sheet_worksheet section = data;
642 psiconv_free_sheet_cell_layout(section->default_layout); 677 psiconv_free_sheet_cell_layout(section->default_layout);
643 psiconv_free_sheet_cell_list(section->cells); 678 psiconv_free_sheet_cell_list(section->cells);
644 psiconv_free_sheet_line_list(section->row_default_layouts); 679 psiconv_free_sheet_line_list(section->row_default_layouts);
645 psiconv_free_sheet_line_list(section->col_default_layouts); 680 psiconv_free_sheet_line_list(section->col_default_layouts);
681 psiconv_free_sheet_grid_section(section->grid);
646} 682}
647 683
648void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet) 684void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet)
649{ 685{
650 if (sheet) { 686 if (sheet) {
… …
690{ 726{
691 if (list) 727 if (list)
692 psiconv_list_free_el(list,psiconv_free_formula_aux); 728 psiconv_list_free_el(list,psiconv_free_formula_aux);
693} 729}
694 730
731void psiconv_free_sheet_name_section(psiconv_sheet_name_section section)
732{
733 if (section) {
734 if(section->name)
735 free(section->name);
736 free(section);
737 }
738}
739
740void psiconv_free_sheet_info_section(psiconv_sheet_info_section section)
741{
742 if (section) {
743 free(section);
744 }
745}
746
747void psiconv_free_sheet_variable_aux(void * variable)
748{
749 psiconv_sheet_variable var = variable;
750 if (var->name)
751 free(var->name);
752 if (var->type == psiconv_var_string)
753 free(var->data.dat_string);
754}
755
756void psiconv_free_sheet_variable(psiconv_sheet_variable var)
757{
758 if (var) {
759 psiconv_free_sheet_variable_aux(var);
760 free(var);
761 }
762}
763
764void psiconv_free_sheet_variable_list(psiconv_sheet_variable_list list)
765{
766 if (list)
767 psiconv_list_free_el(list,psiconv_free_sheet_variable_aux);
768}
769
695void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section) 770void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section)
696{ 771{
697 if (section) { 772 if (section) {
698 psiconv_free_formula_list(section->formulas); 773 psiconv_free_formula_list(section->formulas);
699 psiconv_free_sheet_worksheet_list(section->worksheets); 774 psiconv_free_sheet_worksheet_list(section->worksheets);
775 psiconv_free_sheet_name_section(section->name);
776 psiconv_free_sheet_info_section(section->info);
777 psiconv_free_sheet_variable_list(section->variables);
700 free(section); 778 free(section);
701 } 779 }
702} 780}
703 781
704void psiconv_free_sheet_f(psiconv_sheet_f file) 782void psiconv_free_sheet_f(psiconv_sheet_f file)
Legend:
Removed from v.128  
changed lines
  Added in v.142
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26