gnumeric r16424 - branches/gnumeric-1-8/plugins/excel

[jbrefort svn gnome org]

Author: jbrefort
Date: Fri Feb 29 18:03:58 2008
New Revision: 16424
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16424&view=rev

Log:
2008-02-29  Jean Brefort  <jean brefort normalesup org>

	* ms-chart.c: (ms_excel_chart_read): do not leak the default lot style,
	(store_dim): accept vectors with nul length,
	(chart_write_axis): fix export of invisible axis.



Modified:
   branches/gnumeric-1-8/plugins/excel/ChangeLog
   branches/gnumeric-1-8/plugins/excel/ms-chart.c

Modified: branches/gnumeric-1-8/plugins/excel/ms-chart.c
==============================================================================
--- branches/gnumeric-1-8/plugins/excel/ms-chart.c	(original)
+++ branches/gnumeric-1-8/plugins/excel/ms-chart.c	Fri Feb 29 18:03:58 2008
@@ -3687,6 +3687,9 @@
 
 	if (state.style != NULL)
 		g_object_unref (state.style); /* avoids a leak with corrupted files */
+	if (state.default_plot_style != NULL)
+		g_object_unref (state.default_plot_style);
+
 
 	return FALSE;
 }
@@ -4215,10 +4218,13 @@
 		type = gnm_finite (tmp) ? 1 : 3;
 		count = 1;
 	} else if (IS_GO_DATA_VECTOR (dat)) {
-		/* cheesy test to see if the content is strings or numbers */
-		double tmp = go_data_vector_get_value (GO_DATA_VECTOR (dat), 0);
-		type = gnm_finite (tmp) ? 1 : 3;
 		count = go_data_vector_get_len (GO_DATA_VECTOR (dat));
+		if (count > 0) {
+			/* cheesy test to see if the content is strings or numbers */
+			double tmp = go_data_vector_get_value (GO_DATA_VECTOR (dat), 0);
+			type = gnm_finite (tmp) ? 1 : 3;
+		} else
+			type = 1;
 		if (count > 30000) /* XL limit */
 			count = 30000;
 	} else {
@@ -4822,19 +4828,19 @@
 		GogObject *Grid;
 		gboolean invisible;
 		g_object_get (G_OBJECT (axis), "invisible", &invisible, NULL);
-		chart_write_LINEFORMAT (s, &GOG_STYLED_OBJECT (axis)->style->line,
+		chart_write_LINEFORMAT (s, (invisible? NULL: &GOG_STYLED_OBJECT (axis)->style->line),
 					!invisible, invisible);
 		Grid = gog_object_get_child_by_name (GOG_OBJECT (axis), "MajorGrid");
 		if (Grid) {
 			ms_biff_put_2byte (s->bp, BIFF_CHART_axislineformat, 1);
 			chart_write_LINEFORMAT (s, &GOG_STYLED_OBJECT (Grid)->style->line,
-						TRUE, FALSE);
+						FALSE, FALSE);
 		}
 		Grid = gog_object_get_child_by_name (GOG_OBJECT (axis), "MinorGrid");
 		if (Grid) {
 			ms_biff_put_2byte (s->bp, BIFF_CHART_axislineformat, 2);
 			chart_write_LINEFORMAT (s, &GOG_STYLED_OBJECT (Grid)->style->line,
-						TRUE, FALSE);
+						FALSE, FALSE);
 		}
 	} else {
 		GogStyleLine line_style;