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 #652 from tfussell/fix-merge-cell-count

Browse Source 
Ignore merge cell count
This commit is contained in:
Thomas Fussell 2022-08-21 20:58:40 -05:00 committed by GitHub
commit fbae8cd6c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/detail/serialization/xlsx_consumer.cpp
View File

@ -954,20 +954,13 @@ worksheet xlsx_consumer::read_worksheet_end(const std::string &rel_id)
} }
else if (current_worksheet_element == qn("spreadsheetml", "mergeCells")) // CT_MergeCells 0-1 else if (current_worksheet_element == qn("spreadsheetml", "mergeCells")) // CT_MergeCells 0-1
{ {
auto count = std::stoull(parser().attribute("count")); parser().attribute_map();
while (in_element(qn("spreadsheetml", "mergeCells"))) while (in_element(qn("spreadsheetml", "mergeCells")))
{ {
expect_start_element(qn("spreadsheetml", "mergeCell"), xml::content::simple); expect_start_element(qn("spreadsheetml", "mergeCell"), xml::content::simple);
ws.merge_cells(range_reference(parser().attribute("ref"))); ws.merge_cells(range_reference(parser().attribute("ref")));
expect_end_element(qn("spreadsheetml", "mergeCell")); expect_end_element(qn("spreadsheetml", "mergeCell"));
count--;
}
if (count != 0)
{
throw invalid_file("sizes don't match");
} }
} }
else if (current_worksheet_element == qn("spreadsheetml", "phoneticPr")) // CT_PhoneticPr 0-1 else if (current_worksheet_element == qn("spreadsheetml", "phoneticPr")) // CT_PhoneticPr 0-1