Merge branch 'master' into dev

This commit is contained in:
Thomas Fussell 2017-09-12 16:22:36 -04:00
commit bc1e3656c7

View File

@ -2128,6 +2128,11 @@ void xlsx_consumer::read_stylesheet()
{ {
alignment.horizontal(parser().attribute<xlnt::horizontal_alignment>("horizontal")); alignment.horizontal(parser().attribute<xlnt::horizontal_alignment>("horizontal"));
} }
if (parser().attribute_present("readingOrder"))
{
parser().attribute<int>("readingOrder");
}
} }
else if (xf_child_element == qn("spreadsheetml", "protection")) else if (xf_child_element == qn("spreadsheetml", "protection"))
{ {