[gnumeric] ODF: Fix polar plot axes

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

commit b0719b6efac35f3b9d7ff9c866a70fad09e390a9
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Fri Aug 27 15:24:39 2010 -0600

    ODF: Fix polar plot axes
    
    2010-08-28  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-read.c (oo_chart_axis): OO_PLOT_RADARAREA and
    	  OO_PLOT_POLAR behave like OO_PLOT_RADAR
    	* openoffice-write.c (odf_write_plot): fix axis names for
    	  GogPolarPlot

 plugins/openoffice/ChangeLog          |    7 +++++++
 plugins/openoffice/openoffice-read.c  |    4 +++-
 plugins/openoffice/openoffice-write.c |    6 ++++--
 3 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 00a22ba..94a9dd4 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,12 @@
 2010-08-28  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* openoffice-read.c (oo_chart_axis): OO_PLOT_RADARAREA and 
+	  OO_PLOT_POLAR behave like OO_PLOT_RADAR
+	* openoffice-write.c (odf_write_plot): fix axis names for
+	  GogPolarPlot
+	
+2010-08-28  Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* openoffice-read.c (odf_store_data): new
 	(od_series_regression): handle upper and lower bounds of 
 	  regression line
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index bf40304..f9c6897 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -4308,7 +4308,9 @@ oo_chart_axis (GsfXMLIn *xin, xmlChar const **attrs)
 		if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_CHART, "style-name"))
 			style_name = CXML2C (attrs[1]);
 		else if (oo_attr_enum (xin, attrs, OO_NS_CHART, "dimension", 
-				       (state->chart.plot_type == OO_PLOT_RADAR)? types_radar :  types, &tmp))
+				       (state->chart.plot_type == OO_PLOT_RADAR || 
+					state->chart.plot_type == OO_PLOT_RADARAREA ||
+					state->chart.plot_type == OO_PLOT_POLAR)? types_radar :  types, &tmp))
 			axis_type = tmp;
 
 	axes = gog_chart_get_axes (state->chart.chart, axis_type);
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 1a40063..7eb2eb5 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -4702,7 +4702,8 @@ odf_write_plot (GnmOOExport *state, SheetObject *so, GogObject const *chart, Gog
 		  NULL,
 		  odf_write_axis, odf_write_axis, odf_write_axis},
 		{ "GogPolarPlot", GNMSTYLE "polar", ODF_POLAR,
-		  20., "X-Axis", "Y-Axis", NULL, odf_write_standard_axes_styles,
+		  20., "Circular-Axis", "Radial-Axis", NULL, 
+		  odf_write_radar_axes_styles,
 		  odf_write_standard_series, NULL,
 		  NULL,
 		  odf_write_axis, odf_write_axis, odf_write_axis},
@@ -4727,7 +4728,8 @@ odf_write_plot (GnmOOExport *state, SheetObject *so, GogObject const *chart, Gog
 		  NULL,
 		  odf_write_axis, odf_write_axis, odf_write_axis},
 		{ "GogRadarPlot", CHART "radar", ODF_RADAR,
-		  10., "Circular-Axis", "Radial-Axis", NULL, odf_write_radar_axes_styles,
+		  10., "Circular-Axis", "Radial-Axis", NULL, 
+		  odf_write_radar_axes_styles,
 		  odf_write_standard_series, NULL,
 		  NULL,
 		  odf_write_axis, odf_write_axis, odf_write_axis},