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

fix travis build

Browse Source
This commit is contained in:
Thomas Fussell 2015-10-26 17:23:41 -04:00
parent 6b80eb5a95
commit ae0d572776
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/reader/style_reader.cpp
View File

@ -396,18 +396,16 @@ void style_reader::read_borders(pugi::xml_node borders_node)
{
border new_border;
const std::vector<std::tuple<std::string, side *, bool *>> sides =
{{
{"start", &new_border.start, &new_border.start_assigned},
{"end", &new_border.end, &new_border.end_assigned},
{"left", &new_border.left, &new_border.left_assigned},
{"right", &new_border.right, &new_border.right_assigned},
{"top", &new_border.top, &new_border.top_assigned},
{"bottom", &new_border.bottom, &new_border.bottom_assigned},
{"diagonal", &new_border.diagonal, &new_border.diagonal_assigned},
{"vertical", &new_border.vertical, &new_border.vertical_assigned},
{"horizontal", &new_border.horizontal, &new_border.horizontal_assigned}
}};
std::vector<std::tuple<std::string, side *, bool *>> sides;
sides.push_back({"start", &new_border.start, &new_border.start_assigned});
sides.push_back({"end", &new_border.end, &new_border.end_assigned});
sides.push_back({"left", &new_border.left, &new_border.left_assigned});
sides.push_back({"right", &new_border.right, &new_border.right_assigned});
sides.push_back({"top", &new_border.top, &new_border.top_assigned});
sides.push_back({"bottom", &new_border.bottom, &new_border.bottom_assigned});
sides.push_back({"diagonal", &new_border.diagonal, &new_border.diagonal_assigned});
sides.push_back({"vertical", &new_border.vertical, &new_border.vertical_assigned});
sides.push_back({"horizontal", &new_border.horizontal, &new_border.horizontal_assigned});
for(const auto &side : sides)
{

22
source/writer/style_writer.cpp
View File

@ -166,18 +166,16 @@ std::string style_writer::write_table() const
{
auto border_node = borders_node.append_child("border");
const std::vector<std::tuple<std::string, const side, bool>> sides =
{{
{"start", border_.start, border_.start_assigned},
{"end", border_.end, border_.end_assigned},
{"left", border_.left, border_.left_assigned},
{"right", border_.right, border_.right_assigned},
{"top", border_.top, border_.top_assigned},
{"bottom", border_.bottom, border_.bottom_assigned},
{"diagonal", border_.diagonal, border_.diagonal_assigned},
{"vertical", border_.vertical, border_.vertical_assigned},
{"horizontal", border_.horizontal, border_.horizontal_assigned}
}};
std::vector<std::tuple<std::string, const side, bool>> sides;
sides.push_back({"start", border_.start, border_.start_assigned});
sides.push_back({"end", border_.end, border_.end_assigned});
sides.push_back({"left", border_.left, border_.left_assigned});
sides.push_back({"right", border_.right, border_.right_assigned});
sides.push_back({"top", border_.top, border_.top_assigned});
sides.push_back({"bottom", border_.bottom, border_.bottom_assigned});
sides.push_back({"diagonal", border_.diagonal, border_.diagonal_assigned});
sides.push_back({"vertical", border_.vertical, border_.vertical_assigned});
sides.push_back({"horizontal", border_.horizontal, border_.horizontal_assigned});
for(const auto &side_tuple : sides)
{