/[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 111 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);
… …
317 return ss->normal; 322 return ss->normal;
318 else 323 else
319 return psiconv_list_get(ss->styles,0xff - nr); 324 return psiconv_list_get(ss->styles,0xff - nr);
320} 325}
321 326
327psiconv_formula psiconv_get_formula (psiconv_formula_list ss, int nr)
328{
329 return psiconv_list_get(ss,psiconv_list_length(ss)-nr-1);
330}
331
332/* TODO: What if a cell is both in a default row and a default column?!? */
333psiconv_sheet_cell_layout psiconv_get_default_layout
334 (psiconv_sheet_line_list row_defaults,
335 psiconv_sheet_line_list col_defaults,
336 psiconv_sheet_cell_layout cell_default,
337 int row,int col)
338{
339 int i;
340 psiconv_sheet_line line;
341 for (i = 0;i < psiconv_list_length(row_defaults);i++) {
342 line = psiconv_list_get(row_defaults,i);
343 if (line->position == row)
344 return line->layout;
345 }
346 for (i = 0;i < psiconv_list_length(col_defaults);i++) {
347 line = psiconv_list_get(col_defaults,i);
348 if (line->position == col)
349 return line->layout;
350 }
351 return cell_default;
352}
353
354
322void psiconv_free_color (psiconv_color color) 355void psiconv_free_color (psiconv_color color)
323{ 356{
324 if (color) 357 if (color)
325 free(color); 358 free(color);
326} 359}
… …
409{ 442{
410 if (styles) { 443 if (styles) {
411 psiconv_free_word_style(styles->normal); 444 psiconv_free_word_style(styles->normal);
412 if (styles->styles) 445 if (styles->styles)
413 psiconv_list_free_el(styles->styles,psiconv_free_style_aux); 446 psiconv_list_free_el(styles->styles,psiconv_free_style_aux);
447 free(styles);
414 } 448 }
415} 449}
416 450
417void psiconv_free_header_section(psiconv_header_section header) 451void psiconv_free_header_section(psiconv_header_section header)
418{ 452{
… …
561 psiconv_free_paragraph_layout(layout->paragraph); 595 psiconv_free_paragraph_layout(layout->paragraph);
562 psiconv_free_character_layout(layout->character); 596 psiconv_free_character_layout(layout->character);
563 psiconv_free_sheet_numberformat(layout->numberformat); 597 psiconv_free_sheet_numberformat(layout->numberformat);
564} 598}
565 599
600void psiconv_free_sheet_cell_aux(void *cell)
601{
602 psiconv_sheet_cell data = cell;
603
604 psiconv_free_sheet_cell_layout(data->layout);
605
606 if ((data->type == psiconv_cell_string) && (data->data.dat_string))
607 free(data->data.dat_string);
608}
609
566void psiconv_free_sheet_cell(psiconv_sheet_cell cell) 610void psiconv_free_sheet_cell(psiconv_sheet_cell cell)
567{ 611{
568 if (cell) { 612 if (cell) {
569 psiconv_free_sheet_cell_layout(cell->layout); 613 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); 614 free(cell);
574 } 615 }
575}
576
577void psiconv_free_sheet_cell_aux(void *data)
578{
579 psiconv_sheet_cell cell;
580 cell = data;
581 psiconv_free_sheet_cell(cell);
582} 616}
583 617
584void psiconv_free_sheet_cell_list(psiconv_sheet_cell_list list) 618void psiconv_free_sheet_cell_list(psiconv_sheet_cell_list list)
585{ 619{
586 if (list) 620 if (list)
587 psiconv_list_free_el(list,psiconv_free_sheet_cell_aux); 621 psiconv_list_free_el(list,psiconv_free_sheet_cell_aux);
622}
623
624void psiconv_free_sheet_line_aux(void *line)
625{
626 psiconv_sheet_line data = line;
627
628 psiconv_free_sheet_cell_layout(data->layout);
629}
630
631void psiconv_free_sheet_line(psiconv_sheet_line line)
632{
633 if (line) {
634 psiconv_free_sheet_line_aux(line);
635 free(line);
636 }
637}
638
639
640void psiconv_free_sheet_line_list(psiconv_sheet_line_list list)
641{
642 if (list)
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 }
588} 673}
589 674
590void psiconv_free_sheet_worksheet_aux (void *data) 675void psiconv_free_sheet_worksheet_aux (void *data)
591{ 676{
592 psiconv_sheet_worksheet section = data; 677 psiconv_sheet_worksheet section = data;
593 psiconv_free_sheet_cell_layout(section->default_layout); 678 psiconv_free_sheet_cell_layout(section->default_layout);
594 psiconv_free_sheet_cell_list(section->cells); 679 psiconv_free_sheet_cell_list(section->cells);
680 psiconv_free_sheet_line_list(section->row_default_layouts);
681 psiconv_free_sheet_line_list(section->col_default_layouts);
682 psiconv_free_sheet_grid_section(section->grid);
595} 683}
596 684
597void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet) 685void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet)
598{ 686{
599 if (sheet) { 687 if (sheet) {
… …
639{ 727{
640 if (list) 728 if (list)
641 psiconv_list_free_el(list,psiconv_free_formula_aux); 729 psiconv_list_free_el(list,psiconv_free_formula_aux);
642} 730}
643 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
644void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section) 771void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section)
645{ 772{
646 if (section) { 773 if (section) {
647 psiconv_free_formula_list(section->formulas); 774 psiconv_free_formula_list(section->formulas);
648 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);
649 free(section); 779 free(section);
650 } 780 }
651} 781}
652 782
653void psiconv_free_sheet_f(psiconv_sheet_f file) 783void psiconv_free_sheet_f(psiconv_sheet_f file)
Legend:
Removed from v.111  
changed lines
  Added in v.143
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26