No commit message

Changelog.txt

@@ -1,5 +1,10 @@
 0.1.5
 
+2016-03-20  Brecht Sanders  https://github.com/brechtsanders/
+
+  * fixed issue with detecting with of columns with NULL data
+  * chaged with detection to only count first line of multiline data
+
 0.1.4
 
 2016-03-19  Brecht Sanders  https://github.com/brechtsanders/

examples/example_xlsxio_write.c

@@ -20,13 +20,13 @@ int main (int argc, char* argv[])
   //how many rows to buffer to detect column widths
   xlsxiowrite_set_detection_rows(handle, 10);
   //write column names
-  xlsxiowrite_add_column(handle, "Col1", 4);
-  xlsxiowrite_add_column(handle, "Col2", 21);
-  xlsxiowrite_add_column(handle, "Col3", 12*0);
-  xlsxiowrite_add_column(handle, "Col4", 2);
-  xlsxiowrite_add_column(handle, "Col5", 4);
-  xlsxiowrite_add_column(handle, "Col6", 16);
-  xlsxiowrite_add_column(handle, "Col7", 10);
+  xlsxiowrite_add_column(handle, "Col1", 0*4);
+  xlsxiowrite_add_column(handle, "Col2", 0*21);
+  xlsxiowrite_add_column(handle, "Col3", 0*12);
+  xlsxiowrite_add_column(handle, "Col4", 0*2);
+  xlsxiowrite_add_column(handle, "Col5", 0*4);
+  xlsxiowrite_add_column(handle, "Col6", 0*16);
+  xlsxiowrite_add_column(handle, "Col7", 0*10);
   xlsxiowrite_next_row(handle);
   //write data
   int i;

lib/xlsxio_write.c

@@ -601,8 +601,15 @@ void write_cell_data (xlsxiowriter handle, const char* rowattr, const char* pref
         }
       }
       //keep track of biggest column width
-      if (datalen > 0 && datalen > (*handle->pcurrentcolumn)->maxwidth)
-        (*handle->pcurrentcolumn)->maxwidth = datalen;
+      if (data) {
+        //only count first line in multiline data
+        char* p = strchr(data, '\n');
+        if (p)
+          datalen = p - data;
+        //remember this length if it is the longest one so far
+        if (datalen > 0 && datalen > (*handle->pcurrentcolumn)->maxwidth)
+          (*handle->pcurrentcolumn)->maxwidth = datalen;
+      }
       //prepare for the next column
       handle->pcurrentcolumn = &(*handle->pcurrentcolumn)->next;
     }
@@ -658,7 +665,7 @@ void flush_buffer (xlsxiowriter handle)
 DLL_EXPORT_XLSXIO void xlsxiowrite_set_detection_rows (xlsxiowriter handle, size_t rows)
 {
   //abort if currently not buffering
-  if (!handle->rowstobuffer || !handle->sheetopen)
+  if (!handle->rowstobuffer || handle->sheetopen)
     return;
   //set number of rows to buffer
   handle->rowstobuffer = rows;