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

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

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

Revision 230 Revision 231
… …
37 int res; 37 int res;
38 38
39 psiconv_progress(config,lev,0,"Writing word status section"); 39 psiconv_progress(config,lev,0,"Writing word status section");
40 40
41 if (!value) { 41 if (!value) {
42 psiconv_error(config,0,psiconv_buffer_length(buf),"Null word status section"); 42 psiconv_error(config,lev,0,"Null word status section");
43 return -PSICONV_E_GENERATE; 43 res = -PSICONV_E_GENERATE;
44 goto ERROR;
44 } 45 }
45 46
46 if ((res = psiconv_write_u8(config,buf,lev+1,0x02))) 47 if ((res = psiconv_write_u8(config,buf,lev+1,0x02)))
47 return res; 48 goto ERROR;
48 if ((res = psiconv_write_u8(config,buf,lev+1,(value->show_tabs?0x01:0x00) | 49 if ((res = psiconv_write_u8(config,buf,lev+1,(value->show_tabs?0x01:0x00) |
49 (value->show_spaces?0x02:0x00) | 50 (value->show_spaces?0x02:0x00) |
50 (value->show_paragraph_ends?0x04:0x00) | 51 (value->show_paragraph_ends?0x04:0x00) |
51 (value->show_line_breaks?0x08:0x00) | 52 (value->show_line_breaks?0x08:0x00) |
52 (value->show_hard_minus?0x20:0x00) | 53 (value->show_hard_minus?0x20:0x00) |
53 (value->show_hard_space?0x40:0x00)))) 54 (value->show_hard_space?0x40:0x00))))
54 return res; 55 goto ERROR;
55 if ((res = psiconv_write_u8(config,buf,lev+1,(value->show_full_pictures?0x01:0x00) | 56 if ((res = psiconv_write_u8(config,buf,lev+1,(value->show_full_pictures?0x01:0x00) |
56 (value->show_full_graphs?0x02:0x00)))) 57 (value->show_full_graphs?0x02:0x00))))
57 return res; 58 goto ERROR;
58 if ((res = psiconv_write_bool(config,buf,lev+1,value->show_top_toolbar))) 59 if ((res = psiconv_write_bool(config,buf,lev+1,value->show_top_toolbar)))
59 return res; 60 goto ERROR;
60 if ((res = psiconv_write_bool(config,buf,lev+1,value->show_side_toolbar))) 61 if ((res = psiconv_write_bool(config,buf,lev+1,value->show_side_toolbar)))
61 return res; 62 goto ERROR;
62 if ((res = psiconv_write_u8(config,buf,lev+1,(value->fit_lines_to_screen?0x08:0x00)))) 63 if ((res = psiconv_write_u8(config,buf,lev+1,(value->fit_lines_to_screen?0x08:0x00))))
63 return res; 64 goto ERROR;
64 if ((res = psiconv_write_u32(config,buf,lev+1,value->cursor_position))) 65 if ((res = psiconv_write_u32(config,buf,lev+1,value->cursor_position)))
66 goto ERROR;
67 if ((res = psiconv_write_u32(config,buf,lev+1,value->display_size)))
68 goto ERROR;
69 psiconv_progress(config,lev,0,"End of word status section");
70 return 0;
71
72ERROR:
73 psiconv_error(config,lev,0,"Writing of word status section failed");
65 return res; 74 return res;
66 return psiconv_write_u32(config,buf,lev+1,value->display_size);
67} 75}
68 76
69int psiconv_write_word_styles_section(const psiconv_config config, 77int psiconv_write_word_styles_section(const psiconv_config config,
70 psiconv_buffer buf, int lev, 78 psiconv_buffer buf, int lev,
71 psiconv_word_styles_section value) 79 psiconv_word_styles_section value)
… …
78 psiconv_u32 buflen; 86 psiconv_u32 buflen;
79 87
80 psiconv_progress(config,lev,0,"Writing word styles section"); 88 psiconv_progress(config,lev,0,"Writing word styles section");
81 89
82 if (!value || !value->normal || !value->styles) { 90 if (!value || !value->normal || !value->styles) {
83 psiconv_error(config,0,psiconv_buffer_length(buf),"Null word styles section"); 91 psiconv_error(config,lev,0,"Null word styles section");
84 res = -PSICONV_E_GENERATE; 92 res = -PSICONV_E_GENERATE;
85 goto ERROR1; 93 goto ERROR1;
86 } 94 }
87 95
88 if (!(basepara=psiconv_basic_paragraph_layout())) { 96 if (!(basepara=psiconv_basic_paragraph_layout())) {
… …
94 res = -PSICONV_E_NOMEM; 102 res = -PSICONV_E_NOMEM;
95 goto ERROR2; 103 goto ERROR2;
96 } 104 }
97 105
98 106
99 if ((res = psiconv_write_paragraph_layout_list(config,buf,lev+1,value->normal->paragraph, 107 if ((res = psiconv_write_paragraph_layout_list(config,buf,lev+1,
108 value->normal->paragraph,
100 basepara))) 109 basepara)))
101 goto ERROR3; 110 goto ERROR3;
102 /* Always generate the font for Normal */ 111 /* Always generate the font for Normal */
103 font = basechar->font; 112 font = basechar->font;
104 basechar->font = NULL; 113 basechar->font = NULL;
105 res = psiconv_write_character_layout_list(config,buf,lev+1,value->normal->character, 114 res = psiconv_write_character_layout_list(config,buf,lev+1,
115 value->normal->character,
106 basechar); 116 basechar);
107 basechar->font = font; 117 basechar->font = font;
108 if (res) 118 if (res)
109 goto ERROR3; 119 goto ERROR3;
110 buflen = psiconv_buffer_length(buf); 120 buflen = psiconv_buffer_length(buf);
111 if ((res = psiconv_unicode_write_char(config,buf,lev+1, 121 if ((res = psiconv_unicode_write_char(config,buf,lev+1,
… …
113 goto ERROR3; 123 goto ERROR3;
114 for (j = psiconv_buffer_length(buf) - buflen; j < 4; j++) 124 for (j = psiconv_buffer_length(buf) - buflen; j < 4; j++)
115 if ((res = psiconv_write_u8(config,buf,lev+1,0))) 125 if ((res = psiconv_write_u8(config,buf,lev+1,0)))
116 goto ERROR3; 126 goto ERROR3;
117 127
118 if ((res = psiconv_write_u8(config,buf,lev+1,psiconv_list_length(value->styles)))) 128 if ((res = psiconv_write_u8(config,buf,lev+1,
129 psiconv_list_length(value->styles))))
119 goto ERROR3; 130 goto ERROR3;
120 131
121 132
122 133
123 for (i = 0; i < psiconv_list_length(value->styles); i++) { 134 for (i = 0; i < psiconv_list_length(value->styles); i++) {
124 if (!(style = psiconv_list_get(value->styles,i))) { 135 if (!(style = psiconv_list_get(value->styles,i))) {
125 psiconv_error(config,0,psiconv_buffer_length(buf),"Massive memory corruption"); 136 psiconv_error(config,lev,0,"Massive memory corruption");
126 res = -PSICONV_E_NOMEM; 137 res = -PSICONV_E_NOMEM;
127 goto ERROR3; 138 goto ERROR3;
128 } 139 }
129 buflen = psiconv_buffer_length(buf); 140 buflen = psiconv_buffer_length(buf);
130 if ((res = psiconv_unicode_write_char(config,buf,lev+1,style->hotkey))) 141 if ((res = psiconv_unicode_write_char(config,buf,lev+1,style->hotkey)))
… …
135 } 146 }
136 if ((res = psiconv_write_u8(config,buf,lev+1,psiconv_list_length(value->styles)))) 147 if ((res = psiconv_write_u8(config,buf,lev+1,psiconv_list_length(value->styles))))
137 goto ERROR3; 148 goto ERROR3;
138 for (i = 0; i < psiconv_list_length(value->styles); i++) { 149 for (i = 0; i < psiconv_list_length(value->styles); i++) {
139 if (!(style = psiconv_list_get(value->styles,i))) { 150 if (!(style = psiconv_list_get(value->styles,i))) {
140 psiconv_error(config,0,psiconv_buffer_length(buf),"Massive memory corruption"); 151 psiconv_error(config,lev,0,"Massive memory corruption");
141 res = -PSICONV_E_NOMEM; 152 res = -PSICONV_E_NOMEM;
142 goto ERROR3; 153 goto ERROR3;
143 } 154 }
144 if (!style->name) { 155 if (!style->name) {
145 psiconv_error(config,0,psiconv_buffer_length(buf),"Null style name"); 156 psiconv_error(config,lev,0,"Null style name");
146 res = -PSICONV_E_GENERATE; 157 res = -PSICONV_E_GENERATE;
147 goto ERROR3; 158 goto ERROR3;
148 } 159 }
149 if ((res = psiconv_write_string(config,buf,lev+1,style->name))) 160 if ((res = psiconv_write_string(config,buf,lev+1,style->name)))
150 goto ERROR3; 161 goto ERROR3;
… …
169ERROR3: 180ERROR3:
170 psiconv_free_character_layout(basechar); 181 psiconv_free_character_layout(basechar);
171ERROR2: 182ERROR2:
172 psiconv_free_paragraph_layout(basepara); 183 psiconv_free_paragraph_layout(basepara);
173ERROR1: 184ERROR1:
185 if (res)
186 psiconv_error(config,lev,0,"Writing of word styles section failed");
187 else
188 psiconv_progress(config,lev,0,"End of word styles section");
174 return res; 189 return res;
175} 190}
Legend:
Removed from v.230  
changed lines
  Added in v.231
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26