[gnumeric] Never skip a required plot dimension. [#674341]

[Jean BrÃfort <jbrefort src gnome org>]

commit 403178838551c379968994d34980c42ec12b9635
Author: Jean Brefort <jean brefort normalesup org>
Date:   Wed Apr 18 20:34:44 2012 +0200

    Never skip a required plot dimension. [#674341]

 ChangeLog       |    5 +++++
 NEWS            |    1 +
 src/selection.c |    5 +++--
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b104ee0..527e38d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-18  Jean Brefort  <jean brefort normalesup org>
+
+	* src/selection.c (sv_selection_to_plot): never skip a required plot
+	dimension. [#674341]
+
 2012-04-17  Morten Welinder  <terra gnome org>
 
 	* src/wbc-gtk.c (cb_font_name_changed, cb_font_size_changed)
diff --git a/NEWS b/NEWS
index cb1d633..8e98737 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,7 @@ Andreas:
 Jean:
 	* Fixed crash with sheet object. [#671617]
 	* Fixed labels vectors made of multiple ranges. [#672330]
+	* Never skip a required plot dimension. [#674341]
 
 Morten:
 	* Hook up unknown_image icon for ssconvert too.
diff --git a/src/selection.c b/src/selection.c
index b8b8d5c..f9fbfb8 100644
--- a/src/selection.c
+++ b/src/selection.c
@@ -1629,7 +1629,8 @@ sv_selection_to_plot (SheetView *sv, GogPlot *go_plot)
 				&& (!first_series || !data->share_x)) ||
 			       (desc->series.dim[cur_dim].val_type == GOG_DIM_VALUE && is_string_vec)) {
 				if (desc->series.dim[cur_dim].priority == GOG_SERIES_REQUIRED)
-					goto skip;
+				/* we used to go to the skip label, but see #674341 */
+					break;
 				cur_dim++;
 			}
 
@@ -1653,7 +1654,7 @@ sv_selection_to_plot (SheetView *sv, GogPlot *go_plot)
 			}
 
 			cur_dim++;
-skip :
+/*skip :*/
 
 			if (as_cols) {
 				i += range_width (&vector);