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

work on round-tripping for #230

Browse Source
This commit is contained in:
Thomas Fussell 2018-04-24 19:43:34 -04:00
parent 78ae9bbb89
commit 6eb16243ca
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2185,33 +2185,45 @@ void xlsx_consumer::read_stylesheet()
? format_records.emplace(format_records.end()) ? format_records.emplace(format_records.end())
: style_records.emplace(style_records.end())); : style_records.emplace(style_records.end()));
record.first.border_applied = !parser().attribute_present("applyBorder") if (parser().attribute_present("applyBorder"))
|| is_true(parser().attribute("applyBorder")); {
record.first.border_applied = is_true(parser().attribute("applyBorder"));
}
record.first.border_id = parser().attribute_present("borderId") record.first.border_id = parser().attribute_present("borderId")
? parser().attribute<std::size_t>("borderId") : 0; ? parser().attribute<std::size_t>("borderId") : 0;
record.first.fill_applied = !parser().attribute_present("applyFill") if (parser().attribute_present("applyFill"))
|| is_true(parser().attribute("applyFill")); {
record.first.fill_applied = is_true(parser().attribute("applyFill"));
}
record.first.fill_id = parser().attribute_present("fillId") record.first.fill_id = parser().attribute_present("fillId")
? parser().attribute<std::size_t>("fillId") : 0; ? parser().attribute<std::size_t>("fillId") : 0;
record.first.font_applied = !parser().attribute_present("applyFont") if (parser().attribute_present("applyFont"))
|| is_true(parser().attribute("applyFont")); {
record.first.font_applied = is_true(parser().attribute("applyFont"));
}
record.first.font_id = parser().attribute_present("fontId") record.first.font_id = parser().attribute_present("fontId")
? parser().attribute<std::size_t>("fontId") : 0; ? parser().attribute<std::size_t>("fontId") : 0;
record.first.number_format_applied = !parser().attribute_present("applyNumberFormat") if (parser().attribute_present("applyNumberFormat"))
|| is_true(parser().attribute("applyNumberFormat")); {
record.first.number_format_applied = is_true(parser().attribute("applyNumberFormat"));
}
record.first.number_format_id = parser().attribute_present("numFmtId") record.first.number_format_id = parser().attribute_present("numFmtId")
? parser().attribute<std::size_t>("numFmtId") : 0; ? parser().attribute<std::size_t>("numFmtId") : 0;
auto apply_alignment_present = parser().attribute_present("applyAlignment"); auto apply_alignment_present = parser().attribute_present("applyAlignment");
record.first.alignment_applied = !apply_alignment_present if (apply_alignment_present)
|| is_true(parser().attribute("applyAlignment")); {
record.first.alignment_applied = is_true(parser().attribute("applyAlignment"));
}
auto apply_protection_present = parser().attribute_present("applyProtection"); auto apply_protection_present = parser().attribute_present("applyProtection");
record.first.protection_applied = !apply_protection_present if (apply_protection_present)
|| is_true(parser().attribute("applyProtection")); {
record.first.protection_applied = is_true(parser().attribute("applyProtection"));
}
record.first.pivot_button_ = parser().attribute_present("pivotButton") record.first.pivot_button_ = parser().attribute_present("pivotButton")
&& is_true(parser().attribute("pivotButton")); && is_true(parser().attribute("pivotButton"));