[gnumeric] Don't destroy a sheet object when inserting it. [#669648]

[Jean BrÃfort <jbrefort src gnome org>]

commit 3a42b4b08e6c2d0e8e91617b26b95f94f08d74ec
Author: Jean Brefort <jean brefort normalesup org>
Date:   Wed Feb 8 18:18:56 2012 +0100

    Don't destroy a sheet object when inserting it. [#669648]

 ChangeLog          |    6 ++++++
 NEWS               |    1 +
 src/wbc-gtk-edit.c |    5 ++++-
 3 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 078f964..6b4b79d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-08  Jean Brefort  <jean brefort normalesup org>
+
+	* src/wbc-gtk-edit.c (wbcg_insert_object): don't destroy the object
+	before inserting it when another object is selected somewhere in the
+	workbook. [#669648]
+
 2012-02-07  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* src/sstest.c (test_random_randsnorm): new
diff --git a/NEWS b/NEWS
index e24ae32..3e4c627 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ Andreas:
 
 Jean:
 	* Fix formula interpretation in plot series (with Morten's help). [#662237]
+	* Don't destroy a sheet object when inserting it. [#669648]
 
 Morten:
 	* Improve parsing on numbers with non-ascii digits.
diff --git a/src/wbc-gtk-edit.c b/src/wbc-gtk-edit.c
index e293b01..a3dfccb 100644
--- a/src/wbc-gtk-edit.c
+++ b/src/wbc-gtk-edit.c
@@ -1167,7 +1167,6 @@ wbcg_insert_object (WBCGtk *wbcg, SheetObject *so)
 	g_return_if_fail (IS_SHEET_OBJECT (so));
 
 	wbcg_insert_object_clear (wbcg);
-	wbcg->new_object = so;
 
 	npages = wbcg_get_n_scg (wbcg);
 	for (i = 0; i < npages; i++) {
@@ -1178,6 +1177,10 @@ wbcg_insert_object (WBCGtk *wbcg, SheetObject *so)
 			sc_unant (SHEET_CONTROL (scg));
 		}
 	}
+	/* we can't set wbcg->new_object before now because if one sheet has a
+	 * selected object, the new object will be destroyed by the loop
+	 * above. See #669648. */
+	wbcg->new_object = so;
 	wb_control_update_action_sensitivity (WORKBOOK_CONTROL (wbcg));
 }