X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fgnumeric-reader.c;h=07c1814f8e4c2c7b349332b3abf021477824464e;hb=ff2c83253f1f450a8bd1d36c7efb8b59cdfed058;hp=a0a4766652d2c07f029f0e1cb163bc6f0bf70894;hpb=8a8cd108378417cba0cb530533fd83019965cdc7;p=pspp

diff --git a/src/data/gnumeric-reader.c b/src/data/gnumeric-reader.c
index a0a4766652..07c1814f8e 100644
--- a/src/data/gnumeric-reader.c
+++ b/src/data/gnumeric-reader.c
@@ -629,6 +629,7 @@ struct casereader *
 gnumeric_make_reader (struct spreadsheet *spreadsheet,
 		      const struct spreadsheet_read_options *opts)
 {
+  int type = 0;
   int x = 0;
   struct gnumeric_reader *r = NULL;
   unsigned long int vstart = 0;
@@ -696,7 +697,7 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet,
       n_cases --;
     }
 
-  int type = 0;
+
   /* Read in the first row of cells,
      including the headers if read_names was set */
   while (
@@ -782,7 +783,7 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet,
 	      xmlChar *attr =
 		xmlTextReaderGetAttribute (r->rsd.xtr, _xml ("ValueType"));
 
-	      if ( NULL == attr || 60 !=  _xmlchar_to_int (attr))
+	      if ( NULL == attr || VALUE_STRING !=  _xmlchar_to_int (attr))
 		var_spec [idx].width = 0;
 
 	      free (attr);