/[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 134
… …
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); 37static void psiconv_free_formula_aux(void *data);
38static void psiconv_free_sheet_worksheet_aux (void *data); 38static void psiconv_free_sheet_worksheet_aux (void *data);
39static void psiconv_free_sheet_variable_aux(void * variable);
39 40
40static psiconv_word_styles_section psiconv_empty_word_styles_section(void); 41static psiconv_word_styles_section psiconv_empty_word_styles_section(void);
41static psiconv_text_and_layout psiconv_empty_text_and_layout(void); 42static psiconv_text_and_layout psiconv_empty_text_and_layout(void);
42static psiconv_texted_section psiconv_empty_texted_section(void); 43static psiconv_texted_section psiconv_empty_texted_section(void);
43static psiconv_page_header psiconv_empty_page_header(void); 44static psiconv_page_header psiconv_empty_page_header(void);
… …
317 return ss->normal; 318 return ss->normal;
318 else 319 else
319 return psiconv_list_get(ss->styles,0xff - nr); 320 return psiconv_list_get(ss->styles,0xff - nr);
320} 321}
321 322
323psiconv_formula psiconv_get_formula (psiconv_formula_list ss, int nr)
324{
325 return psiconv_list_get(ss,psiconv_list_length(ss)-nr-1);
326}
327
328/* TODO: What if a cell is both in a default row and a default column?!? */
329psiconv_sheet_cell_layout psiconv_get_default_layout
330 (psiconv_sheet_line_list row_defaults,
331 psiconv_sheet_line_list col_defaults,
332 psiconv_sheet_cell_layout cell_default,
333 int row,int col)
334{
335 int i;
336 psiconv_sheet_line line;
337 for (i = 0;i < psiconv_list_length(row_defaults);i++) {
338 line = psiconv_list_get(row_defaults,i);
339 if (line->position == row)
340 return line->layout;
341 }
342 for (i = 0;i < psiconv_list_length(col_defaults);i++) {
343 line = psiconv_list_get(col_defaults,i);
344 if (line->position == col)
345 return line->layout;
346 }
347 return cell_default;
348}
349
350
322void psiconv_free_color (psiconv_color color) 351void psiconv_free_color (psiconv_color color)
323{ 352{
324 if (color) 353 if (color)
325 free(color); 354 free(color);
326} 355}
… …
561 psiconv_free_paragraph_layout(layout->paragraph); 590 psiconv_free_paragraph_layout(layout->paragraph);
562 psiconv_free_character_layout(layout->character); 591 psiconv_free_character_layout(layout->character);
563 psiconv_free_sheet_numberformat(layout->numberformat); 592 psiconv_free_sheet_numberformat(layout->numberformat);
564} 593}
565 594
595void psiconv_free_sheet_cell_aux(void *cell)
596{
597 psiconv_sheet_cell data = cell;
598
599 psiconv_free_sheet_cell_layout(data->layout);
600
601 if ((data->type == psiconv_cell_string) && (data->data.dat_string))
602 free(data->data.dat_string);
603}
604
566void psiconv_free_sheet_cell(psiconv_sheet_cell cell) 605void psiconv_free_sheet_cell(psiconv_sheet_cell cell)
567{ 606{
568 if (cell) { 607 if (cell) {
569 psiconv_free_sheet_cell_layout(cell->layout); 608 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); 609 free(cell);
574 } 610 }
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} 611}
583 612
584void psiconv_free_sheet_cell_list(psiconv_sheet_cell_list list) 613void psiconv_free_sheet_cell_list(psiconv_sheet_cell_list list)
585{ 614{
586 if (list) 615 if (list)
587 psiconv_list_free_el(list,psiconv_free_sheet_cell_aux); 616 psiconv_list_free_el(list,psiconv_free_sheet_cell_aux);
617}
618
619void psiconv_free_sheet_line_aux(void *line)
620{
621 psiconv_sheet_line data = line;
622
623 psiconv_free_sheet_cell_layout(data->layout);
624}
625
626void psiconv_free_sheet_line(psiconv_sheet_line line)
627{
628 if (line) {
629 psiconv_free_sheet_line_aux(line);
630 free(line);
631 }
632}
633
634
635void psiconv_free_sheet_line_list(psiconv_sheet_line_list list)
636{
637 if (list)
638 psiconv_list_free_el(list,psiconv_free_sheet_line_aux);
639}
640
641void psiconv_free_sheet_grid_break_list(psiconv_sheet_grid_break_list list)
642{
643 if (list)
644 psiconv_list_free(list);
645}
646
647void psiconv_free_sheet_grid_size(psiconv_sheet_grid_size s)
648{
649 if (s)
650 free(s);
651}
652
653void psiconv_free_sheet_grid_size_list(psiconv_sheet_grid_size_list list)
654{
655 if (list)
656 psiconv_list_free(list);
657}
658
659void psiconv_free_sheet_grid_section(psiconv_sheet_grid_section sec)
660{
661 if (sec) {
662 psiconv_free_sheet_grid_size_list(sec->row_heights);
663 psiconv_free_sheet_grid_size_list(sec->column_heights);
664 psiconv_free_sheet_grid_break_list(sec->row_page_breaks);
665 psiconv_free_sheet_grid_break_list(sec->column_page_breaks);
666 free(sec);
667 }
588} 668}
589 669
590void psiconv_free_sheet_worksheet_aux (void *data) 670void psiconv_free_sheet_worksheet_aux (void *data)
591{ 671{
592 psiconv_sheet_worksheet section = data; 672 psiconv_sheet_worksheet section = data;
593 psiconv_free_sheet_cell_layout(section->default_layout); 673 psiconv_free_sheet_cell_layout(section->default_layout);
594 psiconv_free_sheet_cell_list(section->cells); 674 psiconv_free_sheet_cell_list(section->cells);
675 psiconv_free_sheet_line_list(section->row_default_layouts);
676 psiconv_free_sheet_line_list(section->col_default_layouts);
677 psiconv_free_sheet_grid_section(section->grid);
595} 678}
596 679
597void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet) 680void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet)
598{ 681{
599 if (sheet) { 682 if (sheet) {
… …
639{ 722{
640 if (list) 723 if (list)
641 psiconv_list_free_el(list,psiconv_free_formula_aux); 724 psiconv_list_free_el(list,psiconv_free_formula_aux);
642} 725}
643 726
727void psiconv_free_sheet_name_section(psiconv_sheet_name_section section)
728{
729 if (section) {
730 if(section->name)
731 free(section->name);
732 free(section);
733 }
734}
735
736void psiconv_free_sheet_info_section(psiconv_sheet_info_section section)
737{
738 if (section) {
739 free(section);
740 }
741}
742
743void psiconv_free_sheet_variable_aux(void * variable)
744{
745 psiconv_sheet_variable var = variable;
746 if (var->name)
747 free(var->name);
748 if (var->type == psiconv_var_string)
749 free(var->data.dat_string);
750}
751
752void psiconv_free_sheet_variable(psiconv_sheet_variable var)
753{
754 if (var) {
755 psiconv_free_sheet_variable_aux(var);
756 free(var);
757 }
758}
759
760void psiconv_free_sheet_variable_list(psiconv_sheet_variable_list list)
761{
762 if (list)
763 psiconv_list_free_el(list,psiconv_free_sheet_variable_aux);
764}
765
644void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section) 766void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section)
645{ 767{
646 if (section) { 768 if (section) {
647 psiconv_free_formula_list(section->formulas); 769 psiconv_free_formula_list(section->formulas);
648 psiconv_free_sheet_worksheet_list(section->worksheets); 770 psiconv_free_sheet_worksheet_list(section->worksheets);
771 psiconv_free_sheet_name_section(section->name);
772 psiconv_free_sheet_info_section(section->info);
773 psiconv_free_sheet_variable_list(section->variables);
649 free(section); 774 free(section);
650 } 775 }
651} 776}
652 777
653void psiconv_free_sheet_f(psiconv_sheet_f file) 778void psiconv_free_sheet_f(psiconv_sheet_f file)
Legend:
Removed from v.111  
changed lines
  Added in v.134
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26