/[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 134 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);
… …
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);
39static void psiconv_free_sheet_variable_aux(void * variable); 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);
46static void psiconv_free_sheet_worksheet_aux (void *data);
40 47
41static psiconv_word_styles_section psiconv_empty_word_styles_section(void); 48static psiconv_word_styles_section psiconv_empty_word_styles_section(void);
42static psiconv_text_and_layout psiconv_empty_text_and_layout(void); 49static psiconv_text_and_layout psiconv_empty_text_and_layout(void);
43static psiconv_texted_section psiconv_empty_texted_section(void); 50static psiconv_texted_section psiconv_empty_texted_section(void);
44static psiconv_page_header psiconv_empty_page_header(void); 51static psiconv_page_header psiconv_empty_page_header(void);
… …
438{ 445{
439 if (styles) { 446 if (styles) {
440 psiconv_free_word_style(styles->normal); 447 psiconv_free_word_style(styles->normal);
441 if (styles->styles) 448 if (styles->styles)
442 psiconv_list_free_el(styles->styles,psiconv_free_style_aux); 449 psiconv_list_free_el(styles->styles,psiconv_free_style_aux);
450 free(styles);
443 } 451 }
444} 452}
445 453
446void psiconv_free_header_section(psiconv_header_section header) 454void psiconv_free_header_section(psiconv_header_section header)
447{ 455{
… …
468 free(section->name); 476 free(section->name);
469 free(section); 477 free(section);
470 } 478 }
471} 479}
472 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
473void psiconv_free_in_line_layout_aux(void * layout) 507void psiconv_free_in_line_layout_aux(void * layout)
474{ 508{
475 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);
476} 512}
477 513
478void psiconv_free_in_line_layout(psiconv_in_line_layout layout) 514void psiconv_free_in_line_layout(psiconv_in_line_layout layout)
479{ 515{
480 if (layout) { 516 if (layout) {
… …
1310psiconv_sketch_section psiconv_empty_sketch_section(void) 1346psiconv_sketch_section psiconv_empty_sketch_section(void)
1311{ 1347{
1312 psiconv_sketch_section result; 1348 psiconv_sketch_section result;
1313 if (!(result = malloc(sizeof(*result)))) 1349 if (!(result = malloc(sizeof(*result))))
1314 goto ERROR1; 1350 goto ERROR1;
1315 result->form_xsize = 320; 1351 result->displayed_xsize = 320;
1316 result->form_ysize = 200; 1352 result->displayed_ysize = 200;
1317 result->picture_x_offset = result->picture_y_offset = result->picture_xsize = 1353 result->picture_data_x_offset = result->picture_data_y_offset =
1318 result->picture_ysize = 0; 1354 result->form_xsize = result->form_ysize =
1355 result->displayed_size_x_offset = result->displayed_size_y_offset = 0;
1319 result->magnification_x = result->magnification_y = 1.0; 1356 result->magnification_x = result->magnification_y = 1.0;
1320 result->cut_left = result->cut_right = result->cut_top = 1357 result->cut_left = result->cut_right = result->cut_top =
1321 result->cut_bottom = 0.0; 1358 result->cut_bottom = 0.0;
1322 if (!(result->picture = psiconv_empty_paint_data_section())) 1359 if (!(result->picture = psiconv_empty_paint_data_section()))
1323 goto ERROR2; 1360 goto ERROR2;
Legend:
Removed from v.134  
changed lines
  Added in v.171
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26