… | |
… | |
118 | else if (temp == 0x0C) |
118 | else if (temp == 0x0C) |
119 | result->code = psiconv_numberformat_boolean; |
119 | result->code = psiconv_numberformat_boolean; |
120 | else if (temp == 0x0E) |
120 | else if (temp == 0x0E) |
121 | result->code = psiconv_numberformat_text; |
121 | result->code = psiconv_numberformat_text; |
122 | else if (temp == 0x10) |
122 | else if (temp == 0x10) |
123 | result->code = psiconv_numberformat_date_ddmm; |
123 | result->code = psiconv_numberformat_date_dmm; |
124 | else if (temp == 0x12) |
124 | else if (temp == 0x12) |
125 | result->code = psiconv_numberformat_date_mmdd; |
125 | result->code = psiconv_numberformat_date_mmd; |
126 | else if (temp == 0x14) |
126 | else if (temp == 0x14) |
127 | result->code = psiconv_numberformat_date_ddmmyy; |
127 | result->code = psiconv_numberformat_date_ddmmyy; |
128 | else if (temp == 0x16) |
128 | else if (temp == 0x16) |
129 | result->code = psiconv_numberformat_date_mmddyy; |
129 | result->code = psiconv_numberformat_date_mmddyy; |
130 | else if (temp == 0x18) |
130 | else if (temp == 0x18) |
131 | result->code = psiconv_numberformat_date_yymmdd; |
131 | result->code = psiconv_numberformat_date_yymmdd; |
132 | else if (temp == 0x1A) |
132 | else if (temp == 0x1A) |
133 | result->code = psiconv_numberformat_date_ddmmm; |
133 | result->code = psiconv_numberformat_date_dmmm; |
134 | else if (temp == 0x1C) |
134 | else if (temp == 0x1C) |
|
|
135 | result->code = psiconv_numberformat_date_dmmmyy; |
|
|
136 | else if (temp == 0x1E) |
135 | result->code = psiconv_numberformat_date_ddmmmyy; |
137 | result->code = psiconv_numberformat_date_ddmmmyy; |
136 | else if (temp == 0x1E) |
|
|
137 | result->code = psiconv_numberformat_date_ddmmmyyyy; |
|
|
138 | else if (temp == 0x20) |
138 | else if (temp == 0x20) |
139 | result->code = psiconv_numberformat_date_mmm; |
139 | result->code = psiconv_numberformat_date_mmm; |
140 | else if (temp == 0x22) |
140 | else if (temp == 0x22) |
141 | result->code = psiconv_numberformat_date_monthname; |
141 | result->code = psiconv_numberformat_date_monthname; |
142 | else if (temp == 0x24) |
142 | else if (temp == 0x24) |
143 | result->code = psiconv_numberformat_date_mmmyy; |
143 | result->code = psiconv_numberformat_date_mmmyy; |
144 | else if (temp == 0x26) |
144 | else if (temp == 0x26) |
145 | result->code = psiconv_numberformat_date_monthnameyy; |
145 | result->code = psiconv_numberformat_date_monthnameyy; |
146 | else if (temp == 0x28) |
146 | else if (temp == 0x28) |
147 | result->code = psiconv_numberformat_date_monthnameddyyyy; |
147 | result->code = psiconv_numberformat_date_monthnamedyyyy; |
148 | else if (temp == 0x2A) |
148 | else if (temp == 0x2A) |
149 | result->code = psiconv_numberformat_datetime_ddmmyyyyhhii; |
149 | result->code = psiconv_numberformat_datetime_ddmmyyyyhhii; |
150 | else if (temp == 0x2C) |
150 | else if (temp == 0x2C) |
151 | result->code = psiconv_numberformat_datetime_ddmmyyyyHHii; |
151 | result->code = psiconv_numberformat_datetime_ddmmyyyyHHii; |
152 | else if (temp == 0x2E) |
152 | else if (temp == 0x2E) |
… | |
… | |
170 | result->code = psiconv_numberformat_general; |
170 | result->code = psiconv_numberformat_general; |
171 | } |
171 | } |
172 | len ++; |
172 | len ++; |
173 | |
173 | |
174 | psiconv_progress(lev+2,off+len, "Going to read the number of decimals"); |
174 | psiconv_progress(lev+2,off+len, "Going to read the number of decimals"); |
175 | result->decimal = psiconv_read_u8(buf,lev+2,off+len,&res); |
175 | result->decimal = psiconv_read_u8(buf,lev+2,off+len,&res) >> 1; |
176 | if (res) |
176 | if (res) |
177 | goto ERROR1; |
177 | goto ERROR1; |
178 | psiconv_debug(lev+2,off+len,"Decimals: %d",result->decimal); |
178 | psiconv_debug(lev+2,off+len,"Decimals: %d",result->decimal); |
179 | len ++; |
179 | len ++; |
180 | |
180 | |