[gnumeric] Graphs: fix critical.



commit da754cb41613e4f0bc03d05d5804bf347732fa6e
Author: Morten Welinder <terra gnome org>
Date:   Fri Jun 4 15:41:46 2010 -0400

    Graphs: fix critical.

 ChangeLog      |    2 ++
 NEWS           |    1 +
 src/gnm-pane.c |    5 +++--
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a2c528e..a37745f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-06-04  Morten Welinder  <terra gnome org>
 
+	* src/gnm-pane.c (gnm_pane_display_obj_size_tip): Fix critical.
+
 	* src/commands.c (cmd_generic): Rename from cmd_solver.
 	(cmd_generic_with_size): New function.
 
diff --git a/NEWS b/NEWS
index a12ae30..cd8b1ee 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ Jean:
 Morten:
 	* Make sure windows for help commands show up on right screen.
 	* Fix dependency tabulation undo issue.
+	* Fix critical when inserting graph using keys.
 
 --------------------------------------------------------------------------
 Gnumeric 1.10.5
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index 7346b42..4c2e90e 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -556,7 +556,7 @@ gnm_pane_key_press (GtkWidget *widget, GdkEventKey *event)
 	/* Object manipulation */
 	if (scg->selected_objects != NULL ||
 	     scg->wbcg->new_object != NULL) {
-		if (wbc_gtk_get_guru (scg->wbcg) == NULL  &&
+		if (wbc_gtk_get_guru (scg->wbcg) == NULL &&
 		    gnm_pane_object_key_press (pane, event))
 			return TRUE;
 	}
@@ -1884,7 +1884,7 @@ static void
 gnm_pane_display_obj_size_tip (GnmPane *pane, GocItem *ctrl_pt)
 {
 	SheetControlGUI *scg = pane->simple.scg;
-	double const *coords = g_hash_table_lookup (scg->selected_objects, pane->cur_object);
+	double const *coords;
 	double pts[4];
 	char *msg;
 	SheetObjectAnchor anchor;
@@ -1915,6 +1915,7 @@ gnm_pane_display_obj_size_tip (GnmPane *pane, GocItem *ctrl_pt)
 	g_return_if_fail (pane->cur_object != NULL);
 	g_return_if_fail (pane->size_tip != NULL);
 
+	coords = g_hash_table_lookup (scg->selected_objects, pane->cur_object);
 	anchor = *sheet_object_get_anchor (pane->cur_object);
 	scg_object_coords_to_anchor (scg, coords, &anchor);
 	sheet_object_anchor_to_pts (&anchor, scg_sheet (scg), pts);



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