/[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 129 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);
… …
438{ 442{
439 if (styles) { 443 if (styles) {
440 psiconv_free_word_style(styles->normal); 444 psiconv_free_word_style(styles->normal);
441 if (styles->styles) 445 if (styles->styles)
442 psiconv_list_free_el(styles->styles,psiconv_free_style_aux); 446 psiconv_list_free_el(styles->styles,psiconv_free_style_aux);
447 free(styles);
443 } 448 }
444} 449}
445 450
446void psiconv_free_header_section(psiconv_header_section header) 451void psiconv_free_header_section(psiconv_header_section header)
447{ 452{
… …
629 psiconv_free_sheet_line_aux(line); 634 psiconv_free_sheet_line_aux(line);
630 free(line); 635 free(line);
631 } 636 }
632} 637}
633 638
639
634void psiconv_free_sheet_line_list(psiconv_sheet_line_list list) 640void psiconv_free_sheet_line_list(psiconv_sheet_line_list list)
635{ 641{
636 if (list) 642 if (list)
637 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 }
638} 673}
639 674
640void psiconv_free_sheet_worksheet_aux (void *data) 675void psiconv_free_sheet_worksheet_aux (void *data)
641{ 676{
642 psiconv_sheet_worksheet section = data; 677 psiconv_sheet_worksheet section = data;
643 psiconv_free_sheet_cell_layout(section->default_layout); 678 psiconv_free_sheet_cell_layout(section->default_layout);
644 psiconv_free_sheet_cell_list(section->cells); 679 psiconv_free_sheet_cell_list(section->cells);
645 psiconv_free_sheet_line_list(section->row_default_layouts); 680 psiconv_free_sheet_line_list(section->row_default_layouts);
646 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);
647} 683}
648 684
649void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet) 685void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet)
650{ 686{
651 if (sheet) { 687 if (sheet) {
Legend:
Removed from v.129  
changed lines
  Added in v.143
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26