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

Merge pull request #240 from shamanas/master

Browse Source 
Setting the height of a row now produces the expected result.
This commit is contained in:
Thomas Fussell 2017-10-30 19:41:05 -04:00 committed by GitHub
commit 5b8820d2cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2175,8 +2175,14 @@ void xlsx_producer::write_worksheet(const relationship &rel)
write_start_element(xmlns, "sheetData"); write_start_element(xmlns, "sheetData");
for (auto row : ws.rows()) for (auto row : ws.rows(false))
{ {
auto row_index = row.front().row();
write_start_element(xmlns, "row");
write_attribute("r", row_index);
auto min = static_cast<xlnt::row_t>(row.length()); auto min = static_cast<xlnt::row_t>(row.length());
xlnt::row_t max = 0; xlnt::row_t max = 0;
bool any_non_null = false; bool any_non_null = false;
@ -2192,21 +2198,16 @@ void xlsx_producer::write_worksheet(const relationship &rel)
} }
} }
if (!any_non_null) if (any_non_null)
{ {
continue; write_attribute("spans", std::to_string(min) + ":" + std::to_string(max));
} }
write_start_element(xmlns, "row"); if (ws.has_row_properties(row_index))
write_attribute("r", row.front().row());
write_attribute("spans", std::to_string(min) + ":" + std::to_string(max));
if (ws.has_row_properties(row.front().row()))
{ {
const auto &props = ws.row_properties(row.front().row()); const auto &props = ws.row_properties(row_index);
if (props.custom_height) if (props.custom_height || props.height.is_set())
{ {
write_attribute("customHeight", write_bool(true)); write_attribute("customHeight", write_bool(true));
} }