/[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 98 Revision 125
… …
32static void psiconv_free_style_aux(void *style); 32static void psiconv_free_style_aux(void *style);
33static void psiconv_free_in_line_layout_aux(void * layout); 33static void psiconv_free_in_line_layout_aux(void * layout);
34static void psiconv_free_paragraph_aux(void * paragraph); 34static void psiconv_free_paragraph_aux(void * paragraph);
35static void psiconv_free_paint_data_section_aux(void * section); 35static void psiconv_free_paint_data_section_aux(void * section);
36static void psiconv_free_clipart_section_aux(void * section); 36static void psiconv_free_clipart_section_aux(void * section);
37static void psiconv_free_formula_aux(void *data);
38static void psiconv_free_sheet_worksheet_aux (void *data);
37 39
38static psiconv_word_styles_section psiconv_empty_word_styles_section(void); 40static psiconv_word_styles_section psiconv_empty_word_styles_section(void);
39static psiconv_text_and_layout psiconv_empty_text_and_layout(void); 41static psiconv_text_and_layout psiconv_empty_text_and_layout(void);
40static psiconv_texted_section psiconv_empty_texted_section(void); 42static psiconv_texted_section psiconv_empty_texted_section(void);
41static psiconv_page_header psiconv_empty_page_header(void); 43static psiconv_page_header psiconv_empty_page_header(void);
… …
150 0.0, /* space_below */ 152 0.0, /* space_below */
151 psiconv_bool_false, /* keep_together */ 153 psiconv_bool_false, /* keep_together */
152 psiconv_bool_false, /* keep_with_next */ 154 psiconv_bool_false, /* keep_with_next */
153 psiconv_bool_false, /* on_next_page */ 155 psiconv_bool_false, /* on_next_page */
154 psiconv_bool_false, /* no_widow_protection */ 156 psiconv_bool_false, /* no_widow_protection */
157 psiconv_bool_false, /* wrap_to_fit_cell */
155 0.0, /* left_margin */ 158 0.0, /* left_margin */
156 &bullet, /* bullet */ 159 &bullet, /* bullet */
157 &no_border, /* left_border */ 160 &no_border, /* left_border */
158 &no_border, /* right_border */ 161 &no_border, /* right_border */
159 &no_border, /* top_border */ 162 &no_border, /* top_border */
… …
314 return ss->normal; 317 return ss->normal;
315 else 318 else
316 return psiconv_list_get(ss->styles,0xff - nr); 319 return psiconv_list_get(ss->styles,0xff - nr);
317} 320}
318 321
322psiconv_formula psiconv_get_formula (psiconv_formula_list ss, int nr)
323{
324 return psiconv_list_get(ss,psiconv_list_length(ss)-nr-1);
325}
326
327
319void psiconv_free_color (psiconv_color color) 328void psiconv_free_color (psiconv_color color)
320{ 329{
321 if (color) 330 if (color)
322 free(color); 331 free(color);
323} 332}
… …
545{ 554{
546 if (section) 555 if (section)
547 free(section); 556 free(section);
548} 557}
549 558
550/* TODO: Free sublists, strings etc. depending on formula->type */ 559void psiconv_free_sheet_numberformat(psiconv_sheet_numberformat numberformat)
560{
561 if (numberformat)
562 free(numberformat);
563}
564
565void psiconv_free_sheet_cell_layout(psiconv_sheet_cell_layout layout)
566{
567 psiconv_free_paragraph_layout(layout->paragraph);
568 psiconv_free_character_layout(layout->character);
569 psiconv_free_sheet_numberformat(layout->numberformat);
570}
571
572void psiconv_free_sheet_cell_aux(void *cell)
573{
574 psiconv_sheet_cell data = cell;
575
576 psiconv_free_sheet_cell_layout(data->layout);
577
578 if ((data->type == psiconv_cell_string) && (data->data.dat_string))
579 free(data->data.dat_string);
580}
581
582void psiconv_free_sheet_cell(psiconv_sheet_cell cell)
583{
584 if (cell) {
585 psiconv_free_sheet_cell_aux(cell);
586 free(cell);
587 }
588}
589
590void psiconv_free_sheet_cell_list(psiconv_sheet_cell_list list)
591{
592 if (list)
593 psiconv_list_free_el(list,psiconv_free_sheet_cell_aux);
594}
595
596void psiconv_free_sheet_worksheet_aux (void *data)
597{
598 psiconv_sheet_worksheet section = data;
599 psiconv_free_sheet_cell_layout(section->default_layout);
600 psiconv_free_sheet_cell_list(section->cells);
601}
602
603void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet)
604{
605 if (sheet) {
606 psiconv_free_sheet_worksheet_aux(sheet);
607 free(sheet);
608 }
609}
610
611void psiconv_free_sheet_worksheet_list(psiconv_sheet_worksheet_list list)
612{
613 if (list)
614 psiconv_list_free_el(list,psiconv_free_sheet_worksheet_aux);
615}
616
617void psiconv_free_formula_aux(void *data)
618{
619 psiconv_formula formula;
620 formula = data;
621 if (formula->type == psiconv_formula_dat_string)
622 free(formula->data.dat_string);
623 else if ((formula->type != psiconv_formula_dat_int) &&
624 (formula->type != psiconv_formula_dat_var) &&
625 (formula->type != psiconv_formula_dat_float) &&
626 (formula->type != psiconv_formula_dat_cellref) &&
627 (formula->type != psiconv_formula_dat_cellblock) &&
628 (formula->type != psiconv_formula_dat_vcellblock) &&
629 (formula->type != psiconv_formula_mark_opsep) &&
630 (formula->type != psiconv_formula_mark_opend) &&
631 (formula->type != psiconv_formula_mark_eof) &&
632 (formula->type != psiconv_formula_unknown))
633 psiconv_free_formula_list(formula->data.fun_operands);
634}
635
551void psiconv_free_formula(psiconv_formula formula) 636void psiconv_free_formula(psiconv_formula formula)
552{ 637{
553 if (formula) 638 if (formula) {
639 psiconv_free_formula_aux(formula);
554 free(formula); 640 free(formula);
641 }
555} 642}
556 643
557void psiconv_free_formula_list(psiconv_formula_list list) 644void psiconv_free_formula_list(psiconv_formula_list list)
558{ 645{
559 if (list) 646 if (list)
560 psiconv_list_free(list); 647 psiconv_list_free_el(list,psiconv_free_formula_aux);
561} 648}
562 649
563void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section) 650void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section)
564{ 651{
565 if (section) { 652 if (section) {
566 psiconv_free_formula_list(section->formulas); 653 psiconv_free_formula_list(section->formulas);
654 psiconv_free_sheet_worksheet_list(section->worksheets);
567 free(section); 655 free(section);
568 } 656 }
569} 657}
570 658
571void psiconv_free_sheet_f(psiconv_sheet_f file) 659void psiconv_free_sheet_f(psiconv_sheet_f file)
Legend:
Removed from v.98  
changed lines
  Added in v.125
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26