From 4c7962755327f63da4f6348c6450921e86e64280 Mon Sep 17 00:00:00 2001 From: Thomas Fussell Date: Sun, 21 Aug 2022 20:42:45 -0500 Subject: [PATCH] ignore merge cell count --- source/detail/serialization/xlsx_consumer.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/source/detail/serialization/xlsx_consumer.cpp b/source/detail/serialization/xlsx_consumer.cpp index 88272872..e7dce8d1 100644 --- a/source/detail/serialization/xlsx_consumer.cpp +++ b/source/detail/serialization/xlsx_consumer.cpp @@ -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 { - auto count = std::stoull(parser().attribute("count")); + parser().attribute_map(); while (in_element(qn("spreadsheetml", "mergeCells"))) { expect_start_element(qn("spreadsheetml", "mergeCell"), xml::content::simple); ws.merge_cells(range_reference(parser().attribute("ref"))); 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