[gnumeric] Fix import of series names.

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

commit e0c318210ef2195d41a3ecad8ba9cad25f68a754
Author: Jean Brefort <jean brefort normalesup org>
Date:   Mon Aug 22 13:41:55 2011 +0200

    Fix import of series names.

 ChangeLog                         |    5 +++++
 plugins/excel/ChangeLog           |    4 ++++
 plugins/excel/xlsx-read-drawing.c |    2 +-
 src/sheet-object-widget.c         |    2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 231322a..f8ecf31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-22  Jean Brefort  <jean brefort normalesup org>
+
+	* src/sheet-object-widget.c (sheet_widget_combo_create_widget): fixed combo
+	box properties.
+
 2011-08-21  Jean Brefort  <jean brefort normalesup org>
 
 	* src/sheet-control-gui.c (sheet_object_key_pressed): missing spaces.
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index bc7ab14..ed05d9c 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-22  Jean Brefort  <jean brefort normalesup org>
+
+	* xlsx-read-drawing.c (xlsx_chart_ser_f): fix import of series names.
+
 2011-08-20  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* ms-excel-write.c (cb_cell_pre_pass): avoid synthesizing the same style several
diff --git a/plugins/excel/xlsx-read-drawing.c b/plugins/excel/xlsx-read-drawing.c
index 69ac903..0197e16 100644
--- a/plugins/excel/xlsx-read-drawing.c
+++ b/plugins/excel/xlsx-read-drawing.c
@@ -798,7 +798,7 @@ static void
 xlsx_chart_ser_f (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
 {
 	XLSXReadState	*state = (XLSXReadState *)xin->user_state;
-	if (NULL != state->series) {
+	if (NULL != state->series && state->cur_obj == (GogObject *) state->series) {
 		GnmParsePos pp;
 		GnmExprTop const *texpr = xlsx_parse_expr (xin, xin->content->str,
 			parse_pos_init_sheet (&pp, state->sheet));
diff --git a/src/sheet-object-widget.c b/src/sheet-object-widget.c
index 8d9ab9c..9d272f4 100644
--- a/src/sheet-object-widget.c
+++ b/src/sheet-object-widget.c
@@ -3409,7 +3409,7 @@ sheet_widget_combo_create_widget (SheetObjectWidget *sow)
 	if (swl->model != NULL)
 		g_object_set (G_OBJECT (combo),
                       "model",		swl->model,
-                      "text-column",	0,
+                      "entry-text-column",	0,
                       "active",	swl->selection - 1,
                       NULL);