/[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 78 Revision 142
… …
20#include "config.h" 20#include "config.h"
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"
26
27#ifdef DMALLOC
28#include <dmalloc.h>
29#endif
25 30
26static psiconv_color clone_color(psiconv_color color); 31static psiconv_color clone_color(psiconv_color color);
27static psiconv_font clone_font(psiconv_font font); 32static psiconv_font clone_font(psiconv_font font);
28static psiconv_border clone_border(psiconv_border border); 33static psiconv_border clone_border(psiconv_border border);
29static psiconv_bullet clone_bullet(psiconv_bullet bullet); 34static psiconv_bullet clone_bullet(psiconv_bullet bullet);
… …
31static void psiconv_free_style_aux(void *style); 36static void psiconv_free_style_aux(void *style);
32static void psiconv_free_in_line_layout_aux(void * layout); 37static void psiconv_free_in_line_layout_aux(void * layout);
33static void psiconv_free_paragraph_aux(void * paragraph); 38static void psiconv_free_paragraph_aux(void * paragraph);
34static void psiconv_free_paint_data_section_aux(void * section); 39static void psiconv_free_paint_data_section_aux(void * section);
35static 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);
42static void psiconv_free_sheet_worksheet_aux (void *data);
43static void psiconv_free_sheet_variable_aux(void * variable);
44
45static psiconv_word_styles_section psiconv_empty_word_styles_section(void);
46static psiconv_text_and_layout psiconv_empty_text_and_layout(void);
47static psiconv_texted_section psiconv_empty_texted_section(void);
48static psiconv_page_header psiconv_empty_page_header(void);
49static psiconv_page_layout_section psiconv_empty_page_layout_section(void);
50static psiconv_word_status_section psiconv_empty_word_status_section(void);
51static psiconv_word_f psiconv_empty_word_f(void);
52static psiconv_sheet_status_section psiconv_empty_sheet_status_section(void);
53static psiconv_formula_list psiconv_empty_formula_list(void);
54static psiconv_sheet_workbook_section
55 psiconv_empty_sheet_workbook_section(void);
56static psiconv_sheet_f psiconv_empty_sheet_f(void);
57static psiconv_texted_f psiconv_empty_texted_f(void);
58static psiconv_paint_data_section psiconv_empty_paint_data_section(void);
59static psiconv_pictures psiconv_empty_pictures(void);
60static psiconv_mbm_f psiconv_empty_mbm_f(void);
61static psiconv_sketch_section psiconv_empty_sketch_section(void);
62static psiconv_sketch_f psiconv_empty_sketch_f(void);
63static psiconv_clipart_f psiconv_empty_clipart_f(void);
64static psiconv_cliparts psiconv_empty_cliparts(void);
65
36 66
37/* Note: these defaults seem to be hard-coded somewhere outside the 67/* Note: these defaults seem to be hard-coded somewhere outside the
38 files themself. */ 68 files themself. */
39psiconv_character_layout psiconv_basic_character_layout(void) 69psiconv_character_layout psiconv_basic_character_layout(void)
40{ 70{
… …
127 0.0, /* space_below */ 157 0.0, /* space_below */
128 psiconv_bool_false, /* keep_together */ 158 psiconv_bool_false, /* keep_together */
129 psiconv_bool_false, /* keep_with_next */ 159 psiconv_bool_false, /* keep_with_next */
130 psiconv_bool_false, /* on_next_page */ 160 psiconv_bool_false, /* on_next_page */
131 psiconv_bool_false, /* no_widow_protection */ 161 psiconv_bool_false, /* no_widow_protection */
162 psiconv_bool_false, /* wrap_to_fit_cell */
132 0.0, /* left_margin */ 163 0.0, /* left_margin */
133 &bullet, /* bullet */ 164 &bullet, /* bullet */
134 &no_border, /* left_border */ 165 &no_border, /* left_border */
135 &no_border, /* right_border */ 166 &no_border, /* right_border */
136 &no_border, /* top_border */ 167 &no_border, /* top_border */
… …
291 return ss->normal; 322 return ss->normal;
292 else 323 else
293 return psiconv_list_get(ss->styles,0xff - nr); 324 return psiconv_list_get(ss->styles,0xff - nr);
294} 325}
295 326
327psiconv_formula psiconv_get_formula (psiconv_formula_list ss, int nr)
328{
329 return psiconv_list_get(ss,psiconv_list_length(ss)-nr-1);
330}
331
332/* TODO: What if a cell is both in a default row and a default column?!? */
333psiconv_sheet_cell_layout psiconv_get_default_layout
334 (psiconv_sheet_line_list row_defaults,
335 psiconv_sheet_line_list col_defaults,
336 psiconv_sheet_cell_layout cell_default,
337 int row,int col)
338{
339 int i;
340 psiconv_sheet_line line;
341 for (i = 0;i < psiconv_list_length(row_defaults);i++) {
342 line = psiconv_list_get(row_defaults,i);
343 if (line->position == row)
344 return line->layout;
345 }
346 for (i = 0;i < psiconv_list_length(col_defaults);i++) {
347 line = psiconv_list_get(col_defaults,i);
348 if (line->position == col)
349 return line->layout;
350 }
351 return cell_default;
352}
353
354
296void psiconv_free_color (psiconv_color color) 355void psiconv_free_color (psiconv_color color)
297{ 356{
298 if (color) 357 if (color)
299 free(color); 358 free(color);
300} 359}
… …
512 if (file) { 571 if (file) {
513 psiconv_free_page_layout_section(file->page_sec); 572 psiconv_free_page_layout_section(file->page_sec);
514 psiconv_free_text_and_layout(file->paragraphs); 573 psiconv_free_text_and_layout(file->paragraphs);
515 psiconv_free_word_status_section(file->status_sec); 574 psiconv_free_word_status_section(file->status_sec);
516 psiconv_free_word_styles_section(file->styles_sec); 575 psiconv_free_word_styles_section(file->styles_sec);
576 free(file);
577 }
578}
579
580void psiconv_free_sheet_status_section(psiconv_sheet_status_section section)
581{
582 if (section)
583 free(section);
584}
585
586void psiconv_free_sheet_numberformat(psiconv_sheet_numberformat numberformat)
587{
588 if (numberformat)
589 free(numberformat);
590}
591
592void psiconv_free_sheet_cell_layout(psiconv_sheet_cell_layout layout)
593{
594 psiconv_free_paragraph_layout(layout->paragraph);
595 psiconv_free_character_layout(layout->character);
596 psiconv_free_sheet_numberformat(layout->numberformat);
597}
598
599void psiconv_free_sheet_cell_aux(void *cell)
600{
601 psiconv_sheet_cell data = cell;
602
603 psiconv_free_sheet_cell_layout(data->layout);
604
605 if ((data->type == psiconv_cell_string) && (data->data.dat_string))
606 free(data->data.dat_string);
607}
608
609void psiconv_free_sheet_cell(psiconv_sheet_cell cell)
610{
611 if (cell) {
612 psiconv_free_sheet_cell_aux(cell);
613 free(cell);
614 }
615}
616
617void psiconv_free_sheet_cell_list(psiconv_sheet_cell_list list)
618{
619 if (list)
620 psiconv_list_free_el(list,psiconv_free_sheet_cell_aux);
621}
622
623void psiconv_free_sheet_line_aux(void *line)
624{
625 psiconv_sheet_line data = line;
626
627 psiconv_free_sheet_cell_layout(data->layout);
628}
629
630void psiconv_free_sheet_line(psiconv_sheet_line line)
631{
632 if (line) {
633 psiconv_free_sheet_line_aux(line);
634 free(line);
635 }
636}
637
638
639void psiconv_free_sheet_line_list(psiconv_sheet_line_list list)
640{
641 if (list)
642 psiconv_list_free_el(list,psiconv_free_sheet_line_aux);
643}
644
645void psiconv_free_sheet_grid_break_list(psiconv_sheet_grid_break_list list)
646{
647 if (list)
648 psiconv_list_free(list);
649}
650
651void psiconv_free_sheet_grid_size(psiconv_sheet_grid_size s)
652{
653 if (s)
654 free(s);
655}
656
657void psiconv_free_sheet_grid_size_list(psiconv_sheet_grid_size_list list)
658{
659 if (list)
660 psiconv_list_free(list);
661}
662
663void psiconv_free_sheet_grid_section(psiconv_sheet_grid_section sec)
664{
665 if (sec) {
666 psiconv_free_sheet_grid_size_list(sec->row_heights);
667 psiconv_free_sheet_grid_size_list(sec->column_heights);
668 psiconv_free_sheet_grid_break_list(sec->row_page_breaks);
669 psiconv_free_sheet_grid_break_list(sec->column_page_breaks);
670 free(sec);
671 }
672}
673
674void psiconv_free_sheet_worksheet_aux (void *data)
675{
676 psiconv_sheet_worksheet section = data;
677 psiconv_free_sheet_cell_layout(section->default_layout);
678 psiconv_free_sheet_cell_list(section->cells);
679 psiconv_free_sheet_line_list(section->row_default_layouts);
680 psiconv_free_sheet_line_list(section->col_default_layouts);
681 psiconv_free_sheet_grid_section(section->grid);
682}
683
684void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet)
685{
686 if (sheet) {
687 psiconv_free_sheet_worksheet_aux(sheet);
688 free(sheet);
689 }
690}
691
692void psiconv_free_sheet_worksheet_list(psiconv_sheet_worksheet_list list)
693{
694 if (list)
695 psiconv_list_free_el(list,psiconv_free_sheet_worksheet_aux);
696}
697
698void psiconv_free_formula_aux(void *data)
699{
700 psiconv_formula formula;
701 formula = data;
702 if (formula->type == psiconv_formula_dat_string)
703 free(formula->data.dat_string);
704 else if ((formula->type != psiconv_formula_dat_int) &&
705 (formula->type != psiconv_formula_dat_var) &&
706 (formula->type != psiconv_formula_dat_float) &&
707 (formula->type != psiconv_formula_dat_cellref) &&
708 (formula->type != psiconv_formula_dat_cellblock) &&
709 (formula->type != psiconv_formula_dat_vcellblock) &&
710 (formula->type != psiconv_formula_mark_opsep) &&
711 (formula->type != psiconv_formula_mark_opend) &&
712 (formula->type != psiconv_formula_mark_eof) &&
713 (formula->type != psiconv_formula_unknown))
714 psiconv_free_formula_list(formula->data.fun_operands);
715}
716
717void psiconv_free_formula(psiconv_formula formula)
718{
719 if (formula) {
720 psiconv_free_formula_aux(formula);
721 free(formula);
722 }
723}
724
725void psiconv_free_formula_list(psiconv_formula_list list)
726{
727 if (list)
728 psiconv_list_free_el(list,psiconv_free_formula_aux);
729}
730
731void psiconv_free_sheet_name_section(psiconv_sheet_name_section section)
732{
733 if (section) {
734 if(section->name)
735 free(section->name);
736 free(section);
737 }
738}
739
740void psiconv_free_sheet_info_section(psiconv_sheet_info_section section)
741{
742 if (section) {
743 free(section);
744 }
745}
746
747void psiconv_free_sheet_variable_aux(void * variable)
748{
749 psiconv_sheet_variable var = variable;
750 if (var->name)
751 free(var->name);
752 if (var->type == psiconv_var_string)
753 free(var->data.dat_string);
754}
755
756void psiconv_free_sheet_variable(psiconv_sheet_variable var)
757{
758 if (var) {
759 psiconv_free_sheet_variable_aux(var);
760 free(var);
761 }
762}
763
764void psiconv_free_sheet_variable_list(psiconv_sheet_variable_list list)
765{
766 if (list)
767 psiconv_list_free_el(list,psiconv_free_sheet_variable_aux);
768}
769
770void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section)
771{
772 if (section) {
773 psiconv_free_formula_list(section->formulas);
774 psiconv_free_sheet_worksheet_list(section->worksheets);
775 psiconv_free_sheet_name_section(section->name);
776 psiconv_free_sheet_info_section(section->info);
777 psiconv_free_sheet_variable_list(section->variables);
778 free(section);
779 }
780}
781
782void psiconv_free_sheet_f(psiconv_sheet_f file)
783{
784 if (file) {
785 psiconv_free_page_layout_section(file->page_sec);
786 psiconv_free_sheet_status_section(file->status_sec);
787 psiconv_free_sheet_workbook_section(file->workbook_sec);
517 free(file); 788 free(file);
518 } 789 }
519} 790}
520 791
521void psiconv_free_texted_f(psiconv_texted_f file) 792void psiconv_free_texted_f(psiconv_texted_f file)
… …
620 psiconv_free_mbm_f((psiconv_mbm_f) file->file); 891 psiconv_free_mbm_f((psiconv_mbm_f) file->file);
621 else if (file->type == psiconv_sketch_file) 892 else if (file->type == psiconv_sketch_file)
622 psiconv_free_sketch_f((psiconv_sketch_f) file->file); 893 psiconv_free_sketch_f((psiconv_sketch_f) file->file);
623 else if (file->type == psiconv_clipart_file) 894 else if (file->type == psiconv_clipart_file)
624 psiconv_free_clipart_f((psiconv_clipart_f) file->file); 895 psiconv_free_clipart_f((psiconv_clipart_f) file->file);
896 else if (file->type == psiconv_sheet_file)
897 psiconv_free_sheet_f((psiconv_sheet_f) file->file);
625 free(file); 898 free(file);
626 } 899 }
627} 900}
628 901
629int psiconv_compare_color(const psiconv_color value1, 902int psiconv_compare_color(const psiconv_color value1,
… …
758 !psiconv_compare_font(value1->font,value2->font)) 1031 !psiconv_compare_font(value1->font,value2->font))
759 return 0; 1032 return 0;
760 else 1033 else
761 return 1; 1034 return 1;
762} 1035}
1036
1037
1038
1039psiconv_word_styles_section psiconv_empty_word_styles_section(void)
1040{
1041 psiconv_word_styles_section result;
1042 if (!(result = malloc(sizeof(*result))))
1043 goto ERROR1;
1044 if (!(result->styles = psiconv_list_new(sizeof(struct psiconv_word_style_s))))
1045 goto ERROR2;
1046 if (!(result->normal = malloc(sizeof(struct psiconv_word_style_s))))
1047 goto ERROR3;
1048 if (!(result->normal->character = psiconv_basic_character_layout()))
1049 goto ERROR4;
1050 if (!(result->normal->paragraph = psiconv_basic_paragraph_layout()))
1051 goto ERROR5;
1052 result->normal->hotkey = 'N';
1053 result->normal->name = NULL;
1054 result->normal->built_in = psiconv_bool_true;
1055 result->normal->outline_level = 0;
1056 return result;
1057ERROR5:
1058 psiconv_free_character_layout(result->normal->character);
1059ERROR4:
1060 free(result->normal);
1061ERROR3:
1062 psiconv_list_free(result->styles);
1063ERROR2:
1064 free(result);
1065ERROR1:
1066 return NULL;
1067}
1068
1069psiconv_text_and_layout psiconv_empty_text_and_layout(void)
1070{
1071 return psiconv_list_new(sizeof(struct psiconv_paragraph_s));
1072}
1073
1074psiconv_texted_section psiconv_empty_texted_section(void)
1075{
1076 psiconv_texted_section result;
1077 if (!(result = malloc(sizeof(*result))))
1078 goto ERROR1;
1079 if (!(result->paragraphs = psiconv_empty_text_and_layout()))
1080 goto ERROR2;
1081 return result;
1082ERROR2:
1083 free(result);
1084ERROR1:
1085 return NULL;
1086}
1087
1088psiconv_page_header psiconv_empty_page_header(void)
1089{
1090 psiconv_page_header result;
1091 if (!(result = malloc(sizeof(*result))))
1092 goto ERROR1;
1093 result->on_first_page = psiconv_bool_true;
1094 if (!(result->base_paragraph_layout = psiconv_basic_paragraph_layout()))
1095 goto ERROR2;
1096 if (!(result->base_character_layout = psiconv_basic_character_layout()))
1097 goto ERROR3;
1098 if (!(result->text = psiconv_empty_texted_section()))
1099 goto ERROR4;
1100 return result;
1101ERROR4:
1102 psiconv_free_character_layout(result->base_character_layout);
1103ERROR3:
1104 psiconv_free_paragraph_layout(result->base_paragraph_layout);
1105ERROR2:
1106 free(result);
1107ERROR1:
1108 return NULL;
1109}
1110
1111psiconv_page_layout_section psiconv_empty_page_layout_section(void)
1112{
1113 psiconv_page_layout_section result;
1114 if (!(result = malloc(sizeof(*result))))
1115 goto ERROR1;
1116 result->first_page_nr = 1;
1117 result->header_dist = result->footer_dist = 1.27;
1118 result->left_margin = result->right_margin = 3.175;
1119 result->top_margin = result->bottom_margin = 2.54;
1120 result->page_width = 21.0;
1121 result->page_height = 29.7;
1122 result->landscape = psiconv_bool_false;
1123 if (!(result->header = psiconv_empty_page_header()))
1124 goto ERROR2;
1125 if (!(result->footer = psiconv_empty_page_header()))
1126 goto ERROR3;
1127 return result;
1128ERROR3:
1129 psiconv_free_page_header(result->header);
1130ERROR2:
1131 free(result);
1132ERROR1:
1133 return NULL;
1134}
1135
1136psiconv_word_status_section psiconv_empty_word_status_section(void)
1137{
1138 psiconv_word_status_section result;
1139 if (!(result = malloc(sizeof(*result))))
1140 return NULL;
1141 result->show_tabs = result->show_spaces = result->show_paragraph_ends =
1142 result->show_hard_minus = result->show_hard_space =
1143 result->fit_lines_to_screen = psiconv_bool_false;
1144 result->show_full_pictures = result->show_full_graphs =
1145 result->show_top_toolbar = result->show_side_toolbar =
1146 psiconv_bool_true;
1147 result->cursor_position = 0;
1148 result->display_size = 1000;
1149 return result;
1150}
1151
1152psiconv_word_f psiconv_empty_word_f(void)
1153{
1154 psiconv_word_f result;
1155 if (!(result = malloc(sizeof(*result))))
1156 goto ERROR1;
1157 if (!(result->page_sec = psiconv_empty_page_layout_section()))
1158 goto ERROR2;
1159 if (!(result->paragraphs = psiconv_empty_text_and_layout()))
1160 goto ERROR3;
1161 if (!(result->status_sec = psiconv_empty_word_status_section()))
1162 goto ERROR4;
1163 if (!(result->styles_sec = psiconv_empty_word_styles_section()))
1164 goto ERROR5;
1165 return result;
1166ERROR5:
1167 psiconv_free_word_status_section(result->status_sec);
1168ERROR4:
1169 psiconv_free_text_and_layout(result->paragraphs);
1170ERROR3:
1171 psiconv_free_page_layout_section(result->page_sec);
1172ERROR2:
1173 free(result);
1174ERROR1:
1175 return NULL;
1176}
1177
1178psiconv_sheet_status_section psiconv_empty_sheet_status_section(void)
1179{
1180 psiconv_sheet_status_section result;
1181 if (!(result = malloc(sizeof(*result))))
1182 return NULL;
1183 result->show_horizontal_scrollbar = result->show_vertical_scrollbar =
1184 psiconv_triple_auto;
1185 result->show_graph = psiconv_bool_false;
1186 result->show_top_sheet_toolbar = result->show_side_sheet_toolbar =
1187 result->show_top_graph_toolbar = result->show_side_graph_toolbar =
1188 psiconv_bool_true;
1189 result->cursor_row = result->cursor_column = 0;
1190 result->sheet_display_size = result->graph_display_size = 1000;
1191 return result;
1192}
1193
1194psiconv_formula_list psiconv_empty_formula_list(void)
1195{
1196 return psiconv_list_new(sizeof(struct psiconv_formula_s));
1197}
1198
1199psiconv_sheet_workbook_section psiconv_empty_sheet_workbook_section(void)
1200{
1201 psiconv_sheet_workbook_section result;
1202 if (!(result = malloc(sizeof(*result))))
1203 goto ERROR1;
1204 if (!(result->formulas = psiconv_empty_formula_list()))
1205 goto ERROR2;
1206 return result;
1207ERROR2:
1208 free(result);
1209ERROR1:
1210 return NULL;
1211}
1212
1213
1214psiconv_sheet_f psiconv_empty_sheet_f(void)
1215{
1216 psiconv_sheet_f result;
1217 if (!(result = malloc(sizeof(*result))))
1218 goto ERROR1;
1219 if (!(result->page_sec = psiconv_empty_page_layout_section()))
1220 goto ERROR2;
1221 if (!(result->status_sec = psiconv_empty_sheet_status_section()))
1222 goto ERROR3;
1223 if (!(result->workbook_sec = psiconv_empty_sheet_workbook_section()))
1224 goto ERROR4;
1225 return result;
1226ERROR4:
1227 psiconv_free_sheet_status_section(result->status_sec);
1228ERROR3:
1229 psiconv_free_page_layout_section(result->page_sec);
1230ERROR2:
1231 free(result);
1232ERROR1:
1233 return NULL;
1234}
1235
1236psiconv_texted_f psiconv_empty_texted_f(void)
1237{
1238 psiconv_texted_f result;
1239 if (!(result = malloc(sizeof(*result))))
1240 goto ERROR1;
1241 if (!(result->page_sec = psiconv_empty_page_layout_section()))
1242 goto ERROR2;
1243 if (!(result->texted_sec = psiconv_empty_texted_section()))
1244 goto ERROR3;
1245 return result;
1246ERROR3:
1247 psiconv_free_page_layout_section(result->page_sec);
1248ERROR2:
1249 free(result);
1250ERROR1:
1251 return NULL;
1252}
1253
1254psiconv_paint_data_section psiconv_empty_paint_data_section(void)
1255{
1256 psiconv_paint_data_section result;
1257 if (!(result = malloc(sizeof(*result))))
1258 goto ERROR1;
1259 /* Is this correct? */
1260 result->xsize = result->ysize = result->pic_xsize = result->pic_ysize = 0;
1261 /* Probably forbidden... */
1262 if (!(result->red = malloc(0)))
1263 goto ERROR2;
1264 if (!(result->green = malloc(0)))
1265 goto ERROR3;
1266 if (!(result->blue = malloc(0)))
1267 goto ERROR4;
1268 return result;
1269ERROR4:
1270 free(result->green);
1271ERROR3:
1272 free(result->red);
1273ERROR2:
1274 free(result);
1275ERROR1:
1276 return NULL;
1277}
1278
1279
1280psiconv_pictures psiconv_empty_pictures(void)
1281{
1282 psiconv_pictures result;
1283 psiconv_paint_data_section pds;
1284 if (!(result = psiconv_list_new(sizeof(struct psiconv_paint_data_section_s))))
1285 goto ERROR1;
1286 if (!(pds = psiconv_empty_paint_data_section()))
1287 goto ERROR2;
1288 if (psiconv_list_add(result,pds))
1289 goto ERROR3;
1290 free(pds);
1291 return result;
1292ERROR3:
1293 psiconv_free_paint_data_section(pds);
1294ERROR2:
1295 psiconv_list_free(result);
1296ERROR1:
1297 return NULL;
1298}
1299
1300psiconv_mbm_f psiconv_empty_mbm_f(void)
1301{
1302 psiconv_mbm_f result;
1303 if (!(result = malloc(sizeof(*result))))
1304 goto ERROR1;
1305 if (!(result->sections = psiconv_empty_pictures()))
1306 goto ERROR2;
1307 return result;
1308ERROR2:
1309 free(result);
1310ERROR1:
1311 return NULL;
1312}
1313
1314psiconv_sketch_section psiconv_empty_sketch_section(void)
1315{
1316 psiconv_sketch_section result;
1317 if (!(result = malloc(sizeof(*result))))
1318 goto ERROR1;
1319 result->form_xsize = 320;
1320 result->form_ysize = 200;
1321 result->picture_x_offset = result->picture_y_offset = result->picture_xsize =
1322 result->picture_ysize = 0;
1323 result->magnification_x = result->magnification_y = 1.0;
1324 result->cut_left = result->cut_right = result->cut_top =
1325 result->cut_bottom = 0.0;
1326 if (!(result->picture = psiconv_empty_paint_data_section()))
1327 goto ERROR2;
1328 return result;
1329ERROR2:
1330 free(result);
1331ERROR1:
1332 return NULL;
1333}
1334
1335psiconv_sketch_f psiconv_empty_sketch_f(void)
1336{
1337 psiconv_sketch_f result;
1338 if (!(result = malloc(sizeof(*result))))
1339 goto ERROR1;
1340 if (!(result->sketch_sec = psiconv_empty_sketch_section()))
1341 goto ERROR2;
1342 return result;
1343ERROR2:
1344 free(result);
1345ERROR1:
1346 return NULL;
1347}
1348
1349psiconv_cliparts psiconv_empty_cliparts(void)
1350{
1351 /* Is this correct? */
1352 return psiconv_list_new(sizeof(struct psiconv_clipart_section_s));
1353}
1354
1355psiconv_clipart_f psiconv_empty_clipart_f(void)
1356{
1357 psiconv_clipart_f result;
1358 if (!(result = malloc(sizeof(*result))))
1359 goto ERROR1;
1360 if (!(result->sections = psiconv_empty_cliparts()))
1361 goto ERROR2;
1362 return result;
1363ERROR2:
1364 free(result);
1365ERROR1:
1366 return NULL;
1367}
1368
1369psiconv_file psiconv_empty_file(psiconv_file_type_t type)
1370{
1371 psiconv_file result;
1372 if (!(result = malloc(sizeof(*result))))
1373 return NULL;
1374 result->type = type;
1375 if (type == psiconv_word_file) {
1376 if (!(result->file = psiconv_empty_word_f()))
1377 goto ERROR;
1378 } else if (type == psiconv_sheet_file) {
1379 if (!(result->file = psiconv_empty_sheet_f()))
1380 goto ERROR;
1381 } else if (type == psiconv_texted_file) {
1382 if (!(result->file = psiconv_empty_texted_f()))
1383 goto ERROR;
1384 } else if (type == psiconv_mbm_file) {
1385 if (!(result->file = psiconv_empty_mbm_f()))
1386 goto ERROR;
1387 } else if (type == psiconv_sketch_file) {
1388 if (!(result->file = psiconv_empty_sketch_f()))
1389 goto ERROR;
1390 } else if (type == psiconv_clipart_file) {
1391 if (!(result->file = psiconv_empty_clipart_f()))
1392 goto ERROR;
1393 } else
1394 goto ERROR;
1395 return result;
1396ERROR:
1397 free(result);
1398 return NULL;
1399}
Legend:
Removed from v.78  
changed lines
  Added in v.142
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26