Change "union value" to dynamically allocate long strings.

[pspp-builds.git] / src / ui / gui / psppire-data-editor.c

diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c
index be911ba6d69817d928264eb13effd969272d029b..7c3fca685eaa5e7d295455c4773584b649861ffd 100644 (file)
--- a/src/ui/gui/psppire-data-editor.c
+++ b/src/ui/gui/psppire-data-editor.c
@@ -23,8 +23,9 @@
 
 #include <language/syntax-string-source.h>
 #include "psppire-data-store.h"
+#include <libpspp/i18n.h>
 #include <ui/gui/sheet/psppire-axis.h>
-#include "helper.h"
+#include "executor.h"
 
 #include <gtk-contrib/gtkxpaned.h>
 #include <gettext.h>
@@ -743,7 +744,9 @@ update_data_ref_entry (const PsppireSheet *sheet,
          gchar *text = g_strdup_printf ("%d: %s", row + FIRST_CASE_NUMBER,
                                         var_get_name (var));
 
-         gchar *s = pspp_locale_to_utf8 (text, -1, 0);
+         gchar *s = recode_string (UTF8,
+                                   psppire_dict_encoding (data_store->dict),
+                                   text, -1);
 
          g_free (text);
 
@@ -1301,13 +1304,15 @@ psppire_data_editor_insert_variable (PsppireDataEditor *de)
   switch (gtk_notebook_get_current_page (GTK_NOTEBOOK (de)))
     {
     case PSPPIRE_DATA_EDITOR_DATA_VIEW:
-      if ( de->data_sheet[0]->state == PSPPIRE_SHEET_COLUMN_SELECTED )
+      if ( PSPPIRE_SHEET (de->data_sheet[0])->select_status
+          == PSPPIRE_SHEET_COLUMN_SELECTED )
        posn = PSPPIRE_SHEET (de->data_sheet[0])->range.col0;
       else
        posn = PSPPIRE_SHEET (de->data_sheet[0])->active_cell.col;
       break;
     case PSPPIRE_DATA_EDITOR_VARIABLE_VIEW:
-      if ( de->var_sheet->state == PSPPIRE_SHEET_ROW_SELECTED )
+      if ( PSPPIRE_SHEET (de->var_sheet)->select_status
+          == PSPPIRE_SHEET_ROW_SELECTED )
        posn = PSPPIRE_SHEET (de->var_sheet)->range.row0;
       else
        posn = PSPPIRE_SHEET (de->var_sheet)->active_cell.row;
@@ -1617,7 +1622,7 @@ data_sheet_set_clip (PsppireSheet *sheet)
 
   /* Construct clip data. */
   map = case_map_by_name (ds->dict->dict, clip_dict);
-  writer = autopaging_writer_create (dict_get_next_value_idx (clip_dict));
+  writer = autopaging_writer_create (dict_get_proto (clip_dict));
   for (i = range.row0; i <= range.rowi ; ++i )
     {
       struct ccase *old = psppire_data_store_get_case (ds, i);
@@ -1664,7 +1669,7 @@ clip_to_text (void)
   casenumber r;
   GString *string;
 
-  const size_t val_cnt = casereader_get_value_cnt (clip_datasheet);
+  const size_t val_cnt = caseproto_get_n_widths (casereader_get_proto (clip_datasheet));
   const casenumber case_cnt = casereader_get_case_cnt (clip_datasheet);
   const size_t var_cnt = dict_get_var_cnt (clip_dict);
 
@@ -1706,7 +1711,7 @@ clip_to_html (void)
   casenumber r;
   GString *string;
 
-  const size_t val_cnt = casereader_get_value_cnt (clip_datasheet);
+  const size_t val_cnt = caseproto_get_n_widths (casereader_get_proto (clip_datasheet));
   const casenumber case_cnt = casereader_get_case_cnt (clip_datasheet);
   const size_t var_cnt = dict_get_var_cnt (clip_dict);