- Tweak the pixels/inch ratio for XL object import.

- Remove some dead prototypes.

ChangeLog-2000-02-23

+1999-09-20  Jody Goldberg <jgoldberg@home.com>
+
+	* src/cell.h (cell_deep_thaw_dependencies,
+		      cell_deep_freeze_dependencies) : Remove non-existant
+		      prototypes.
+
 1999-09-19  Jukka-Pekka Iivonen  <iivonen@iki.fi>
 
 	* src/functions/fn-stat.c: Implemented PERCENTILE() function.

NEWS

@@ -3,6 +3,7 @@ Gnumeric 0.36
 Jody:
 	* Improve selection to correctly handle overlapping ranges.
 	* Improve XL import of 'escher' stream for pictures and objects.
+	* Enabled import of XL objects by default.
 
 Jukka:
 	* Major clean up to the documentation of functions.

OChangeLog-2000-02-23

+1999-09-20  Jody Goldberg <jgoldberg@home.com>
+
+	* src/cell.h (cell_deep_thaw_dependencies,
+		      cell_deep_freeze_dependencies) : Remove non-existant
+		      prototypes.
+
 1999-09-19  Jukka-Pekka Iivonen  <iivonen@iki.fi>
 
 	* src/functions/fn-stat.c: Implemented PERCENTILE() function.

plugins/excel/ms-obj.c

@@ -115,14 +115,18 @@ ms_parse_object_anchor (int anchor[4],
 
 	for (i = 0; i < 4; ++i) {
 		guint16 const pos = MS_OLE_GET_GUINT16(data + 4*i);
-		float margin = (MS_OLE_GET_GUINT16(data + 4*i + 2) / (1024./72.));
+		/* FIXME : we are slightly off.  Tweak the pixels/inch ratio
+		 * to make this come out on my screen for pic.xls.
+		 * 66 pixels/inch seems correct ???
+		 */
+		float margin = (MS_OLE_GET_GUINT16(data + 4*i + 2) / (1024./66.));
 
-		/* FIXME : we are slightly off.  What about margins ? */
 		float const tmp = (i&1) /* odds are rows */
 		    ? sheet_row_get_unit_distance (sheet, 0, pos)
 		    : sheet_col_get_unit_distance (sheet, 0, pos);
 #ifndef NO_DEBUG_EXCEL
 		if (ms_excel_read_debug > 1) {
+			printf ("zoom = %f;\n", zoom);
 			printf ("%f units (%d pixels) from ",
 				margin, (int)(zoom * margin));
 			if (i&1)

src/cell.h

@@ -185,13 +185,6 @@ void        cell_freeze_redraws          (void);
 void        cell_deep_thaw_redraws            (void);
 void        cell_deep_freeze_redraws          (void);
 
-/*
- * Optimizations to stop any queueing of dependencies.
- */
-extern int  dependencies_deep_frozen;
-void        cell_deep_thaw_dependencies       (void);
-void        cell_deep_freeze_dependencies     (void);
-
 /*
  * Routines used to lookup which cells displays on a given column
  *