--- psiconv/trunk/lib/psiconv/data.c	2003/11/19 21:04:06	159
+++ psiconv/trunk/lib/psiconv/data.c	2003/11/26 20:56:17	171
@@ -41,6 +41,9 @@
 static void psiconv_free_formula_aux(void *data);
 static void psiconv_free_sheet_worksheet_aux (void *data);
 static void psiconv_free_sheet_variable_aux(void * variable);
+static void psiconv_free_sheet_cell_aux(void *cell);
+static void psiconv_free_sheet_line_aux(void *line);
+static void psiconv_free_sheet_worksheet_aux (void *data);
 
 static psiconv_word_styles_section psiconv_empty_word_styles_section(void);
 static psiconv_text_and_layout psiconv_empty_text_and_layout(void);
@@ -490,7 +493,8 @@
     free(section);
 }
 
-void psiconv_free_object(psiconv_object object)
+void psiconv_free_embedded_object_section
+                                     (psiconv_embedded_object_section object)
 {
   if (object) {
     psiconv_free_object_icon_section(object->icon);
@@ -503,7 +507,8 @@
 void psiconv_free_in_line_layout_aux(void * layout)
 {
   psiconv_free_character_layout(((psiconv_in_line_layout) layout)->layout);
-  psiconv_free_object(((psiconv_in_line_layout) layout)->object);
+  psiconv_free_embedded_object_section
+                                (((psiconv_in_line_layout) layout)->object);
 }
 
 void psiconv_free_in_line_layout(psiconv_in_line_layout layout)
@@ -1343,10 +1348,11 @@
   psiconv_sketch_section result;
   if (!(result = malloc(sizeof(*result))))
     goto ERROR1;
-  result->form_xsize = 320;
-  result->form_ysize = 200;
-  result->picture_x_offset = result->picture_y_offset = result->picture_xsize =
-          result->picture_ysize = 0;
+  result->displayed_xsize = 320;
+  result->displayed_ysize = 200;
+  result->picture_data_x_offset = result->picture_data_y_offset = 
+          result->form_xsize = result->form_ysize =
+          result->displayed_size_x_offset = result->displayed_size_y_offset = 0;
   result->magnification_x = result->magnification_y = 1.0;
   result->cut_left = result->cut_right = result->cut_top = 
           result->cut_bottom = 0.0;