gnumeric r16415 - trunk/plugins/excel

[mortenw svn gnome org]

Author: mortenw
Date: Thu Feb 28 18:16:13 2008
New Revision: 16415
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16415&view=rev

Log:
Don't do criticals for data errors.



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

Modified: trunk/plugins/excel/ms-chart.c
==============================================================================
--- trunk/plugins/excel/ms-chart.c	(original)
+++ trunk/plugins/excel/ms-chart.c	Thu Feb 28 18:16:13 2008
@@ -208,7 +208,7 @@
 BC_R(top_state) (XLChartReadState *s, unsigned n)
 {
 	g_return_val_if_fail (s != NULL, 0);
-	g_return_val_if_fail (s->stack->len >= n+1, 0);
+	XL_CHECK_CONDITION_VAL (s->stack->len >= n+1, 0);
 	return g_array_index (s->stack, int, s->stack->len-1-n);
 }
 
@@ -2442,7 +2442,7 @@
 	d (0, g_printerr ("}\n"););
 
 	g_return_val_if_fail (s->stack != NULL, TRUE);
-	g_return_val_if_fail (s->stack->len > 0, TRUE);
+	XL_CHECK_CONDITION_VAL (s->stack->len > 0, TRUE);
 
 	popped_state = BC_R(top_state) (s, 0);
 	s->stack = g_array_remove_index_fast (s->stack, s->stack->len-1);
@@ -3588,7 +3588,7 @@
 	g_array_free (state.stack, TRUE);
 	ms_container_finalize (&state.container);
 
-	{
+	if (state.chart) {
 		/* try to replace hidden axes by visible ones when possible */
 		GSList *l, *cur;
 		GogAxis *hidden, *visible;