From 6890c29b53e43f7264df75f0cfb05c9b18aa5ecc Mon Sep 17 00:00:00 2001 From: Jaskaran Singh Date: Thu, 9 Jun 2016 11:55:47 +0530 Subject: [PATCH 1/2] Correct entries for border style(sort them) --- src/liborcus/odf_helper.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/liborcus/odf_helper.cpp b/src/liborcus/odf_helper.cpp index 3e4cd6d10..c06f390db 100644 --- a/src/liborcus/odf_helper.cpp +++ b/src/liborcus/odf_helper.cpp @@ -22,22 +22,22 @@ typedef mdds::sorted_string_map odf_border_style_ma odf_border_style_map::entry odf_border_style_entries[] = { - { MDDS_ASCII("unknown"), spreadsheet::border_style_t::unknown}, - { MDDS_ASCII("none"), spreadsheet::border_style_t::none}, - { MDDS_ASCII("solid"), spreadsheet::border_style_t::solid}, - { MDDS_ASCII("dash_dot"), spreadsheet::border_style_t::dash_dot}, - { MDDS_ASCII("dash_dot_dot"), spreadsheet::border_style_t::dash_dot_dot}, + { MDDS_ASCII("dash-dot"), spreadsheet::border_style_t::dash_dot}, + { MDDS_ASCII("dash-dot-dot"), spreadsheet::border_style_t::dash_dot_dot}, { MDDS_ASCII("dashed"), spreadsheet::border_style_t::dashed}, { MDDS_ASCII("dotted"), spreadsheet::border_style_t::dotted}, - { MDDS_ASCII("double_border"), spreadsheet::border_style_t::double_border}, + { MDDS_ASCII("double-border"), spreadsheet::border_style_t::double_border}, { MDDS_ASCII("hair"), spreadsheet::border_style_t::hair}, { MDDS_ASCII("medium"), spreadsheet::border_style_t::medium}, - { MDDS_ASCII("medium_dash_dot"), spreadsheet::border_style_t::medium_dash_dot}, - { MDDS_ASCII("medium_dash_dot_dot"), spreadsheet::border_style_t::medium_dash_dot_dot}, - { MDDS_ASCII("medium_dashed"), spreadsheet::border_style_t::medium_dashed}, - { MDDS_ASCII("slant_dash_dot"), spreadsheet::border_style_t::slant_dash_dot}, + { MDDS_ASCII("medium-dash-dot"), spreadsheet::border_style_t::medium_dash_dot}, + { MDDS_ASCII("medium-dash-dot-dot"), spreadsheet::border_style_t::medium_dash_dot_dot}, + { MDDS_ASCII("medium-dashed"), spreadsheet::border_style_t::medium_dashed}, + { MDDS_ASCII("none"), spreadsheet::border_style_t::none}, + { MDDS_ASCII("slant-dash-dot"), spreadsheet::border_style_t::slant_dash_dot}, + { MDDS_ASCII("solid"), spreadsheet::border_style_t::solid}, { MDDS_ASCII("thick"), spreadsheet::border_style_t::thick}, - { MDDS_ASCII("thin"), spreadsheet::border_style_t::thin} + { MDDS_ASCII("thin"), spreadsheet::border_style_t::thin}, + { MDDS_ASCII("unknown"), spreadsheet::border_style_t::unknown} }; -- GitLab From 39ced999741deb42fc884dc196d125460739717b Mon Sep 17 00:00:00 2001 From: Jaskaran Singh Date: Thu, 9 Jun 2016 11:56:22 +0530 Subject: [PATCH 2/2] Improve test for odf border styles --- src/liborcus/odf_styles_context_test.cpp | 10 ++++------ test/ods/styles/cell-styles.xml | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/liborcus/odf_styles_context_test.cpp b/src/liborcus/odf_styles_context_test.cpp index 838bf2d55..276495722 100644 --- a/src/liborcus/odf_styles_context_test.cpp +++ b/src/liborcus/odf_styles_context_test.cpp @@ -86,18 +86,16 @@ int main() assert(cell_format); cell_border = styles.get_border(border); - assert(cell_border->top.style == orcus::spreadsheet::border_style_t::dashed); + assert(cell_border->top.style == orcus::spreadsheet::border_style_t::solid); assert(cell_border->bottom.style == orcus::spreadsheet::border_style_t::thin); assert(cell_border->left.style == orcus::spreadsheet::border_style_t::none); - assert(cell_border->right.style == orcus::spreadsheet::border_style_t::thin); + assert(cell_border->right.style == orcus::spreadsheet::border_style_t::dash_dot_dot); assert(cell_border->top.border_color.red == 0xff); assert(cell_border->bottom.border_color.green == 0xee); assert(cell_border->left.border_color.blue == 0x11); assert(cell_border->right.border_width.value == 0.22); assert(cell_border->bottom.border_width.value == 1.74); - //TODO : These border styles dont work :- solid,dash_dot,dash_dot_dot ...and some others - /*Test that border applies to the diagonal*/ style = find_cell_style_by_name("Name3", &styles); xf = style->xf; @@ -106,8 +104,8 @@ int main() assert(cell_format); cell_border = styles.get_border(border); - assert(cell_border->diagonal_bl_tr.style == orcus::spreadsheet::border_style_t::thick); - assert(cell_border->diagonal_tl_br.style == orcus::spreadsheet::border_style_t::thin); + assert(cell_border->diagonal_bl_tr.style == orcus::spreadsheet::border_style_t::medium); + assert(cell_border->diagonal_tl_br.style == orcus::spreadsheet::border_style_t::medium_dash_dot); assert(cell_border->diagonal_bl_tr.border_color.red == 0xff); assert(cell_border->diagonal_tl_br.border_color.green == 0x00); assert(cell_border->diagonal_tl_br.border_width.value == 0.74); diff --git a/test/ods/styles/cell-styles.xml b/test/ods/styles/cell-styles.xml index e9b944d1a..8ba326e6b 100644 --- a/test/ods/styles/cell-styles.xml +++ b/test/ods/styles/cell-styles.xml @@ -4,12 +4,12 @@ - + - + - + -- GitLab