/[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 142 Revision 171
39static void psiconv_free_paint_data_section_aux(void * section); 39static void psiconv_free_paint_data_section_aux(void * section);
40static void psiconv_free_clipart_section_aux(void * section); 40static void psiconv_free_clipart_section_aux(void * section);
41static void psiconv_free_formula_aux(void *data); 41static void psiconv_free_formula_aux(void *data);
42static 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); 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);
44 47
45static psiconv_word_styles_section psiconv_empty_word_styles_section(void); 48static psiconv_word_styles_section psiconv_empty_word_styles_section(void);
46static psiconv_text_and_layout psiconv_empty_text_and_layout(void); 49static psiconv_text_and_layout psiconv_empty_text_and_layout(void);
47static psiconv_texted_section psiconv_empty_texted_section(void); 50static psiconv_texted_section psiconv_empty_texted_section(void);
48static psiconv_page_header psiconv_empty_page_header(void); 51static psiconv_page_header psiconv_empty_page_header(void);
442{ 445{
443 if (styles) { 446 if (styles) {
444 psiconv_free_word_style(styles->normal); 447 psiconv_free_word_style(styles->normal);
445 if (styles->styles) 448 if (styles->styles)
446 psiconv_list_free_el(styles->styles,psiconv_free_style_aux); 449 psiconv_list_free_el(styles->styles,psiconv_free_style_aux);
450 free(styles);
447 } 451 }
448} 452}
449 453
450void psiconv_free_header_section(psiconv_header_section header) 454void psiconv_free_header_section(psiconv_header_section header)
451{ 455{
472 free(section->name); 476 free(section->name);
473 free(section); 477 free(section);
474 } 478 }
475} 479}
476 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
477void psiconv_free_in_line_layout_aux(void * layout) 507void psiconv_free_in_line_layout_aux(void * layout)
478{ 508{
479 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);
480} 512}
481 513
482void psiconv_free_in_line_layout(psiconv_in_line_layout layout) 514void psiconv_free_in_line_layout(psiconv_in_line_layout layout)
483{ 515{
484 if (layout) { 516 if (layout) {
1314psiconv_sketch_section psiconv_empty_sketch_section(void) 1346psiconv_sketch_section psiconv_empty_sketch_section(void)
1315{ 1347{
1316 psiconv_sketch_section result; 1348 psiconv_sketch_section result;
1317 if (!(result = malloc(sizeof(*result)))) 1349 if (!(result = malloc(sizeof(*result))))
1318 goto ERROR1; 1350 goto ERROR1;
1319 result->form_xsize = 320; 1351 result->displayed_xsize = 320;
1320 result->form_ysize = 200; 1352 result->displayed_ysize = 200;
1321 result->picture_x_offset = result->picture_y_offset = result->picture_xsize = 1353 result->picture_data_x_offset = result->picture_data_y_offset =
1322 result->picture_ysize = 0; 1354 result->form_xsize = result->form_ysize =
1355 result->displayed_size_x_offset = result->displayed_size_y_offset = 0;
1323 result->magnification_x = result->magnification_y = 1.0; 1356 result->magnification_x = result->magnification_y = 1.0;
1324 result->cut_left = result->cut_right = result->cut_top = 1357 result->cut_left = result->cut_right = result->cut_top =
1325 result->cut_bottom = 0.0; 1358 result->cut_bottom = 0.0;
1326 if (!(result->picture = psiconv_empty_paint_data_section())) 1359 if (!(result->picture = psiconv_empty_paint_data_section()))
1327 goto ERROR2; 1360 goto ERROR2;

Legend:
Removed from v.142  
changed lines
  Added in v.171

frodo@frodo.looijaard.name
ViewVC Help
Powered by ViewVC 1.1.26