/[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 171
… …
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);
… …
33static void psiconv_free_in_line_layout_aux(void * layout); 37static void psiconv_free_in_line_layout_aux(void * layout);
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);
42static void psiconv_free_sheet_worksheet_aux (void *data);
43static void psiconv_free_sheet_variable_aux(void * variable);
44static void psiconv_free_sheet_cell_aux(void *cell);
45static void psiconv_free_sheet_line_aux(void *line);
38static void psiconv_free_sheet_worksheet_aux (void *data); 46static void psiconv_free_sheet_worksheet_aux (void *data);
39 47
40static psiconv_word_styles_section psiconv_empty_word_styles_section(void); 48static psiconv_word_styles_section psiconv_empty_word_styles_section(void);
41static psiconv_text_and_layout psiconv_empty_text_and_layout(void); 49static psiconv_text_and_layout psiconv_empty_text_and_layout(void);
42static psiconv_texted_section psiconv_empty_texted_section(void); 50static psiconv_texted_section psiconv_empty_texted_section(void);
… …
437{ 445{
438 if (styles) { 446 if (styles) {
439 psiconv_free_word_style(styles->normal); 447 psiconv_free_word_style(styles->normal);
440 if (styles->styles) 448 if (styles->styles)
441 psiconv_list_free_el(styles->styles,psiconv_free_style_aux); 449 psiconv_list_free_el(styles->styles,psiconv_free_style_aux);
450 free(styles);
442 } 451 }
443} 452}
444 453
445void psiconv_free_header_section(psiconv_header_section header) 454void psiconv_free_header_section(psiconv_header_section header)
446{ 455{
… …
467 free(section->name); 476 free(section->name);
468 free(section); 477 free(section);
469 } 478 }
470} 479}
471 480
481void psiconv_free_object_icon_section(psiconv_object_icon_section section)
482{
483 if (section) {
484 if (section->icon_name)
485 free(section->icon_name);
486 free(section);
487 }
488}
489
490void psiconv_free_object_display_section(psiconv_object_display_section section)
491{
492 if (section)
493 free(section);
494}
495
496void psiconv_free_embedded_object_section
497 (psiconv_embedded_object_section object)
498{
499 if (object) {
500 psiconv_free_object_icon_section(object->icon);
501 psiconv_free_object_display_section(object->display);
502 psiconv_free_file(object->object);
503 free(object);
504 }
505}
506
472void psiconv_free_in_line_layout_aux(void * layout) 507void psiconv_free_in_line_layout_aux(void * layout)
473{ 508{
474 psiconv_free_character_layout(((psiconv_in_line_layout) layout)->layout); 509 psiconv_free_character_layout(((psiconv_in_line_layout) layout)->layout);
510 psiconv_free_embedded_object_section
511 (((psiconv_in_line_layout) layout)->object);
475} 512}
476 513
477void psiconv_free_in_line_layout(psiconv_in_line_layout layout) 514void psiconv_free_in_line_layout(psiconv_in_line_layout layout)
478{ 515{
479 if (layout) { 516 if (layout) {
… …
628 psiconv_free_sheet_line_aux(line); 665 psiconv_free_sheet_line_aux(line);
629 free(line); 666 free(line);
630 } 667 }
631} 668}
632 669
670
633void psiconv_free_sheet_line_list(psiconv_sheet_line_list list) 671void psiconv_free_sheet_line_list(psiconv_sheet_line_list list)
634{ 672{
635 if (list) 673 if (list)
636 psiconv_list_free_el(list,psiconv_free_sheet_line_aux); 674 psiconv_list_free_el(list,psiconv_free_sheet_line_aux);
675}
676
677void psiconv_free_sheet_grid_break_list(psiconv_sheet_grid_break_list list)
678{
679 if (list)
680 psiconv_list_free(list);
681}
682
683void psiconv_free_sheet_grid_size(psiconv_sheet_grid_size s)
684{
685 if (s)
686 free(s);
687}
688
689void psiconv_free_sheet_grid_size_list(psiconv_sheet_grid_size_list list)
690{
691 if (list)
692 psiconv_list_free(list);
693}
694
695void psiconv_free_sheet_grid_section(psiconv_sheet_grid_section sec)
696{
697 if (sec) {
698 psiconv_free_sheet_grid_size_list(sec->row_heights);
699 psiconv_free_sheet_grid_size_list(sec->column_heights);
700 psiconv_free_sheet_grid_break_list(sec->row_page_breaks);
701 psiconv_free_sheet_grid_break_list(sec->column_page_breaks);
702 free(sec);
703 }
637} 704}
638 705
639void psiconv_free_sheet_worksheet_aux (void *data) 706void psiconv_free_sheet_worksheet_aux (void *data)
640{ 707{
641 psiconv_sheet_worksheet section = data; 708 psiconv_sheet_worksheet section = data;
642 psiconv_free_sheet_cell_layout(section->default_layout); 709 psiconv_free_sheet_cell_layout(section->default_layout);
643 psiconv_free_sheet_cell_list(section->cells); 710 psiconv_free_sheet_cell_list(section->cells);
644 psiconv_free_sheet_line_list(section->row_default_layouts); 711 psiconv_free_sheet_line_list(section->row_default_layouts);
645 psiconv_free_sheet_line_list(section->col_default_layouts); 712 psiconv_free_sheet_line_list(section->col_default_layouts);
713 psiconv_free_sheet_grid_section(section->grid);
646} 714}
647 715
648void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet) 716void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet)
649{ 717{
650 if (sheet) { 718 if (sheet) {
… …
690{ 758{
691 if (list) 759 if (list)
692 psiconv_list_free_el(list,psiconv_free_formula_aux); 760 psiconv_list_free_el(list,psiconv_free_formula_aux);
693} 761}
694 762
763void psiconv_free_sheet_name_section(psiconv_sheet_name_section section)
764{
765 if (section) {
766 if(section->name)
767 free(section->name);
768 free(section);
769 }
770}
771
772void psiconv_free_sheet_info_section(psiconv_sheet_info_section section)
773{
774 if (section) {
775 free(section);
776 }
777}
778
779void psiconv_free_sheet_variable_aux(void * variable)
780{
781 psiconv_sheet_variable var = variable;
782 if (var->name)
783 free(var->name);
784 if (var->type == psiconv_var_string)
785 free(var->data.dat_string);
786}
787
788void psiconv_free_sheet_variable(psiconv_sheet_variable var)
789{
790 if (var) {
791 psiconv_free_sheet_variable_aux(var);
792 free(var);
793 }
794}
795
796void psiconv_free_sheet_variable_list(psiconv_sheet_variable_list list)
797{
798 if (list)
799 psiconv_list_free_el(list,psiconv_free_sheet_variable_aux);
800}
801
695void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section) 802void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section)
696{ 803{
697 if (section) { 804 if (section) {
698 psiconv_free_formula_list(section->formulas); 805 psiconv_free_formula_list(section->formulas);
699 psiconv_free_sheet_worksheet_list(section->worksheets); 806 psiconv_free_sheet_worksheet_list(section->worksheets);
807 psiconv_free_sheet_name_section(section->name);
808 psiconv_free_sheet_info_section(section->info);
809 psiconv_free_sheet_variable_list(section->variables);
700 free(section); 810 free(section);
701 } 811 }
702} 812}
703 813
704void psiconv_free_sheet_f(psiconv_sheet_f file) 814void psiconv_free_sheet_f(psiconv_sheet_f file)
… …
1236psiconv_sketch_section psiconv_empty_sketch_section(void) 1346psiconv_sketch_section psiconv_empty_sketch_section(void)
1237{ 1347{
1238 psiconv_sketch_section result; 1348 psiconv_sketch_section result;
1239 if (!(result = malloc(sizeof(*result)))) 1349 if (!(result = malloc(sizeof(*result))))
1240 goto ERROR1; 1350 goto ERROR1;
1241 result->form_xsize = 320; 1351 result->displayed_xsize = 320;
1242 result->form_ysize = 200; 1352 result->displayed_ysize = 200;
1243 result->picture_x_offset = result->picture_y_offset = result->picture_xsize = 1353 result->picture_data_x_offset = result->picture_data_y_offset =
1244 result->picture_ysize = 0; 1354 result->form_xsize = result->form_ysize =
1355 result->displayed_size_x_offset = result->displayed_size_y_offset = 0;
1245 result->magnification_x = result->magnification_y = 1.0; 1356 result->magnification_x = result->magnification_y = 1.0;
1246 result->cut_left = result->cut_right = result->cut_top = 1357 result->cut_left = result->cut_right = result->cut_top =
1247 result->cut_bottom = 0.0; 1358 result->cut_bottom = 0.0;
1248 if (!(result->picture = psiconv_empty_paint_data_section())) 1359 if (!(result->picture = psiconv_empty_paint_data_section()))
1249 goto ERROR2; 1360 goto ERROR2;
Legend:
Removed from v.128  
changed lines
  Added in v.171
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26