/[public]/psiconv/trunk/lib/psiconv/generate_common.c
ViewVC logotype

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 142 Revision 170
… …
27 27
28#ifdef DMALLOC 28#ifdef DMALLOC
29#include <dmalloc.h> 29#include <dmalloc.h>
30#endif 30#endif
31 31
32static int psiconv_write_layout_section(psiconv_buffer buf, 32static int psiconv_write_layout_section(const psiconv_config config,
33 psiconv_buffer buf,
33 const psiconv_text_and_layout value, 34 const psiconv_text_and_layout value,
34 const psiconv_word_styles_section styles, 35 const psiconv_word_styles_section styles,
35 int with_styles); 36 int with_styles);
36 37
37/* Maybe use a psiconv_header_section variable instead? */ 38/* Maybe use a psiconv_header_section variable instead? */
38int psiconv_write_header_section(psiconv_buffer buf,psiconv_u32 uid1, 39int psiconv_write_header_section(const psiconv_config config,
40 psiconv_buffer buf,psiconv_u32 uid1,
39 psiconv_u32 uid2, psiconv_u32 uid3) 41 psiconv_u32 uid2, psiconv_u32 uid3)
40{ 42{
41 int res; 43 int res;
42 if ((res = psiconv_write_u32(buf,uid1))) 44 if ((res = psiconv_write_u32(config,buf,uid1)))
43 return res; 45 return res;
44 if ((res = psiconv_write_u32(buf,uid2))) 46 if ((res = psiconv_write_u32(config,buf,uid2)))
45 return res; 47 return res;
46 if ((res = psiconv_write_u32(buf,uid3))) 48 if ((res = psiconv_write_u32(config,buf,uid3)))
47 return res; 49 return res;
48 return psiconv_write_u32(buf,psiconv_checkuid(uid1,uid2,uid3)); 50 return psiconv_write_u32(config,buf,psiconv_checkuid(uid1,uid2,uid3));
49} 51}
50 52
51int psiconv_write_section_table_section(psiconv_buffer buf, 53int psiconv_write_section_table_section(const psiconv_config config,
54 psiconv_buffer buf,
52 const psiconv_section_table_section value) 55 const psiconv_section_table_section value)
53{ 56{
54 int res,i; 57 int res,i;
55 psiconv_section_table_entry entry; 58 psiconv_section_table_entry entry;
56 59
57 if (!value) { 60 if (!value) {
58 psiconv_warn(0,psiconv_buffer_length(buf),"Null section table section"); 61 psiconv_warn(config,0,psiconv_buffer_length(buf),"Null section table section");
59 return -PSICONV_E_GENERATE; 62 return -PSICONV_E_GENERATE;
60 } 63 }
61 64
62 if ((res = psiconv_write_u8(buf,2 * psiconv_list_length(value)))) 65 if ((res = psiconv_write_u8(config,buf,2 * psiconv_list_length(value))))
63 return res; 66 return res;
64 for (i = 0; i < psiconv_list_length(value); i++) { 67 for (i = 0; i < psiconv_list_length(value); i++) {
65 if (!(entry = psiconv_list_get(value,i))) { 68 if (!(entry = psiconv_list_get(value,i))) {
66 psiconv_warn(0,psiconv_buffer_length(buf),"Massive memory corruption"); 69 psiconv_warn(config,0,psiconv_buffer_length(buf),"Massive memory corruption");
67 return -PSICONV_E_NOMEM; 70 return -PSICONV_E_NOMEM;
68 } 71 }
69 if ((res = psiconv_write_u32(buf,entry->id))) 72 if ((res = psiconv_write_u32(config,buf,entry->id)))
70 return res; 73 return res;
71 if ((res = psiconv_write_offset(buf,entry->offset))) 74 if ((res = psiconv_write_offset(config,buf,entry->offset)))
72 return res; 75 return res;
73 } 76 }
74 return -PSICONV_E_OK; 77 return -PSICONV_E_OK;
75} 78}
76 79
77int psiconv_write_application_id_section(psiconv_buffer buf,psiconv_u32 id, 80int psiconv_write_application_id_section(const psiconv_config config,
81 psiconv_buffer buf,psiconv_u32 id,
78 const psiconv_string_t text) 82 const psiconv_string_t text)
79{ 83{
80 int res; 84 int res;
81 if ((res = psiconv_write_u32(buf,id))) 85 if ((res = psiconv_write_u32(config,buf,id)))
82 return res; 86 return res;
83 return psiconv_write_string(buf,text); 87 return psiconv_write_string(config,buf,text);
84} 88}
85 89
86int psiconv_write_text_section(psiconv_buffer buf, 90int psiconv_write_text_section(const psiconv_config config,
91 psiconv_buffer buf,
87 const psiconv_text_and_layout value) 92 const psiconv_text_and_layout value)
88{ 93{
89 int res; 94 int res;
90 psiconv_buffer extra_buf; 95 psiconv_buffer extra_buf;
91 int i,j; 96 int i,j;
92 psiconv_paragraph paragraph; 97 psiconv_paragraph paragraph;
93 98
94 if (!value) { 99 if (!value) {
95 psiconv_warn(0,psiconv_buffer_length(buf),"Null text section"); 100 psiconv_warn(config,0,psiconv_buffer_length(buf),"Null text section");
96 return -PSICONV_E_GENERATE; 101 return -PSICONV_E_GENERATE;
97 } 102 }
98 103
99 if (psiconv_list_length(value)) { 104 if (psiconv_list_length(value)) {
100 if (!(extra_buf = psiconv_buffer_new())) 105 if (!(extra_buf = psiconv_buffer_new()))
101 return -PSICONV_E_NOMEM; 106 return -PSICONV_E_NOMEM;
102 for (i = 0; i < psiconv_list_length(value); i++) { 107 for (i = 0; i < psiconv_list_length(value); i++) {
103 if (!(paragraph = psiconv_list_get(value,i))) { 108 if (!(paragraph = psiconv_list_get(value,i))) {
104 psiconv_warn(0,psiconv_buffer_length(buf),"Massive memory corruption"); 109 psiconv_warn(config,0,psiconv_buffer_length(buf),"Massive memory corruption");
105 res = -PSICONV_E_OTHER; 110 res = -PSICONV_E_OTHER;
106 goto ERROR; 111 goto ERROR;
107 } 112 }
108 for (j = 0; j < strlen(paragraph->text); j++) 113 for (j = 0; j < strlen(paragraph->text); j++)
109 if ((res = psiconv_write_u8(extra_buf,paragraph->text[j]))) 114 if ((res = psiconv_write_u8(config,extra_buf,paragraph->text[j])))
110 goto ERROR; 115 goto ERROR;
111 psiconv_write_u8(extra_buf,0x06); 116 psiconv_write_u8(config,extra_buf,0x06);
112 } 117 }
113 if ((res = psiconv_write_X(buf,psiconv_buffer_length(extra_buf)))) 118 if ((res = psiconv_write_X(config,buf,psiconv_buffer_length(extra_buf))))
114 goto ERROR; 119 goto ERROR;
115 res = psiconv_buffer_concat(buf,extra_buf); 120 res = psiconv_buffer_concat(buf,extra_buf);
116 } else 121 } else
117 /* Hack: empty text sections are just not allowed */ 122 /* Hack: empty text sections are just not allowed */
118 return psiconv_write_u16(buf,0x0602); 123 return psiconv_write_u16(config,buf,0x0602);
119 124
120ERROR: 125ERROR:
121 psiconv_buffer_free(extra_buf); 126 psiconv_buffer_free(extra_buf);
122 return res; 127 return res;
123} 128}
124 129
125int psiconv_write_layout_section(psiconv_buffer buf, 130int psiconv_write_layout_section(const psiconv_config config,
131 psiconv_buffer buf,
126 const psiconv_text_and_layout value, 132 const psiconv_text_and_layout value,
127 const psiconv_word_styles_section styles, 133 const psiconv_word_styles_section styles,
128 int with_styles) 134 int with_styles)
129{ 135{
130 typedef struct psiconv_paragraph_type_list_s 136 typedef struct psiconv_paragraph_type_list_s
… …
132 psiconv_character_layout character; 138 psiconv_character_layout character;
133 psiconv_paragraph_layout paragraph; 139 psiconv_paragraph_layout paragraph;
134 psiconv_u8 style; 140 psiconv_u8 style;
135 psiconv_u8 nr; 141 psiconv_u8 nr;
136 } *psiconv_paragraph_type_list; 142 } *psiconv_paragraph_type_list;
143 psiconv_u32 obj_id;
137 psiconv_list paragraph_type_list; /* Of psiconv_paragraph_type_list_s */ 144 psiconv_list paragraph_type_list; /* Of psiconv_paragraph_type_list_s */
138 psiconv_paragraph_type_list paragraph_type; 145 psiconv_paragraph_type_list paragraph_type;
139 struct psiconv_paragraph_type_list_s new_type; 146 struct psiconv_paragraph_type_list_s new_type;
140 psiconv_buffer buf_types,buf_elements,buf_inlines; 147 psiconv_buffer buf_types,buf_elements,buf_inlines,buf_objects;
141 psiconv_paragraph paragraph; 148 psiconv_paragraph paragraph;
142 psiconv_in_line_layout in_line; 149 psiconv_in_line_layout in_line = NULL;
143 psiconv_word_style style; 150 psiconv_word_style style;
144 psiconv_character_layout para_charlayout; 151 psiconv_character_layout para_charlayout;
145 int i,j,para_type,nr_of_inlines=0,res,ptl_length,pel_length,thislen,paralen; 152 int i,j,para_type,nr_of_inlines=0,res,ptl_length,pel_length,thislen,paralen;
146 153
147 if (!value) { 154 if (!value) {
148 psiconv_warn(0,psiconv_buffer_length(buf),"Null text section"); 155 psiconv_warn(config,0,psiconv_buffer_length(buf),"Null text section");
149 return -PSICONV_E_GENERATE; 156 return -PSICONV_E_GENERATE;
150 } 157 }
151 158
152 if (!(paragraph_type_list = psiconv_list_new(sizeof(new_type)))) { 159 if (!(paragraph_type_list = psiconv_list_new(sizeof(new_type)))) {
153 res = -PSICONV_E_NOMEM; 160 res = -PSICONV_E_NOMEM;
… …
167 if (!(buf_inlines = psiconv_buffer_new())) { 174 if (!(buf_inlines = psiconv_buffer_new())) {
168 res = -PSICONV_E_NOMEM; 175 res = -PSICONV_E_NOMEM;
169 goto ERROR4; 176 goto ERROR4;
170 } 177 }
171 178
179 if (!(buf_objects = psiconv_buffer_new())) {
180 res = -PSICONV_E_NOMEM;
181 goto ERROR5;
182 }
183
172 for (i = 0; i < psiconv_list_length(value); i++) { 184 for (i = 0; i < psiconv_list_length(value); i++) {
173 if (!(paragraph = psiconv_list_get(value,i))) { 185 if (!(paragraph = psiconv_list_get(value,i))) {
174 psiconv_warn(0,psiconv_buffer_length(buf),"Massive memory corruption"); 186 psiconv_warn(config,0,psiconv_buffer_length(buf),"Massive memory corruption");
175 res = -PSICONV_E_OTHER; 187 res = -PSICONV_E_OTHER;
176 goto ERROR5; 188 goto ERROR6;
177 } 189 }
178 if ((res = psiconv_write_u32(buf_elements,strlen(paragraph->text)+1))) 190 if ((res = psiconv_write_u32(config,buf_elements,strlen(paragraph->text)+1)))
179 goto ERROR5; 191 goto ERROR6;
180 192
193 /* We need it for the next if-statement */
194 if (psiconv_list_length(paragraph->in_lines) == 1)
195 if (!(in_line = psiconv_list_get(paragraph->in_lines,1)))
196 goto ERROR6;
197
181 if (psiconv_list_length(paragraph->in_lines) > 1) { 198 if ((psiconv_list_length(paragraph->in_lines) > 1) ||
199 ((psiconv_list_length(paragraph->in_lines) == 1) &&
200 (in_line->object != NULL))) {
182 /* Inline layouts, so we generate a paragraph element and inline 201 /* Inline layouts, or an object, so we generate a paragraph element
183 elements */ 202 and inline elements */
184 if ((res = psiconv_write_u8(buf_elements,0x00))) 203 if ((res = psiconv_write_u8(config,buf_elements,0x00)))
185 goto ERROR5; 204 goto ERROR6;
186 if (!(style = psiconv_get_style(styles,paragraph->base_style))) { 205 if (!(style = psiconv_get_style(styles,paragraph->base_style))) {
187 psiconv_warn(0,psiconv_buffer_length(buf),"Unknown style"); 206 psiconv_warn(config,0,psiconv_buffer_length(buf),"Unknown style");
188 res = -PSICONV_E_GENERATE; 207 res = -PSICONV_E_GENERATE;
189 goto ERROR5; 208 goto ERROR6;
190 } 209 }
191 if ((res = psiconv_write_paragraph_layout_list(buf_elements, 210 if ((res = psiconv_write_paragraph_layout_list(config,buf_elements,
192 paragraph->base_paragraph, 211 paragraph->base_paragraph,
193 style->paragraph))) 212 style->paragraph)))
194 goto ERROR5; 213 goto ERROR6;
195 if (with_styles) 214 if (with_styles)
196 if ((res = psiconv_write_u8(buf_elements,paragraph->base_style))) 215 if ((res = psiconv_write_u8(config,buf_elements,paragraph->base_style)))
197 goto ERROR5; 216 goto ERROR6;
198 if ((res = psiconv_write_u32(buf_elements, 217 if ((res = psiconv_write_u32(config,buf_elements,
199 psiconv_list_length(paragraph->in_lines)))) 218 psiconv_list_length(paragraph->in_lines))))
200 goto ERROR5; 219 goto ERROR6;
201 220
202 /* Generate the inlines. NB: Against what are all settings relative?!? */ 221 /* Generate the inlines. NB: Against what are all settings relative?!? */
203 paralen = 0; 222 paralen = 0;
204 for (j = 0; j < psiconv_list_length(paragraph->in_lines); j++) { 223 for (j = 0; j < psiconv_list_length(paragraph->in_lines); j++) {
205 nr_of_inlines ++; 224 nr_of_inlines ++;
206 if (!(in_line = psiconv_list_get(paragraph->in_lines,j))) { 225 if (!(in_line = psiconv_list_get(paragraph->in_lines,j))) {
207 psiconv_warn(0,psiconv_buffer_length(buf), 226 psiconv_warn(config,0,psiconv_buffer_length(buf),
208 "Massive memory corruption"); 227 "Massive memory corruption");
209 res = -PSICONV_E_OTHER; 228 res = -PSICONV_E_OTHER;
210 goto ERROR5; 229 goto ERROR6;
211 } 230 }
212 if ((res = psiconv_write_u8(buf_inlines,0x00))) 231 if ((res = psiconv_write_u8(config,buf_inlines,in_line->object?0x01:0x00)))
213 goto ERROR5; 232 goto ERROR6;
214 thislen = in_line->length; 233 thislen = in_line->length;
215 paralen += thislen; 234 paralen += thislen;
216 /* If this is the last in_line, we need to make sure that the 235 /* If this is the last in_line, we need to make sure that the
217 complete length of all inlines equals the text length */ 236 complete length of all inlines equals the text length */
218 if (j == psiconv_list_length(paragraph->in_lines)-1) { 237 if (j == psiconv_list_length(paragraph->in_lines)-1) {
219 if (paralen > strlen(paragraph->text)+1) { 238 if (paralen > strlen(paragraph->text)+1) {
220 res = -PSICONV_E_GENERATE; 239 res = -PSICONV_E_GENERATE;
221 goto ERROR5; 240 goto ERROR6;
222 } 241 }
223 thislen += strlen(paragraph->text)+1-paralen; 242 thislen += strlen(paragraph->text)+1-paralen;
224 } 243 }
225 if ((res = psiconv_write_u32(buf_inlines,thislen))) 244 if ((res = psiconv_write_u32(config,buf_inlines,thislen)))
226 goto ERROR5; 245 goto ERROR6;
227 if ((res = psiconv_write_character_layout_list(buf_inlines, 246 if ((res = psiconv_write_character_layout_list(config,buf_inlines,
228 in_line->layout, 247 in_line->layout,
229 style->character))) 248 style->character)))
230 goto ERROR5; 249 goto ERROR6;
250 if (in_line->object) {
251 if ((res = psiconv_write_u32(config,buf_inlines,PSICONV_ID_OBJECT)))
252 goto ERROR6;
253 obj_id = psiconv_buffer_unique_id();
254 if ((res = psiconv_buffer_add_reference(buf_inlines,obj_id)))
255 goto ERROR6;
256 if ((res = psiconv_buffer_add_target(buf_objects,obj_id)))
257 goto ERROR6;
258 if ((res = psiconv_write_embedded_object_section(config,buf_objects,
259 in_line->object)))
260 goto ERROR6;
261 if ((res = psiconv_write_length(config,buf_inlines,in_line->object_width)))
262 goto ERROR6;
263 if ((res = psiconv_write_length(config,buf_inlines,in_line->object_height)))
264 goto ERROR6;
265 }
231 } 266 }
232 } else { 267 } else {
233 /* No inline layouts (or only 1), so we generate a paragraph type list */ 268 /* No inline layouts (or only 1), so we generate a paragraph type list */
234 para_type = 0; 269 para_type = 0;
235 /* Set para_charlayout to the correct character-level layout */ 270 /* Set para_charlayout to the correct character-level layout */
236 if (psiconv_list_length(paragraph->in_lines) == 0) 271 if (psiconv_list_length(paragraph->in_lines) == 0)
237 para_charlayout = paragraph->base_character; 272 para_charlayout = paragraph->base_character;
238 else { 273 else {
239 if (!(in_line = psiconv_list_get(paragraph->in_lines,0))) { 274 if (!(in_line = psiconv_list_get(paragraph->in_lines,0))) {
240 psiconv_warn(0,psiconv_buffer_length(buf), 275 psiconv_warn(config,0,psiconv_buffer_length(buf),
241 "Massive memory corruption"); 276 "Massive memory corruption");
242 res = -PSICONV_E_OTHER; 277 res = -PSICONV_E_OTHER;
243 goto ERROR5; 278 goto ERROR6;
244 } 279 }
245 para_charlayout = in_line->layout; 280 para_charlayout = in_line->layout;
246 } 281 }
247 for (j = 0; j < psiconv_list_length(paragraph_type_list); j++) { 282 for (j = 0; j < psiconv_list_length(paragraph_type_list); j++) {
248 if (!(paragraph_type = psiconv_list_get(paragraph_type_list,j))) { 283 if (!(paragraph_type = psiconv_list_get(paragraph_type_list,j))) {
249 psiconv_warn(0,psiconv_buffer_length(buf), 284 psiconv_warn(config,0,psiconv_buffer_length(buf),
250 "Massive memory corruption"); 285 "Massive memory corruption");
251 res = -PSICONV_E_OTHER; 286 res = -PSICONV_E_OTHER;
252 goto ERROR5; 287 goto ERROR6;
253 } 288 }
254 if ((paragraph->base_style == paragraph_type->style) && 289 if ((paragraph->base_style == paragraph_type->style) &&
255 !psiconv_compare_character_layout(para_charlayout, 290 !psiconv_compare_character_layout(para_charlayout,
256 paragraph_type->character) && 291 paragraph_type->character) &&
257 !psiconv_compare_paragraph_layout(paragraph->base_paragraph, 292 !psiconv_compare_paragraph_layout(paragraph->base_paragraph,
… …
267 new_type.paragraph = paragraph->base_paragraph; 302 new_type.paragraph = paragraph->base_paragraph;
268 new_type.character = para_charlayout; 303 new_type.character = para_charlayout;
269 new_type.style = paragraph->base_style; 304 new_type.style = paragraph->base_style;
270 paragraph_type = &new_type; 305 paragraph_type = &new_type;
271 if ((res = psiconv_list_add(paragraph_type_list,paragraph_type))) 306 if ((res = psiconv_list_add(paragraph_type_list,paragraph_type)))
272 goto ERROR5; 307 goto ERROR6;
273 if ((res = psiconv_write_u32(buf_types,paragraph_type->nr))) 308 if ((res = psiconv_write_u32(config,buf_types,paragraph_type->nr)))
274 goto ERROR5; 309 goto ERROR6;
275 if (!(style = psiconv_get_style(styles,paragraph_type->style))) { 310 if (!(style = psiconv_get_style(styles,paragraph_type->style))) {
276 psiconv_warn(0,psiconv_buffer_length(buf),"Unknown style"); 311 psiconv_warn(config,0,psiconv_buffer_length(buf),"Unknown style");
277 res = -PSICONV_E_GENERATE; 312 res = -PSICONV_E_GENERATE;
278 goto ERROR5; 313 goto ERROR6;
279 } 314 }
280 if ((res = psiconv_write_paragraph_layout_list(buf_types, 315 if ((res = psiconv_write_paragraph_layout_list(config,buf_types,
281 paragraph_type->paragraph,style->paragraph))) 316 paragraph_type->paragraph,style->paragraph)))
282 goto ERROR5; 317 goto ERROR6;
283 if (with_styles) 318 if (with_styles)
284 if ((res = psiconv_write_u8(buf_types,paragraph_type->style))) 319 if ((res = psiconv_write_u8(config,buf_types,paragraph_type->style)))
285 goto ERROR5; 320 goto ERROR6;
286 if ((res = psiconv_write_character_layout_list(buf_types, 321 if ((res = psiconv_write_character_layout_list(config,buf_types,
287 paragraph_type->character,style->character))) 322 paragraph_type->character,style->character)))
288 goto ERROR5; 323 goto ERROR6;
289 } 324 }
290 if ((res = psiconv_write_u8(buf_elements,para_type))) 325 if ((res = psiconv_write_u8(config,buf_elements,para_type)))
291 goto ERROR5; 326 goto ERROR6;
292 } 327 }
293 } 328 }
294 329
295 /* HACK: special case: no paragraphs at all. We need to improvize. */ 330 /* HACK: special case: no paragraphs at all. We need to improvize. */
296 if (!psiconv_list_length(value)) { 331 if (!psiconv_list_length(value)) {
297 if ((res = psiconv_write_u32(buf_types,1))) 332 if ((res = psiconv_write_u32(config,buf_types,1)))
298 goto ERROR5; 333 goto ERROR6;
299 if ((res = psiconv_write_u32(buf_types,0))) 334 if ((res = psiconv_write_u32(config,buf_types,0)))
300 goto ERROR5; 335 goto ERROR6;
301 if (with_styles) 336 if (with_styles)
302 if ((res = psiconv_write_u8(buf_types,0))) 337 if ((res = psiconv_write_u8(config,buf_types,0)))
303 goto ERROR5; 338 goto ERROR6;
304 if ((res = psiconv_write_u32(buf_types,0))) 339 if ((res = psiconv_write_u32(config,buf_types,0)))
305 goto ERROR5; 340 goto ERROR6;
306 341
307 if ((res = psiconv_write_u32(buf_elements,1))) 342 if ((res = psiconv_write_u32(config,buf_elements,1)))
308 goto ERROR5; 343 goto ERROR6;
309 if ((res = psiconv_write_u8(buf_elements,1))) 344 if ((res = psiconv_write_u8(config,buf_elements,1)))
310 goto ERROR5; 345 goto ERROR6;
311 pel_length = 1; 346 pel_length = 1;
312 ptl_length = 1; 347 ptl_length = 1;
313 } else { 348 } else {
314 pel_length = psiconv_list_length(value); 349 pel_length = psiconv_list_length(value);
315 ptl_length = psiconv_list_length(paragraph_type_list); 350 ptl_length = psiconv_list_length(paragraph_type_list);
316 } 351 }
317 352
318 /* Now append everything */ 353 /* Now append everything */
319 if ((res = psiconv_write_u16(buf,with_styles?0x0001:0x0000))) 354 if ((res = psiconv_write_u16(config,buf,with_styles?0x0001:0x0000)))
320 goto ERROR5; 355 goto ERROR6;
321 if ((res = psiconv_write_u8(buf, ptl_length))) 356 if ((res = psiconv_write_u8(config,buf, ptl_length)))
322 goto ERROR5; 357 goto ERROR6;
323 if ((res = psiconv_buffer_concat(buf,buf_types))) 358 if ((res = psiconv_buffer_concat(buf,buf_types)))
324 goto ERROR5; 359 goto ERROR6;
325 if ((res = psiconv_write_u32(buf,pel_length))) 360 if ((res = psiconv_write_u32(config,buf,pel_length)))
326 goto ERROR5; 361 goto ERROR6;
327 if ((res = psiconv_buffer_concat(buf,buf_elements))) 362 if ((res = psiconv_buffer_concat(buf,buf_elements)))
328 goto ERROR5; 363 goto ERROR6;
329 if ((res = psiconv_write_u32(buf,nr_of_inlines))) 364 if ((res = psiconv_write_u32(config,buf,nr_of_inlines)))
330 goto ERROR5; 365 goto ERROR6;
331 res = psiconv_buffer_concat(buf,buf_inlines); 366 if ((res = psiconv_buffer_concat(buf,buf_inlines)))
367 goto ERROR6;
368 if ((res = psiconv_buffer_concat(buf,buf_objects)))
369 goto ERROR6;
332 370
371ERROR6:
372 psiconv_buffer_free(buf_objects);
333ERROR5: 373ERROR5:
334 psiconv_buffer_free(buf_inlines); 374 psiconv_buffer_free(buf_inlines);
335ERROR4: 375ERROR4:
336 psiconv_buffer_free(buf_elements); 376 psiconv_buffer_free(buf_elements);
337ERROR3: 377ERROR3:
… …
340 psiconv_list_free(paragraph_type_list); 380 psiconv_list_free(paragraph_type_list);
341ERROR1: 381ERROR1:
342 return res; 382 return res;
343} 383}
344 384
345int psiconv_write_styled_layout_section(psiconv_buffer buf, 385int psiconv_write_styled_layout_section(const psiconv_config config,
386 psiconv_buffer buf,
346 psiconv_text_and_layout result, 387 psiconv_text_and_layout result,
347 psiconv_word_styles_section styles) 388 psiconv_word_styles_section styles)
348{ 389{
349 return psiconv_write_layout_section(buf,result,styles,1); 390 return psiconv_write_layout_section(config,buf,result,styles,1);
350} 391}
351 392
352int psiconv_write_styleless_layout_section(psiconv_buffer buf, 393int psiconv_write_styleless_layout_section(const psiconv_config config,
394 psiconv_buffer buf,
353 const psiconv_text_and_layout value, 395 const psiconv_text_and_layout value,
354 const psiconv_character_layout base_char, 396 const psiconv_character_layout base_char,
355 const psiconv_paragraph_layout base_para) 397 const psiconv_paragraph_layout base_para)
356{ 398{
357 int res = 0; 399 int res = 0;
… …
372 goto ERROR5; 414 goto ERROR5;
373 if (!(styles_section->styles = psiconv_list_new(sizeof( 415 if (!(styles_section->styles = psiconv_list_new(sizeof(
374 struct psiconv_word_style_s)))) 416 struct psiconv_word_style_s))))
375 goto ERROR6; 417 goto ERROR6;
376 418
377 res = psiconv_write_layout_section(buf,value,styles_section,0); 419 res = psiconv_write_layout_section(config,buf,value,styles_section,0);
378 psiconv_free_word_styles_section(styles_section); 420 psiconv_free_word_styles_section(styles_section);
379 return res; 421 return res;
380 422
381ERROR6: 423ERROR6:
382 free(styles_section->normal->name); 424 free(styles_section->normal->name);
… …
392 if (!res) 434 if (!res)
393 return -PSICONV_E_NOMEM; 435 return -PSICONV_E_NOMEM;
394 else 436 else
395 return res; 437 return res;
396} 438}
439
440
441int psiconv_write_embedded_object_section(const psiconv_config config,
442 psiconv_buffer buf,
443 const psiconv_embedded_object_section value)
444{
445 int res;
446 psiconv_u32 display_id,icon_id,table_id;
447 psiconv_buffer extra_buf;
448
449 if (!value) {
450 psiconv_warn(config,0,psiconv_buffer_length(buf),"Null Object");
451 res = -PSICONV_E_GENERATE;
452 goto ERROR1;
453 }
454
455 if (!(extra_buf = psiconv_buffer_new())) {
456 res = -PSICONV_E_NOMEM;
457 goto ERROR1;
458 }
459
460 display_id = psiconv_buffer_unique_id();
461 icon_id = psiconv_buffer_unique_id();
462 table_id = psiconv_buffer_unique_id();
463 if ((res = psiconv_write_u8(config,buf,0x06)))
464 goto ERROR2;
465 if ((res = psiconv_write_u32(config,buf,PSICONV_ID_OBJECT_DISPLAY_SECTION)))
466 goto ERROR2;
467 if ((res = psiconv_buffer_add_reference(buf,display_id)))
468 goto ERROR2;
469 if ((res = psiconv_write_u32(config,buf,PSICONV_ID_OBJECT_ICON_SECTION)))
470 goto ERROR2;
471 if ((res = psiconv_buffer_add_reference(buf,icon_id)))
472 goto ERROR2;
473 if ((res = psiconv_write_u32(config,buf,PSICONV_ID_OBJECT_SECTION_TABLE_SECTION)))
474 goto ERROR2;
475 if ((res = psiconv_buffer_add_reference(buf,table_id)))
476 goto ERROR2;
477
478 if ((res = psiconv_buffer_add_target(buf,display_id)))
479 goto ERROR2;
480 if ((res = psiconv_write_object_display_section(config,buf,value->display)))
481 goto ERROR2;
482 if ((res = psiconv_buffer_add_target(buf,icon_id)))
483 goto ERROR2;
484 if ((res = psiconv_write_object_icon_section(config,buf,value->icon)))
485 goto ERROR2;
486 if ((res = psiconv_buffer_add_target(buf,table_id)))
487 goto ERROR2;
488 switch(value->object->type) {
489 case psiconv_word_file:
490 if ((res = psiconv_write_word_file(config,extra_buf,
491 (psiconv_word_f) value->object->file)))
492 goto ERROR2;
493 break;
494 case psiconv_sketch_file:
495 if ((res = psiconv_write_sketch_file(config,extra_buf,
496 (psiconv_sketch_f) value->object->file)))
497 goto ERROR2;
498 break;
499/*
500 case psiconv_sheet_file:
501 if ((res = psiconv_write_sheet_file(config,extra_buf,
502 (psiconv_sheet_f) value->object->file)))
503 goto ERROR2;
504 break;
505*/
506 default:
507 psiconv_warn(config,0,psiconv_buffer_length(buf),
508 "Unknown or unsupported object type");
509 res = -PSICONV_E_GENERATE;
510 goto ERROR2;
511 }
512
513 if ((res = psiconv_buffer_resolve(extra_buf)))
514 goto ERROR2;
515 if ((res = psiconv_buffer_concat(buf,extra_buf)))
516 goto ERROR2;
517
518 return 0;
519
520ERROR2:
521 psiconv_buffer_free(extra_buf);
522ERROR1:
523 return res;
524}
525
526
527int psiconv_write_object_display_section(const psiconv_config config,
528 psiconv_buffer buf,
529 const psiconv_object_display_section value)
530{
531 int res;
532
533 if (!value) {
534 psiconv_warn(config,0,psiconv_buffer_length(buf),"Null Object Display Section");
535 res = -PSICONV_E_GENERATE;
536 goto ERROR1;
537 }
538
539 if ((res = psiconv_write_u8(config,buf,value->show_icon?0x00:0x01)))
540 goto ERROR1;
541 if ((res = psiconv_write_length(config,buf,value->width)))
542 goto ERROR1;
543 if ((res = psiconv_write_length(config,buf,value->height)))
544 goto ERROR1;
545 if ((res = psiconv_write_u32(config,buf,0x00000000)))
546 goto ERROR1;
547
548 return 0;
549
550ERROR1:
551 return res;
552}
553
554int psiconv_write_object_icon_section(const psiconv_config config,
555 psiconv_buffer buf,
556 const psiconv_object_icon_section value)
557{
558 int res;
559
560 if (!value) {
561 psiconv_warn(config,0,psiconv_buffer_length(buf),"Null Object Icon Section");
562 res = -PSICONV_E_GENERATE;
563 goto ERROR1;
564 }
565
566 if ((res = psiconv_write_string(config,buf,value->icon_name)))
567 goto ERROR1;
568 if ((res = psiconv_write_length(config,buf,value->icon_width)))
569 goto ERROR1;
570 if ((res = psiconv_write_length(config,buf,value->icon_height)))
571 goto ERROR1;
572
573 return 0;
574
575ERROR1:
576 return res;
577}
Legend:
Removed from v.142  
changed lines
  Added in v.170
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26