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 protectedRanges and make builtinId optional for styles, closes #82

Browse Source
This commit is contained in:
Thomas Fussell 2016-11-15 07:09:17 -06:00
parent 2618237678
commit 8bd725f2fa
1 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
source/detail/xlsx_consumer.cpp
View File

@ -740,6 +740,11 @@ void xlsx_consumer::read_workbook()
parser().attribute("showObjects"); parser().attribute("showObjects");
} }
if (parser().attribute_present("filterPrivacy"))
{
parser().attribute("filterPrivacy");
}
parser().next_expect(xml::parser::event_type::end_element, xmlns, "workbookPr"); parser().next_expect(xml::parser::event_type::end_element, xmlns, "workbookPr");
} }
else if (qname == xml::qname(xmlns, "sheets")) else if (qname == xml::qname(xmlns, "sheets"))
@ -1044,7 +1049,9 @@ void xlsx_consumer::read_stylesheet()
{ {
std::string name; std::string name;
std::size_t record_id; std::size_t record_id;
std::size_t builtin_id; std::pair<std::size_t, bool> builtin_id;
std::pair<std::size_t, bool> i_level;
std::pair<bool, bool> hidden;
bool custom_builtin; bool custom_builtin;
}; };
@ -1384,7 +1391,21 @@ void xlsx_consumer::read_stylesheet()
data.name = parser().attribute("name"); data.name = parser().attribute("name");
data.record_id = parser().attribute<std::size_t>("xfId"); data.record_id = parser().attribute<std::size_t>("xfId");
data.builtin_id = parser().attribute<std::size_t>("builtinId");
if (parser().attribute_present("builtinId"))
{
data.builtin_id = {parser().attribute<std::size_t>("builtinId"), true};
}
if (parser().attribute_present("iLevel"))
{
data.i_level = {parser().attribute<std::size_t>("iLevel"), true};
}
if (parser().attribute_present("hidden"))
{
data.hidden = {is_true(parser().attribute("hidden")), true};
}
if (parser().attribute_present("customBuiltin")) if (parser().attribute_present("customBuiltin"))
{ {
@ -1625,7 +1646,16 @@ void xlsx_consumer::read_stylesheet()
if (style_data_iter == style_datas.end()) continue; if (style_data_iter == style_datas.end()) continue;
auto new_style = stylesheet.create_style(style_data_iter->name); auto new_style = stylesheet.create_style(style_data_iter->name);
new_style.builtin_id(style_data_iter->builtin_id);
if (style_data_iter->builtin_id.second)
{
new_style.builtin_id(style_data_iter->builtin_id.first);
}
if (style_data_iter->hidden.second)
{
new_style.hidden(style_data_iter->hidden.first);
}
new_style.alignment(record.alignment.first, record.alignment.second); new_style.alignment(record.alignment.first, record.alignment.second);
new_style.border(stylesheet.borders.at(record.border_id.first), record.border_id.second); new_style.border(stylesheet.borders.at(record.border_id.first), record.border_id.second);
@ -2084,6 +2114,21 @@ void xlsx_consumer::read_worksheet(const std::string &rel_id)
parser().attribute(xml::qname(xmlns_r, "id")); parser().attribute(xml::qname(xmlns_r, "id"));
parser().next_expect(xml::parser::event_type::end_element, xmlns, "legacyDrawing"); parser().next_expect(xml::parser::event_type::end_element, xmlns, "legacyDrawing");
} }
else if (parser().qname() == xml::qname(xmlns, "protectedRanges"))
{
parser().attribute_map();
while (parser().peek() != xml::parser::event_type::end_element
|| parser().qname() != xml::qname(xmlns, "protectedRanges"))
{
if (parser().next() == xml::parser::event_type::start_element)
{
parser().attribute_map();
}
}
parser().next();
}
} }
parser().next_expect(xml::parser::event_type::end_element, xmlns, "worksheet"); parser().next_expect(xml::parser::event_type::end_element, xmlns, "worksheet");