/[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 217 Revision 232
… …
41 psiconv_u32 uid2, psiconv_u32 uid3) 41 psiconv_u32 uid2, psiconv_u32 uid3)
42{ 42{
43 int res; 43 int res;
44 psiconv_progress(config,lev,0,"Writing header section"); 44 psiconv_progress(config,lev,0,"Writing header section");
45 if ((res = psiconv_write_u32(config,buf,lev+1,uid1))) 45 if ((res = psiconv_write_u32(config,buf,lev+1,uid1)))
46 return res; 46 goto ERROR;
47 if ((res = psiconv_write_u32(config,buf,lev+1,uid2))) 47 if ((res = psiconv_write_u32(config,buf,lev+1,uid2)))
48 return res; 48 goto ERROR;
49 if ((res = psiconv_write_u32(config,buf,lev+1,uid3))) 49 if ((res = psiconv_write_u32(config,buf,lev+1,uid3)))
50 goto ERROR;
51 if ((res = psiconv_write_u32(config,buf,lev+1,
52 psiconv_checkuid(uid1,uid2,uid3))))
53 goto ERROR;
54 psiconv_progress(config,lev,0,"End of header section");
55 return 0;
56
57ERROR:
58 psiconv_error(config,lev,0,"Writing of header section failed");
50 return res; 59 return res;
51 return psiconv_write_u32(config,buf,lev+1,psiconv_checkuid(uid1,uid2,uid3));
52} 60}
53 61
54int psiconv_write_section_table_section(const psiconv_config config, 62int psiconv_write_section_table_section(const psiconv_config config,
55 psiconv_buffer buf,int lev, 63 psiconv_buffer buf,int lev,
56 const psiconv_section_table_section value) 64 const psiconv_section_table_section value)
… …
58 int res,i; 66 int res,i;
59 psiconv_section_table_entry entry; 67 psiconv_section_table_entry entry;
60 68
61 psiconv_progress(config,lev,0,"Writing section table section"); 69 psiconv_progress(config,lev,0,"Writing section table section");
62 if (!value) { 70 if (!value) {
63 psiconv_error(config,0,psiconv_buffer_length(buf),"Null section table section"); 71 psiconv_error(config,lev,0,"Null section table section");
64 return -PSICONV_E_GENERATE; 72 res = -PSICONV_E_GENERATE;
73 goto ERROR;
65 } 74 }
66 75
67 if ((res = psiconv_write_u8(config,buf,lev+1,2 * psiconv_list_length(value)))) 76 if ((res = psiconv_write_u8(config,buf,lev+1,2 * psiconv_list_length(value))))
68 return res; 77 goto ERROR;
69 for (i = 0; i < psiconv_list_length(value); i++) { 78 for (i = 0; i < psiconv_list_length(value); i++) {
70 if (!(entry = psiconv_list_get(value,i))) { 79 if (!(entry = psiconv_list_get(value,i))) {
71 psiconv_error(config,0,psiconv_buffer_length(buf),"Massive memory corruption"); 80 psiconv_error(config,lev+1,0,"Massive memory corruption");
72 return -PSICONV_E_NOMEM; 81 res = -PSICONV_E_NOMEM;
82 goto ERROR;
73 } 83 }
74 if ((res = psiconv_write_u32(config,buf,lev+1,entry->id))) 84 if ((res = psiconv_write_u32(config,buf,lev+1,entry->id)))
75 return res; 85 goto ERROR;
76 if ((res = psiconv_write_offset(config,buf,lev+1,entry->offset))) 86 if ((res = psiconv_write_offset(config,buf,lev+1,entry->offset)))
77 return res; 87 goto ERROR;
78 } 88 }
89 psiconv_progress(config,lev,0,"End of section table section");
79 return -PSICONV_E_OK; 90 return -PSICONV_E_OK;
91
92ERROR:
93 psiconv_error(config,lev,0,"Writing of section table section failed");
94 return res;
80} 95}
81 96
82int psiconv_write_application_id_section(const psiconv_config config, 97int psiconv_write_application_id_section(const psiconv_config config,
83 psiconv_buffer buf,int lev,psiconv_u32 id, 98 psiconv_buffer buf,int lev,psiconv_u32 id,
84 const psiconv_string_t text) 99 const psiconv_string_t text)
85{ 100{
86 int res; 101 int res;
87 psiconv_progress(config,lev,0,"Writing application id section"); 102 psiconv_progress(config,lev,0,"Writing application id section");
88 if ((res = psiconv_write_u32(config,buf,lev+1,id))) 103 if ((res = psiconv_write_u32(config,buf,lev+1,id)))
104 goto ERROR;
105 if ((res = psiconv_write_string(config,buf,lev+1,text)))
106 goto ERROR;
107 psiconv_progress(config,lev,0,"End of application id section");
108 return 0;
109ERROR:
110 psiconv_error(config,lev,0,"Writing of application id section failed");
89 return res; 111 return res;
90 return psiconv_write_string(config,buf,lev+1,text);
91} 112}
92 113
93int psiconv_write_text_section(const psiconv_config config, 114int psiconv_write_text_section(const psiconv_config config,
94 psiconv_buffer buf,int lev, 115 psiconv_buffer buf,int lev,
95 const psiconv_text_and_layout value) 116 const psiconv_text_and_layout value)
96{ 117{
97 int res; 118 int res;
98 psiconv_buffer extra_buf; 119 psiconv_buffer extra_buf = NULL;
99 int i,j; 120 int i,j;
100 psiconv_paragraph paragraph; 121 psiconv_paragraph paragraph;
101 122
102 psiconv_progress(config,lev,0,"Writing text section"); 123 psiconv_progress(config,lev,0,"Writing text section");
103 if (!value) { 124 if (!value) {
104 psiconv_error(config,0,psiconv_buffer_length(buf),"Null text section"); 125 psiconv_error(config,lev+1,0,"Null text section");
105 return -PSICONV_E_GENERATE; 126 res = -PSICONV_E_GENERATE;
127 goto ERROR;
106 } 128 }
107 129
108 if (psiconv_list_length(value)) { 130 if (psiconv_list_length(value)) {
109 if (!(extra_buf = psiconv_buffer_new())) 131 if (!(extra_buf = psiconv_buffer_new())) {
110 return -PSICONV_E_NOMEM; 132 res = -PSICONV_E_NOMEM;
133 goto ERROR;
134 }
111 for (i = 0; i < psiconv_list_length(value); i++) { 135 for (i = 0; i < psiconv_list_length(value); i++) {
112 if (!(paragraph = psiconv_list_get(value,i))) { 136 if (!(paragraph = psiconv_list_get(value,i))) {
113 psiconv_error(config,0,psiconv_buffer_length(buf),"Massive memory corruption"); 137 psiconv_error(config,lev+1,0,"Massive memory corruption");
114 res = -PSICONV_E_NOMEM; 138 res = -PSICONV_E_NOMEM;
115 goto ERROR; 139 goto ERROR;
116 } 140 }
117 for (j = 0; j < psiconv_unicode_strlen(paragraph->text); j++) 141 for (j = 0; j < psiconv_unicode_strlen(paragraph->text); j++)
118 if ((res = psiconv_unicode_write_char(config,extra_buf,lev+1, 142 if ((res = psiconv_unicode_write_char(config,extra_buf,lev+1,
… …
123 if ((res = psiconv_write_X(config,buf,lev+1,psiconv_buffer_length(extra_buf)))) 147 if ((res = psiconv_write_X(config,buf,lev+1,psiconv_buffer_length(extra_buf))))
124 goto ERROR; 148 goto ERROR;
125 res = psiconv_buffer_concat(buf,extra_buf); 149 res = psiconv_buffer_concat(buf,extra_buf);
126 } else 150 } else
127 /* Hack: empty text sections are just not allowed */ 151 /* Hack: empty text sections are just not allowed */
128 return psiconv_write_u16(config,buf,lev+1,0x0602); 152 if ((res = psiconv_write_u16(config,buf,lev+1,0x0602)))
153 goto ERROR;
154
155 psiconv_progress(config,lev,0,"End of text section");
156 return 0;
129 157
130ERROR: 158ERROR:
159 if (extra_buf)
131 psiconv_buffer_free(extra_buf); 160 psiconv_buffer_free(extra_buf);
161 psiconv_error(config,lev,0,"Writing of text section failed");
132 return res; 162 return res;
133} 163}
134 164
135int psiconv_write_layout_section(const psiconv_config config, 165int psiconv_write_layout_section(const psiconv_config config,
136 psiconv_buffer buf,int lev, 166 psiconv_buffer buf,int lev,
… …
156 psiconv_character_layout para_charlayout; 186 psiconv_character_layout para_charlayout;
157 int i,j,para_type,nr_of_inlines=0,res,ptl_length,pel_length,thislen,paralen; 187 int i,j,para_type,nr_of_inlines=0,res,ptl_length,pel_length,thislen,paralen;
158 188
159 psiconv_progress(config,lev,0,"Writing layout section"); 189 psiconv_progress(config,lev,0,"Writing layout section");
160 if (!value) { 190 if (!value) {
161 psiconv_error(config,0,psiconv_buffer_length(buf),"Null text section"); 191 psiconv_error(config,lev,0,"Null text section");
162 return -PSICONV_E_GENERATE; 192 res = -PSICONV_E_GENERATE;
193 goto ERROR1;
163 } 194 }
164 195
165 if (!(paragraph_type_list = psiconv_list_new(sizeof(new_type)))) { 196 if (!(paragraph_type_list = psiconv_list_new(sizeof(new_type)))) {
166 res = -PSICONV_E_NOMEM; 197 res = -PSICONV_E_NOMEM;
167 goto ERROR1; 198 goto ERROR1;
… …
187 goto ERROR5; 218 goto ERROR5;
188 } 219 }
189 220
190 for (i = 0; i < psiconv_list_length(value); i++) { 221 for (i = 0; i < psiconv_list_length(value); i++) {
191 if (!(paragraph = psiconv_list_get(value,i))) { 222 if (!(paragraph = psiconv_list_get(value,i))) {
192 psiconv_error(config,0,psiconv_buffer_length(buf),"Massive memory corruption"); 223 psiconv_error(config,lev+1,0,"Massive memory corruption");
193 res = -PSICONV_E_NOMEM; 224 res = -PSICONV_E_NOMEM;
194 goto ERROR6; 225 goto ERROR6;
195 } 226 }
196 if ((res = psiconv_write_u32(config,buf_elements,lev+1, 227 if ((res = psiconv_write_u32(config,buf_elements,lev+1,
197 psiconv_unicode_strlen(paragraph->text)+1))) 228 psiconv_unicode_strlen(paragraph->text)+1)))
198 goto ERROR6; 229 goto ERROR6;
199 230
200 /* We need it for the next if-statement */ 231 /* We need it for the next if-statement */
201 if (psiconv_list_length(paragraph->in_lines) == 1) 232 if (psiconv_list_length(paragraph->in_lines) == 1)
202 if (!(in_line = psiconv_list_get(paragraph->in_lines,1))) 233 if (!(in_line = psiconv_list_get(paragraph->in_lines,1))) {
234 res = -PSICONV_E_NOMEM;
203 goto ERROR6; 235 goto ERROR6;
236 }
204 237
205 if ((psiconv_list_length(paragraph->in_lines) > 1) || 238 if ((psiconv_list_length(paragraph->in_lines) > 1) ||
206 ((psiconv_list_length(paragraph->in_lines) == 1) && 239 ((psiconv_list_length(paragraph->in_lines) == 1) &&
207 (in_line->object != NULL))) { 240 (in_line->object != NULL))) {
208 /* Inline layouts, or an object, so we generate a paragraph element 241 /* Inline layouts, or an object, so we generate a paragraph element
209 and inline elements */ 242 and inline elements */
210 if ((res = psiconv_write_u8(config,buf_elements,lev+1,0x00))) 243 if ((res = psiconv_write_u8(config,buf_elements,lev+1,0x00)))
211 goto ERROR6; 244 goto ERROR6;
212 if (!(style = psiconv_get_style(styles,paragraph->base_style))) { 245 if (!(style = psiconv_get_style(styles,paragraph->base_style))) {
213 psiconv_error(config,0,psiconv_buffer_length(buf),"Unknown style"); 246 psiconv_error(config,lev+1,0,"Unknown style");
214 res = -PSICONV_E_GENERATE; 247 res = -PSICONV_E_GENERATE;
215 goto ERROR6; 248 goto ERROR6;
216 } 249 }
217 if ((res = psiconv_write_paragraph_layout_list(config,buf_elements,lev+1, 250 if ((res = psiconv_write_paragraph_layout_list(config,buf_elements,lev+1,
218 paragraph->base_paragraph, 251 paragraph->base_paragraph,
… …
228 /* Generate the inlines. NB: Against what are all settings relative?!? */ 261 /* Generate the inlines. NB: Against what are all settings relative?!? */
229 paralen = 0; 262 paralen = 0;
230 for (j = 0; j < psiconv_list_length(paragraph->in_lines); j++) { 263 for (j = 0; j < psiconv_list_length(paragraph->in_lines); j++) {
231 nr_of_inlines ++; 264 nr_of_inlines ++;
232 if (!(in_line = psiconv_list_get(paragraph->in_lines,j))) { 265 if (!(in_line = psiconv_list_get(paragraph->in_lines,j))) {
233 psiconv_error(config,0,psiconv_buffer_length(buf), 266 psiconv_error(config,lev,0,"Massive memory corruption");
234 "Massive memory corruption");
235 res = -PSICONV_E_NOMEM; 267 res = -PSICONV_E_NOMEM;
236 goto ERROR6; 268 goto ERROR6;
237 } 269 }
238 if ((res = psiconv_write_u8(config,buf_inlines,lev+1,in_line->object?0x01:0x00))) 270 if ((res = psiconv_write_u8(config,buf_inlines,lev+1,in_line->object?0x01:0x00)))
239 goto ERROR6; 271 goto ERROR6;
… …
277 /* Set para_charlayout to the correct character-level layout */ 309 /* Set para_charlayout to the correct character-level layout */
278 if (psiconv_list_length(paragraph->in_lines) == 0) 310 if (psiconv_list_length(paragraph->in_lines) == 0)
279 para_charlayout = paragraph->base_character; 311 para_charlayout = paragraph->base_character;
280 else { 312 else {
281 if (!(in_line = psiconv_list_get(paragraph->in_lines,0))) { 313 if (!(in_line = psiconv_list_get(paragraph->in_lines,0))) {
282 psiconv_error(config,0,psiconv_buffer_length(buf), 314 psiconv_error(config,lev,0,"Massive memory corruption");
283 "Massive memory corruption");
284 res = -PSICONV_E_NOMEM; 315 res = -PSICONV_E_NOMEM;
285 goto ERROR6; 316 goto ERROR6;
286 } 317 }
287 para_charlayout = in_line->layout; 318 para_charlayout = in_line->layout;
288 } 319 }
289 for (j = 0; j < psiconv_list_length(paragraph_type_list); j++) { 320 for (j = 0; j < psiconv_list_length(paragraph_type_list); j++) {
290 if (!(paragraph_type = psiconv_list_get(paragraph_type_list,j))) { 321 if (!(paragraph_type = psiconv_list_get(paragraph_type_list,j))) {
291 psiconv_error(config,0,psiconv_buffer_length(buf), 322 psiconv_error(config,lev,0,"Massive memory corruption");
292 "Massive memory corruption");
293 res = -PSICONV_E_NOMEM; 323 res = -PSICONV_E_NOMEM;
294 goto ERROR6; 324 goto ERROR6;
295 } 325 }
296 if ((paragraph->base_style == paragraph_type->style) && 326 if ((paragraph->base_style == paragraph_type->style) &&
297 !psiconv_compare_character_layout(para_charlayout, 327 !psiconv_compare_character_layout(para_charlayout,
… …
313 if ((res = psiconv_list_add(paragraph_type_list,paragraph_type))) 343 if ((res = psiconv_list_add(paragraph_type_list,paragraph_type)))
314 goto ERROR6; 344 goto ERROR6;
315 if ((res = psiconv_write_u32(config,buf_types,lev+1,paragraph_type->nr))) 345 if ((res = psiconv_write_u32(config,buf_types,lev+1,paragraph_type->nr)))
316 goto ERROR6; 346 goto ERROR6;
317 if (!(style = psiconv_get_style(styles,paragraph_type->style))) { 347 if (!(style = psiconv_get_style(styles,paragraph_type->style))) {
318 psiconv_error(config,0,psiconv_buffer_length(buf),"Unknown style"); 348 psiconv_error(config,lev,0,"Unknown style");
319 res = -PSICONV_E_GENERATE; 349 res = -PSICONV_E_GENERATE;
320 goto ERROR6; 350 goto ERROR6;
321 } 351 }
322 if ((res = psiconv_write_paragraph_layout_list(config,buf_types,lev+1, 352 if ((res = psiconv_write_paragraph_layout_list(config,buf_types,lev+1,
323 paragraph_type->paragraph,style->paragraph))) 353 paragraph_type->paragraph,style->paragraph)))
… …
384ERROR3: 414ERROR3:
385 psiconv_buffer_free(buf_types); 415 psiconv_buffer_free(buf_types);
386ERROR2: 416ERROR2:
387 psiconv_list_free(paragraph_type_list); 417 psiconv_list_free(paragraph_type_list);
388ERROR1: 418ERROR1:
419 if (res)
420 psiconv_error(config,lev,0,"Writing of layout section failed");
421 else
422 psiconv_progress(config,lev,0,"End of layout section");
389 return res; 423 return res;
390} 424}
391 425
392int psiconv_write_styled_layout_section(const psiconv_config config, 426int psiconv_write_styled_layout_section(const psiconv_config config,
393 psiconv_buffer buf,int lev, 427 psiconv_buffer buf,int lev,
394 psiconv_text_and_layout result, 428 psiconv_text_and_layout result,
395 psiconv_word_styles_section styles) 429 psiconv_word_styles_section styles)
396{ 430{
431 int res;
432
397 psiconv_progress(config,lev,0,"Writing styled layout section"); 433 psiconv_progress(config,lev,0,"Writing styled layout section");
398 return psiconv_write_layout_section(config,buf,lev+1,result,styles,1); 434 res = psiconv_write_layout_section(config,buf,lev+1,result,styles,1);
435 if (res)
436 psiconv_error(config,lev,0,"Writing of styles layout section failed");
437 else
438 psiconv_progress(config,lev,0,"End of styled layout section");
439 return res;
399} 440}
400 441
401int psiconv_write_styleless_layout_section(const psiconv_config config, 442int psiconv_write_styleless_layout_section(const psiconv_config config,
402 psiconv_buffer buf,int lev, 443 psiconv_buffer buf,int lev,
403 const psiconv_text_and_layout value, 444 const psiconv_text_and_layout value,
… …
425 struct psiconv_word_style_s)))) 466 struct psiconv_word_style_s))))
426 goto ERROR6; 467 goto ERROR6;
427 468
428 res = psiconv_write_layout_section(config,buf,lev+1,value,styles_section,0); 469 res = psiconv_write_layout_section(config,buf,lev+1,value,styles_section,0);
429 psiconv_free_word_styles_section(styles_section); 470 psiconv_free_word_styles_section(styles_section);
471 psiconv_progress(config,lev,0,"End of styleless layout section");
430 return res; 472 return res;
431 473
432ERROR6: 474ERROR6:
433 free(styles_section->normal->name); 475 free(styles_section->normal->name);
434ERROR5: 476ERROR5:
… …
438ERROR3: 480ERROR3:
439 free(styles_section->normal); 481 free(styles_section->normal);
440ERROR2: 482ERROR2:
441 free(styles_section); 483 free(styles_section);
442ERROR1: 484ERROR1:
485 psiconv_error(config,lev,0,"Writing of styleless layout section failed");
443 if (!res) 486 if (!res)
444 return -PSICONV_E_NOMEM; 487 return -PSICONV_E_NOMEM;
445 else 488 else
446 return res; 489 return res;
447} 490}
… …
455 psiconv_u32 display_id,icon_id,table_id; 498 psiconv_u32 display_id,icon_id,table_id;
456 psiconv_buffer extra_buf; 499 psiconv_buffer extra_buf;
457 500
458 psiconv_progress(config,lev,0,"Writing embedded object section"); 501 psiconv_progress(config,lev,0,"Writing embedded object section");
459 if (!value) { 502 if (!value) {
460 psiconv_error(config,0,psiconv_buffer_length(buf),"Null Object"); 503 psiconv_error(config,lev,0,"Null Object");
461 res = -PSICONV_E_GENERATE; 504 res = -PSICONV_E_GENERATE;
462 goto ERROR1; 505 goto ERROR1;
463 } 506 }
464 507
465 if (!(extra_buf = psiconv_buffer_new())) { 508 if (!(extra_buf = psiconv_buffer_new())) {
… …
512 (psiconv_sheet_f) value->object->file))) 555 (psiconv_sheet_f) value->object->file)))
513 goto ERROR2; 556 goto ERROR2;
514 break; 557 break;
515*/ 558*/
516 default: 559 default:
517 psiconv_error(config,0,psiconv_buffer_length(buf), 560 psiconv_error(config,lev,0,"Unknown or unsupported object type");
518 "Unknown or unsupported object type");
519 res = -PSICONV_E_GENERATE; 561 res = -PSICONV_E_GENERATE;
520 goto ERROR2; 562 goto ERROR2;
521 } 563 }
522 564
523 if ((res = psiconv_buffer_resolve(extra_buf))) 565 if ((res = psiconv_buffer_resolve(extra_buf)))
524 goto ERROR2; 566 goto ERROR2;
525 if ((res = psiconv_buffer_concat(buf,extra_buf))) 567 if ((res = psiconv_buffer_concat(buf,extra_buf)))
526 goto ERROR2; 568 goto ERROR2;
527 psiconv_buffer_free(extra_buf); 569 psiconv_buffer_free(extra_buf);
528 570
571 psiconv_progress(config,lev,0,"End of embedded object section");
529 return 0; 572 return 0;
530 573
531ERROR2: 574ERROR2:
532 psiconv_buffer_free(extra_buf); 575 psiconv_buffer_free(extra_buf);
533ERROR1: 576ERROR1:
577 psiconv_error(config,lev,0,"Writing of embedded object section failed");
534 return res; 578 return res;
535} 579}
536 580
537 581
538int psiconv_write_object_display_section(const psiconv_config config, 582int psiconv_write_object_display_section(const psiconv_config config,
… …
542 int res; 586 int res;
543 587
544 psiconv_progress(config,lev,0,"Writing object display section"); 588 psiconv_progress(config,lev,0,"Writing object display section");
545 589
546 if (!value) { 590 if (!value) {
547 psiconv_error(config,0,psiconv_buffer_length(buf),"Null Object Display Section"); 591 psiconv_error(config,lev,0,"Null Object Display Section");
548 res = -PSICONV_E_GENERATE; 592 res = -PSICONV_E_GENERATE;
549 goto ERROR1; 593 goto ERROR1;
550 } 594 }
551 595
552 if ((res = psiconv_write_u8(config,buf,lev+1,value->show_icon?0x00:0x01))) 596 if ((res = psiconv_write_u8(config,buf,lev+1,value->show_icon?0x00:0x01)))
… …
556 if ((res = psiconv_write_length(config,buf,lev+1,value->height))) 600 if ((res = psiconv_write_length(config,buf,lev+1,value->height)))
557 goto ERROR1; 601 goto ERROR1;
558 if ((res = psiconv_write_u32(config,buf,lev+1,0x00000000))) 602 if ((res = psiconv_write_u32(config,buf,lev+1,0x00000000)))
559 goto ERROR1; 603 goto ERROR1;
560 604
605 psiconv_progress(config,lev,0,"End of object display section");
606
561 return 0; 607 return 0;
562 608
563ERROR1: 609ERROR1:
610 psiconv_error(config,lev,0,"Writing of object display section failed");
564 return res; 611 return res;
565} 612}
566 613
567int psiconv_write_object_icon_section(const psiconv_config config, 614int psiconv_write_object_icon_section(const psiconv_config config,
568 psiconv_buffer buf,int lev, 615 psiconv_buffer buf,int lev,
… …
571 int res; 618 int res;
572 619
573 psiconv_progress(config,lev,0,"Writing object icon section"); 620 psiconv_progress(config,lev,0,"Writing object icon section");
574 621
575 if (!value) { 622 if (!value) {
576 psiconv_error(config,0,psiconv_buffer_length(buf),"Null Object Icon Section"); 623 psiconv_error(config,lev,0,"Null Object Icon Section");
577 res = -PSICONV_E_GENERATE; 624 res = -PSICONV_E_GENERATE;
578 goto ERROR1; 625 goto ERROR1;
579 } 626 }
580 627
581 if ((res = psiconv_write_string(config,buf,lev+1,value->icon_name))) 628 if ((res = psiconv_write_string(config,buf,lev+1,value->icon_name)))
… …
583 if ((res = psiconv_write_length(config,buf,lev+1,value->icon_width))) 630 if ((res = psiconv_write_length(config,buf,lev+1,value->icon_width)))
584 goto ERROR1; 631 goto ERROR1;
585 if ((res = psiconv_write_length(config,buf,lev+1,value->icon_height))) 632 if ((res = psiconv_write_length(config,buf,lev+1,value->icon_height)))
586 goto ERROR1; 633 goto ERROR1;
587 634
635 psiconv_progress(config,lev,0,"End of object icon section");
588 return 0; 636 return 0;
589 637
590ERROR1: 638ERROR1:
639 psiconv_error(config,lev,0,"Writing of object icon section failed");
591 return res; 640 return res;
592} 641}
Legend:
Removed from v.217  
changed lines
  Added in v.232
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26