| … | |
… | |
| 63 | { |
63 | { |
| 64 | int res,i; |
64 | int res,i; |
| 65 | psiconv_word_style style; |
65 | psiconv_word_style style; |
| 66 | psiconv_paragraph_layout basepara; |
66 | psiconv_paragraph_layout basepara; |
| 67 | psiconv_character_layout basechar; |
67 | psiconv_character_layout basechar; |
|
|
68 | psiconv_font font; |
| 68 | |
69 | |
| 69 | |
70 | |
| 70 | if (!value || !value->normal || !value->styles) { |
71 | if (!value || !value->normal || !value->styles) { |
| 71 | psiconv_warn(0,psiconv_buffer_length(buf),"Null word styles section"); |
72 | psiconv_warn(0,psiconv_buffer_length(buf),"Null word styles section"); |
| 72 | res = -PSICONV_E_GENERATE; |
73 | res = -PSICONV_E_GENERATE; |
| … | |
… | |
| 85 | |
86 | |
| 86 | |
87 | |
| 87 | if ((res = psiconv_write_paragraph_layout_list(buf,value->normal->paragraph, |
88 | if ((res = psiconv_write_paragraph_layout_list(buf,value->normal->paragraph, |
| 88 | basepara))) |
89 | basepara))) |
| 89 | goto ERROR3; |
90 | goto ERROR3; |
|
|
91 | /* Always generate the font for Normal */ |
|
|
92 | font = basechar->font; |
|
|
93 | basechar->font = NULL; |
| 90 | if ((res = psiconv_write_character_layout_list(buf,value->normal->character, |
94 | res = psiconv_write_character_layout_list(buf,value->normal->character, |
| 91 | basechar))) |
95 | basechar); |
|
|
96 | basechar->font = font; |
|
|
97 | if (res) |
| 92 | goto ERROR3; |
98 | goto ERROR3; |
| 93 | if ((res = psiconv_write_u32(buf,value->normal->hotkey))) |
99 | if ((res = psiconv_write_u32(buf,value->normal->hotkey))) |
| 94 | goto ERROR3; |
100 | goto ERROR3; |
| 95 | if ((res = psiconv_write_u8(buf,psiconv_list_length(value->styles)))) |
101 | if ((res = psiconv_write_u8(buf,psiconv_list_length(value->styles)))) |
| 96 | goto ERROR3; |
102 | goto ERROR3; |
Parent Directory
| 
Revision Log
| 
Patch