X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=c43c65d120ee7307fd68fba953b4f8fe83385d03;hb=51cf173b5eaaa8c5cc6233f9c8924eb44498e89d;hp=de4502ff823e47fd7188ea315b053c78f379c45f;hpb=685be7e2f49916d06005ba8588dcf9d0be896aac;p=pspp

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index de4502ff82..c43c65d120 100644
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -1076,6 +1076,19 @@ on_cut (PsppireDataWindow *dw)
       if (ssw_sheet_try_cut (sheet))
 	return;
 
+      if (sel.start_x > sel.end_x)
+	{
+	  gint tmp = sel.start_x;
+	  sel.start_x = sel.end_x;
+	  sel.end_x = tmp;
+	}
+      if (sel.start_y > sel.end_y)
+	{
+	  gint tmp = sel.start_y;
+	  sel.start_y = sel.end_y;
+	  sel.end_y = tmp;
+	}
+	  
       GtkClipboard *clip =
 	gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (dw)),
 				       GDK_SELECTION_CLIPBOARD);
@@ -1087,8 +1100,10 @@ on_cut (PsppireDataWindow *dw)
 	  for (x = sel.start_x ; x <= sel.end_x; ++x)
 	    {
 	      const struct variable * var = psppire_dict_get_variable (dict, x);
+	      gboolean use_value_label = FALSE;
+	      g_object_get (dw->data_editor, "value-labels", &use_value_label, NULL);
 	      gchar *s = psppire_data_store_get_string (dw->data_editor->data_store,
-							  y, var, FALSE);
+							  y, var, use_value_label);
 	      g_string_append (str, s);
               if (x < sel.end_x)
                 g_string_append (str, "\t");