xlsxwriter 0.2.1.pre.2 → 0.2.2

data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/chart.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2020, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  * chart - A libxlsxwriter library for creating Excel XLSX chart files.
  *
@@ -124,6 +124,12 @@ typedef enum lxw_chart_type {
     /** Line chart. */
     LXW_CHART_LINE,
 
+    /** Line chart - stacked. */
+    LXW_CHART_LINE_STACKED,
+
+    /** Line chart - percentage stacked. */
+    LXW_CHART_LINE_STACKED_PERCENT,
+
     /** Pie chart. */
     LXW_CHART_PIE,
 
@@ -647,9 +653,6 @@ typedef struct lxw_chart_line {
     /** Set the transparency of the line. 0 - 100. Default 0. */
     uint8_t transparency;
 
-    /* Members for internal use only. */
-    uint8_t has_color;
-
 } lxw_chart_line;
 
 /**
@@ -668,9 +671,6 @@ typedef struct lxw_chart_fill {
     /** Set the transparency of the fill. 0 - 100. Default 0. */
     uint8_t transparency;
 
-    /* Members for internal use only. */
-    uint8_t has_color;
-
 } lxw_chart_fill;
 
 /**
@@ -689,10 +689,6 @@ typedef struct lxw_chart_pattern {
     /** The pattern type. See #lxw_chart_pattern_type. */
     uint8_t type;
 
-    /* Members for internal use only. */
-    uint8_t has_fg_color;
-    uint8_t has_bg_color;
-
 } lxw_chart_pattern;
 
 /**
@@ -717,25 +713,24 @@ typedef struct lxw_chart_font {
     /** The chart font underline property. Set to 0 or 1. */
     uint8_t underline;
 
-    /** The chart font rotation property. Range: -90 to 90. */
+    /** The chart font rotation property. Range: -90 to 90, and 270-271.
+     *  The angle 270 gives a stacked (top to bottom) alignment.
+     *  The angle 271 gives a stacked alignment for East Asian fonts.
+     * */
     int32_t rotation;
 
     /** The chart font color. See @ref working_with_colors. */
     lxw_color_t color;
 
-    /** The chart font pitch family property. Rarely required. set to 0. */
+    /** The chart font pitch family property. Rarely required, set to 0. */
     uint8_t pitch_family;
 
-    /** The chart font character set property. Rarely required. set to 0. */
+    /** The chart font character set property. Rarely required, set to 0. */
     uint8_t charset;
 
-    /** The chart font baseline property. Rarely required. set to 0. */
+    /** The chart font baseline property. Rarely required, set to 0. */
     int8_t baseline;
 
-    /* Members for internal use only. */
-
-    uint8_t has_color;
-
 } lxw_chart_font;
 
 typedef struct lxw_chart_marker {
@@ -792,6 +787,54 @@ typedef struct lxw_chart_point {
 
 } lxw_chart_point;
 
+/**
+ * @brief Struct to represent an Excel chart data label.
+ *
+ * The lxw_chart_data_label struct is used to represent a data label in a
+ * chart series so that custom properties can be set for it.
+ */
+typedef struct lxw_chart_data_label {
+
+    /** The string or formula value for the data label. See
+	 *  @ref chart_custom_labels. */
+    char *value;
+
+    /** Option to hide/delete the data label from the chart series.
+	 *  See @ref chart_custom_labels. */
+    uint8_t hide;
+
+    /** The font properties for the chart data label. @ref chart_fonts. */
+    lxw_chart_font *font;
+
+    /** The line/border for the chart data label. See @ref chart_lines. */
+    lxw_chart_line *line;
+
+    /** The fill for the chart data label. See @ref chart_fills. */
+    lxw_chart_fill *fill;
+
+    /** The pattern for the chart data label. See @ref chart_patterns.*/
+    lxw_chart_pattern *pattern;
+
+} lxw_chart_data_label;
+
+/* Internal version of lxw_chart_data_label with more metadata. */
+typedef struct lxw_chart_custom_label {
+
+    char *value;
+    uint8_t hide;
+    lxw_chart_font *font;
+    lxw_chart_line *line;
+    lxw_chart_fill *fill;
+    lxw_chart_pattern *pattern;
+
+    /* We use a range to hold the label formula properties even though it
+     * will only have 1 point in order to re-use similar functions.*/
+    lxw_series_range *range;
+
+    struct lxw_series_data_point data_point;
+
+} lxw_chart_custom_label;
+
 /**
  * @brief Define how blank values are displayed in a chart.
  */
@@ -921,7 +964,9 @@ typedef struct lxw_chart_series {
     lxw_chart_pattern *pattern;
     lxw_chart_marker *marker;
     lxw_chart_point *points;
+    lxw_chart_custom_label *data_labels;
     uint16_t point_count;
+    uint16_t data_label_count;
 
     uint8_t smooth;
     uint8_t invert_if_negative;
@@ -939,6 +984,9 @@ typedef struct lxw_chart_series {
     uint8_t default_label_position;
     char *label_num_format;
     lxw_chart_font *label_font;
+    lxw_chart_line *label_line;
+    lxw_chart_fill *label_fill;
+    lxw_chart_pattern *label_pattern;
 
     lxw_series_error_bars *x_error_bars;
     lxw_series_error_bars *y_error_bars;
@@ -1043,8 +1091,8 @@ typedef struct lxw_chart {
     uint8_t subtype;
     uint16_t series_index;
 
-    void (*write_chart_type) (struct lxw_chart *);
-    void (*write_plot_area) (struct lxw_chart *);
+    void (*write_chart_type)(struct lxw_chart *);
+    void (*write_plot_area)(struct lxw_chart *);
 
     /**
      * A pointer to the chart x_axis object which can be used in functions
@@ -1627,11 +1675,11 @@ void chart_series_set_smooth(lxw_chart_series *series, uint8_t smooth);
  *     chart_series_set_labels(series);
  * @endcode
  *
- * @image html chart_labels1.png
+ * @image html chart_data_labels1.png
  *
  * By default data labels are displayed in Excel with only the values shown:
  *
- * @image html chart_labels2.png
+ * @image html chart_data_labels2.png
  *
  * However, it is possible to configure other display options, as shown
  * in the functions below.
@@ -1656,7 +1704,7 @@ void chart_series_set_labels(lxw_chart_series *series);
  *     chart_series_set_labels_options(series, LXW_TRUE, LXW_TRUE, LXW_TRUE);
  * @endcode
  *
- * @image html chart_labels3.png
+ * @image html chart_data_labels3.png
  *
  * For more information see @ref chart_labels.
  */
@@ -1664,6 +1712,63 @@ void chart_series_set_labels_options(lxw_chart_series *series,
                                      uint8_t show_name, uint8_t show_category,
                                      uint8_t show_value);
 
+/** @brief Set the properties for data labels in a series.
+*
+* @param series      A series object created via `chart_add_series()`.
+* @param data_labels An NULL terminated array of #lxw_chart_data_label pointers.
+*
+* @return A #lxw_error.
+*
+* The `%chart_series_set_labels_custom()` function is used to set the properties
+* for data labels in a series. It can also be used to delete individual data
+* labels in a series.
+*
+* In general properties are set for all the data labels in a chart
+* series. However, it is also possible to set properties for individual data
+* labels in a series using `%chart_series_set_labels_custom()`.
+*
+* The `%chart_series_set_labels_custom()` function takes a pointer to an array
+* of #lxw_chart_data_label pointers. The list should be `NULL` terminated:
+*
+* @code
+*     // Add the series data labels.
+*     chart_series_set_labels(series);
+*
+*     // Create some custom labels.
+*     lxw_chart_data_label data_label1 = {.value = "Jan"};
+*     lxw_chart_data_label data_label2 = {.value = "Feb"};
+*     lxw_chart_data_label data_label3 = {.value = "Mar"};
+*     lxw_chart_data_label data_label4 = {.value = "Apr"};
+*     lxw_chart_data_label data_label5 = {.value = "May"};
+*     lxw_chart_data_label data_label6 = {.value = "Jun"};
+*
+*     // Create an array of label pointers. NULL indicates the end of the array.
+*     lxw_chart_data_label *data_labels[] = {
+*         &data_label1,
+*         &data_label2,
+*         &data_label3,
+*         &data_label4,
+*         &data_label5,
+*         &data_label6,
+*         NULL
+*     };
+*
+*     // Set the custom labels.
+*     chart_series_set_labels_custom(series, data_labels);
+* @endcode
+*
+* @image html chart_data_labels18.png
+*
+* @note The array of #lxw_chart_point pointers should be NULL terminated as
+* shown in the example. Any #lxw_chart_data_label items set to a default
+* initialization or omitted from the list will be assigned the default data
+* label value.
+*
+* For more details see @ref chart_custom_labels.
+*/
+lxw_error chart_series_set_labels_custom(lxw_chart_series *series, lxw_chart_data_label
+                                         *data_labels[]);
+
 /**
  * @brief Set the separator for the data label captions.
  *
@@ -1690,7 +1795,7 @@ void chart_series_set_labels_options(lxw_chart_series *series,
  *     chart_series_set_labels_separator(series, LXW_CHART_LABEL_SEPARATOR_NEWLINE);
  * @endcode
  *
- * @image html chart_labels4.png
+ * @image html chart_data_labels4.png
  *
  * For more information see @ref chart_labels.
  */
@@ -1711,7 +1816,7 @@ void chart_series_set_labels_separator(lxw_chart_series *series,
  *     chart_series_set_labels_position(series, LXW_CHART_LABEL_POSITION_ABOVE);
  * @endcode
  *
- * @image html chart_labels5.png
+ * @image html chart_data_labels5.png
  *
  * In Excel the allowable data label positions vary for different chart
  * types. The allowable, and default, positions are:
@@ -1771,7 +1876,7 @@ void chart_series_set_labels_leader_line(lxw_chart_series *series);
  *     chart_series_set_labels_legend(series);
  * @endcode
  *
- * @image html chart_labels6.png
+ * @image html chart_data_labels6.png
  *
  * For more information see @ref chart_labels.
  */
@@ -1792,7 +1897,7 @@ void chart_series_set_labels_legend(lxw_chart_series *series);
  *     chart_series_set_labels_percentage(series);
  * @endcode
  *
- * @image html chart_labels7.png
+ * @image html chart_data_labels7.png
  *
  * For more information see @ref chart_labels.
  */
@@ -1812,7 +1917,7 @@ void chart_series_set_labels_percentage(lxw_chart_series *series);
  *     chart_series_set_labels_num_format(series, "$0.00");
  * @endcode
  *
- * @image html chart_labels8.png
+ * @image html chart_data_labels8.png
  *
  * The number format is similar to the Worksheet Cell Format num_format,
  * see `format_set_num_format()`.
@@ -1839,7 +1944,7 @@ void chart_series_set_labels_num_format(lxw_chart_series *series,
  *     chart_series_set_labels_font(series, &font);
  * @endcode
  *
- * @image html chart_labels9.png
+ * @image html chart_data_labels9.png
  *
  * For more information see @ref chart_fonts and @ref chart_labels.
  *
@@ -1847,6 +1952,67 @@ void chart_series_set_labels_num_format(lxw_chart_series *series,
 void chart_series_set_labels_font(lxw_chart_series *series,
                                   lxw_chart_font *font);
 
+/**
+ * @brief Set the line properties for the data labels in a chart series.
+ *
+ * @param series A series object created via `chart_add_series()`.
+ * @param line   A #lxw_chart_line struct.
+ *
+ * Set the line/border properties of the data labels in a chart series:
+ *
+ * @code
+ *     lxw_chart_line line = {.color = LXW_COLOR_RED};
+ *     lxw_chart_fill fill = {.color = LXW_COLOR_YELLOW};
+ *
+ *     chart_series_set_labels_line(series, &line);
+ *     chart_series_set_labels_fill(series, &fill);
+ *
+ * @endcode
+ *
+ * @image html chart_data_labels24.png
+ *
+ * For more information see @ref chart_lines and @ref chart_labels.
+ */
+void chart_series_set_labels_line(lxw_chart_series *series,
+                                  lxw_chart_line *line);
+
+/**
+ * @brief Set the fill properties for the data labels in a chart series.
+ *
+ * @param series A series object created via `chart_add_series()`.
+ * @param fill   A #lxw_chart_fill struct.
+ *
+ * Set the fill properties of the data labels in a chart series:
+ *
+ * @code
+ *     lxw_chart_fill fill = {.color = LXW_COLOR_YELLOW};
+ *
+ *     chart_series_set_labels_fill(series, &fill);
+ * @endcode
+ *
+ * See the example and image above and also see @ref chart_fills and
+ * @ref chart_labels.
+ */
+void chart_series_set_labels_fill(lxw_chart_series *series,
+                                  lxw_chart_fill *fill);
+
+/**
+ * @brief Set the pattern properties for the data labels in a chart series.
+ *
+ * @param series  A series object created via `chart_add_series()`.
+ * @param pattern A #lxw_chart_pattern struct.
+ *
+ * Set the pattern properties of the data labels in a chart series:
+ *
+ * @code
+ *     chart_series_set_labels_pattern(series, &pattern);
+ * @endcode
+ *
+ * For more information see #lxw_chart_pattern_type and @ref chart_patterns.
+ */
+void chart_series_set_labels_pattern(lxw_chart_series *series,
+                                     lxw_chart_pattern *pattern);
+
 /**
  * @brief Turn on a trendline for a chart data series.
  *

data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/chartsheet.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2020, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  * chartsheet - A libxlsxwriter library for creating Excel XLSX chartsheet files.
  *
@@ -77,7 +77,7 @@ typedef struct lxw_chartsheet {
     lxw_worksheet *worksheet;
     lxw_chart *chart;
 
-    struct lxw_protection protection;
+    struct lxw_protection_obj protection;
     uint8_t is_protected;
 
     char *name;
@@ -143,7 +143,7 @@ lxw_error chartsheet_set_chart(lxw_chartsheet *chartsheet, lxw_chart *chart);
 /* Not currently required since scale options aren't useful in a chartsheet. */
 lxw_error chartsheet_set_chart_opt(lxw_chartsheet *chartsheet,
                                    lxw_chart *chart,
-                                   lxw_image_options *user_options);
+                                   lxw_chart_options *user_options);
 
 /**
  * @brief Make a chartsheet the active, i.e., visible chartsheet.

data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/comment.h

@@ -0,0 +1,76 @@
+/*
+ * libxlsxwriter
+ *
+ * Copyright 2014-2020, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ * comment - A libxlsxwriter library for creating Excel XLSX comment files.
+ *
+ */
+#ifndef __LXW_COMMENT_H__
+#define __LXW_COMMENT_H__
+
+#include <stdint.h>
+
+#include "common.h"
+#include "worksheet.h"
+
+/* Define the tree.h RB structs for the red-black head types. */
+RB_HEAD(lxw_author_ids, lxw_author_id);
+
+/*
+ * Struct to represent a comment object.
+ */
+typedef struct lxw_comment {
+
+    FILE *file;
+    struct lxw_comment_objs *comment_objs;
+    struct lxw_author_ids *author_ids;
+    char *comment_author;
+    uint32_t author_id;
+
+} lxw_comment;
+
+/* Struct to an author id */
+typedef struct lxw_author_id {
+    uint32_t id;
+    char *author;
+
+    RB_ENTRY (lxw_author_id) tree_pointers;
+} lxw_author_id;
+
+#define LXW_RB_GENERATE_AUTHOR_IDS(name, type, field, cmp) \
+    RB_GENERATE_INSERT_COLOR(name, type, field, static)    \
+    RB_GENERATE_REMOVE_COLOR(name, type, field, static)    \
+    RB_GENERATE_INSERT(name, type, field, cmp, static)     \
+    RB_GENERATE_REMOVE(name, type, field, static)          \
+    RB_GENERATE_FIND(name, type, field, cmp, static)       \
+    RB_GENERATE_NEXT(name, type, field, static)            \
+    RB_GENERATE_MINMAX(name, type, field, static)          \
+    /* Add unused struct to allow adding a semicolon */    \
+    struct lxw_rb_generate_author_ids{int unused;}
+
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* *INDENT-ON* */
+
+lxw_comment *lxw_comment_new(void);
+void lxw_comment_free(lxw_comment *comment);
+void lxw_comment_assemble_xml_file(lxw_comment *self);
+
+/* Declarations required for unit testing. */
+#ifdef TESTING
+
+STATIC void _comment_xml_declaration(lxw_comment *self);
+
+#endif /* TESTING */
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+}
+#endif
+/* *INDENT-ON* */
+
+#endif /* __LXW_COMMENT_H__ */

data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/common.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2020, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  */
 
 /**
@@ -9,7 +9,7 @@
  *
  * @brief Common functions and defines for the libxlsxwriter library.
  *
- * <!-- Copyright 2014-2019, John McNamara, jmcnamara@cpan.org -->
+ * <!-- Copyright 2014-2020, John McNamara, jmcnamara@cpan.org -->
  *
  */
 #ifndef __LXW_COMMON_H__
@@ -25,6 +25,16 @@
 #define STATIC
 #endif
 
+#ifndef DEPRECATED
+#if __GNUC__ >= 5
+#define DEPRECATED(func, msg) func __attribute__ ((deprecated(msg)))
+#elif defined(_MSC_VER)
+#define DEPRECATED(func, msg) __declspec(deprecated, msg) func
+#else
+#define DEPRECATED(func, msg) func
+#endif
+#endif
+
 /** Integer data type to represent a row value. Equivalent to `uint32_t`.
  *
  * The maximum row in Excel is 1,048,576.
@@ -86,6 +96,9 @@ typedef enum lxw_error {
     /** Unknown zip error when closing xlsx file. */
     LXW_ERROR_ZIP_CLOSE,
 
+    /** Feature is not currently supported in this configuration. */
+    LXW_ERROR_FEATURE_NOT_SUPPORTED,
+
     /** NULL function parameter ignored. */
     LXW_ERROR_NULL_PARAMETER_IGNORED,
 
@@ -104,9 +117,6 @@ typedef enum lxw_error {
     /** Worksheet name is already in use. */
     LXW_ERROR_SHEETNAME_ALREADY_USED,
 
-    /** Worksheet name 'History' is reserved by Excel. */
-    LXW_ERROR_SHEETNAME_RESERVED,
-
     /** Parameter exceeds Excel's limit of 32 characters. */
     LXW_ERROR_32_STRING_LENGTH_EXCEEDED,
 
@@ -125,6 +135,9 @@ typedef enum lxw_error {
     /** Worksheet row or column index out of range. */
     LXW_ERROR_WORKSHEET_INDEX_OUT_OF_RANGE,
 
+    /** Maximum hyperlink length (2079) exceeded. */
+    LXW_ERROR_WORKSHEET_MAX_URL_LENGTH_EXCEEDED,
+
     /** Maximum number of worksheet URLs (65530) exceeded. */
     LXW_ERROR_WORKSHEET_MAX_NUMBER_URLS_EXCEEDED,
 
@@ -164,6 +177,9 @@ enum lxw_custom_property_types {
     LXW_CUSTOM_DATETIME
 };
 
+/* Size of MD5 byte arrays. */
+#define LXW_MD5_SIZE              16
+
 /* Excel sheetname max of 31 chars. */
 #define LXW_SHEETNAME_MAX         31
 
@@ -188,6 +204,9 @@ enum lxw_custom_property_types {
 /* Datetime string length. */
 #define LXW_DATETIME_LENGTH       sizeof("2016-12-12T23:00:00Z")
 
+/* GUID string length. */
+#define LXW_GUID_LENGTH           sizeof("{12345678-1234-1234-1234-1234567890AB}")
+
 #define LXW_EPOCH_1900            0
 #define LXW_EPOCH_1904            1
 

data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/content_types.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2020, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  * content_types - A libxlsxwriter library for creating Excel XLSX
  *                 content_types files.
@@ -53,6 +53,10 @@ void lxw_ct_add_chart_name(lxw_content_types *content_types,
                            const char *name);
 void lxw_ct_add_drawing_name(lxw_content_types *content_types,
                              const char *name);
+void lxw_ct_add_comment_name(lxw_content_types *content_types,
+                             const char *name);
+void lxw_ct_add_vml_name(lxw_content_types *content_types);
+
 void lxw_ct_add_shared_strings(lxw_content_types *content_types);
 void lxw_ct_add_calc_chain(lxw_content_types *content_types);
 void lxw_ct_add_custom_properties(lxw_content_types *content_types);

data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/core.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2020, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  * core - A libxlsxwriter library for creating Excel XLSX core files.
  *

data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/custom.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2020, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  * custom - A libxlsxwriter library for creating Excel custom property files.
  *

data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/drawing.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2020, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  * drawing - A libxlsxwriter library for creating Excel XLSX drawing files.
  *
@@ -10,6 +10,7 @@
 #define __LXW_DRAWING_H__
 
 #include <stdint.h>
+#include <string.h>
 
 #include "common.h"
 
@@ -22,19 +23,6 @@ enum lxw_drawing_types {
     LXW_DRAWING_SHAPE
 };
 
-enum lxw_anchor_types {
-    LXW_ANCHOR_TYPE_NONE = 0,
-    LXW_ANCHOR_TYPE_IMAGE,
-    LXW_ANCHOR_TYPE_CHART
-};
-
-enum lxw_anchor_edit_types {
-    LXW_ANCHOR_EDIT_AS_NONE = 0,
-    LXW_ANCHOR_EDIT_AS_RELATIVE,
-    LXW_ANCHOR_EDIT_AS_ONE_CELL,
-    LXW_ANCHOR_EDIT_AS_ABSOLUTE
-};
-
 enum image_types {
     LXW_IMAGE_UNKNOWN = 0,
     LXW_IMAGE_PNG,
@@ -52,8 +40,8 @@ typedef struct lxw_drawing_coords {
 
 /* Object to represent the properties of a drawing. */
 typedef struct lxw_drawing_object {
-    uint8_t anchor_type;
-    uint8_t edit_as;
+    uint8_t type;
+    uint8_t anchor;
     struct lxw_drawing_coords from;
     struct lxw_drawing_coords to;
     uint32_t col_absolute;
@@ -61,8 +49,9 @@ typedef struct lxw_drawing_object {
     uint32_t width;
     uint32_t height;
     uint8_t shape;
+    uint32_t rel_index;
+    uint32_t url_rel_index;
     char *description;
-    char *url;
     char *tip;
 
     STAILQ_ENTRY (lxw_drawing_object) list_pointers;