--- psiconv/trunk/lib/psiconv/data.h	2001/01/30 23:57:28	101
+++ psiconv/trunk/lib/psiconv/data.h	2001/02/08 20:03:49	107
@@ -193,6 +193,7 @@
   psiconv_bool_t keep_with_next;
   psiconv_bool_t on_next_page;
   psiconv_bool_t no_widow_protection;
+  psiconv_bool_t wrap_to_fit_cell;
   psiconv_length_t border_distance;
   psiconv_bullet bullet;
   psiconv_border left_border;
@@ -406,6 +407,24 @@
   psiconv_cliparts sections;
 } *psiconv_clipart_f;
 
+typedef struct psiconv_sheet_ref_s
+{
+  psiconv_s16 offset;
+  psiconv_bool_t absolute;
+} psiconv_sheet_ref_t;
+
+typedef struct psiconv_sheet_cell_reference_s
+{
+  psiconv_sheet_ref_t row;
+  psiconv_sheet_ref_t column;
+} psiconv_sheet_cell_reference_t;
+
+typedef struct psiconv_sheet_cell_block_s
+{
+  psiconv_sheet_cell_reference_t first;
+  psiconv_sheet_cell_reference_t last;
+} psiconv_sheet_cell_block_t;
+
 typedef struct psiconv_sheet_status_section_s
 {
   psiconv_bool_t show_graph;
@@ -437,6 +456,9 @@
   psiconv_formula_op_pow,
   psiconv_formula_op_pos,
   psiconv_formula_op_neg,
+  psiconv_formula_op_not,
+  psiconv_formula_op_and,
+  psiconv_formula_op_or,
   psiconv_formula_op_con,
   psiconv_formula_op_bra,
   psiconv_formula_mark_eof,
@@ -565,6 +587,8 @@
     psiconv_u32 dat_int;
     double dat_float;
     char *dat_string;
+    psiconv_sheet_cell_reference_t dat_cellref;
+    psiconv_sheet_cell_block_t dat_cellblock;
     psiconv_formula_list fun_operands;
   } data;
 } *psiconv_formula;