[gnumeric] Autofill: fix crash related to computing tooltips.



commit 1ca915a0ad20a42ff3ead9356c058586a87e5409
Author: Morten Welinder <terra gnome org>
Date:   Wed May 6 09:49:02 2009 -0400

    Autofill: fix crash related to computing tooltips.
---
 ChangeLog            |    5 +++++
 NEWS                 |    1 +
 src/sheet-autofill.c |    6 +++---
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c0e82eb..5dc3df0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-06  Morten Welinder  <terra gnome org>
+
+	* src/sheet-autofill.c (afc_set_cell_hint): Don't use the target
+	cell for conventions -- it can be NULL.  Fixes #581589.
+
 2009-05-05  Morten Welinder  <terra gnome org>
 
 	* src/gnm-so-polygon.c (gnm_so_polygon_set_property): Handle NULL
diff --git a/NEWS b/NEWS
index 43c034f..5ebd308 100644
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,7 @@ Morten:
 	* Fix style-allocation screwup.
 	* Fix xls export performance problem.  [#581378]
 	* Fix xls export issue that made files readable by Gnumeric only.
+	* Fix autofill crash.  [#581589]
 
 --------------------------------------------------------------------------
 Gnumeric 1.9.6
diff --git a/src/sheet-autofill.c b/src/sheet-autofill.c
index 68d318f..e94d5f3 100644
--- a/src/sheet-autofill.c
+++ b/src/sheet-autofill.c
@@ -880,7 +880,7 @@ afc_set_cell_hint (AutoFiller *af, GnmCell *cell, GnmCellPos const *pos,
 			else {
 				res = gnm_expr_as_string (aexpr,
 							  &rinfo.pos,
-							  cell->base.sheet->convs);
+							  sheet->convs);
 				gnm_expr_free (aexpr);
 			}
 		} else if (texpr) {
@@ -889,7 +889,7 @@ afc_set_cell_hint (AutoFiller *af, GnmCell *cell, GnmCellPos const *pos,
 			else
 				res = gnm_expr_top_as_string (texpr,
 							      &rinfo.pos,
-							      cell->base.sheet->convs);
+							      sheet->convs);
 			gnm_expr_top_unref (texpr);
 		} else {
 			if (doit)
@@ -897,7 +897,7 @@ afc_set_cell_hint (AutoFiller *af, GnmCell *cell, GnmCellPos const *pos,
 			else
 				res = gnm_expr_top_as_string (src_texpr,
 							      &rinfo.pos,
-							      cell->base.sheet->convs);
+							      sheet->convs);
 		}
 	} else if (src) {
 		if (doit)



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