From 0a01137ce4791e61bd3a96ba3e691cf7ab3fe0fd Mon Sep 17 00:00:00 2001 From: Jody Goldberg Date: Mon, 20 Sep 1999 13:08:23 +0000 Subject: [PATCH] Remove a few #if ENABLE_BONOBO checks and add an include for 1999-09-20 Jody Goldberg * ms-obj.[ch]: Remove a few #if ENABLE_BONOBO checks and add an include for sheet-object.h. --- plugins/excel/ChangeLog | 5 +++++ plugins/excel/ms-obj.c | 2 -- plugins/excel/ms-obj.h | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog index 1e2b74f4a..d9975e7a9 100644 --- a/plugins/excel/ChangeLog +++ b/plugins/excel/ChangeLog @@ -1,3 +1,8 @@ +1999-09-20 Jody Goldberg + + * ms-obj.[ch]: Remove a few #if ENABLE_BONOBO checks + and add an include for sheet-object.h. + 1999-09-20 Jukka-Pekka Iivonen * ms-obj.[ch]: Added a few #if ENABLE_BONOBO checks to make it diff --git a/plugins/excel/ms-obj.c b/plugins/excel/ms-obj.c index 30bcad49a..28a527d4b 100644 --- a/plugins/excel/ms-obj.c +++ b/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 } diff --git a/plugins/excel/ms-obj.h b/plugins/excel/ms-obj.h index d929797c5..3a91975ac 100644 --- a/plugins/excel/ms-obj.h +++ b/plugins/excel/ms-obj.h @@ -13,6 +13,8 @@ # include # include # 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 { -- GitLab