c/libxlsxwriter
1
0
Fork 0
mirror of https://github.com/jmcnamara/libxlsxwriter synced 2025-03-28 21:13:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

format: fix identation and alignment property mismatch

Browse Source 
Fix issue where a horizontal alignment format was ignored if the
indentation was also set.
This commit is contained in:
John McNamara 2024-02-03 23:42:54 +00:00
parent d3c1443155
commit b0c76b3396
4 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/styles.c
View File

@ -1045,13 +1045,16 @@ _write_alignment(lxw_styles *self, lxw_format *format)
LXW_INIT_ATTRIBUTES();
/* Indent is only allowed for horizontal left, right and distributed. */
/* Indent is only allowed for some alignment properties. */
/* If it is defined for any other alignment or no alignment has been */
/* set then default to left alignment. */
if (format->indent
&& format->text_h_align != LXW_ALIGN_LEFT
&& format->text_h_align != LXW_ALIGN_RIGHT
&& format->text_h_align != LXW_ALIGN_DISTRIBUTED) {
&& format->text_h_align != LXW_ALIGN_DISTRIBUTED
&& format->text_v_align != LXW_ALIGN_VERTICAL_TOP
&& format->text_v_align != LXW_ALIGN_VERTICAL_BOTTOM
&& format->text_v_align != LXW_ALIGN_VERTICAL_DISTRIBUTED) {
format->text_h_align = LXW_ALIGN_LEFT;
}
@ -1110,9 +1113,6 @@ _write_alignment(lxw_styles *self, lxw_format *format)
if (format->text_v_align == LXW_ALIGN_VERTICAL_DISTRIBUTED)
LXW_PUSH_ATTRIBUTES_STR("vertical", "distributed");
if (format->indent)
LXW_PUSH_ATTRIBUTES_INT("indent", format->indent);
/* Map rotation to Excel values. */
if (rotation) {
if (rotation == 270)
@ -1123,6 +1123,9 @@ _write_alignment(lxw_styles *self, lxw_format *format)
LXW_PUSH_ATTRIBUTES_INT("textRotation", rotation);
}
if (format->indent)
LXW_PUSH_ATTRIBUTES_INT("indent", format->indent);
if (format->text_wrap)
LXW_PUSH_ATTRIBUTES_STR("wrapText", "1");

37
test/functional/src/test_format24.c Normal file
View File

@ -0,0 +1,37 @@
/*****************************************************************************
* Test cases for libxlsxwriter.
*
* Test to compare output against Excel files.
*
* Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
*
*/
#include "xlsxwriter.h"
int main() {
lxw_workbook *workbook = workbook_new("test_format24.xlsx");
lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
lxw_format *format1 = workbook_add_format(workbook);
/*
'rotation': 270,
'indent': 1,
'align': "center",
'valign': "top"
*/
format_set_rotation(format1, 270);
format_set_indent(format1, 1);
format_set_align(format1, LXW_ALIGN_CENTER);
format_set_align(format1, LXW_ALIGN_VERTICAL_TOP);
worksheet_set_row(worksheet, 0, 75, NULL);
worksheet_write_string(worksheet, 0, 0, "ABCD", format1);
return workbook_close(workbook);
}

3
test/functional/test_formatting.py
View File

@ -49,6 +49,9 @@ class TestCompareXLSXFiles(base_test_class.XLSXBaseTest):
def test_format18(self):
self.run_exe_test('test_format18')
def test_format24(self):
self.run_exe_test('test_format24')
def test_format50(self):
self.run_exe_test('test_format50')

BIN
test/functional/xlsx_files/format24.xlsx Normal file
View File

Binary file not shown.