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