--- psiconv/trunk/lib/psiconv/parse_sheet.c	2001/07/01 13:14:19	121
+++ psiconv/trunk/lib/psiconv/parse_sheet.c	2001/07/01 20:40:52	122
@@ -120,9 +120,9 @@
   else if (temp == 0x0E)
     result->code = psiconv_numberformat_text;
   else if (temp == 0x10)
-    result->code = psiconv_numberformat_date_ddmm;
+    result->code = psiconv_numberformat_date_dmm;
   else if (temp == 0x12)
-    result->code = psiconv_numberformat_date_mmdd;
+    result->code = psiconv_numberformat_date_mmd;
   else if (temp == 0x14)
     result->code = psiconv_numberformat_date_ddmmyy;
   else if (temp == 0x16)
@@ -130,11 +130,11 @@
   else if (temp == 0x18)
     result->code = psiconv_numberformat_date_yymmdd;
   else if (temp == 0x1A)
-    result->code = psiconv_numberformat_date_ddmmm;
+    result->code = psiconv_numberformat_date_dmmm;
   else if (temp == 0x1C)
-    result->code = psiconv_numberformat_date_ddmmmyy;
+    result->code = psiconv_numberformat_date_dmmmyy;
   else if (temp == 0x1E)
-    result->code = psiconv_numberformat_date_ddmmmyyyy;
+    result->code = psiconv_numberformat_date_ddmmmyy;
   else if (temp == 0x20)
     result->code = psiconv_numberformat_date_mmm;
   else if (temp == 0x22)
@@ -144,7 +144,7 @@
   else if (temp == 0x26)
     result->code = psiconv_numberformat_date_monthnameyy;
   else if (temp == 0x28)
-    result->code = psiconv_numberformat_date_monthnameddyyyy;
+    result->code = psiconv_numberformat_date_monthnamedyyyy;
   else if (temp == 0x2A)
     result->code = psiconv_numberformat_datetime_ddmmyyyyhhii;
   else if (temp == 0x2C)
@@ -172,7 +172,7 @@
   len ++;
 
   psiconv_progress(lev+2,off+len, "Going to read the number of decimals");
-  result->decimal = psiconv_read_u8(buf,lev+2,off+len,&res);
+  result->decimal = psiconv_read_u8(buf,lev+2,off+len,&res) >> 1;
   if (res)
     goto ERROR1;
   psiconv_debug(lev+2,off+len,"Decimals: %d",result->decimal);