[gnumeric] Fix ODF contour/surface plot confusion. [#607631]

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

commit 308b914a330ce9ae7ebd0d8e6b825eed20275ec5
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Thu Jan 21 00:44:38 2010 -0700

    Fix ODF contour/surface plot confusion. [#607631]
    
    2010-01-21  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-read.c (oo_plot_area): handle OO_PLOT_XYZ_SURFACE like
    	  OO_PLOT_XYZ_CONTOUR
    	(oo_series_domain): ditto
    	(oo_chart): replace OO_PLOT_XYZ_CONTOUR with OO_PLOT_XYZ_SURFACE

 NEWS                                 |    3 +++
 plugins/openoffice/ChangeLog         |    7 +++++++
 plugins/openoffice/openoffice-read.c |    7 ++-----
 3 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/NEWS b/NEWS
index 91e6f74..982b3a1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 Gnumeric 1.9.19
 
+Andreas:
+	* Fix ODF contour/surface plot confusion. [#607631]
+
 Morten:
 	* Fix TRIMMEAN border case.  [#607562]
 	* Fix TDIST border case.  [#607008]
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index c538541..a4762d6 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-21  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* openoffice-read.c (oo_plot_area): handle OO_PLOT_XYZ_SURFACE like
+	  OO_PLOT_XYZ_CONTOUR
+	(oo_series_domain): ditto
+	(oo_chart): replace OO_PLOT_XYZ_CONTOUR with OO_PLOT_XYZ_SURFACE
+
 2010-01-19  Morten Welinder <terra gnome org>
 
 	* Release 1.9.18
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 7333721..70edb22 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -124,7 +124,6 @@ typedef enum {
 	OO_PLOT_BUBBLE,
 	OO_PLOT_GANTT,
 	OO_PLOT_POLAR,
-	OO_PLOT_XYZ_CONTOUR,
 	OO_PLOT_SCATTER_COLOUR,
 	OO_PLOT_XYZ_SURFACE,
 	OO_PLOT_SURFACE,
@@ -3631,14 +3630,13 @@ oo_plot_area (GsfXMLIn *xin, xmlChar const **attrs)
 	case OO_PLOT_BUBBLE:	type = "GogBubblePlot"; break;
 	case OO_PLOT_GANTT:	type = "GogDropBarPlot"; break;
 	case OO_PLOT_POLAR:	type = "GogPolarPlot"; break;
-	case OO_PLOT_XYZ_CONTOUR:
+	case OO_PLOT_XYZ_SURFACE:
 		if (oo_style_have_three_dimensional (state->chart.these_plot_styles)) {
 			type = "GogXYZSurfacePlot";
 			state->chart.plot_type = OO_PLOT_XYZ_SURFACE;
 		} else
 			type = "GogXYZContourPlot";
 		break;
-	case OO_PLOT_XYZ_SURFACE: type = "GogXYZSurfacePlot"; break;
 	case OO_PLOT_SURFACE: type = "GogSurfacePlot"; break;
 	case OO_PLOT_SCATTER_COLOUR: type = "GogXYColorPlot";	break;
 	case OO_PLOT_XL_SURFACE: type = "XLSurfacePlot";	break;
@@ -3808,7 +3806,6 @@ oo_series_domain (GsfXMLIn *xin, xmlChar const **attrs)
 	case OO_PLOT_SCATTER_COLOUR:
 		dim = (state->chart.domain_count == 0) ? GOG_MS_DIM_VALUES : GOG_MS_DIM_CATEGORIES;
 		break;
-	case OO_PLOT_XYZ_CONTOUR:
 	case OO_PLOT_XYZ_SURFACE:
 	case OO_PLOT_SURFACE:
 		name = (state->chart.domain_count == 0) ? "Y" : "X";
@@ -3850,7 +3847,7 @@ oo_chart (GsfXMLIn *xin, xmlChar const **attrs)
 		{ "chart:gantt",	OO_PLOT_GANTT },
 		{ "chart:surface",	OO_PLOT_CONTOUR },
 		{ "gnm:polar",  	OO_PLOT_POLAR },
-		{ "gnm:xyz-contour", 	OO_PLOT_XYZ_CONTOUR },
+		{ "gnm:xyz-surface", 	OO_PLOT_XYZ_SURFACE },
 		{ "gnm:scatter-color", 	OO_PLOT_SCATTER_COLOUR },
 		{ NULL,	0 },
 	};