/[public]/psiconv/trunk/lib/psiconv/data.c

Diff of /psiconv/trunk/lib/psiconv/data.c

Parent Directory | Revision Log | View Patch Patch

Revision 41		Revision 171
1	/*	1	/*
2	data.c - Part of psiconv, a PSION 5 file formats converter	2	data.c - Part of psiconv, a PSION 5 file formats converter
3	Copyright (c) 1999 Frodo Looijaard <frodol@dds.nl>	3	Copyright (c) 1999, 2000 Frodo Looijaard <frodol@dds.nl>
4		4
5	This program is free software; you can redistribute it and/or modify	5	This program is free software; you can redistribute it and/or modify
6	it under the terms of the GNU General Public License as published by	6	it under the terms of the GNU General Public License as published by
7	the Free Software Foundation; either version 2 of the License, or	7	the Free Software Foundation; either version 2 of the License, or
8	(at your option) any later version.	8	(at your option) any later version.
…		…
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	#include "general.h"	26
		27	#ifdef DMALLOC
		28	#include <dmalloc.h>
		29	#endif
27		30
28	static psiconv_color clone_color(psiconv_color color);	31	static psiconv_color clone_color(psiconv_color color);
29	static psiconv_font clone_font(psiconv_font font);	32	static psiconv_font clone_font(psiconv_font font);
30	static psiconv_border clone_border(psiconv_border border);	33	static psiconv_border clone_border(psiconv_border border);
31	static psiconv_bullet clone_bullet(psiconv_bullet bullet);	34	static psiconv_bullet clone_bullet(psiconv_bullet bullet);
32	static psiconv_all_tabs clone_all_tabs(psiconv_all_tabs all_tabs);	35	static psiconv_all_tabs clone_all_tabs(psiconv_all_tabs all_tabs);
33	static void psiconv_free_style_aux(void *style);	36	static void psiconv_free_style_aux(void *style);
34	static void psiconv_free_in_line_layout_aux(void * layout);	37	static void psiconv_free_in_line_layout_aux(void * layout);
35	static void psiconv_free_paragraph_aux(void * paragraph);	38	static void psiconv_free_paragraph_aux(void * paragraph);
36	static void psiconv_free_paint_data_section_aux(void * section);	39	static void psiconv_free_paint_data_section_aux(void * section);
37	static void psiconv_free_clipart_section_aux(psiconv_clipart_section section);	40	static void psiconv_free_clipart_section_aux(void * section);
		41	static void psiconv_free_formula_aux(void *data);
		42	static void psiconv_free_sheet_worksheet_aux (void *data);
		43	static void psiconv_free_sheet_variable_aux(void * variable);
		44	static void psiconv_free_sheet_cell_aux(void *cell);
		45	static void psiconv_free_sheet_line_aux(void *line);
		46	static void psiconv_free_sheet_worksheet_aux (void *data);
38		47
		48	static psiconv_word_styles_section psiconv_empty_word_styles_section(void);
		49	static psiconv_text_and_layout psiconv_empty_text_and_layout(void);
		50	static psiconv_texted_section psiconv_empty_texted_section(void);
		51	static psiconv_page_header psiconv_empty_page_header(void);
		52	static psiconv_page_layout_section psiconv_empty_page_layout_section(void);
		53	static psiconv_word_status_section psiconv_empty_word_status_section(void);
		54	static psiconv_word_f psiconv_empty_word_f(void);
		55	static psiconv_sheet_status_section psiconv_empty_sheet_status_section(void);
		56	static psiconv_formula_list psiconv_empty_formula_list(void);
		57	static psiconv_sheet_workbook_section
		58	psiconv_empty_sheet_workbook_section(void);
		59	static psiconv_sheet_f psiconv_empty_sheet_f(void);
		60	static psiconv_texted_f psiconv_empty_texted_f(void);
		61	static psiconv_paint_data_section psiconv_empty_paint_data_section(void);
		62	static psiconv_pictures psiconv_empty_pictures(void);
		63	static psiconv_mbm_f psiconv_empty_mbm_f(void);
		64	static psiconv_sketch_section psiconv_empty_sketch_section(void);
		65	static psiconv_sketch_f psiconv_empty_sketch_f(void);
		66	static psiconv_clipart_f psiconv_empty_clipart_f(void);
		67	static psiconv_cliparts psiconv_empty_cliparts(void);
		68
		69
		70	/* Note: these defaults seem to be hard-coded somewhere outside the
		71	files themself. */
39	psiconv_character_layout psiconv_basic_character_layout(void)	72	psiconv_character_layout psiconv_basic_character_layout(void)
40	{	73	{
41	/* Make the structures static, to oblige IRIX */	74	/* Make the structures static, to oblige IRIX */
42	static struct psiconv_color black =	75	static struct psiconv_color_s black =
43	{	76	{
44	0x00, /* red */	77	0x00, /* red */
45	0x00, /* green */	78	0x00, /* green */
46	0x00, /* blue */	79	0x00, /* blue */
47	};	80	};
48	static struct psiconv_color white =	81	static struct psiconv_color_s white =
49	{	82	{
50	0xff, /* red */	83	0xff, /* red */
51	0xff, /* green */	84	0xff, /* green */
52	0xff, /* blue */	85	0xff, /* blue */
53	};	86	};
54	static struct psiconv_font font =	87	static struct psiconv_font_s font =
55	{	88	{
56	"Times New Roman", /* name */	89	"Times New Roman", /* name */
57	3 /* screenfont */	90	3 /* screenfont */
58	};	91	};
59	struct psiconv_character_layout cl =	92	struct psiconv_character_layout_s cl =
60	{	93	{
61	&black, /* color */	94	&black, /* color */
62	&white, /* back_color */	95	&white, /* back_color */
63	10.0, /* font_size */	96	10.0, /* font_size */
64	psiconv_bool_false, /* italic */	97	psiconv_bool_false, /* italic */
65	psiconv_bool_false, /* bold */	98	psiconv_bool_false, /* bold */
66	psiconv_normalscript, /* super_sub */	99	psiconv_normalscript, /* super_sub */
67	psiconv_bool_false, /* underline */	100	psiconv_bool_false, /* underline */
68	psiconv_bool_false, /* strike_out */	101	psiconv_bool_false, /* strikethrough */
69	&font, /* font */	102	&font, /* font */
70	};	103	};
71		104
72	return psiconv_clone_character_layout(&cl);	105	return psiconv_clone_character_layout(&cl);
73	}	106	}
74		107
		108	/* Note: these defaults seem to be hard-coded somewhere outside the
		109	files themself. */
75	psiconv_paragraph_layout psiconv_basic_paragraph_layout(void)	110	psiconv_paragraph_layout psiconv_basic_paragraph_layout(void)
76	{	111	{
77	static struct psiconv_font font =	112	static struct psiconv_font_s font =
78	{	113	{
79	"Times New Roman", /* name */	114	"Times New Roman", /* name */
80	2 /* screenfont */	115	2 /* screenfont */
81	};	116	};
82	static struct psiconv_color black =	117	static struct psiconv_color_s black =
83	{	118	{
84	0x00, /* red */	119	0x00, /* red */
85	0x00, /* green */	120	0x00, /* green */
86	0x00, /* blue */	121	0x00, /* blue */
87	};	122	};
88	static struct psiconv_color white =	123	static struct psiconv_color_s white =
89	{	124	{
90	0xff, /* red */	125	0xff, /* red */
91	0xff, /* green */	126	0xff, /* green */
92	0xff, /* blue */	127	0xff, /* blue */
93	};	128	};
94	static struct psiconv_border no_border =	129	static struct psiconv_border_s no_border =
95	{	130	{
96	psiconv_border_none, /* kind */	131	psiconv_border_none, /* kind */
97	1, /* thickness */	132	1, /* thickness */
98	&black /* color */	133	&black /* color */
99	};	134	};
100	static struct psiconv_bullet bullet =	135	static struct psiconv_bullet_s bullet =
101	{	136	{
102	psiconv_bool_false, /* on */	137	psiconv_bool_false, /* on */
103	10.0, /* font_size */	138	10.0, /* font_size */
104	0x95, /* character */	139	0x95, /* character */
105	psiconv_bool_true, /* indent */	140	psiconv_bool_true, /* indent */
106	&black, /* color */	141	&black, /* color */
107	&font, /* font */	142	&font, /* font */
108	};	143	};
109	static struct psiconv_all_tabs tabs =	144	static struct psiconv_all_tabs_s tabs =
110	{	145	{
111	0.64, /* normal */	146	0.64, /* normal */
112	NULL /* kind */	147	NULL /* kind */
113	};	148	};
114	struct psiconv_paragraph_layout pl =	149	struct psiconv_paragraph_layout_s pl =
115	{	150	{
116	&white, /* back_color */	151	&white, /* back_color */
117	0.0, /* indent_left */	152	0.0, /* indent_left */
118	0.0, /* indent_right */	153	0.0, /* indent_right */
119	0.0, /* indent_first */	154	0.0, /* indent_first */
120	psiconv_justify_left, /* justify_hor */	155	psiconv_justify_left, /* justify_hor */
121	psiconv_justify_middle,/* justify_ver */	156	psiconv_justify_middle,/* justify_ver */
122	0.0, /* interline */	157	10.0, /* linespacing */
123	psiconv_bool_false, /* interline_exact */	158	psiconv_bool_false, /* linespacing_exact */
124	0.0, /* top_space */	159	0.0, /* space_above */
125	0.0, /* bottom_space */	160	0.0, /* space_below */
126	psiconv_bool_false, /* on_one_page */
127	psiconv_bool_false, /* together_with */	161	psiconv_bool_false, /* keep_together */
		162	psiconv_bool_false, /* keep_with_next */
128	psiconv_bool_false, /* on_next_page */	163	psiconv_bool_false, /* on_next_page */
129	psiconv_bool_false, /* no_widow_protection */	164	psiconv_bool_false, /* no_widow_protection */
		165	psiconv_bool_false, /* wrap_to_fit_cell */
130	0.0, /* left_margin */	166	0.0, /* left_margin */
131	&bullet, /* bullet */	167	&bullet, /* bullet */
132	&no_border, /* left_border */	168	&no_border, /* left_border */
133	&no_border, /* right_border */	169	&no_border, /* right_border */
134	&no_border, /* top_border */	170	&no_border, /* top_border */
135	&no_border, /* bottom_border */	171	&no_border, /* bottom_border */
136	&tabs, /* tabs */	172	&tabs, /* tabs */
137	};	173	};
138	psiconv_paragraph_layout res;	174	psiconv_paragraph_layout res;
139		175
140	pl.tabs->extras = psiconv_list_new(sizeof(struct psiconv_tab));	176	if (!(pl.tabs->extras = psiconv_list_new(sizeof(struct psiconv_tab_s))))
		177	return NULL;
141	res = psiconv_clone_paragraph_layout(&pl);	178	res = psiconv_clone_paragraph_layout(&pl);
142	psiconv_list_free(pl.tabs->extras);	179	psiconv_list_free(pl.tabs->extras);
143	return res;	180	return res;
144	}	181	}
145		182
146	psiconv_color clone_color(psiconv_color color)	183	psiconv_color clone_color(psiconv_color color)
147	{	184	{
148	psiconv_color result;	185	psiconv_color result;
149	result = malloc(sizeof(*result));	186	if (!(result = malloc(sizeof(*result))))
		187	return NULL;
150	result = color;	188	result = color;
151	return result;	189	return result;
152	}	190	}
153		191
154	psiconv_font clone_font(psiconv_font font)	192	psiconv_font clone_font(psiconv_font font)
155	{	193	{
156	psiconv_font result;	194	psiconv_font result;
157	result = malloc(sizeof(*result));	195	if(!(result = malloc(sizeof(*result))))
		196	goto ERROR1;
158	result = font;	197	result = font;
159	result->name = strdup(result->name);	198	if (!(result->name = strdup(result->name)))
		199	goto ERROR2;
160	return result;	200	return result;
		201	ERROR2:
		202	free(result);
		203	ERROR1:
		204	return NULL;
161	}	205	}
162		206
163	psiconv_border clone_border(psiconv_border border)	207	psiconv_border clone_border(psiconv_border border)
164	{	208	{
165	psiconv_border result;	209	psiconv_border result;
166	result = malloc(sizeof(*result));	210	if (!(result = malloc(sizeof(*result))))
		211	goto ERROR1;
167	result = border;	212	result = border;
168	result->color = clone_color(result->color);	213	if(!(result->color = clone_color(result->color)))
		214	goto ERROR2;
169	return result;	215	return result;
		216	ERROR2:
		217	free(result);
		218	ERROR1:
		219	return NULL;
170	}	220	}
171		221
172	psiconv_bullet clone_bullet(psiconv_bullet bullet)	222	psiconv_bullet clone_bullet(psiconv_bullet bullet)
173	{	223	{
174	psiconv_bullet result;	224	psiconv_bullet result;
175	result = malloc(sizeof(*result));	225	if (!(result = malloc(sizeof(*result))))
		226	goto ERROR1;
176	result = bullet;	227	result = bullet;
177	result->font = clone_font(result->font);	228	if (!(result->font = clone_font(result->font)))
		229	goto ERROR2;
178	result->color = clone_color(result->color);	230	if (!(result->color = clone_color(result->color)))
		231	goto ERROR3;
179	return result;	232	return result;
		233	ERROR3:
		234	psiconv_free_font(result->font);
		235	ERROR2:
		236	free(result);
		237	ERROR1:
		238	return NULL;
180	}	239	}
181		240
182	psiconv_all_tabs clone_all_tabs(psiconv_all_tabs all_tabs)	241	psiconv_all_tabs clone_all_tabs(psiconv_all_tabs all_tabs)
183	{	242	{
184	psiconv_all_tabs result;	243	psiconv_all_tabs result;
185	result = malloc(sizeof(*result));	244	if (!(result = malloc(sizeof(*result))))
		245	goto ERROR1;
186	result = all_tabs;	246	result = all_tabs;
187	result->extras = psiconv_list_clone(result->extras);	247	if (!(result->extras = psiconv_list_clone(result->extras)))
		248	goto ERROR2;
188	return result;	249	return result;
		250	ERROR2:
		251	free(result);
		252	ERROR1:
		253	return NULL;
189	}	254	}
190		255
191	psiconv_character_layout psiconv_clone_character_layout	256	psiconv_character_layout psiconv_clone_character_layout
192	(psiconv_character_layout ls)	257	(psiconv_character_layout ls)
193	{	258	{
194	psiconv_character_layout result;	259	psiconv_character_layout result;
195		260
196	result = malloc(sizeof(*result));	261	if (!(result = malloc(sizeof(*result))))
		262	goto ERROR1;
197	result = ls;	263	result = ls;
198	result->color = clone_color(result->color);	264	if (!(result->color = clone_color(result->color)))
		265	goto ERROR2;
199	result->back_color = clone_color(result->back_color);	266	if (!(result->back_color = clone_color(result->back_color)))
		267	goto ERROR3;
200	result->font = clone_font(result->font);	268	if (!(result->font = clone_font(result->font)))
		269	goto ERROR4;
201	return result;	270	return result;
		271	ERROR4:
		272	psiconv_free_color(result->back_color);
		273	ERROR3:
		274	psiconv_free_color(result->color);
		275	ERROR2:
		276	free(result);
		277	ERROR1:
		278	return NULL;
202	}	279	}
203		280
204	psiconv_paragraph_layout psiconv_clone_paragraph_layout	281	psiconv_paragraph_layout psiconv_clone_paragraph_layout
205	(psiconv_paragraph_layout ls)	282	(psiconv_paragraph_layout ls)
206	{	283	{
207	psiconv_paragraph_layout result;	284	psiconv_paragraph_layout result;
208		285
209	result = malloc(sizeof(*result));	286	if (!(result = malloc(sizeof(*result))))
		287	goto ERROR1;
210	result = ls;	288	result = ls;
211	result->back_color = clone_color(result->back_color);	289	if (!(result->back_color = clone_color(result->back_color)))
		290	goto ERROR2;
212	result->bullet = clone_bullet(result->bullet);	291	if (!(result->bullet = clone_bullet(result->bullet)))
		292	goto ERROR3;
213	result->left_border = clone_border(result->left_border);	293	if (!(result->left_border = clone_border(result->left_border)))
		294	goto ERROR4;
214	result->right_border = clone_border(result->right_border);	295	if (!(result->right_border = clone_border(result->right_border)))
		296	goto ERROR5;
215	result->top_border = clone_border(result->top_border);	297	if (!(result->top_border = clone_border(result->top_border)))
		298	goto ERROR6;
216	result->bottom_border = clone_border(result->bottom_border);	299	if (!(result->bottom_border = clone_border(result->bottom_border)))
		300	goto ERROR7;
217	result->tabs = clone_all_tabs(result->tabs);	301	if (!(result->tabs = clone_all_tabs(result->tabs)))
		302	goto ERROR8;
218	return result;	303	return result;
		304	ERROR8:
		305	psiconv_free_border(result->bottom_border);
		306	ERROR7:
		307	psiconv_free_border(result->top_border);
		308	ERROR6:
		309	psiconv_free_border(result->right_border);
		310	ERROR5:
		311	psiconv_free_border(result->left_border);
		312	ERROR4:
		313	psiconv_free_bullet(result->bullet);
		314	ERROR3:
		315	psiconv_free_color(result->back_color);
		316	ERROR2:
		317	free(result);
		318	ERROR1:
		319	return NULL;
219	}	320	}
220		321
221	psiconv_word_style psiconv_get_style (psiconv_word_styles_section ss, int nr)	322	psiconv_word_style psiconv_get_style (psiconv_word_styles_section ss, int nr)
222	{	323	{
223	if (nr == 0)	324	if (nr == 0)
224	return ss->normal;	325	return ss->normal;
225	else	326	else
226	return psiconv_list_get(ss->styles,0xff - nr);	327	return psiconv_list_get(ss->styles,0xff - nr);
227	}	328	}
		329
		330	psiconv_formula psiconv_get_formula (psiconv_formula_list ss, int nr)
		331	{
		332	return psiconv_list_get(ss,psiconv_list_length(ss)-nr-1);
		333	}
		334
		335	/* TODO: What if a cell is both in a default row and a default column?!? */
		336	psiconv_sheet_cell_layout psiconv_get_default_layout
		337	(psiconv_sheet_line_list row_defaults,
		338	psiconv_sheet_line_list col_defaults,
		339	psiconv_sheet_cell_layout cell_default,
		340	int row,int col)
		341	{
		342	int i;
		343	psiconv_sheet_line line;
		344	for (i = 0;i < psiconv_list_length(row_defaults);i++) {
		345	line = psiconv_list_get(row_defaults,i);
		346	if (line->position == row)
		347	return line->layout;
		348	}
		349	for (i = 0;i < psiconv_list_length(col_defaults);i++) {
		350	line = psiconv_list_get(col_defaults,i);
		351	if (line->position == col)
		352	return line->layout;
		353	}
		354	return cell_default;
		355	}
		356
228		357
229	void psiconv_free_color (psiconv_color color)	358	void psiconv_free_color (psiconv_color color)
230	{	359	{
231	if (color)	360	if (color)
232	free(color);	361	free(color);
…		…
316	{	445	{
317	if (styles) {	446	if (styles) {
318	psiconv_free_word_style(styles->normal);	447	psiconv_free_word_style(styles->normal);
319	if (styles->styles)	448	if (styles->styles)
320	psiconv_list_free_el(styles->styles,psiconv_free_style_aux);	449	psiconv_list_free_el(styles->styles,psiconv_free_style_aux);
		450	free(styles);
321	}	451	}
322	}	452	}
323		453
324	void psiconv_free_header_section(psiconv_header_section header)	454	void psiconv_free_header_section(psiconv_header_section header)
325	{	455	{
…		…
346	free(section->name);	476	free(section->name);
347	free(section);	477	free(section);
348	}	478	}
349	}	479	}
350		480
		481	void 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
		490	void psiconv_free_object_display_section(psiconv_object_display_section section)
		491	{
		492	if (section)
		493	free(section);
		494	}
		495
		496	void 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
351	void psiconv_free_in_line_layout_aux(void * layout)	507	void psiconv_free_in_line_layout_aux(void * layout)
352	{	508	{
353	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);
354	}	512	}
355		513
356	void psiconv_free_in_line_layout(psiconv_in_line_layout layout)	514	void psiconv_free_in_line_layout(psiconv_in_line_layout layout)
357	{	515	{
358	if (layout) {	516	if (layout) {
…		…
449	psiconv_free_word_styles_section(file->styles_sec);	607	psiconv_free_word_styles_section(file->styles_sec);
450	free(file);	608	free(file);
451	}	609	}
452	}	610	}
453		611
		612	void psiconv_free_sheet_status_section(psiconv_sheet_status_section section)
		613	{
		614	if (section)
		615	free(section);
		616	}
		617
		618	void psiconv_free_sheet_numberformat(psiconv_sheet_numberformat numberformat)
		619	{
		620	if (numberformat)
		621	free(numberformat);
		622	}
		623
		624	void psiconv_free_sheet_cell_layout(psiconv_sheet_cell_layout layout)
		625	{
		626	psiconv_free_paragraph_layout(layout->paragraph);
		627	psiconv_free_character_layout(layout->character);
		628	psiconv_free_sheet_numberformat(layout->numberformat);
		629	}
		630
		631	void psiconv_free_sheet_cell_aux(void *cell)
		632	{
		633	psiconv_sheet_cell data = cell;
		634
		635	psiconv_free_sheet_cell_layout(data->layout);
		636
		637	if ((data->type == psiconv_cell_string) && (data->data.dat_string))
		638	free(data->data.dat_string);
		639	}
		640
		641	void psiconv_free_sheet_cell(psiconv_sheet_cell cell)
		642	{
		643	if (cell) {
		644	psiconv_free_sheet_cell_aux(cell);
		645	free(cell);
		646	}
		647	}
		648
		649	void psiconv_free_sheet_cell_list(psiconv_sheet_cell_list list)
		650	{
		651	if (list)
		652	psiconv_list_free_el(list,psiconv_free_sheet_cell_aux);
		653	}
		654
		655	void psiconv_free_sheet_line_aux(void *line)
		656	{
		657	psiconv_sheet_line data = line;
		658
		659	psiconv_free_sheet_cell_layout(data->layout);
		660	}
		661
		662	void psiconv_free_sheet_line(psiconv_sheet_line line)
		663	{
		664	if (line) {
		665	psiconv_free_sheet_line_aux(line);
		666	free(line);
		667	}
		668	}
		669
		670
		671	void psiconv_free_sheet_line_list(psiconv_sheet_line_list list)
		672	{
		673	if (list)
		674	psiconv_list_free_el(list,psiconv_free_sheet_line_aux);
		675	}
		676
		677	void psiconv_free_sheet_grid_break_list(psiconv_sheet_grid_break_list list)
		678	{
		679	if (list)
		680	psiconv_list_free(list);
		681	}
		682
		683	void psiconv_free_sheet_grid_size(psiconv_sheet_grid_size s)
		684	{
		685	if (s)
		686	free(s);
		687	}
		688
		689	void psiconv_free_sheet_grid_size_list(psiconv_sheet_grid_size_list list)
		690	{
		691	if (list)
		692	psiconv_list_free(list);
		693	}
		694
		695	void psiconv_free_sheet_grid_section(psiconv_sheet_grid_section sec)
		696	{
		697	if (sec) {
		698	psiconv_free_sheet_grid_size_list(sec->row_heights);
		699	psiconv_free_sheet_grid_size_list(sec->column_heights);
		700	psiconv_free_sheet_grid_break_list(sec->row_page_breaks);
		701	psiconv_free_sheet_grid_break_list(sec->column_page_breaks);
		702	free(sec);
		703	}
		704	}
		705
		706	void psiconv_free_sheet_worksheet_aux (void *data)
		707	{
		708	psiconv_sheet_worksheet section = data;
		709	psiconv_free_sheet_cell_layout(section->default_layout);
		710	psiconv_free_sheet_cell_list(section->cells);
		711	psiconv_free_sheet_line_list(section->row_default_layouts);
		712	psiconv_free_sheet_line_list(section->col_default_layouts);
		713	psiconv_free_sheet_grid_section(section->grid);
		714	}
		715
		716	void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet)
		717	{
		718	if (sheet) {
		719	psiconv_free_sheet_worksheet_aux(sheet);
		720	free(sheet);
		721	}
		722	}
		723
		724	void psiconv_free_sheet_worksheet_list(psiconv_sheet_worksheet_list list)
		725	{
		726	if (list)
		727	psiconv_list_free_el(list,psiconv_free_sheet_worksheet_aux);
		728	}
		729
		730	void psiconv_free_formula_aux(void *data)
		731	{
		732	psiconv_formula formula;
		733	formula = data;
		734	if (formula->type == psiconv_formula_dat_string)
		735	free(formula->data.dat_string);
		736	else if ((formula->type != psiconv_formula_dat_int) &&
		737	(formula->type != psiconv_formula_dat_var) &&
		738	(formula->type != psiconv_formula_dat_float) &&
		739	(formula->type != psiconv_formula_dat_cellref) &&
		740	(formula->type != psiconv_formula_dat_cellblock) &&
		741	(formula->type != psiconv_formula_dat_vcellblock) &&
		742	(formula->type != psiconv_formula_mark_opsep) &&
		743	(formula->type != psiconv_formula_mark_opend) &&
		744	(formula->type != psiconv_formula_mark_eof) &&
		745	(formula->type != psiconv_formula_unknown))
		746	psiconv_free_formula_list(formula->data.fun_operands);
		747	}
		748
		749	void psiconv_free_formula(psiconv_formula formula)
		750	{
		751	if (formula) {
		752	psiconv_free_formula_aux(formula);
		753	free(formula);
		754	}
		755	}
		756
		757	void psiconv_free_formula_list(psiconv_formula_list list)
		758	{
		759	if (list)
		760	psiconv_list_free_el(list,psiconv_free_formula_aux);
		761	}
		762
		763	void psiconv_free_sheet_name_section(psiconv_sheet_name_section section)
		764	{
		765	if (section) {
		766	if(section->name)
		767	free(section->name);
		768	free(section);
		769	}
		770	}
		771
		772	void psiconv_free_sheet_info_section(psiconv_sheet_info_section section)
		773	{
		774	if (section) {
		775	free(section);
		776	}
		777	}
		778
		779	void psiconv_free_sheet_variable_aux(void * variable)
		780	{
		781	psiconv_sheet_variable var = variable;
		782	if (var->name)
		783	free(var->name);
		784	if (var->type == psiconv_var_string)
		785	free(var->data.dat_string);
		786	}
		787
		788	void psiconv_free_sheet_variable(psiconv_sheet_variable var)
		789	{
		790	if (var) {
		791	psiconv_free_sheet_variable_aux(var);
		792	free(var);
		793	}
		794	}
		795
		796	void psiconv_free_sheet_variable_list(psiconv_sheet_variable_list list)
		797	{
		798	if (list)
		799	psiconv_list_free_el(list,psiconv_free_sheet_variable_aux);
		800	}
		801
		802	void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section)
		803	{
		804	if (section) {
		805	psiconv_free_formula_list(section->formulas);
		806	psiconv_free_sheet_worksheet_list(section->worksheets);
		807	psiconv_free_sheet_name_section(section->name);
		808	psiconv_free_sheet_info_section(section->info);
		809	psiconv_free_sheet_variable_list(section->variables);
		810	free(section);
		811	}
		812	}
		813
		814	void psiconv_free_sheet_f(psiconv_sheet_f file)
		815	{
		816	if (file) {
		817	psiconv_free_page_layout_section(file->page_sec);
		818	psiconv_free_sheet_status_section(file->status_sec);
		819	psiconv_free_sheet_workbook_section(file->workbook_sec);
		820	free(file);
		821	}
		822	}
		823
454	void psiconv_free_texted_f(psiconv_texted_f file)	824	void psiconv_free_texted_f(psiconv_texted_f file)
455	{	825	{
456	if (file) {	826	if (file) {
457	psiconv_free_page_layout_section(file->page_sec);	827	psiconv_free_page_layout_section(file->page_sec);
458	psiconv_free_texted_section(file->texted_sec);	828	psiconv_free_texted_section(file->texted_sec);
…		…
482	{	852	{
483	if (section)	853	if (section)
484	psiconv_list_free_el(section,&psiconv_free_paint_data_section_aux);	854	psiconv_list_free_el(section,&psiconv_free_paint_data_section_aux);
485	}	855	}
486		856
487	void psiconv_free_mbm_jumptable_section (psiconv_mbm_jumptable_section section)	857	void psiconv_free_jumptable_section (psiconv_jumptable_section section)
488	{	858	{
489	if (section)	859	if (section)
490	psiconv_list_free(section);	860	psiconv_list_free(section);
491	}	861	}
492		862
…		…
512	psiconv_free_sketch_section(file->sketch_sec);	882	psiconv_free_sketch_section(file->sketch_sec);
513	free(file);	883	free(file);
514	}	884	}
515	}	885	}
516		886
517	void psiconv_free_clipart_section_aux(psiconv_clipart_section section)	887	void psiconv_free_clipart_section_aux(void *section)
518	{	888	{
519	if (section)	889	if (section)
520	free(section->picture);	890	free(((psiconv_clipart_section ) section)->picture);
521	}	891	}
522		892
523	void psiconv_free_clipart_section(psiconv_clipart_section section)	893	void psiconv_free_clipart_section(psiconv_clipart_section section)
524	{	894	{
525	if (section) {	895	if (section) {
…		…
552	else if (file->type == psiconv_mbm_file)	922	else if (file->type == psiconv_mbm_file)
553	psiconv_free_mbm_f((psiconv_mbm_f) file->file);	923	psiconv_free_mbm_f((psiconv_mbm_f) file->file);
554	else if (file->type == psiconv_sketch_file)	924	else if (file->type == psiconv_sketch_file)
555	psiconv_free_sketch_f((psiconv_sketch_f) file->file);	925	psiconv_free_sketch_f((psiconv_sketch_f) file->file);
556	else if (file->type == psiconv_clipart_file)	926	else if (file->type == psiconv_clipart_file)
557	psiconv_free_sketch_f((psiconv_clipart_f) file->file);	927	psiconv_free_clipart_f((psiconv_clipart_f) file->file);
		928	else if (file->type == psiconv_sheet_file)
		929	psiconv_free_sheet_f((psiconv_sheet_f) file->file);
558	free(file);	930	free(file);
559	}	931	}
560	}	932	}
		933
		934	int psiconv_compare_color(const psiconv_color value1,
		935	const psiconv_color value2)
		936	{
		937	if (!value1 \|\| !value2)
		938	return 1;
		939	if ((value1->red == value2->red) &&
		940	(value1->green == value2->green) &&
		941	(value1->blue == value2->blue))
		942	return 0;
		943	else
		944	return 1;
		945	}
		946
		947	int psiconv_compare_font(const psiconv_font value1,
		948	const psiconv_font value2)
		949	{
		950	if (!value1 \|\| !value2 \|\| !value1->name \|\| !value2->name)
		951	return 1;
		952	if ((value1->screenfont == value2->screenfont) &&
		953	!strcmp(value1->name,value2->name))
		954	return 0;
		955	else
		956	return 1;
		957	}
		958
		959	int psiconv_compare_border(const psiconv_border value1,
		960	const psiconv_border value2)
		961	{
		962	if (!value1 \|\| !value2)
		963	return 1;
		964	if ((value1->kind == value2->kind) &&
		965	(value1->thickness == value2->thickness) &&
		966	!psiconv_compare_color(value1->color,value2->color))
		967	return 0;
		968	else
		969	return 1;
		970	}
		971
		972	int psiconv_compare_bullet(const psiconv_bullet value1,
		973	const psiconv_bullet value2)
		974	{
		975	if (!value1 \|\| !value2)
		976	return 1;
		977	if ((value1->on == value2->on) &&
		978	(value1->font_size == value2->font_size) &&
		979	(value1->character == value2->character) &&
		980	(value1->indent == value2->indent) &&
		981	!psiconv_compare_color(value1->color,value2->color) &&
		982	!psiconv_compare_font(value1->font,value2->font))
		983	return 0;
		984	else
		985	return 1;
		986	}
		987
		988	int psiconv_compare_tab(const psiconv_tab value1, const psiconv_tab value2)
		989	{
		990	if (!value1 \|\| !value2)
		991	return 1;
		992	if ((value1->location == value2->location) &&
		993	(value1->kind == value2->kind))
		994	return 0;
		995	else
		996	return 1;
		997	}
		998
		999	int psiconv_compare_all_tabs(const psiconv_all_tabs value1,
		1000	const psiconv_all_tabs value2)
		1001	{
		1002	int i;
		1003
		1004	if (!value1 \|\| !value2 \|\| !value1->extras \|\| !value2->extras)
		1005	return 1;
		1006
		1007	if ((value1->normal != value2->normal) \|\|
		1008	psiconv_list_length(value1->extras) !=
		1009	psiconv_list_length(value2->extras))
		1010	return 1;
		1011	for (i = 0; i < psiconv_list_length(value1->extras); i++)
		1012	if (psiconv_compare_tab(psiconv_list_get(value1->extras,i),
		1013	psiconv_list_get(value2->extras,i)))
		1014
		1015	return 1;
		1016	return 0;
		1017	}
		1018
		1019	int psiconv_compare_paragraph_layout(const psiconv_paragraph_layout value1,
		1020	const psiconv_paragraph_layout value2)
		1021	{
		1022	if (!value1 \|\| !value2)
		1023	return 1;
		1024	if ((value1->indent_left == value2->indent_left) &&
		1025	(value1->indent_right == value2->indent_right) &&
		1026	(value1->indent_first == value2->indent_first) &&
		1027	(value1->justify_hor == value2->justify_hor) &&
		1028	(value1->justify_ver == value2->justify_ver) &&
		1029	(value1->linespacing == value2->linespacing) &&
		1030	(value1->space_above == value2->space_above) &&
		1031	(value1->space_below == value2->space_below) &&
		1032	(value1->keep_together == value2->keep_together) &&
		1033	(value1->keep_with_next == value2->keep_with_next) &&
		1034	(value1->on_next_page == value2->on_next_page) &&
		1035	(value1->no_widow_protection == value2->no_widow_protection) &&
		1036	(value1->border_distance == value2->border_distance) &&
		1037	!psiconv_compare_color(value1->back_color,value2->back_color) &&
		1038	!psiconv_compare_bullet(value1->bullet,value2->bullet) &&
		1039	!psiconv_compare_border(value1->left_border,value2->left_border) &&
		1040	!psiconv_compare_border(value1->right_border,value2->right_border) &&
		1041	!psiconv_compare_border(value1->top_border,value2->top_border) &&
		1042	!psiconv_compare_border(value1->bottom_border,value2->bottom_border) &&
		1043	!psiconv_compare_all_tabs(value1->tabs,value2->tabs))
		1044	return 0;
		1045	else
		1046	return 1;
		1047	}
		1048
		1049
		1050	int psiconv_compare_character_layout(const psiconv_character_layout value1,
		1051	const psiconv_character_layout value2)
		1052	{
		1053	if (!value1 \|\| !value2)
		1054	return 1;
		1055	if ((value1->font_size == value2->font_size) &&
		1056	(value1->italic == value2->italic) &&
		1057	(value1->bold == value2->bold) &&
		1058	(value1->super_sub == value2->super_sub) &&
		1059	(value1->underline == value2->underline) &&
		1060	(value1->strikethrough == value2->strikethrough) &&
		1061	!psiconv_compare_color(value1->color,value2->color) &&
		1062	!psiconv_compare_color(value1->back_color,value2->back_color) &&
		1063	!psiconv_compare_font(value1->font,value2->font))
		1064	return 0;
		1065	else
		1066	return 1;
		1067	}
		1068
		1069
		1070
		1071	psiconv_word_styles_section psiconv_empty_word_styles_section(void)
		1072	{
		1073	psiconv_word_styles_section result;
		1074	if (!(result = malloc(sizeof(*result))))
		1075	goto ERROR1;
		1076	if (!(result->styles = psiconv_list_new(sizeof(struct psiconv_word_style_s))))
		1077	goto ERROR2;
		1078	if (!(result->normal = malloc(sizeof(struct psiconv_word_style_s))))
		1079	goto ERROR3;
		1080	if (!(result->normal->character = psiconv_basic_character_layout()))
		1081	goto ERROR4;
		1082	if (!(result->normal->paragraph = psiconv_basic_paragraph_layout()))
		1083	goto ERROR5;
		1084	result->normal->hotkey = 'N';
		1085	result->normal->name = NULL;
		1086	result->normal->built_in = psiconv_bool_true;
		1087	result->normal->outline_level = 0;
		1088	return result;
		1089	ERROR5:
		1090	psiconv_free_character_layout(result->normal->character);
		1091	ERROR4:
		1092	free(result->normal);
		1093	ERROR3:
		1094	psiconv_list_free(result->styles);
		1095	ERROR2:
		1096	free(result);
		1097	ERROR1:
		1098	return NULL;
		1099	}
		1100
		1101	psiconv_text_and_layout psiconv_empty_text_and_layout(void)
		1102	{
		1103	return psiconv_list_new(sizeof(struct psiconv_paragraph_s));
		1104	}
		1105
		1106	psiconv_texted_section psiconv_empty_texted_section(void)
		1107	{
		1108	psiconv_texted_section result;
		1109	if (!(result = malloc(sizeof(*result))))
		1110	goto ERROR1;
		1111	if (!(result->paragraphs = psiconv_empty_text_and_layout()))
		1112	goto ERROR2;
		1113	return result;
		1114	ERROR2:
		1115	free(result);
		1116	ERROR1:
		1117	return NULL;
		1118	}
		1119
		1120	psiconv_page_header psiconv_empty_page_header(void)
		1121	{
		1122	psiconv_page_header result;
		1123	if (!(result = malloc(sizeof(*result))))
		1124	goto ERROR1;
		1125	result->on_first_page = psiconv_bool_true;
		1126	if (!(result->base_paragraph_layout = psiconv_basic_paragraph_layout()))
		1127	goto ERROR2;
		1128	if (!(result->base_character_layout = psiconv_basic_character_layout()))
		1129	goto ERROR3;
		1130	if (!(result->text = psiconv_empty_texted_section()))
		1131	goto ERROR4;
		1132	return result;
		1133	ERROR4:
		1134	psiconv_free_character_layout(result->base_character_layout);
		1135	ERROR3:
		1136	psiconv_free_paragraph_layout(result->base_paragraph_layout);
		1137	ERROR2:
		1138	free(result);
		1139	ERROR1:
		1140	return NULL;
		1141	}
		1142
		1143	psiconv_page_layout_section psiconv_empty_page_layout_section(void)
		1144	{
		1145	psiconv_page_layout_section result;
		1146	if (!(result = malloc(sizeof(*result))))
		1147	goto ERROR1;
		1148	result->first_page_nr = 1;
		1149	result->header_dist = result->footer_dist = 1.27;
		1150	result->left_margin = result->right_margin = 3.175;
		1151	result->top_margin = result->bottom_margin = 2.54;
		1152	result->page_width = 21.0;
		1153	result->page_height = 29.7;
		1154	result->landscape = psiconv_bool_false;
		1155	if (!(result->header = psiconv_empty_page_header()))
		1156	goto ERROR2;
		1157	if (!(result->footer = psiconv_empty_page_header()))
		1158	goto ERROR3;
		1159	return result;
		1160	ERROR3:
		1161	psiconv_free_page_header(result->header);
		1162	ERROR2:
		1163	free(result);
		1164	ERROR1:
		1165	return NULL;
		1166	}
		1167
		1168	psiconv_word_status_section psiconv_empty_word_status_section(void)
		1169	{
		1170	psiconv_word_status_section result;
		1171	if (!(result = malloc(sizeof(*result))))
		1172	return NULL;
		1173	result->show_tabs = result->show_spaces = result->show_paragraph_ends =
		1174	result->show_hard_minus = result->show_hard_space =
		1175	result->fit_lines_to_screen = psiconv_bool_false;
		1176	result->show_full_pictures = result->show_full_graphs =
		1177	result->show_top_toolbar = result->show_side_toolbar =
		1178	psiconv_bool_true;
		1179	result->cursor_position = 0;
		1180	result->display_size = 1000;
		1181	return result;
		1182	}
		1183
		1184	psiconv_word_f psiconv_empty_word_f(void)
		1185	{
		1186	psiconv_word_f result;
		1187	if (!(result = malloc(sizeof(*result))))
		1188	goto ERROR1;
		1189	if (!(result->page_sec = psiconv_empty_page_layout_section()))
		1190	goto ERROR2;
		1191	if (!(result->paragraphs = psiconv_empty_text_and_layout()))
		1192	goto ERROR3;
		1193	if (!(result->status_sec = psiconv_empty_word_status_section()))
		1194	goto ERROR4;
		1195	if (!(result->styles_sec = psiconv_empty_word_styles_section()))
		1196	goto ERROR5;
		1197	return result;
		1198	ERROR5:
		1199	psiconv_free_word_status_section(result->status_sec);
		1200	ERROR4:
		1201	psiconv_free_text_and_layout(result->paragraphs);
		1202	ERROR3:
		1203	psiconv_free_page_layout_section(result->page_sec);
		1204	ERROR2:
		1205	free(result);
		1206	ERROR1:
		1207	return NULL;
		1208	}
		1209
		1210	psiconv_sheet_status_section psiconv_empty_sheet_status_section(void)
		1211	{
		1212	psiconv_sheet_status_section result;
		1213	if (!(result = malloc(sizeof(*result))))
		1214	return NULL;
		1215	result->show_horizontal_scrollbar = result->show_vertical_scrollbar =
		1216	psiconv_triple_auto;
		1217	result->show_graph = psiconv_bool_false;
		1218	result->show_top_sheet_toolbar = result->show_side_sheet_toolbar =
		1219	result->show_top_graph_toolbar = result->show_side_graph_toolbar =
		1220	psiconv_bool_true;
		1221	result->cursor_row = result->cursor_column = 0;
		1222	result->sheet_display_size = result->graph_display_size = 1000;
		1223	return result;
		1224	}
		1225
		1226	psiconv_formula_list psiconv_empty_formula_list(void)
		1227	{
		1228	return psiconv_list_new(sizeof(struct psiconv_formula_s));
		1229	}
		1230
		1231	psiconv_sheet_workbook_section psiconv_empty_sheet_workbook_section(void)
		1232	{
		1233	psiconv_sheet_workbook_section result;
		1234	if (!(result = malloc(sizeof(*result))))
		1235	goto ERROR1;
		1236	if (!(result->formulas = psiconv_empty_formula_list()))
		1237	goto ERROR2;
		1238	return result;
		1239	ERROR2:
		1240	free(result);
		1241	ERROR1:
		1242	return NULL;
		1243	}
		1244
		1245
		1246	psiconv_sheet_f psiconv_empty_sheet_f(void)
		1247	{
		1248	psiconv_sheet_f result;
		1249	if (!(result = malloc(sizeof(*result))))
		1250	goto ERROR1;
		1251	if (!(result->page_sec = psiconv_empty_page_layout_section()))
		1252	goto ERROR2;
		1253	if (!(result->status_sec = psiconv_empty_sheet_status_section()))
		1254	goto ERROR3;
		1255	if (!(result->workbook_sec = psiconv_empty_sheet_workbook_section()))
		1256	goto ERROR4;
		1257	return result;
		1258	ERROR4:
		1259	psiconv_free_sheet_status_section(result->status_sec);
		1260	ERROR3:
		1261	psiconv_free_page_layout_section(result->page_sec);
		1262	ERROR2:
		1263	free(result);
		1264	ERROR1:
		1265	return NULL;
		1266	}
		1267
		1268	psiconv_texted_f psiconv_empty_texted_f(void)
		1269	{
		1270	psiconv_texted_f result;
		1271	if (!(result = malloc(sizeof(*result))))
		1272	goto ERROR1;
		1273	if (!(result->page_sec = psiconv_empty_page_layout_section()))
		1274	goto ERROR2;
		1275	if (!(result->texted_sec = psiconv_empty_texted_section()))
		1276	goto ERROR3;
		1277	return result;
		1278	ERROR3:
		1279	psiconv_free_page_layout_section(result->page_sec);
		1280	ERROR2:
		1281	free(result);
		1282	ERROR1:
		1283	return NULL;
		1284	}
		1285
		1286	psiconv_paint_data_section psiconv_empty_paint_data_section(void)
		1287	{
		1288	psiconv_paint_data_section result;
		1289	if (!(result = malloc(sizeof(*result))))
		1290	goto ERROR1;
		1291	/* Is this correct? */
		1292	result->xsize = result->ysize = result->pic_xsize = result->pic_ysize = 0;
		1293	/* Probably forbidden... */
		1294	if (!(result->red = malloc(0)))
		1295	goto ERROR2;
		1296	if (!(result->green = malloc(0)))
		1297	goto ERROR3;
		1298	if (!(result->blue = malloc(0)))
		1299	goto ERROR4;
		1300	return result;
		1301	ERROR4:
		1302	free(result->green);
		1303	ERROR3:
		1304	free(result->red);
		1305	ERROR2:
		1306	free(result);
		1307	ERROR1:
		1308	return NULL;
		1309	}
		1310
		1311
		1312	psiconv_pictures psiconv_empty_pictures(void)
		1313	{
		1314	psiconv_pictures result;
		1315	psiconv_paint_data_section pds;
		1316	if (!(result = psiconv_list_new(sizeof(struct psiconv_paint_data_section_s))))
		1317	goto ERROR1;
		1318	if (!(pds = psiconv_empty_paint_data_section()))
		1319	goto ERROR2;
		1320	if (psiconv_list_add(result,pds))
		1321	goto ERROR3;
		1322	free(pds);
		1323	return result;
		1324	ERROR3:
		1325	psiconv_free_paint_data_section(pds);
		1326	ERROR2:
		1327	psiconv_list_free(result);
		1328	ERROR1:
		1329	return NULL;
		1330	}
		1331
		1332	psiconv_mbm_f psiconv_empty_mbm_f(void)
		1333	{
		1334	psiconv_mbm_f result;
		1335	if (!(result = malloc(sizeof(*result))))
		1336	goto ERROR1;
		1337	if (!(result->sections = psiconv_empty_pictures()))
		1338	goto ERROR2;
		1339	return result;
		1340	ERROR2:
		1341	free(result);
		1342	ERROR1:
		1343	return NULL;
		1344	}
		1345
		1346	psiconv_sketch_section psiconv_empty_sketch_section(void)
		1347	{
		1348	psiconv_sketch_section result;
		1349	if (!(result = malloc(sizeof(*result))))
		1350	goto ERROR1;
		1351	result->displayed_xsize = 320;
		1352	result->displayed_ysize = 200;
		1353	result->picture_data_x_offset = result->picture_data_y_offset =
		1354	result->form_xsize = result->form_ysize =
		1355	result->displayed_size_x_offset = result->displayed_size_y_offset = 0;
		1356	result->magnification_x = result->magnification_y = 1.0;
		1357	result->cut_left = result->cut_right = result->cut_top =
		1358	result->cut_bottom = 0.0;
		1359	if (!(result->picture = psiconv_empty_paint_data_section()))
		1360	goto ERROR2;
		1361	return result;
		1362	ERROR2:
		1363	free(result);
		1364	ERROR1:
		1365	return NULL;
		1366	}
		1367
		1368	psiconv_sketch_f psiconv_empty_sketch_f(void)
		1369	{
		1370	psiconv_sketch_f result;
		1371	if (!(result = malloc(sizeof(*result))))
		1372	goto ERROR1;
		1373	if (!(result->sketch_sec = psiconv_empty_sketch_section()))
		1374	goto ERROR2;
		1375	return result;
		1376	ERROR2:
		1377	free(result);
		1378	ERROR1:
		1379	return NULL;
		1380	}
		1381
		1382	psiconv_cliparts psiconv_empty_cliparts(void)
		1383	{
		1384	/* Is this correct? */
		1385	return psiconv_list_new(sizeof(struct psiconv_clipart_section_s));
		1386	}
		1387
		1388	psiconv_clipart_f psiconv_empty_clipart_f(void)
		1389	{
		1390	psiconv_clipart_f result;
		1391	if (!(result = malloc(sizeof(*result))))
		1392	goto ERROR1;
		1393	if (!(result->sections = psiconv_empty_cliparts()))
		1394	goto ERROR2;
		1395	return result;
		1396	ERROR2:
		1397	free(result);
		1398	ERROR1:
		1399	return NULL;
		1400	}
		1401
		1402	psiconv_file psiconv_empty_file(psiconv_file_type_t type)
		1403	{
		1404	psiconv_file result;
		1405	if (!(result = malloc(sizeof(*result))))
		1406	return NULL;
		1407	result->type = type;
		1408	if (type == psiconv_word_file) {
		1409	if (!(result->file = psiconv_empty_word_f()))
		1410	goto ERROR;
		1411	} else if (type == psiconv_sheet_file) {
		1412	if (!(result->file = psiconv_empty_sheet_f()))
		1413	goto ERROR;
		1414	} else if (type == psiconv_texted_file) {
		1415	if (!(result->file = psiconv_empty_texted_f()))
		1416	goto ERROR;
		1417	} else if (type == psiconv_mbm_file) {
		1418	if (!(result->file = psiconv_empty_mbm_f()))
		1419	goto ERROR;
		1420	} else if (type == psiconv_sketch_file) {
		1421	if (!(result->file = psiconv_empty_sketch_f()))
		1422	goto ERROR;
		1423	} else if (type == psiconv_clipart_file) {
		1424	if (!(result->file = psiconv_empty_clipart_f()))
		1425	goto ERROR;
		1426	} else
		1427	goto ERROR;
		1428	return result;
		1429	ERROR:
		1430	free(result);
		1431	return NULL;
		1432	}

 Legend:



Removed from v.41
 


changed lines


 
Added in v.171
 Legend:



Removed from v.41
 


changed lines


 
Added in v.171
-Removed from v.41
+Added in v.171

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