Remove a few #if ENABLE_BONOBO checks and add an include for

1999-09-20  Jody Goldberg <jgoldberg@home.com>

	* ms-obj.[ch]: Remove a few #if ENABLE_BONOBO checks
	  and add an include for sheet-object.h.

plugins/excel/ChangeLog

+1999-09-20  Jody Goldberg <jgoldberg@home.com>
+
+	* ms-obj.[ch]: Remove a few #if ENABLE_BONOBO checks 
+	  and add an include for sheet-object.h.
+
 1999-09-20  Jukka-Pekka Iivonen  <iivonen@iki.fi>
 
 	* ms-obj.[ch]: Added a few #if ENABLE_BONOBO checks to make it

plugins/excel/ms-obj.c

@@ -422,7 +422,6 @@ ms_read_OBJ (BiffQuery *q, ExcelWorkbook * wb, Sheet * sheet)
 	};
 
 	gboolean errors;
-#ifdef ENABLE_BONOBO
 	SheetObjectType type;
 	MSObj * obj = g_new(MSObj, 1);
 	obj->excel_type = (unsigned)-1; /* Set to undefined */
@@ -497,5 +496,4 @@ ms_read_OBJ (BiffQuery *q, ExcelWorkbook * wb, Sheet * sheet)
 #endif
 
 	return obj;
-#endif
 }

plugins/excel/ms-obj.h

@@ -13,6 +13,8 @@
 #	include <bonobo/gnome-stream.h>
 #	include <bonobo/gnome-stream-memory.h>
 #	include "sheet-object-container.h"
+#else
+#	include "sheet-object.h"
 #endif
 
 #include "ms-excel-read.h"
@@ -26,9 +28,7 @@ typedef struct
 	int id;
 
 	/* Type specific parameters */
-#ifdef ENABLE_BONOBO
 	SheetObjectType	gnumeric_type;
-#endif
 	unsigned	excel_type;
 	union {
 		struct {