[gnumeric] Fix encounter with macro sheets on xls import. [#684646]

[Andreas J. Guelzow <guelzow src gnome org>]

commit e6a6a18f8dc5d5da2e05d98cd858f6e78719110d
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Sun Sep 23 23:22:19 2012 -0600

    Fix encounter with macro sheets on xls import. [#684646]
    
    2012-09-23  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/sheet-control-gui.c (sheet_control_gui_new): check for NULL sheets

 ChangeLog               |    4 ++++
 NEWS                    |    1 +
 src/sheet-control-gui.c |   17 ++++++++++-------
 3 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 266ce0d..8fe2224 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-23  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* src/sheet-control-gui.c (sheet_control_gui_new): check for NULL sheets
+
 2012-09-22  Andreas J. Guelzow <aguelzow pyrshep ca>
 	for Weng Xuetian
 
diff --git a/NEWS b/NEWS
index 7d6585a..391160b 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ Gnumeric 1.11.7
 
 Andreas:
 	* Fix ODF export of conditional styles including data styles. [#683739]
+	* Fix encounter with macro sheets on xls import. [#684646]
 
 Jean:
 	* Fixed indentation in cell format dialog. [#683576]
diff --git a/src/sheet-control-gui.c b/src/sheet-control-gui.c
index df3970f..2a58ee6 100644
--- a/src/sheet-control-gui.c
+++ b/src/sheet-control-gui.c
@@ -1721,14 +1721,17 @@ sheet_control_gui_new (SheetView *sv, WBCGtk *wbcg)
 			g_signal_connect (G_OBJECT (scg->vs), "key-press-event",
 			                  G_CALLBACK (sheet_object_key_pressed), scg);
 		}
-#warning GTK3: we used GtkStyle::white there */
-		gtk_widget_override_background_color (scg->vs, GTK_STATE_NORMAL, &gs_white);
 		sv_attach_control (sv, SHEET_CONTROL (scg));
-		g_object_set_data (G_OBJECT (scg->vs), "sheet-control", scg);
-		if (sheet->sheet_objects) {
-			/* we need an idle function because not every thing is intialized at this point */
-			sheet_object_new_view ((SheetObject *) sheet->sheet_objects->data, (SheetObjectViewContainer*) scg->vs);
-			g_idle_add ((GSourceFunc) post_create_cb, scg);
+		if (scg->vs) {
+#warning GTK3: we used GtkStyle::white there */
+			gtk_widget_override_background_color (scg->vs, GTK_STATE_NORMAL, &gs_white);
+			g_object_set_data (G_OBJECT (scg->vs), "sheet-control", scg);
+			if (sheet->sheet_objects) {
+				/* we need an idle function because not every thing is intialized at this point */
+				sheet_object_new_view ((SheetObject *) sheet->sheet_objects->data, 
+						       (SheetObjectViewContainer*) scg->vs);
+				g_idle_add ((GSourceFunc) post_create_cb, scg);
+			}
 		}
 	}