[gnumeric] Style Optimizer: fix crash. [#582027]



commit f76311a0819af3abe34e619ca6edd5825e6e2591
Author: Morten Welinder <terra gnome org>
Date:   Sat May 9 21:01:40 2009 -0400

    Style Optimizer: fix crash.  [#582027]
---
 ChangeLog         |    3 +++
 src/sheet-style.c |    4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3822838..99b4d3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-05-09  Morten Welinder  <terra gnome org>
 
+	* src/sheet-style.c (cell_tile_optimize): Remove extraneous
+	"break;"  Fixes #582027.
+
 	* src/gnumeric-gconf.c (gnm_gconf_set_workbook_ncols,
 	gnm_gconf_set_workbook_nrows): Respect any valid size.
 
diff --git a/src/sheet-style.c b/src/sheet-style.c
index 8dbb399..1c70f64 100644
--- a/src/sheet-style.c
+++ b/src/sheet-style.c
@@ -2717,7 +2717,6 @@ cell_tile_optimize (CellTile **tile, int level, CellTileOptimize *data,
 				res->style_row.style[i] = mstyle;
 				gnm_style_link (mstyle);
 			}
-			break;
 		} else if (all_simple) {
 			if (data->debug)
 				g_printerr ("Could turn %s into a matrix\n",
@@ -2843,8 +2842,7 @@ verify_styles (GSList *pre, GSList *post)
 	g_slist_free (pre);
 	g_slist_free (post);
 
-	if (bad)
-		abort ();
+	g_assert (!bad);
 }
 
 void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]