gnumeric r17082 - in trunk: . src

[mortenw svn gnome org]

Author: mortenw
Date: Thu Jan 22 15:30:24 2009
New Revision: 17082
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17082&view=rev

Log:
2009-01-22  Morten Welinder  <terra gnome org>

	* src/commands.c (select_range): If the sheet and wbc are for
	different workbooks, do nothing.  Fixes #568634.



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/src/commands.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Thu Jan 22 15:30:24 2009
@@ -73,6 +73,7 @@
 	* Fix issue with BASE.   [#567252]
 	* Fix XLS import criticals.  [#567823]
 	* Don't evaluate both branches of IF.  [#326595]
+	* Fix undo crash for inter-workbook operations.  [#568634]
 
 --------------------------------------------------------------------------
 Gnumeric 1.9.3

Modified: trunk/src/commands.c
==============================================================================
--- trunk/src/commands.c	(original)
+++ trunk/src/commands.c	Thu Jan 22 15:30:24 2009
@@ -313,9 +313,18 @@
 static void
 select_range (Sheet *sheet, const GnmRange *r, WorkbookControl *wbc)
 {
-	SheetView *sv = sheet_get_view (sheet, wb_control_view (wbc));
+	SheetView *sv;
+
+	if (sheet->workbook != wb_control_get_workbook (wbc)) {
+		/*
+		 * We could try to pick a random wbc for the sheet's
+		 * workbook.  But not right now.
+		 */
+		return;
+	}
 
 	wb_control_sheet_focus (wbc, sheet);
+	sv = sheet_get_view (sheet, wb_control_view (wbc));
 	sv_selection_reset (sv);
 	sv_selection_add_range (sv, r);
 	sv_make_cell_visible (sv, r->start.col, r->start.row, FALSE);