[gnumeric] Fix writing of scatter style in xlsx export. [#656799]

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

commit 4e64a495de1a06d7294d6090c9122a6556d200dc
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Wed Aug 17 23:58:40 2011 -0600

    Fix writing of scatter style in xlsx export. [#656799]
    
    2011-08-17  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* xlsx-read-drawing.c (xlsx_scatter_style): also read incorrect "markers"
    	* xlsx-write-drawing.c (xlsx_write_chart): write "marker" rather than "markers"

 NEWS                               |    1 +
 plugins/excel/ChangeLog            |    5 +++++
 plugins/excel/xlsx-read-drawing.c  |    1 +
 plugins/excel/xlsx-write-drawing.c |    2 +-
 4 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index ebbeb12..ef8bb4e 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ Andreas:
 	* Fix enabling of modify comment or hyperlink. [#655877]
 	* Fully read scientific format from ODF.
 	* Provide xls file opener permitting encoding specification. [#535473]
+	* Fix writing of scatter style in xlsx export. [#656799]
 
 Jean:
 	* Make things build against gtk+-3.0.
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 06b9889..e0266b0 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-17  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* xlsx-read-drawing.c (xlsx_scatter_style): also read incorrect "markers"
+	* xlsx-write-drawing.c (xlsx_write_chart): write "marker" rather than "markers"
+
 2011-08-14  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* plugins/excel/boot.c (excel_enc_file_open): new
diff --git a/plugins/excel/xlsx-read-drawing.c b/plugins/excel/xlsx-read-drawing.c
index 82ecd3e..69ac903 100644
--- a/plugins/excel/xlsx-read-drawing.c
+++ b/plugins/excel/xlsx-read-drawing.c
@@ -708,6 +708,7 @@ xlsx_scatter_style (GsfXMLIn *xin, xmlChar const **attrs)
 		{"line",	0},
 		{"lineMarker",  1},
 		{"marker",      2},
+		{"markers",     2}, /* We used to write this erroneously */
 		{"none",	3},
 		{"smooth",      4},
 		{"smoothMarker", 5}
diff --git a/plugins/excel/xlsx-write-drawing.c b/plugins/excel/xlsx-write-drawing.c
index 1b50ce9..d4bc8e1 100644
--- a/plugins/excel/xlsx-write-drawing.c
+++ b/plugins/excel/xlsx-write-drawing.c
@@ -309,7 +309,7 @@ xlsx_write_chart (XLSXWriteState *state, GsfOutput *chart_part, SheetObject *so)
 				(use_splines?
 					(has_markers? "smoothMarker": "smooth"):
 					(has_markers? "lineMarker": "line")):
-				(has_markers? "markers": "none");
+				(has_markers? "marker": "none");
 		use_xy = TRUE;
 		gsf_xml_out_start_element (xml, "c:scatterChart");
 		xlsx_write_chart_cstr_unchecked (xml, "c:scatterStyle", style);