gnumeric r16646 - trunk/plugins/excel

[jody svn gnome org]

Author: jody
Date: Sun Jun 22 20:45:59 2008
New Revision: 16646
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16646&view=rev

Log:
Squashed commit of the following:

commit b9654e10ab31dcc2adcfb90bc43e27f8f55ddef0
Author: Jody Goldberg <jody gnome org>
Date:   Sun Jun 22 13:40:25 2008 -0400

    Parse charts in charts, but still drop them on the floor.


Modified:
   trunk/plugins/excel/ChangeLog
   trunk/plugins/excel/ms-chart.c
   trunk/plugins/excel/ms-excel-read.c

Modified: trunk/plugins/excel/ms-chart.c
==============================================================================
--- trunk/plugins/excel/ms-chart.c	(original)
+++ trunk/plugins/excel/ms-chart.c	Sun Jun 22 20:45:59 2008
@@ -3124,13 +3124,15 @@
 static gboolean
 chart_realize_obj (MSContainer *container, MSObj *obj)
 {
+	g_warning ("Dropping nested object");
 	return FALSE;
 }
 
 static SheetObject *
 chart_create_obj  (MSContainer *container, MSObj *obj)
 {
-	return NULL;
+	return (NULL != container && NULL != container->parent)
+		? (container->parent->vtbl->create_obj) (container->parent, obj) : NULL;
 }
 
 static GnmExprTop const *

Modified: trunk/plugins/excel/ms-excel-read.c
==============================================================================
--- trunk/plugins/excel/ms-excel-read.c	(original)
+++ trunk/plugins/excel/ms-excel-read.c	Sun Jun 22 20:45:59 2008
@@ -657,8 +657,6 @@
 ms_sheet_create_obj (MSContainer *container, MSObj *obj)
 {
 	SheetObject *so = NULL;
-	Workbook *wb;
-	ExcelReadSheet *esheet;
 	gpointer label;
 
 	if (obj == NULL)
@@ -666,9 +664,6 @@
 
 	g_return_val_if_fail (container != NULL, NULL);
 
-	esheet = (ExcelReadSheet *)container;
-	wb = esheet->container.importer->wb;
-
 	switch (obj->excel_type) {
 	case 0x01: /* Line */
 	case 0x04: /* Arc */
@@ -712,13 +707,16 @@
 		break;
 
 	/* ignore combos associateed with filters */
-	case 0x14:
+	case 0x14: {
+		ExcelReadSheet *esheet = (ExcelReadSheet *)container;
+
 		if (!obj->combo_in_autofilter)
 			so = g_object_new (sheet_widget_combo_get_type (), NULL);
 
 		/* ok, there are combos to go with the autofilter it can stay */
 		else if (esheet != NULL)
 			esheet->filter = NULL;
+	}
 	break;
 
 	case 0x19: so = g_object_new (cell_comment_get_type (), NULL);