StarMirror/xlnt
1
0
Fork 0
mirror of https://github.com/tfussell/xlnt.git synced 2024-03-22 13:11:17 +08:00
Code Issues Projects Releases Wiki Activity

Fixed block calculation in xlsx_producer

Browse Source
This commit is contained in:
Kostas Dizas 2018-10-19 23:19:23 +01:00
parent 3ab49c8af6
commit dde45fd17f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/detail/serialization/xlsx_producer.cpp
View File

@ -2439,6 +2439,10 @@ void xlsx_producer::write_worksheet(const relationship &rel)
// See note for CT_Row, span attribute about block optimization // See note for CT_Row, span attribute about block optimization
if (first_row_in_block) if (first_row_in_block)
{ {
// reset block column range
first_block_column = constants::max_column();
last_block_column = constants::min_column();
first_check_row = row; first_check_row = row;
// round up to the next multiple of 16 // round up to the next multiple of 16
last_check_row = ((row / 16) + 1) * 16; last_check_row = ((row / 16) + 1) * 16;
@ -2448,8 +2452,8 @@ void xlsx_producer::write_worksheet(const relationship &rel)
{ {
for (auto column = dimension.top_left().column(); column <= dimension.bottom_right().column(); ++column) for (auto column = dimension.top_left().column(); column <= dimension.bottom_right().column(); ++column)
{ {
if (!ws.has_cell(cell_reference(column, row))) continue; if (!ws.has_cell(cell_reference(column, check_row))) continue;
auto cell = ws.cell(cell_reference(column, row)); auto cell = ws.cell(cell_reference(column, check_row));
if (cell.garbage_collectible()) continue; if (cell.garbage_collectible()) continue;
first_block_column = std::min(first_block_column, cell.column()); first_block_column = std::min(first_block_column, cell.column());