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

clean up cell deserialization for #103

Browse Source
This commit is contained in:
Thomas Fussell 2016-12-31 20:05:10 -05:00
parent 7de0b05480
commit 760f95e2df
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/detail/xlsx_consumer.cpp
View File

@ -2049,7 +2049,7 @@ void xlsx_consumer::read_worksheet(const std::string &rel_id)
auto cell = ws.cell(cell_reference(parser().attribute("r"))); auto cell = ws.cell(cell_reference(parser().attribute("r")));
auto has_type = parser().attribute_present("t"); auto has_type = parser().attribute_present("t");
auto type = has_type ? parser().attribute("t") : ""; auto type = has_type ? parser().attribute("t") : "n";
auto has_format = parser().attribute_present("s"); auto has_format = parser().attribute_present("s");
auto format_id = static_cast<std::size_t>(has_format ? std::stoull(parser().attribute("s")) : 0LL); auto format_id = static_cast<std::size_t>(has_format ? std::stoull(parser().attribute("s")) : 0LL);
@ -2105,30 +2105,30 @@ void xlsx_consumer::read_worksheet(const std::string &rel_id)
cell.formula(formula_value_string); cell.formula(formula_value_string);
} }
if (has_type && (type == "inlineStr" || type == "str")) if (has_value)
{
if (type == "inlineStr" || type == "str")
{ {
cell.value(value_string); cell.value(value_string);
} }
else if (has_type && type == "s" && !has_formula) else if (type == "s" && !has_formula)
{ {
auto shared_string_index = static_cast<std::size_t>(std::stoull(value_string)); auto shared_string_index = static_cast<std::size_t>(std::stoull(value_string));
auto shared_string = shared_strings.at(shared_string_index); auto shared_string = shared_strings.at(shared_string_index);
cell.value(shared_string); cell.value(shared_string);
} }
else if (has_type && type == "b") // boolean else if (type == "b") // boolean
{ {
cell.value(value_string != "0"); cell.value(is_true(value_string));
} }
else if (has_value && !value_string.empty()) else if (type == "n") // numeric
{
if (!value_string.empty() && value_string[0] == '#')
{
cell.error(value_string);
}
else
{ {
cell.value(std::stold(value_string)); cell.value(std::stold(value_string));
} }
else if (!value_string.empty() && value_string[0] == '#')
{
cell.error(value_string);
}
} }
if (has_format) if (has_format)