--- psiconv/trunk/lib/psiconv/parse_word.c	2003/11/25 17:57:05	168
+++ psiconv/trunk/lib/psiconv/parse_word.c	2004/01/26 12:59:54	188
@@ -161,7 +161,7 @@
 ERROR2:
   free (*result);
 ERROR1:
-  psiconv_warn(config,lev+1,off,"Reading of Word Status Section failed");
+  psiconv_error(config,lev+1,off,"Reading of Word Status Section failed");
   if (length)
     *length = 0;
    if (!res)
@@ -213,13 +213,7 @@
     psiconv_debug(config,lev+3,off+len,"Hotkey value %08x",temp);
     temp = 0;
   }
-  style->hotkey = temp & 0x000000ff;
-  if ((style->hotkey >= 32) && (style->hotkey < 127))
-    psiconv_debug(config,lev+3,off+len,"Hotkey: %c",style->hotkey);
-  else if (style->hotkey == 0x00)
-    psiconv_debug(config,lev+3,off+len,"Hotkey: <none>");
-  else
-    psiconv_debug(config,lev+3,off+len,"Hotkey: %02x",style->hotkey);
+  style->hotkey = psiconv_unicode_from_char(config,temp);
   (*result)->normal = style;
   len += 0x04;
 
@@ -377,7 +371,7 @@
 ERROR5:
   for (j = 0; j < i ;j++) {
     if (!(style = psiconv_list_get((*result)->styles,j))) {
-      psiconv_warn(config,lev+1,off,"Massive memory corruption");
+      psiconv_error(config,lev+1,off,"Massive memory corruption");
       goto ERROR4;
     }
     psiconv_free_character_layout(style->character);
@@ -391,7 +385,7 @@
 ERROR2:
   free (*result);
 ERROR1:
-  psiconv_warn(config,lev+1,off,"Reading of Word Status Section failed");
+  psiconv_error(config,lev+1,off,"Reading of Word Status Section failed");
   if (length)
     *length = 0;
    if (!res)