[gnumeric] ODF: Fix series label handling

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

commit 9c638988edf8ee72ef458393ea2d7cef35d41485
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Sun Sep 5 23:34:30 2010 -0600

    ODF: Fix series label handling
    
    2010-09-06  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-read.c (odf_get_formula_type): new
    	(oo_cell_start): use odf_get_formula_type
    	(oo_plot_series): fix handling of series label

 NEWS                                 |    1 +
 plugins/openoffice/ChangeLog         |    6 ++
 plugins/openoffice/openoffice-read.c |   91 ++++++++++++++++++++++++----------
 3 files changed, 72 insertions(+), 26 deletions(-)
---
diff --git a/NEWS b/NEWS
index 34c01e7..a3fcff3 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Gnumeric 1.10.11
 Andreas:
 	* Fix image-fill, pattern and gradient export. [#628762]
 	* Read tab colors from OOo config in ODF files.
+	* Improve some ODF chart import/export.
 
 --------------------------------------------------------------------------
 Gnumeric 1.10.10
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 330dc26..956f040 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-06  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* openoffice-read.c (odf_get_formula_type): new
+	(oo_cell_start): use odf_get_formula_type
+	(oo_plot_series): fix handling of series label
+
 2010-09-05  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* openoffice-write.c (odf_write_gnm_settings): new
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index f527114..1a08bff 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -128,7 +128,8 @@ typedef enum {
 	FORMULA_OPENFORMULA = 0,
 	FORMULA_OLD_OPENOFFICE,
 	FORMULA_MICROSOFT,
-	NUM_FORMULAE_SUPPORTED
+	NUM_FORMULAE_SUPPORTED,
+	FORMULA_NOT_SUPPORTED
 } OOFormula;
 
 #define OD_BORDER_THIN		1
@@ -1710,6 +1711,32 @@ oo_row_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
 	state->pos.eval.row += state->row_inc;
 }
 
+static OOFormula
+odf_get_formula_type (GsfXMLIn *xin, char const **str)
+{
+	OOParseState *state = (OOParseState *)xin->user_state;
+	OOFormula f_type = FORMULA_NOT_SUPPORTED;
+	if (state->ver == OOO_VER_OPENDOC) {
+		if (strncmp (*str, "msoxl:", 6) == 0) {
+			*str += 6;
+			f_type = FORMULA_MICROSOFT;
+		} else if (strncmp (*str, "oooc:", 5) == 0) {
+			*str += 5;
+			f_type = FORMULA_OLD_OPENOFFICE;
+		} else if (strncmp (*str, "of:", 3) == 0) {
+			*str += 3;
+			f_type = FORMULA_OPENFORMULA;
+		} else {
+			/* They really should include a namespace */
+			/* We assume that it is an OpenFormula expression */
+			*str += 0;
+			f_type = FORMULA_OPENFORMULA;
+		}
+	} else if (state->ver == OOO_VER_1)
+		f_type = FORMULA_OLD_OPENOFFICE;
+
+	return f_type;
+}
 
 static void
 oo_cell_start (GsfXMLIn *xin, xmlChar const **attrs)
@@ -1737,7 +1764,7 @@ oo_cell_start (GsfXMLIn *xin, xmlChar const **attrs)
 		if (oo_attr_int_range (xin, attrs, OO_NS_TABLE, "number-columns-repeated", &state->col_inc, 0, INT_MAX))
 			;
 		else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_TABLE, "formula")) {
-			OOFormula f_type = FORMULA_OPENFORMULA;
+			OOFormula f_type;
 
 			if (attrs[1] == NULL) {
 				oo_warning (xin, _("Missing expression"));
@@ -1745,25 +1772,9 @@ oo_cell_start (GsfXMLIn *xin, xmlChar const **attrs)
 			}
 
 			expr_string = CXML2C (attrs[1]);
-			if (state->ver == OOO_VER_OPENDOC) {
-				if (strncmp (expr_string, "msoxl:", 6) == 0) {
-					expr_string += 6;
-					f_type = FORMULA_MICROSOFT;
-				} else if (strncmp (expr_string, "oooc:", 5) == 0) {
-					expr_string += 5;
-					f_type = FORMULA_OLD_OPENOFFICE;
-				} else if (strncmp (expr_string, "of:", 3) == 0)
-					expr_string += 3;
-				else if (strncmp (expr_string, "=", 1) == 0)
-					/* They really should include a namespace */
-					/* We assume that it is an OpenFormula expression */
-					expr_string += 0;
-				else {
-					oo_warning (xin, _("Missing or unknown expression namespace: %s"), expr_string);
-					continue;
-				}
-			} else if (state->ver == OOO_VER_1)
-				f_type = FORMULA_OLD_OPENOFFICE;
+			f_type = odf_get_formula_type (xin, &expr_string);
+			if (f_type == FORMULA_NOT_SUPPORTED)
+				continue;
 
 			expr_string = gnm_expr_char_start_p (expr_string);
 			if (expr_string == NULL)
@@ -5073,7 +5084,6 @@ oo_plot_assign_dim (GsfXMLIn *xin, xmlChar const *range, int dim_type, char cons
 			state->chart.src_label.end.row = ++state->chart.src_label.start.row;
 		else
 			state->chart.src_label.end.col = ++state->chart.src_label.start.col;
-
 	}
 }
 
@@ -5308,6 +5318,7 @@ static void
 oo_plot_series (GsfXMLIn *xin, xmlChar const **attrs)
 {
 	OOParseState *state = (OOParseState *)xin->user_state;
+	xmlChar const *label = NULL;
 
 	if (state->debug)
 		g_print ("<<<<< Start\n");
@@ -5379,15 +5390,43 @@ oo_plot_series (GsfXMLIn *xin, xmlChar const **attrs)
 				oo_plot_assign_dim (xin, attrs[1], GOG_MS_DIM_VALUES, NULL);
 				break;
 			}
-		} else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_CHART, "label-cell-address"))
-				oo_plot_assign_dim (xin, attrs[1], GOG_MS_DIM_LABELS, NULL);
-		else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_GNUM_NS_EXT, "label-cell-expression"))
-				oo_plot_assign_dim (xin, attrs[1], GOG_MS_DIM_LABELS, NULL);
+		} else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_CHART, "label-cell-address")) {
+			if (label == NULL)
+				label = attrs[1];
+		} else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_GNUM_NS_EXT, "label-cell-expression"))
+			label = attrs[1];
 		else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
 					     OO_NS_CHART, "style-name"))
 			state->chart.i_plot_styles[OO_CHART_STYLE_SERIES] = g_hash_table_lookup
 				(state->chart.graph_styles, CXML2C (attrs[1]));
 	}
+
+	if (label != NULL) {
+		GnmExprTop const *texpr;
+		OOFormula f_type = odf_get_formula_type (xin, (char const **)&label);
+
+		if (f_type != FORMULA_NOT_SUPPORTED) {
+			GnmParsePos pp;
+			GnmRangeRef ref;
+			char const *ptr = oo_rangeref_parse 
+				(&ref, CXML2C (label),
+				 parse_pos_init_sheet (&pp, state->pos.sheet));
+			if (ptr == CXML2C (label))
+				texpr = oo_expr_parse_str (xin, label,
+							   &state->pos, 
+							   GNM_EXPR_PARSE_DEFAULT, 
+							   f_type);
+			else {
+				GnmValue *v = value_new_cellrange (&ref.a, &ref.b, 0, 0);
+				texpr = gnm_expr_top_new_constant (v);
+			}
+			if (texpr != NULL)
+				gog_series_set_name (state->chart.series,
+						     GO_DATA_SCALAR (gnm_go_data_scalar_new_expr 
+								     (state->pos.sheet, texpr)),
+						     NULL);
+		}
+	}
 	oo_chart_style_to_series (xin, state->chart.i_plot_styles[OO_CHART_STYLE_PLOTAREA], 
 				  G_OBJECT (state->chart.series));
 	oo_chart_style_to_series (xin, state->chart.i_plot_styles[OO_CHART_STYLE_SERIES],