--- psiconv/trunk/lib/psiconv/data.h	2004/01/04 22:07:02	182
+++ psiconv/trunk/lib/psiconv/data.h	2004/01/06 20:15:01	184
@@ -54,7 +54,7 @@
 typedef psiconv_u32 psiconv_X_t;
 
 /* A string */
-typedef char *psiconv_string_t;
+typedef psiconv_ucs2 *psiconv_string_t;
 
 /* In the Psion file, these are identical; but we translate them to more
    human-readable quantities */
@@ -139,7 +139,7 @@
 {
   psiconv_bool_t on;
   psiconv_size_t font_size;
-  psiconv_u8 character;
+  psiconv_ucs2 character;
   psiconv_bool_t indent;
   psiconv_color color;
   psiconv_font font;
@@ -283,7 +283,7 @@
 
 typedef struct psiconv_paragraph_s
 {
-  char *text;
+  psiconv_string_t text;
   psiconv_character_layout base_character;
   psiconv_paragraph_layout base_paragraph;
   psiconv_s16 base_style;
@@ -533,7 +533,7 @@
   union {
     psiconv_u32 dat_int;
     double dat_float;
-    char *dat_string;
+    psiconv_string_t dat_string;
     psiconv_bool_t dat_bool;
     psiconv_sheet_errorcode_t dat_error;
   } data;
@@ -705,7 +705,7 @@
   union {
     psiconv_u32 dat_int;
     double dat_float;
-    char *dat_string;
+    psiconv_string_t dat_string;
     psiconv_sheet_cell_reference_t dat_cellref;
     psiconv_sheet_cell_block_t dat_cellblock;
     psiconv_formula_list fun_operands;
@@ -783,12 +783,12 @@
 typedef struct psiconv_sheet_variable_s
 {
   psiconv_u32 number;
-  char *name;
+  psiconv_string_t name;
   psiconv_variable_type_t type;
   union {
     psiconv_s32 dat_int;
     double dat_float;
-    char *dat_string;
+    psiconv_string_t dat_string;
     psiconv_sheet_cell_reference_t dat_cellref;
     psiconv_sheet_cell_block_t dat_cellblock;
   } data;
@@ -799,7 +799,7 @@
 
 typedef struct psiconv_sheet_name_section_s
 {
-  char *name;
+  psiconv_string_t name;
 } *psiconv_sheet_name_section;
 
 typedef struct psiconv_sheet_info_section_s