/[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 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);
… …
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{
… …
468 free(section->name); 473 free(section->name);
469 free(section); 474 free(section);
470 } 475 }
471} 476}
472 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
473void psiconv_free_in_line_layout_aux(void * layout) 504void psiconv_free_in_line_layout_aux(void * layout)
474{ 505{
475 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);
476} 509}
477 510
478void psiconv_free_in_line_layout(psiconv_in_line_layout layout) 511void psiconv_free_in_line_layout(psiconv_in_line_layout layout)
479{ 512{
480 if (layout) { 513 if (layout) {
… …
629 psiconv_free_sheet_line_aux(line); 662 psiconv_free_sheet_line_aux(line);
630 free(line); 663 free(line);
631 } 664 }
632} 665}
633 666
667
634void psiconv_free_sheet_line_list(psiconv_sheet_line_list list) 668void psiconv_free_sheet_line_list(psiconv_sheet_line_list list)
635{ 669{
636 if (list) 670 if (list)
637 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 }
638} 701}
639 702
640void psiconv_free_sheet_worksheet_aux (void *data) 703void psiconv_free_sheet_worksheet_aux (void *data)
641{ 704{
642 psiconv_sheet_worksheet section = data; 705 psiconv_sheet_worksheet section = data;
643 psiconv_free_sheet_cell_layout(section->default_layout); 706 psiconv_free_sheet_cell_layout(section->default_layout);
644 psiconv_free_sheet_cell_list(section->cells); 707 psiconv_free_sheet_cell_list(section->cells);
645 psiconv_free_sheet_line_list(section->row_default_layouts); 708 psiconv_free_sheet_line_list(section->row_default_layouts);
646 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);
647} 711}
648 712
649void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet) 713void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet)
650{ 714{
651 if (sheet) { 715 if (sheet) {
… …
1279psiconv_sketch_section psiconv_empty_sketch_section(void) 1343psiconv_sketch_section psiconv_empty_sketch_section(void)
1280{ 1344{
1281 psiconv_sketch_section result; 1345 psiconv_sketch_section result;
1282 if (!(result = malloc(sizeof(*result)))) 1346 if (!(result = malloc(sizeof(*result))))
1283 goto ERROR1; 1347 goto ERROR1;
1284 result->form_xsize = 320; 1348 result->displayed_xsize = 320;
1285 result->form_ysize = 200; 1349 result->displayed_ysize = 200;
1286 result->picture_x_offset = result->picture_y_offset = result->picture_xsize = 1350 result->picture_data_x_offset = result->picture_data_y_offset =
1287 result->picture_ysize = 0; 1351 result->form_xsize = result->form_ysize =
1352 result->displayed_size_x_offset = result->displayed_size_y_offset = 0;
1288 result->magnification_x = result->magnification_y = 1.0; 1353 result->magnification_x = result->magnification_y = 1.0;
1289 result->cut_left = result->cut_right = result->cut_top = 1354 result->cut_left = result->cut_right = result->cut_top =
1290 result->cut_bottom = 0.0; 1355 result->cut_bottom = 0.0;
1291 if (!(result->picture = psiconv_empty_paint_data_section())) 1356 if (!(result->picture = psiconv_empty_paint_data_section()))
1292 goto ERROR2; 1357 goto ERROR2;
Legend:
Removed from v.129  
changed lines
  Added in v.167
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26