--- psiconv/trunk/lib/psiconv/generate_common.c	2004/02/21 13:24:04	216
+++ psiconv/trunk/lib/psiconv/generate_common.c	2004/02/22 22:24:39	217
@@ -115,10 +115,10 @@
         goto ERROR;
       }
       for (j = 0; j < psiconv_unicode_strlen(paragraph->text); j++) 
-        if ((res = psiconv_write_u8(config,extra_buf,lev+1,
-		          psiconv_unicode_to_char(config,paragraph->text[j]))))
+	if ((res = psiconv_unicode_write_char(config,extra_buf,lev+1,
+                                              paragraph->text[j])))
           goto ERROR;
-      psiconv_write_u8(config,extra_buf,lev+1,0x06);
+      psiconv_unicode_write_char(config,extra_buf,lev+1,0x06);
     }
     if ((res = psiconv_write_X(config,buf,lev+1,psiconv_buffer_length(extra_buf))))
       goto ERROR;
@@ -419,8 +419,7 @@
                             psiconv_clone_paragraph_layout(base_para)))
     goto ERROR4;
   styles_section->normal->hotkey = 0;
-  if ((res = psiconv_unicode_from_chars(config,"",
-	                                &styles_section->normal->name)))
+  if (!(styles_section->normal->name = psiconv_unicode_empty_string()))
     goto ERROR5;
   if (!(styles_section->styles = psiconv_list_new(sizeof(
                                         struct psiconv_word_style_s))))