Initial restructuring for hyperlinks.

.indent.pro

@@ -43,6 +43,7 @@
 
 /* libxlsxwriter typedefs. */
 -T lxw_app
+-T lxw_autofilter
 -T lxw_border
 -T lxw_cell
 -T lxw_col_options
@@ -58,11 +59,16 @@
 -T lxw_format
 -T lxw_hash_element
 -T lxw_hash_table
+-T lxw_header_footer_options
 -T lxw_heading_pair
+-T lxw_merged_range
 -T lxw_packager
 -T lxw_part_name
+-T lxw_print_area
 -T lxw_rel_tuple
 -T lxw_relationships
+-T lxw_repeat_cols
+-T lxw_repeat_rows
 -T lxw_row
 -T lxw_row_col_options
 -T lxw_row_t

include/xlsxwriter/worksheet.h

@@ -110,7 +110,8 @@ enum cell_types {
     INLINE_STRING_CELL,
     FORMULA_CELL,
     ARRAY_FORMULA_CELL,
-    BLANK_CELL
+    BLANK_CELL,
+    HYPERLLINK_URL
 };
 
 /* Define the queue.h TAILQ structs for the list head types. */
@@ -209,6 +210,7 @@ typedef struct lxw_worksheet {
     FILE *file;
     FILE *optimize_tmpfile;
     struct lxw_table_rows *table;
+    struct lxw_table_rows *hyperlinks;
     struct lxw_cell **array;
     struct lxw_merged_ranges *merged_ranges;
 
@@ -332,7 +334,7 @@ typedef struct lxw_cell {
     } u;
 
     double formula_result;
-    char *range;
+    char *user_data;
 
     /* List pointers for queue.h. */
     TAILQ_ENTRY (lxw_cell) list_pointers;
@@ -1338,7 +1340,7 @@ uint8_t worksheet_set_footer(lxw_worksheet *worksheet, char *string);
  *
  */
 uint8_t worksheet_set_header_opt(lxw_worksheet *worksheet, char *string,
-                                 lxw_header_footer_options * options);
+                                 lxw_header_footer_options *options);
 
 /**
  * @brief Set the printed page footer caption with additional options.
@@ -1353,7 +1355,7 @@ uint8_t worksheet_set_header_opt(lxw_worksheet *worksheet, char *string,
  *
  */
 uint8_t worksheet_set_footer_opt(lxw_worksheet *worksheet, char *string,
-                                 lxw_header_footer_options * options);
+                                 lxw_header_footer_options *options);
 
 /**
  * @brief Set the horizontal page breaks on a worksheet.
@@ -1721,10 +1723,11 @@ STATIC void _worksheet_write_page_setup(lxw_worksheet *worksheet);
 STATIC void _worksheet_write_col_info(lxw_worksheet *worksheet,
                                       lxw_col_options *options);
 STATIC void _write_row(lxw_worksheet *worksheet, lxw_row *row, char *spans);
-STATIC lxw_row *_get_row_list(lxw_worksheet *worksheet, lxw_row_t row_num);
+STATIC lxw_row *_get_row_list(struct lxw_table_rows *table,
+                              lxw_row_t row_num);
 
 STATIC void _worksheet_write_merge_cell(lxw_worksheet *worksheet,
-                                        lxw_merged_range * merged_range);
+                                        lxw_merged_range *merged_range);
 STATIC void _worksheet_write_merge_cells(lxw_worksheet *worksheet);
 
 STATIC void _worksheet_write_odd_header(lxw_worksheet *worksheet);

src/worksheet.c

@@ -43,6 +43,9 @@ _new_worksheet(lxw_worksheet_init_data *init_data)
     worksheet->table = calloc(1, sizeof(struct lxw_table_rows));
     GOTO_LABEL_ON_MEM_ERROR(worksheet->table, mem_error);
 
+    worksheet->hyperlinks = calloc(1, sizeof(struct lxw_table_rows));
+    GOTO_LABEL_ON_MEM_ERROR(worksheet->hyperlinks, mem_error);
+
     if (init_data && init_data->optimize) {
         worksheet->array = calloc(LXW_COL_MAX, sizeof(struct lxw_cell *));
         GOTO_LABEL_ON_MEM_ERROR(worksheet->array, mem_error);
@@ -65,6 +68,7 @@ _new_worksheet(lxw_worksheet_init_data *init_data)
     GOTO_LABEL_ON_MEM_ERROR(worksheet->merged_ranges, mem_error);
 
     TAILQ_INIT(worksheet->table);
+    TAILQ_INIT(worksheet->hyperlinks);
     STAILQ_INIT(worksheet->merged_ranges);
 
     if (init_data && init_data->optimize) {
@@ -132,7 +136,7 @@ _free_cell(lxw_cell *cell)
         || cell->type == INLINE_STRING_CELL)
         free(cell->u.string);
 
-    free(cell->range);
+    free(cell->user_data);
 
     free(cell);
 }
@@ -180,6 +184,24 @@ _free_worksheet(lxw_worksheet *worksheet)
         free(worksheet->table);
     }
 
+    if (worksheet->hyperlinks) {
+
+        while (!TAILQ_EMPTY(worksheet->hyperlinks)) {
+            row = TAILQ_FIRST(worksheet->hyperlinks);
+
+            while (!TAILQ_EMPTY(row->cells)) {
+                cell = TAILQ_FIRST(row->cells);
+                TAILQ_REMOVE(row->cells, cell, list_pointers);
+                _free_cell(cell);
+            }
+            TAILQ_REMOVE(worksheet->hyperlinks, row, list_pointers);
+            free(row->cells);
+            free(row);
+        }
+
+        free(worksheet->hyperlinks);
+    }
+
     if (worksheet->merged_ranges) {
         while (!STAILQ_EMPTY(worksheet->merged_ranges)) {
             merged_range = STAILQ_FIRST(worksheet->merged_ranges);
@@ -323,7 +345,7 @@ _new_array_formula_cell(lxw_row_t row_num, lxw_col_t col_num, char *formula,
     cell->type = ARRAY_FORMULA_CELL;
     cell->format = format;
     cell->u.string = formula;
-    cell->range = range;
+    cell->user_data = range;
 
     return cell;
 }
@@ -349,9 +371,8 @@ _new_blank_cell(lxw_row_t row_num, lxw_col_t col_num, lxw_format *format)
  * Get or create the row object for a given row number.
  */
 STATIC lxw_row *
-_get_row_list(lxw_worksheet *self, lxw_row_t row_num)
+_get_row_list(struct lxw_table_rows *table, lxw_row_t row_num)
 {
-    struct lxw_table_rows *table = self->table;
     lxw_row *new_row;
     lxw_row *first_row = TAILQ_FIRST(table);
     lxw_row *last_row = TAILQ_LAST(table, lxw_table_rows);
@@ -419,7 +440,7 @@ _get_row(lxw_worksheet *self, lxw_row_t row_num)
     lxw_row *row;
 
     if (!self->optimize) {
-        row = _get_row_list(self, row_num);
+        row = _get_row_list(self->table, row_num);
         return row;
     }
     else {
@@ -1016,7 +1037,7 @@ _write_array_formula_num_cell(lxw_worksheet *self, lxw_cell *cell)
 
     _INIT_ATTRIBUTES();
     _PUSH_ATTRIBUTES_STR("t", "array");
-    _PUSH_ATTRIBUTES_STR("ref", cell->range);
+    _PUSH_ATTRIBUTES_STR("ref", cell->user_data);
 
     __builtin_snprintf(data, ATTR_32, "%.16g", cell->formula_result);
 
@@ -1327,7 +1348,7 @@ _worksheet_write_cols(lxw_worksheet *self)
  */
 STATIC void
 _worksheet_write_merge_cell(lxw_worksheet *self,
-                            lxw_merged_range * merged_range)
+                            lxw_merged_range *merged_range)
 {
 
     struct xml_attribute_list attributes;
@@ -2305,7 +2326,7 @@ worksheet_set_margins(lxw_worksheet *self, double left, double right,
  */
 uint8_t
 worksheet_set_header_opt(lxw_worksheet *self, char *string,
-                         lxw_header_footer_options * options)
+                         lxw_header_footer_options *options)
 {
     if (options) {
         if (options->margin > 0)
@@ -2329,7 +2350,7 @@ worksheet_set_header_opt(lxw_worksheet *self, char *string,
  */
 uint8_t
 worksheet_set_footer_opt(lxw_worksheet *self, char *string,
-                         lxw_header_footer_options * options)
+                         lxw_header_footer_options *options)
 {
     if (options) {
         if (options->margin > 0)

test/unit/worksheet/test_worksheet_write_row.c

@@ -20,7 +20,7 @@ CTEST(worksheet, write_row) {
     lxw_worksheet *worksheet = _new_worksheet(NULL);
     worksheet->file = testfile;
 
-    lxw_row *row = _get_row_list(worksheet, 0);
+    lxw_row *row = _get_row_list(worksheet->table, 0);
 
     _write_row(worksheet, row, NULL);