[gnumeric] Fix contour plot import from ODF. [#788728]

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

commit 1568db554e493d09dfdf4a5682d90a62b3f32f60
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Mon Oct 9 18:16:43 2017 -0600

    Fix contour plot import from ODF. [#788728]
    
    * openoffice-read.c (oo_series_domain): fix series order #788728

 NEWS                                 |    3 +++
 plugins/openoffice/ChangeLog         |    7 ++++---
 plugins/openoffice/openoffice-read.c |    3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/NEWS b/NEWS
index 4209bb1..0eef30f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 Gnumeric 1.12.36
 
+Andreas:
+       * Fix contour plot import from ODF. [#788728]
+
 Morten:
        * Convert all xpm files to png.
        * Avoid to-pixdata options for resources.  It's going away.
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index e26dd41..0363770 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,7 @@
+2017-01-30  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+       * openoffice-read.c (oo_series_domain): fix series order #788728
+
 2017-07-06  Morten Welinder <terra gnome org>
 
        * Release 1.12.35
@@ -33,10 +37,7 @@
        * openoffice-write.c (odf_write_named_expression): Don't write
        range-usable-as attribute.
 
-2017-01-30  Andreas J. Guelzow <aguelzow pyrshep ca>
 
-       * openoffice-read.c (oo_cell_content_link) local links may be
-       prefixed with #
        * openoffice-write.c (odf_write_objects) prefix local links with #
 
 2017-03-06  Morten Welinder  <terra gnome org>
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 4001bc3..9483cc8 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -9548,7 +9548,8 @@ oo_series_domain (GsfXMLIn *xin, xmlChar const **attrs)
                name = (state->chart.domain_count == 0) ? "Y" : "X";
                break;
        case OO_PLOT_CONTOUR:
-               dim = (state->chart.domain_count == 0) ? -1 : GOG_MS_DIM_CATEGORIES;
+               /* y-values first, then x-values */
+               dim = (state->chart.domain_count == 0) ? GOG_MS_DIM_CATEGORIES : -1;
                break;
        default:
                dim = GOG_MS_DIM_CATEGORIES;