/[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 163
… …
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{
… …
439 free(section->name); 473 free(section->name);
440 free(section); 474 free(section);
441 } 475 }
442} 476}
443 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_object(psiconv_object object)
494{
495 if (object) {
496 psiconv_free_object_icon_section(object->icon);
497 psiconv_free_object_display_section(object->display);
498 psiconv_free_file(object->object);
499 free(object);
500 }
501}
502
444void psiconv_free_in_line_layout_aux(void * layout) 503void psiconv_free_in_line_layout_aux(void * layout)
445{ 504{
446 psiconv_free_character_layout(((psiconv_in_line_layout) layout)->layout); 505 psiconv_free_character_layout(((psiconv_in_line_layout) layout)->layout);
506 psiconv_free_object(((psiconv_in_line_layout) layout)->object);
447} 507}
448 508
449void psiconv_free_in_line_layout(psiconv_in_line_layout layout) 509void psiconv_free_in_line_layout(psiconv_in_line_layout layout)
450{ 510{
451 if (layout) { 511 if (layout) {
… …
561 psiconv_free_paragraph_layout(layout->paragraph); 621 psiconv_free_paragraph_layout(layout->paragraph);
562 psiconv_free_character_layout(layout->character); 622 psiconv_free_character_layout(layout->character);
563 psiconv_free_sheet_numberformat(layout->numberformat); 623 psiconv_free_sheet_numberformat(layout->numberformat);
564} 624}
565 625
626void psiconv_free_sheet_cell_aux(void *cell)
627{
628 psiconv_sheet_cell data = cell;
629
630 psiconv_free_sheet_cell_layout(data->layout);
631
632 if ((data->type == psiconv_cell_string) && (data->data.dat_string))
633 free(data->data.dat_string);
634}
635
566void psiconv_free_sheet_cell(psiconv_sheet_cell cell) 636void psiconv_free_sheet_cell(psiconv_sheet_cell cell)
567{ 637{
568 if (cell) { 638 if (cell) {
569 psiconv_free_sheet_cell_layout(cell->layout); 639 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); 640 free(cell);
574 } 641 }
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} 642}
583 643
584void psiconv_free_sheet_cell_list(psiconv_sheet_cell_list list) 644void psiconv_free_sheet_cell_list(psiconv_sheet_cell_list list)
585{ 645{
586 if (list) 646 if (list)
587 psiconv_list_free_el(list,psiconv_free_sheet_cell_aux); 647 psiconv_list_free_el(list,psiconv_free_sheet_cell_aux);
648}
649
650void psiconv_free_sheet_line_aux(void *line)
651{
652 psiconv_sheet_line data = line;
653
654 psiconv_free_sheet_cell_layout(data->layout);
655}
656
657void psiconv_free_sheet_line(psiconv_sheet_line line)
658{
659 if (line) {
660 psiconv_free_sheet_line_aux(line);
661 free(line);
662 }
663}
664
665
666void psiconv_free_sheet_line_list(psiconv_sheet_line_list list)
667{
668 if (list)
669 psiconv_list_free_el(list,psiconv_free_sheet_line_aux);
670}
671
672void psiconv_free_sheet_grid_break_list(psiconv_sheet_grid_break_list list)
673{
674 if (list)
675 psiconv_list_free(list);
676}
677
678void psiconv_free_sheet_grid_size(psiconv_sheet_grid_size s)
679{
680 if (s)
681 free(s);
682}
683
684void psiconv_free_sheet_grid_size_list(psiconv_sheet_grid_size_list list)
685{
686 if (list)
687 psiconv_list_free(list);
688}
689
690void psiconv_free_sheet_grid_section(psiconv_sheet_grid_section sec)
691{
692 if (sec) {
693 psiconv_free_sheet_grid_size_list(sec->row_heights);
694 psiconv_free_sheet_grid_size_list(sec->column_heights);
695 psiconv_free_sheet_grid_break_list(sec->row_page_breaks);
696 psiconv_free_sheet_grid_break_list(sec->column_page_breaks);
697 free(sec);
698 }
588} 699}
589 700
590void psiconv_free_sheet_worksheet_aux (void *data) 701void psiconv_free_sheet_worksheet_aux (void *data)
591{ 702{
592 psiconv_sheet_worksheet section = data; 703 psiconv_sheet_worksheet section = data;
593 psiconv_free_sheet_cell_layout(section->default_layout); 704 psiconv_free_sheet_cell_layout(section->default_layout);
594 psiconv_free_sheet_cell_list(section->cells); 705 psiconv_free_sheet_cell_list(section->cells);
706 psiconv_free_sheet_line_list(section->row_default_layouts);
707 psiconv_free_sheet_line_list(section->col_default_layouts);
708 psiconv_free_sheet_grid_section(section->grid);
595} 709}
596 710
597void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet) 711void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet)
598{ 712{
599 if (sheet) { 713 if (sheet) {
… …
639{ 753{
640 if (list) 754 if (list)
641 psiconv_list_free_el(list,psiconv_free_formula_aux); 755 psiconv_list_free_el(list,psiconv_free_formula_aux);
642} 756}
643 757
758void psiconv_free_sheet_name_section(psiconv_sheet_name_section section)
759{
760 if (section) {
761 if(section->name)
762 free(section->name);
763 free(section);
764 }
765}
766
767void psiconv_free_sheet_info_section(psiconv_sheet_info_section section)
768{
769 if (section) {
770 free(section);
771 }
772}
773
774void psiconv_free_sheet_variable_aux(void * variable)
775{
776 psiconv_sheet_variable var = variable;
777 if (var->name)
778 free(var->name);
779 if (var->type == psiconv_var_string)
780 free(var->data.dat_string);
781}
782
783void psiconv_free_sheet_variable(psiconv_sheet_variable var)
784{
785 if (var) {
786 psiconv_free_sheet_variable_aux(var);
787 free(var);
788 }
789}
790
791void psiconv_free_sheet_variable_list(psiconv_sheet_variable_list list)
792{
793 if (list)
794 psiconv_list_free_el(list,psiconv_free_sheet_variable_aux);
795}
796
644void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section) 797void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section)
645{ 798{
646 if (section) { 799 if (section) {
647 psiconv_free_formula_list(section->formulas); 800 psiconv_free_formula_list(section->formulas);
648 psiconv_free_sheet_worksheet_list(section->worksheets); 801 psiconv_free_sheet_worksheet_list(section->worksheets);
802 psiconv_free_sheet_name_section(section->name);
803 psiconv_free_sheet_info_section(section->info);
804 psiconv_free_sheet_variable_list(section->variables);
649 free(section); 805 free(section);
650 } 806 }
651} 807}
652 808
653void psiconv_free_sheet_f(psiconv_sheet_f file) 809void psiconv_free_sheet_f(psiconv_sheet_f file)
… …
1185psiconv_sketch_section psiconv_empty_sketch_section(void) 1341psiconv_sketch_section psiconv_empty_sketch_section(void)
1186{ 1342{
1187 psiconv_sketch_section result; 1343 psiconv_sketch_section result;
1188 if (!(result = malloc(sizeof(*result)))) 1344 if (!(result = malloc(sizeof(*result))))
1189 goto ERROR1; 1345 goto ERROR1;
1190 result->form_xsize = 320; 1346 result->displayed_xsize = 320;
1191 result->form_ysize = 200; 1347 result->displayed_ysize = 200;
1192 result->picture_x_offset = result->picture_y_offset = result->picture_xsize = 1348 result->picture_data_x_offset = result->picture_data_y_offset =
1193 result->picture_ysize = 0; 1349 result->form_xsize = result->form_ysize =
1350 result->displayed_size_x_offset = result->displayed_size_y_offset = 0;
1194 result->magnification_x = result->magnification_y = 1.0; 1351 result->magnification_x = result->magnification_y = 1.0;
1195 result->cut_left = result->cut_right = result->cut_top = 1352 result->cut_left = result->cut_right = result->cut_top =
1196 result->cut_bottom = 0.0; 1353 result->cut_bottom = 0.0;
1197 if (!(result->picture = psiconv_empty_paint_data_section())) 1354 if (!(result->picture = psiconv_empty_paint_data_section()))
1198 goto ERROR2; 1355 goto ERROR2;
Legend:
Removed from v.111  
changed lines
  Added in v.163
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26