update libxlsx to 0.8.4 November 10 2018

QtExcel · Nov 17, 2018 · 7d5e212 · 7d5e212
1 parent 758af59
commit 7d5e212
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/libxlsxwriter/include/xlsxwriter.h b/libxlsxwriter/include/xlsxwriter.h
@@ -18,6 +18,6 @@
 #include "xlsxwriter/format.h"
 #include "xlsxwriter/utility.h"
 
-#define LXW_VERSION "0.8.3"
+#define LXW_VERSION "0.8.4"
 
 #endif /* __LXW_XLSXWRITER_H__ */
diff --git a/libxlsxwriter/include/xlsxwriter/workbook.h b/libxlsxwriter/include/xlsxwriter/workbook.h
@@ -216,7 +216,7 @@ typedef struct lxw_doc_properties {
  *   to assembling the final XLSX file. The temporary files are created in the
  *   system's temp directory. If the default temporary directory isn't
  *   accessible to your application, or doesn't contain enough space, you can
- *   specify an alternative location using the `tempdir` option.
+ *   specify an alternative location using the `tmpdir` option.
  */
 typedef struct lxw_workbook_options {
     /** Optimize the workbook to use constant memory for worksheets */
@@ -334,7 +334,7 @@ lxw_workbook *workbook_new(const char *filename);
  *   to assembling the final XLSX file. The temporary files are created in the
  *   system's temp directory. If the default temporary directory isn't
  *   accessible to your application, or doesn't contain enough space, you can
- *   specify an alternative location using the `tempdir` option.*
+ *   specify an alternative location using the `tmpdir` option.*
  *
  * See @ref working_with_memory for more details.
  *

diff --git a/libxlsxwriter/src/styles.c b/libxlsxwriter/src/styles.c
@@ -155,6 +155,7 @@ _write_num_fmts(lxw_styles *self)
     struct xml_attribute_list attributes;
     struct xml_attribute *attribute;
     lxw_format *format;
+    uint16_t last_format_index = 0;
 
     if (!self->num_format_count)
         return;
@@ -171,7 +172,13 @@ _write_num_fmts(lxw_styles *self)
         if (format->num_format_index < 164)
             continue;
 
+        /* Ignore duplicates which have an already used index. */
+        if (format->num_format_index <= last_format_index)
+            continue;
+
         _write_num_fmt(self, format->num_format_index, format->num_format);
+
+        last_format_index = format->num_format_index;
     }
 
     lxw_xml_end_tag(self->file, "numFmts");

diff --git a/libxlsxwriter/src/workbook.c b/libxlsxwriter/src/workbook.c
@@ -471,7 +471,7 @@ _prepare_num_formats(lxw_workbook *self)
                 num_format_index = calloc(1, sizeof(uint16_t));
                 *num_format_index = index;
                 format->num_format_index = index;
-                lxw_insert_hash_element(num_formats, num_format,
+                lxw_insert_hash_element(num_formats, format->num_format,
                                         num_format_index,
                                         LXW_FORMAT_FIELD_LEN);
                 index++;