NA set to a number didn't work in .xls sheets

tidyverse · Apr 10, 2015 · 3e830be · 3e830be
1 parent 10d0015
commit 3e830be
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/CellType.h b/src/CellType.h
@@ -61,7 +61,7 @@ inline CellType cellType(xls::st_cell::st_cell_data cell, xls::st_xf* styles,
   case 6:    // formula
   case 1030: // formula (Apple Numbers Bug)
     if (cell.l == 0) {
-      return CELL_NUMERIC;
+      return na.contains(cell.d) ? CELL_BLANK : CELL_NUMERIC;
     } else {
       if (na.contains((char*) cell.str)) {
         return CELL_BLANK;
@@ -75,6 +75,9 @@ inline CellType cellType(xls::st_cell::st_cell_data cell, xls::st_xf* styles,
   case 515: // Number
   case 638: // Rk
     {
+      if (na.contains(cell.d))
+        return CELL_BLANK;
+
       if (styles == NULL)
         return CELL_NUMERIC;