[Pspp-cvs] pspp/src/ui/gui ChangeLog clipboard.c

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   07/08/13 06:34:26

Modified files:
        src/ui/gui     : ChangeLog clipboard.c 

Log message:
        Fixed bug pasting from the clipboard, where the wrong columns limit was 
        being used.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/clipboard.c?cvsroot=pspp&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- ChangeLog   13 Aug 2007 04:31:43 -0000      1.79
+++ ChangeLog   13 Aug 2007 06:34:25 -0000      1.80
@@ -1,3 +1,8 @@
+2007-08-13  John Darrington <address@hidden>
+
+       * clipboard.c (clip_to_html clip_to_text): Fixed bug --- use the
+       variable count instead of the value count for the columns limit. 
+
 2007-08-12  John Darrington <address@hidden>
            Ben Pfaff  <address@hidden>
 

Index: clipboard.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/clipboard.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- clipboard.c 13 Aug 2007 04:31:43 -0000      1.1
+++ clipboard.c 13 Aug 2007 06:34:25 -0000      1.2
@@ -166,6 +166,7 @@
 
   const size_t val_cnt = casereader_get_value_cnt (clip_datasheet);
   const casenumber case_cnt = casereader_get_case_cnt (clip_datasheet);
+  const size_t var_cnt = dict_get_var_cnt (clip_dict);
 
   string = g_string_sized_new (10 * val_cnt * case_cnt);
 
@@ -179,7 +180,7 @@
          break;
        }
 
-      for (c = 0 ; c < val_cnt ; ++c)
+      for (c = 0 ; c < var_cnt ; ++c)
        {
          const struct variable *v = dict_get_var (clip_dict, c);
          data_out_g_string (string, v, &cc);
@@ -205,6 +206,8 @@
 
   const size_t val_cnt = casereader_get_value_cnt (clip_datasheet);
   const casenumber case_cnt = casereader_get_case_cnt (clip_datasheet);
+  const size_t var_cnt = dict_get_var_cnt (clip_dict);
+
 
   /* Guestimate the size needed */
   string = g_string_sized_new (20 * val_cnt * case_cnt);
@@ -221,7 +224,7 @@
        }
       g_string_append (string, "<tr>\n");
 
-      for (c = 0 ; c < val_cnt ; ++c)
+      for (c = 0 ; c < var_cnt ; ++c)
        {
          const struct variable *v = dict_get_var (clip_dict, c);
          g_string_append (string, "<td>");