github-starred/libxlsxwriter
2
0
Fork 0
mirror of https://github.com/jmcnamara/libxlsxwriter.git synced 2026-05-21 06:45:21 -06:00
Code Issues 16 Projects Packages Wiki Activity Actions

Renamed worksheet_set_column() function.

Browse source 
Renamed worksheet_set_column() function to worksheet_set_column_opt()
for consistency with current and future APIs. The worksheet_set_column()
function is now used without the option.

This is a backward incompatible change.
This commit is contained in:
John McNamara 2016-01-04 00:01:00 +00:00
parent 51d97e7f41
commit 2c34defdf4
45 changed files with 130 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/anatomy.c
View file

@ -29,7 +29,7 @@ int main() {
format_set_num_format(myformat2, "$#,##0.00");
/* Widen the first column to make the text clearer. */
worksheet_set_column(worksheet1, 0, 0, 20, NULL, NULL);
worksheet_set_column(worksheet1, 0, 0, 20, NULL);
/* Write some unformatted data. */
worksheet_write_string(worksheet1, 0, 0, "Peach", NULL);

2
examples/dates_and_times01.c
View file

@ -26,7 +26,7 @@ int main() {
format_set_num_format(format, "mmm d yyyy hh:mm AM/PM");
/* Widen the first column to make the text clearer. */
worksheet_set_column(worksheet, 0, 0, 20, NULL, NULL);
worksheet_set_column(worksheet, 0, 0, 20, NULL);
/* Write the number without formatting. */
worksheet_write_number(worksheet, 0, 0, number, NULL ); // 41333.5

2
examples/dates_and_times02.c
View file

@ -22,7 +22,7 @@ int main() {
format_set_num_format(format, "mmm d yyyy hh:mm AM/PM");
/* Widen the first column to make the text clearer. */
worksheet_set_column(worksheet, 0, 0, 20, NULL, NULL);
worksheet_set_column(worksheet, 0, 0, 20, NULL);
/* Write the datetime without formatting. */
worksheet_write_datetime(worksheet, 0, 0, &datetime, NULL ); // 41333.5

2
examples/dates_and_times03.c
View file

@ -48,7 +48,7 @@ int main() {
worksheet_write_string(worksheet, row, col + 1, "Format", bold);
/* Widen the first column to make the text clearer. */
worksheet_set_column(worksheet, 0, 1, 20, NULL, NULL);
worksheet_set_column(worksheet, 0, 1, 20, NULL);
/* Write the same date and time using each of the above formats. */
for (i = 0; i < 14; i++) {

2
examples/defined_name.c
View file

@ -30,7 +30,7 @@ int main() {
/* Write some text to the worksheets and a defined names in a formula. */
LXW_FOREACH_WORKSHEET(worksheet, workbook){
worksheet_set_column(worksheet, 0, 0, 45, NULL, NULL);
worksheet_set_column(worksheet, 0, 0, 45, NULL);
worksheet_write_string(worksheet, 0, 0,
"This worksheet contains some defined names.", NULL);

4
examples/demo.c
View file

@ -20,8 +20,8 @@ int main() {
format_set_bold(format);
/* Change the column widths for clarity. */
worksheet_set_column(worksheet, 0, 0, 20, NULL, NULL);
worksheet_set_column(worksheet, 1, 1, 2, NULL, NULL);
worksheet_set_column(worksheet, 0, 0, 20, NULL);
worksheet_set_column(worksheet, 1, 1, 2, NULL);
/* Write some simple text. */
worksheet_write_string(worksheet, 0, 0, "Hello", NULL);

2
examples/doc_properties.c
View file

@ -30,7 +30,7 @@ int main() {
workbook_set_properties(workbook, &properties);
/* Add some text to the file. */
worksheet_set_column(worksheet, 0, 0, 70, NULL, NULL);
worksheet_set_column(worksheet, 0, 0, 70, NULL);
worksheet_write_string(worksheet, 0, 0,
"Select 'Workbook Properties' to see properties." , NULL);

2
examples/format_font.c
View file

@ -17,7 +17,7 @@ int main() {
lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
/* Widen the first column to make the text clearer. */
worksheet_set_column(worksheet, 0, 0, 20, NULL, NULL);
worksheet_set_column(worksheet, 0, 0, 20, NULL);
/* Add some formats. */
lxw_format *format1 = workbook_add_format(workbook);

2
examples/format_num_format.c
View file

@ -15,7 +15,7 @@ int main() {
lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
/* Widen the first column to make the text clearer. */
worksheet_set_column(worksheet, 0, 0, 30, NULL, NULL);
worksheet_set_column(worksheet, 0, 0, 30, NULL);
/* Add some formats. */
lxw_format *format01 = workbook_add_format(workbook);

10
examples/headers_footers.c
View file

@ -49,7 +49,7 @@ int main() {
worksheet_set_header(worksheet1, header1);
worksheet_set_footer(worksheet1, footer1);
worksheet_set_column(worksheet1, 0, 0, 50, NULL, NULL);
worksheet_set_column(worksheet1, 0, 0, 50, NULL);
worksheet_write_string(worksheet1, 0, 0, preview, NULL);
@ -64,7 +64,7 @@ int main() {
worksheet_set_header(worksheet2, header2);
worksheet_set_footer(worksheet2, footer2);
worksheet_set_column(worksheet2, 0, 0, 50, NULL, NULL);
worksheet_set_column(worksheet2, 0, 0, 50, NULL);
worksheet_write_string(worksheet2, 0, 0, preview, NULL);
worksheet_set_h_pagebreaks(worksheet2, breaks);
@ -81,7 +81,7 @@ int main() {
worksheet_set_header(worksheet3, header3);
worksheet_set_footer(worksheet3, footer3);
worksheet_set_column(worksheet3, 0, 0, 50, NULL, NULL);
worksheet_set_column(worksheet3, 0, 0, 50, NULL);
worksheet_write_string(worksheet3, 0, 0, preview, NULL);
@ -93,7 +93,7 @@ int main() {
worksheet_set_header(worksheet4, header4);
worksheet_set_column(worksheet4, 0, 0, 50, NULL, NULL);
worksheet_set_column(worksheet4, 0, 0, 50, NULL);
worksheet_write_string(worksheet4, 0, 0, preview, NULL);
@ -105,7 +105,7 @@ int main() {
worksheet_set_header(worksheet5, header5);
worksheet_set_column(worksheet5, 0, 0, 50, NULL, NULL);
worksheet_set_column(worksheet5, 0, 0, 50, NULL);
worksheet_write_string(worksheet5, 0, 0, preview, NULL);

2
examples/hide_row_col.c
View file

@ -32,7 +32,7 @@ int main() {
/* Columns can be hidden explicitly. This doesn't increase the file size. */
lxw_row_col_options options = {.hidden = 1};
worksheet_set_column(worksheet, COLS("G:XFD"), 8.43, NULL, &options);
worksheet_set_column_opt(worksheet, COLS("G:XFD"), 8.43, NULL, &options);
workbook_close(workbook);

6
examples/hide_sheet.c
View file

@ -22,9 +22,9 @@ int main() {
worksheet_write_string(worksheet3, 0, 0, "Sheet2 is hidden", NULL);
/* Make the first column wider to make the text clearer. */
worksheet_set_column(worksheet1, 0, 0, 30, NULL, NULL);
worksheet_set_column(worksheet2, 0, 0, 30, NULL, NULL);
worksheet_set_column(worksheet3, 0, 0, 30, NULL, NULL);
worksheet_set_column(worksheet1, 0, 0, 30, NULL);
worksheet_set_column(worksheet2, 0, 0, 30, NULL);
worksheet_set_column(worksheet3, 0, 0, 30, NULL);
workbook_close(workbook);

2
examples/hyperlinks.c
View file

@ -28,7 +28,7 @@ int main() {
format_set_font_color(red_format, LXW_COLOR_RED);
/* Widen the first column to make the text clearer. */
worksheet_set_column(worksheet, 0, 0, 30, NULL, NULL);
worksheet_set_column(worksheet, 0, 0, 30, NULL);
/* Write a hyperlink. */
worksheet_write_url(worksheet, 0, 0, "http://libxlsxwriter.github.io", url_format);

2
examples/images.c
View file

@ -15,7 +15,7 @@ int main() {
lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
/* Change some of the column widths for clarity. */
worksheet_set_column(worksheet, COLS("A:A"), 30, NULL, NULL);
worksheet_set_column(worksheet, COLS("A:A"), 30, NULL);
/* Insert an image. */
worksheet_write_string(worksheet, CELL("A2"), "Insert an image in a cell:", NULL);

2
examples/merge_range.c
View file

@ -21,7 +21,7 @@ int main() {
format_set_border(merge_format, LXW_BORDER_THIN);
/* Increase the cell size of the merged cells to highlight the formatting. */
worksheet_set_column(worksheet, 1, 3, 12, NULL, NULL);
worksheet_set_column(worksheet, 1, 3, 12, NULL);
worksheet_set_row(worksheet, 3, 30, NULL, NULL);
worksheet_set_row(worksheet, 6, 30, NULL, NULL);
worksheet_set_row(worksheet, 7, 30, NULL, NULL);

6
examples/panes.c
View file

@ -40,7 +40,7 @@ int main() {
worksheet_freeze_panes(worksheet1, 1, 0);
/* Some sheet formatting. */
worksheet_set_column(worksheet1, 0, 8, 16, NULL, NULL);
worksheet_set_column(worksheet1, 0, 8, 16, NULL);
worksheet_set_row(worksheet1, 0, 20, NULL, NULL);
worksheet_set_selection(worksheet1, 4, 3, 4, 3);
@ -62,7 +62,7 @@ int main() {
worksheet_freeze_panes(worksheet2, 0, 1);
/* Some sheet formatting. */
worksheet_set_column(worksheet2, 0, 0, 16, NULL, NULL);
worksheet_set_column(worksheet2, 0, 0, 16, NULL);
worksheet_set_selection(worksheet2, 4, 3, 4, 3);
/* Some worksheet text to demonstrate scrolling. */
@ -82,7 +82,7 @@ int main() {
/* Some sheet formatting. */
worksheet_set_column(worksheet3, 0, 25, 16, NULL, NULL);
worksheet_set_column(worksheet3, 0, 25, 16, NULL);
worksheet_set_row(worksheet3, 0, 20, NULL, NULL);
worksheet_write_string(worksheet3, 0, 0, "", header);
worksheet_set_selection(worksheet3, 4, 3, 4, 3);

2
examples/tutorial3.c
View file

@ -48,7 +48,7 @@ int main() {
format_set_num_format(date_format, "mmmm d yyyy");
/* Adjust the column width. */
worksheet_set_column(worksheet, 0, 0, 15, NULL, NULL);
worksheet_set_column(worksheet, 0, 0, 15, NULL);
/* Write some data header. */
worksheet_write_string(worksheet, row, col, "Item", bold);

2
examples/worksheet_protection.c
View file

@ -20,7 +20,7 @@ int main() {
format_set_hidden(hidden);
/* Widen the first column to make the text clearer. */
worksheet_set_column(worksheet, 0, 0, 40, NULL, NULL);
worksheet_set_column(worksheet, 0, 0, 40, NULL);
/* Turn worksheet protection on without a password. */
worksheet_protect(worksheet, NULL, NULL);

75
include/xlsxwriter/worksheet.h
View file

@ -1083,14 +1083,13 @@ int8_t worksheet_set_row(lxw_worksheet *worksheet,
* @param last_col The zero indexed last column.
* @param width The width of the column(s).
* @param format A pointer to a Format instance or NULL.
* @param options Optional row parameters: hidden, level, collapsed.
*
* The `%worksheet_set_column()` function can be used to change the default
* properties of a single column or a range of columns:
*
* @code
* // Width of columns B:D set to 30.
* worksheet_set_column(worksheet, 1, 3, 30, NULL, NULL);
* worksheet_set_column(worksheet, 1, 3, 30, NULL);
*
* @endcode
*
@ -1099,7 +1098,7 @@ int8_t worksheet_set_row(lxw_worksheet *worksheet,
*
* @code
* // Width of column B set to 30.
* worksheet_set_column(worksheet, 1, 1, 30, NULL, NULL);
* worksheet_set_column(worksheet, 1, 1, 30, NULL);
*
* @endcode
*
@ -1107,12 +1106,12 @@ int8_t worksheet_set_row(lxw_worksheet *worksheet,
* the form of `COLS()` macro:
*
* @code
* worksheet_set_column(worksheet, 4, 4, 20, NULL, NULL);
* worksheet_set_column(worksheet, 5, 8, 30, NULL, NULL);
* worksheet_set_column(worksheet, 4, 4, 20, NULL);
* worksheet_set_column(worksheet, 5, 8, 30, NULL);
*
* // Same as the examples above but clearer.
* worksheet_set_column(worksheet, COLS("E:E"), 20, NULL, NULL);
* worksheet_set_column(worksheet, COLS("F:H"), 30, NULL, NULL);
* worksheet_set_column(worksheet, COLS("E:E"), 20, NULL);
* worksheet_set_column(worksheet, COLS("F:H"), 30, NULL);
*
* @endcode
*
@ -1132,7 +1131,7 @@ int8_t worksheet_set_row(lxw_worksheet *worksheet,
* format_set_bold(bold);
*
* // Set the first column to bold.
* worksheet_set_column(worksheet, 0, 0, LXW_DEF_COL_HEIGHT, bold, NULL);
* worksheet_set_column(worksheet, 0, 0, LXW_DEF_COL_HEIGHT, bold);
* @endcode
*
* The `format` parameter will be applied to any cells in the column that
@ -1140,7 +1139,7 @@ int8_t worksheet_set_row(lxw_worksheet *worksheet,
*
* @code
* // Column 1 has format1.
* worksheet_set_column(worksheet, COLS("A:A"), 8.43, format1, NULL);
* worksheet_set_column(worksheet, COLS("A:A"), 8.43, format1);
*
* // Cell A1 in column 1 defaults to format1.
* worksheet_write_string(worksheet, 0, 0, "Hello", NULL);
@ -1153,10 +1152,10 @@ int8_t worksheet_set_row(lxw_worksheet *worksheet,
*
* @code
* // Row 1 has format1.
* worksheet_set_row(worksheet, 0, 15, format1, NULL);
* worksheet_set_row(worksheet, 0, 15, format1);
*
* // Col 1 has format2.
* worksheet_set_column(worksheet, COLS("A:A"), 8.43, format2, NULL);
* worksheet_set_column(worksheet, COLS("A:A"), 8.43, format2);
*
* // Cell A1 defaults to format1, the row format.
* worksheet_write_string(worksheet, 0, 0, "Hello", NULL);
@ -1164,27 +1163,45 @@ int8_t worksheet_set_row(lxw_worksheet *worksheet,
* // Cell A2 keeps format2, the column format.
* worksheet_write_string(worksheet, 1, 0, "Hello", NULL);
* @endcode
*
* The `options` parameter is a #lxw_row_col_options struct. It has the
* following members but currently only the `hidden` property is supported:
*
* - `hidden`
* - `level`
* - `collapsed`
*
* The `"hidden"` option is used to hide a column. This can be used, for
* example, to hide intermediary steps in a complicated calculation:
*
* @code
* lxw_row_col_options options = {.hidden = 1, .level = 0, .collapsed = 0};
*
* worksheet_set_column(worksheet, COLS("A:A"), 8.43, NULL, &options);
* @endcode
*
*/
int8_t worksheet_set_column(lxw_worksheet *worksheet, lxw_col_t first_col,
lxw_col_t last_col, double width,
lxw_format *format, lxw_row_col_options *options);
lxw_format *format);
/**
* @brief Set the properties for one or more columns of cells with options.
*
* @param worksheet Pointer to a lxw_worksheet instance to be updated.
* @param first_col The zero indexed first column.
* @param last_col The zero indexed last column.
* @param width The width of the column(s).
* @param format A pointer to a Format instance or NULL.
* @param options Optional row parameters: hidden, level, collapsed.
*
* The `%worksheet_set_column_opt()` function is the same as
* `worksheet_set_column()` with an additional `options` parameter.
*
* The `options` parameter is a #lxw_row_col_options struct. It has the
* following members but currently only the `hidden` property is supported:
*
* - `hidden`
* - `level`
* - `collapsed`
*
* The `"hidden"` option is used to hide a column. This can be used, for
* example, to hide intermediary steps in a complicated calculation:
*
* @code
* lxw_row_col_options options = {.hidden = 1, .level = 0, .collapsed = 0};
*
* worksheet_set_column_opt(worksheet, COLS("A:A"), 8.43, NULL, &options);
* @endcode
*
*/
int8_t worksheet_set_column_opt(lxw_worksheet *worksheet, lxw_col_t first_col,
lxw_col_t last_col, double width,
lxw_format *format,
lxw_row_col_options *options);
/**
* @brief Insert an image in a worksheet cell.

25
src/worksheet.c
View file

@ -3656,14 +3656,15 @@ worksheet_write_url(lxw_worksheet *self,
}
/*
* Set the properties of a single column or a range of columns.
* Set the properties of a single column or a range of columns with options.
*/
int8_t
worksheet_set_column(lxw_worksheet *self,
lxw_col_t firstcol,
lxw_col_t lastcol,
double width,
lxw_format *format, lxw_row_col_options *user_options)
worksheet_set_column_opt(lxw_worksheet *self,
lxw_col_t firstcol,
lxw_col_t lastcol,
double width,
lxw_format *format,
lxw_row_col_options *user_options)
{
lxw_col_options *copied_options;
uint8_t ignore_row = LXW_TRUE;
@ -3767,6 +3768,18 @@ worksheet_set_column(lxw_worksheet *self,
return 0;
}
/*
* Set the properties of a single column or a range of columns.
*/
int8_t
worksheet_set_column(lxw_worksheet *self,
lxw_col_t firstcol,
lxw_col_t lastcol, double width, lxw_format *format)
{
return worksheet_set_column_opt(self, firstcol, lastcol, width, format,
NULL);
}
/*
* Set the properties of a row.
*/

2
test/functional/src/test_escapes06.c
View file

@ -17,7 +17,7 @@ int main() {
format_set_num_format(num_format, "[Red]0.0%\\ \"a\"");
worksheet_set_column(worksheet, 0, 0, 14, NULL, NULL);
worksheet_set_column(worksheet, 0, 0, 14, NULL);
worksheet_write_number(worksheet, CELL("A1"), 123, num_format);

2
test/functional/src/test_image12.c
View file

@ -15,7 +15,7 @@ int main() {
lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
worksheet_set_row(worksheet, 1, 75, NULL, NULL);
worksheet_set_column(worksheet, 2, 2, 32, NULL, NULL);
worksheet_set_column(worksheet, 2, 2, 32, NULL);
worksheet_insert_image(worksheet, CELL("C2"), "images/logo.png");

2
test/functional/src/test_image13.c
View file

@ -17,7 +17,7 @@ int main() {
lxw_image_options options = {.x_offset = 8, .y_offset = 5};
worksheet_set_row(worksheet, 1, 75, NULL, NULL);
worksheet_set_column(worksheet, 2, 2, 32, NULL, NULL);
worksheet_set_column(worksheet, 2, 2, 32, NULL);
worksheet_insert_image_opt(worksheet, CELL("C2"), "images/logo.png", &options);

4
test/functional/src/test_image14.c
View file

@ -16,8 +16,8 @@ int main() {
worksheet_set_row(worksheet, 1, 4.5, NULL, NULL);
worksheet_set_row(worksheet, 2, 35.25, NULL, NULL);
worksheet_set_column(worksheet, 2, 4, 3.29, NULL, NULL);
worksheet_set_column(worksheet, 5, 5, 10.71, NULL, NULL);
worksheet_set_column(worksheet, 2, 4, 3.29, NULL);
worksheet_set_column(worksheet, 5, 5, 10.71, NULL);
worksheet_insert_image(worksheet, CELL("C2"), "images/logo.png");

4
test/functional/src/test_image15.c
View file

@ -18,8 +18,8 @@ int main() {
worksheet_set_row(worksheet, 1, 4.5, NULL, NULL);
worksheet_set_row(worksheet, 2, 35.25, NULL, NULL);
worksheet_set_column(worksheet, 2, 4, 3.29, NULL, NULL);
worksheet_set_column(worksheet, 5, 5, 10.71, NULL, NULL);
worksheet_set_column(worksheet, 2, 4, 3.29, NULL);
worksheet_set_column(worksheet, 5, 5, 10.71, NULL);
worksheet_insert_image_opt(worksheet, CELL("C2"), "images/logo.png", &options);

2
test/functional/src/test_image17.c
View file

@ -15,7 +15,7 @@ int main() {
lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
worksheet_set_row(worksheet, 1, 96, NULL, NULL);
worksheet_set_column(worksheet, 2, 2, 18, NULL, NULL);
worksheet_set_column(worksheet, 2, 2, 18, NULL);
worksheet_insert_image(worksheet, CELL("C2"), "images/issue32.png");

2
test/functional/src/test_image18.c
View file

@ -17,7 +17,7 @@ int main() {
lxw_image_options options = {.x_offset = 5, .y_offset = 5};
worksheet_set_row(worksheet, 1, 96, NULL, NULL);
worksheet_set_column(worksheet, 2, 2, 18, NULL, NULL);
worksheet_set_column(worksheet, 2, 2, 18, NULL);
worksheet_insert_image_opt(worksheet, CELL("C2"), "images/issue32.png", &options);

2
test/functional/src/test_image31.c
View file

@ -16,7 +16,7 @@ int main() {
lxw_image_options options = {.x_offset = -2, .y_offset = -1};
worksheet_set_column(worksheet, 3, 3, 3.86, NULL, NULL);
worksheet_set_column(worksheet, 3, 3, 3.86, NULL);
worksheet_set_row(worksheet, 7, 7.5, NULL, NULL);
worksheet_insert_image_opt(worksheet, CELL("E9"), "images/red.png", &options);

4
test/functional/src/test_image33.c
View file

@ -16,8 +16,8 @@ int main() {
lxw_image_options options = {.x_offset = -2, .y_offset = -1};
worksheet_set_column(worksheet, 3, 3, 3.86, NULL, NULL);
worksheet_set_column(worksheet, 4, 4, 1.43, NULL, NULL);
worksheet_set_column(worksheet, 3, 3, 3.86, NULL);
worksheet_set_column(worksheet, 4, 4, 1.43, NULL);
worksheet_set_row(worksheet, 7, 7.5, NULL, NULL);
worksheet_set_row(worksheet, 8, 9.75, NULL, NULL);

2
test/functional/src/test_optimize22.c
View file

@ -19,7 +19,7 @@ int main() {
format_set_bold(bold);
worksheet_set_column(worksheet, 0, 0, 36, bold, NULL);
worksheet_set_column(worksheet, 0, 0, 36, bold);
return workbook_close(workbook);
}

2
test/functional/src/test_properties01.c
View file

@ -27,7 +27,7 @@ int main() {
workbook_set_properties(workbook, properties);
worksheet_set_column(worksheet, 0, 0, 70, NULL, NULL);
worksheet_set_column(worksheet, 0, 0, 70, NULL);
worksheet_write_string(worksheet, CELL("A1"), "Select 'Office Button -> Prepare -> Properties' to see the file properties." , NULL);
free(properties->title);

2
test/functional/src/test_row_col_format03.c
View file

@ -17,7 +17,7 @@ int main() {
lxw_format *italic = workbook_add_format(workbook);
format_set_italic(italic);
worksheet_set_column(worksheet, 0, 0, 8.43, italic, NULL);
worksheet_set_column(worksheet, 0, 0, 8.43, italic);
return workbook_close(workbook);
}

2
test/functional/src/test_row_col_format04.c
View file

@ -17,7 +17,7 @@ int main() {
lxw_format *italic = workbook_add_format(workbook);
format_set_italic(italic);
worksheet_set_column(worksheet, 0, 0, 8.43, italic, NULL);
worksheet_set_column(worksheet, 0, 0, 8.43, italic);
worksheet_write_string(worksheet, 0, 0, "Foo", NULL);

4
test/functional/src/test_row_col_format05.c
View file

@ -20,8 +20,8 @@ int main() {
lxw_format *italic = workbook_add_format(workbook);
format_set_italic(italic);
worksheet_set_column(worksheet, 0, 0, 8.43, bold, NULL);
worksheet_set_column(worksheet, 2, 2, 8.43, italic, NULL);
worksheet_set_column(worksheet, 0, 0, 8.43, bold);
worksheet_set_column(worksheet, 2, 2, 8.43, italic);
return workbook_close(workbook);
}

4
test/functional/src/test_row_col_format06.c
View file

@ -20,8 +20,8 @@ int main() {
lxw_format *italic = workbook_add_format(workbook);
format_set_italic(italic);
worksheet_set_column(worksheet, 0, 0, 8.43, bold, NULL);
worksheet_set_column(worksheet, 2, 2, 8.43, italic, NULL);
worksheet_set_column(worksheet, 0, 0, 8.43, bold);
worksheet_set_column(worksheet, 2, 2, 8.43, italic);
worksheet_write_string(worksheet, 0, 0, "Foo", NULL);
worksheet_write_string(worksheet, 0, 2, "Bar", NULL);

2
test/functional/src/test_row_col_format08.c
View file

@ -28,7 +28,7 @@ int main() {
_set_default_xf_indices(workbook);
worksheet_set_row(worksheet, 0, 15, bold, NULL);
worksheet_set_column(worksheet, 0, 0, 8.43, italic, NULL);
worksheet_set_column(worksheet, 0, 0, 8.43, italic);
worksheet_write_string(worksheet, 0, 0, "Foo", mixed);
worksheet_write_string(worksheet, 0, 1, "Foo", NULL);

2
test/functional/src/test_row_col_format09.c
View file

@ -28,7 +28,7 @@ int main() {
_set_default_xf_indices(workbook);
worksheet_set_row(worksheet, 4, 15, bold, NULL);
worksheet_set_column(worksheet, 2, 2, 8.43, italic, NULL);
worksheet_set_column(worksheet, 2, 2, 8.43, italic);
worksheet_write_string(worksheet, 0, 2, "Foo", NULL);
worksheet_write_string(worksheet, 4, 0, "Foo", NULL);

2
test/functional/src/test_row_col_format10.c
View file

@ -17,7 +17,7 @@ int main() {
lxw_format *bold = workbook_add_format(workbook);
format_set_bold(bold);
worksheet_set_column(worksheet, 2, 2, LXW_DEF_COL_WIDTH, bold, NULL);
worksheet_set_column(worksheet, 2, 2, LXW_DEF_COL_WIDTH, bold);
return workbook_close(workbook);
}

2
test/functional/src/test_row_col_format11.c
View file

@ -14,7 +14,7 @@ int main() {
lxw_workbook *workbook = new_workbook("test_row_col_format11.xlsx");
lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
worksheet_set_column(worksheet, 2, 2, 4, NULL, NULL);
worksheet_set_column(worksheet, 2, 2, 4, NULL);
return workbook_close(workbook);
}

2
test/functional/src/test_row_col_format12.c
View file

@ -15,7 +15,7 @@ int main() {
lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
lxw_row_col_options options = {1, 0, 0};
worksheet_set_column(worksheet, 2, 2, LXW_DEF_COL_WIDTH, NULL, &options);
worksheet_set_column_opt(worksheet, 2, 2, LXW_DEF_COL_WIDTH, NULL, &options);
return workbook_close(workbook);
}

10
test/functional/src/test_row_col_format13.c
View file

@ -18,11 +18,11 @@ int main() {
format_set_bold(bold);
worksheet_set_column(worksheet, COLS("B:D"), 5, NULL, NULL);
worksheet_set_column(worksheet, COLS("F:F"), 8, NULL, &options);
worksheet_set_column(worksheet, COLS("H:H"), LXW_DEF_COL_WIDTH, bold, NULL);
worksheet_set_column(worksheet, COLS("J:J"), 2, NULL, NULL);
worksheet_set_column(worksheet, COLS("L:L"), LXW_DEF_COL_WIDTH, NULL, &options);
worksheet_set_column(worksheet, COLS("B:D"), 5, NULL);
worksheet_set_column_opt(worksheet, COLS("F:F"), 8, NULL, &options);
worksheet_set_column(worksheet, COLS("H:H"), LXW_DEF_COL_WIDTH, bold);
worksheet_set_column(worksheet, COLS("J:J"), 2, NULL);
worksheet_set_column_opt(worksheet, COLS("L:L"), LXW_DEF_COL_WIDTH, NULL, &options);
return workbook_close(workbook);
}

10
test/functional/src/test_row_col_format14.c
View file

@ -18,11 +18,11 @@ int main() {
format_set_bold(bold);
worksheet_set_column(worksheet, 1, 3, 5, NULL, NULL);
worksheet_set_column(worksheet, 5, 5, 8, NULL, NULL);
worksheet_set_column(worksheet, 7, 7, LXW_DEF_COL_WIDTH, bold, NULL);
worksheet_set_column(worksheet, 9, 9, 2, NULL, NULL);
worksheet_set_column(worksheet, 11, 11, LXW_DEF_COL_WIDTH, NULL, &options);
worksheet_set_column(worksheet, 1, 3, 5, NULL);
worksheet_set_column(worksheet, 5, 5, 8, NULL);
worksheet_set_column(worksheet, 7, 7, LXW_DEF_COL_WIDTH, bold);
worksheet_set_column(worksheet, 9, 9, 2, NULL);
worksheet_set_column_opt(worksheet, 11, 11, LXW_DEF_COL_WIDTH, NULL, &options);
return workbook_close(workbook);
}

2
test/functional/src/test_row_col_format15.c
View file

@ -17,7 +17,7 @@ int main() {
lxw_format *italic = workbook_add_format(workbook);
format_set_italic(italic);
worksheet_set_column(worksheet, 16383, 16383, 8.43, italic, NULL);
worksheet_set_column(worksheet, 16383, 16383, 8.43, italic);
return workbook_close(workbook);
}

2
test/functional/src/test_row_col_format16.c
View file

@ -17,7 +17,7 @@ int main() {
lxw_format *italic = workbook_add_format(workbook);
format_set_italic(italic);
worksheet_set_column(worksheet, 16383, 16383, 8.43, italic, NULL);
worksheet_set_column(worksheet, 16383, 16383, 8.43, italic);
worksheet_write_string(worksheet, 0, 16383, "Foo", NULL);

2
test/functional/src/test_simple04.c
View file

@ -22,7 +22,7 @@ int main() {
format_set_num_format_index(format1, 20);
format_set_num_format_index(format2, 14);
worksheet_set_column(worksheet, 0, 0, 12, NULL, NULL);
worksheet_set_column(worksheet, 0, 0, 12, NULL);
worksheet_write_datetime(worksheet, 0, 0, &datetime1, format1);
worksheet_write_datetime(worksheet, 1, 0, &datetime2, format2);