diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2022-06-07 19:03:31 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2022-06-07 19:03:31 -0400 |
| commit | 579a756977f5461e9dc11502aa2c77f9dd927b38 (patch) | |
| tree | 73a5d685055d85137411d81cf04829d4121e0172 | |
| parent | a714e1732a52fc1c5d9e6c85961cd5039b7c8bc6 (diff) | |
| download | orcus-579a756977f5461e9dc11502aa2c77f9dd927b38.tar.gz | |
Prefer std::make_unique over reset & reduce indentation by early bailout
| -rw-r--r-- | src/liborcus/odf_styles_context.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/liborcus/odf_styles_context.cpp b/src/liborcus/odf_styles_context.cpp index 8844cc13..78f58f77 100644 --- a/src/liborcus/odf_styles_context.cpp +++ b/src/liborcus/odf_styles_context.cpp @@ -216,7 +216,7 @@ void styles_context::start_element(xmlns_id_t ns, xml_token_t name, const xml_at style_attr_parser func; func = std::for_each(attrs.begin(), attrs.end(), func); - m_current_style.reset(new odf_style(func.get_name(), func.get_family(), func.get_parent())); + m_current_style = std::make_unique<odf_style>(func.get_name(), func.get_family(), func.get_parent()); break; } case XML_table_column_properties: @@ -286,37 +286,37 @@ bool styles_context::end_element(xmlns_id_t ns, xml_token_t name) { case XML_style: { - if (m_current_style) + if (!m_current_style) + break; + + if (mp_styles && m_current_style->family == style_family_table_cell) { - if (mp_styles && m_current_style->family == style_family_table_cell) + odf_style::cell& cell = *m_current_style->cell_data; + mp_styles->set_xf_font(cell.font); + mp_styles->set_xf_fill(cell.fill); + mp_styles->set_xf_border(cell.border); + mp_styles->set_xf_protection(cell.protection); + size_t xf_id = 0; + if (cell.automatic_style) + xf_id = mp_styles->commit_cell_xf(); + else { - odf_style::cell& cell = *m_current_style->cell_data; - mp_styles->set_xf_font(cell.font); - mp_styles->set_xf_fill(cell.fill); - mp_styles->set_xf_border(cell.border); - mp_styles->set_xf_protection(cell.protection); - size_t xf_id = 0; - if (cell.automatic_style) - xf_id = mp_styles->commit_cell_xf(); - else - { - size_t style_xf_id = mp_styles->commit_cell_style_xf(); - mp_styles->set_cell_style_name(m_current_style->name); - mp_styles->set_cell_style_xf(style_xf_id); - mp_styles->set_cell_style_parent_name(m_current_style->parent_name); + size_t style_xf_id = mp_styles->commit_cell_style_xf(); + mp_styles->set_cell_style_name(m_current_style->name); + mp_styles->set_cell_style_xf(style_xf_id); + mp_styles->set_cell_style_parent_name(m_current_style->parent_name); - xf_id = mp_styles->commit_cell_style(); - } - cell.xf = xf_id; + xf_id = mp_styles->commit_cell_style(); } - - std::string_view style_name = m_current_style->name; - m_styles.insert( - odf_styles_map_type::value_type( - style_name, std::move(m_current_style))); - assert(!m_current_style); + cell.xf = xf_id; } + std::string_view style_name = m_current_style->name; + m_styles.insert( + odf_styles_map_type::value_type( + style_name, std::move(m_current_style))); + assert(!m_current_style); + break; } } |