Commit 0a01137c authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

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.
parent faa0e65f
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> 1999-09-20 Jukka-Pekka Iivonen <iivonen@iki.fi>
* ms-obj.[ch]: Added a few #if ENABLE_BONOBO checks to make it * ms-obj.[ch]: Added a few #if ENABLE_BONOBO checks to make it
......
...@@ -422,7 +422,6 @@ ms_read_OBJ (BiffQuery *q, ExcelWorkbook * wb, Sheet * sheet) ...@@ -422,7 +422,6 @@ ms_read_OBJ (BiffQuery *q, ExcelWorkbook * wb, Sheet * sheet)
}; };
gboolean errors; gboolean errors;
#ifdef ENABLE_BONOBO
SheetObjectType type; SheetObjectType type;
MSObj * obj = g_new(MSObj, 1); MSObj * obj = g_new(MSObj, 1);
obj->excel_type = (unsigned)-1; /* Set to undefined */ obj->excel_type = (unsigned)-1; /* Set to undefined */
...@@ -497,5 +496,4 @@ ms_read_OBJ (BiffQuery *q, ExcelWorkbook * wb, Sheet * sheet) ...@@ -497,5 +496,4 @@ ms_read_OBJ (BiffQuery *q, ExcelWorkbook * wb, Sheet * sheet)
#endif #endif
return obj; return obj;
#endif
} }
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
# include <bonobo/gnome-stream.h> # include <bonobo/gnome-stream.h>
# include <bonobo/gnome-stream-memory.h> # include <bonobo/gnome-stream-memory.h>
# include "sheet-object-container.h" # include "sheet-object-container.h"
#else
# include "sheet-object.h"
#endif #endif
#include "ms-excel-read.h" #include "ms-excel-read.h"
...@@ -26,9 +28,7 @@ typedef struct ...@@ -26,9 +28,7 @@ typedef struct
int id; int id;
/* Type specific parameters */ /* Type specific parameters */
#ifdef ENABLE_BONOBO
SheetObjectType gnumeric_type; SheetObjectType gnumeric_type;
#endif
unsigned excel_type; unsigned excel_type;
union { union {
struct { struct {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment