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

ignore optional formula attributes

Browse Source
This commit is contained in:
Thomas Fussell 2016-11-27 09:41:03 +01:00
parent 26b0302aac
commit 1ff174a0c9
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/detail/xlsx_consumer.cpp
View File

@ -1774,18 +1774,25 @@ void xlsx_consumer::read_worksheet(const std::string &rel_id)
{
auto current_element = expect_start_element(xml::content::mixed);
if (current_element == xml::qname(xmlns, "v"))
if (current_element == xml::qname(xmlns, "v")) // s:ST_Xstring
{
has_value = true;
value_string = read_text();
}
else if (current_element == xml::qname(xmlns, "f"))
else if (current_element == xml::qname(xmlns, "f")) // CT_CellFormula
{
has_formula = true;
has_shared_formula = parser().attribute_present("t") && parser().attribute("t") == "shared";
if (parser().attribute_present("t"))
{
has_shared_formula = parser().attribute("t") == "shared";
}
skip_attributes({"aca", "ref", "dt2D", "dtr", "del1", "del2", "r1", "r2", "ca", "si", "bx"});
formula_value_string = read_text();
}
else if (current_element == xml::qname(xmlns, "is"))
else if (current_element == xml::qname(xmlns, "is")) // CT_Rst
{
parser().next_expect(xml::parser::event_type::start_element, xmlns, "t");
value_string = read_text();