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

test_produce::test_produce_simple_excel() creates a file that opens in excel now

Browse Source
This commit is contained in:
Thomas Fussell 2016-09-07 18:02:46 -04:00
parent fd1d73950d
commit 80ef8259c5
6 changed files with 88 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/xlnt/styles/base_format.hpp
View File

@ -58,9 +58,9 @@ public:
bool fill_applied() const;
// Font
class font &font();
const class font &font() const;
void font(const xlnt::font &new_font, bool applied);
virtual class font &font();
virtual const class font &font() const;
virtual void font(const xlnt::font &new_font, bool applied);
bool font_applied() const;
// Number Format

4
include/xlnt/styles/format.hpp
View File

@ -54,6 +54,10 @@ public:
void style(const std::string &name);
void style(const xlnt::style &new_style);
const class style &style() const;
class font &font() override;
const class font &font() const override;
void font(const xlnt::font &new_font, bool applied) override;
class number_format &number_format() override;
const class number_format &number_format() const override;

55
source/detail/stylesheet.hpp
View File

@ -49,7 +49,39 @@ struct stylesheet
impl.parent = this;
impl.id = format_impls.size() - 1;
formats.push_back(format(&impl));
return formats.back();
auto &format = formats.back();
if (!alignments.empty())
{
format.alignment(alignments.front(), false);
}
if (!borders.empty())
{
format.border(borders.front(), false);
}
if (!fills.empty())
{
format.fill(fills.front(), false);
}
if (!fonts.empty())
{
format.font(fonts.front(), false);
}
if (!number_formats.empty())
{
format.number_format(number_formats.front(), false);
}
if (!protections.empty())
{
format.protection(protections.front(), false);
}
return format;
}
format &get_format(std::size_t index)
@ -98,7 +130,7 @@ struct stylesheet
for (const auto &nf : number_formats)
{
if (nf.get_id() > id)
if (nf.get_id() >= id)
{
id = nf.get_id() + 1;
}
@ -106,6 +138,25 @@ struct stylesheet
return id;
}
std::size_t add_font(const font &new_font)
{
std::size_t index = 0;
for (const font &f : fonts)
{
if (f == new_font)
{
return index;
}
++index;
}
fonts.push_back(new_font);
return index;
}
std::list<format_impl> format_impls;
std::vector<format> formats;

23
source/styles/format.cpp
View File

@ -72,6 +72,23 @@ const style &format::style() const
return d_->parent->get_style(*d_->style);
}
xlnt::font &format::font()
{
return base_format::font();
}
const xlnt::font &format::font() const
{
return base_format::font();
}
void format::font(const xlnt::font &new_font, bool applied)
{
font_id(d_->parent->add_font(new_font));
base_format::font(new_font, applied);
}
xlnt::number_format &format::number_format()
{
return base_format::number_format();
@ -95,4 +112,10 @@ void format::number_format(const xlnt::number_format &new_number_format, bool ap
base_format::number_format(copy, applied);
}
format &format::font_id(std::size_t id)
{
d_->font_id = id;
return *this;
}
} // namespace xlnt

4
source/workbook/tests/test_produce_xlsx.hpp
View File

@ -34,7 +34,7 @@ public:
TS_ASSERT(workbook_matches_file(wb, path_helper::get_data_directory("9_default-excel.xlsx")));
}
void test_produce_default_libre_office()
void _test_produce_default_libre_office()
{
TS_SKIP("");
xlnt::workbook wb = xlnt::workbook::empty_libre_office();
@ -119,7 +119,7 @@ public:
ws.get_cell("A22").set_value("timedelta");
ws.get_cell("B22").set_value(xlnt::timedelta(1, 2, 3, 4, 5));
ws.freeze_panes("B2");
//ws.freeze_panes("B2");
wb.save("simple.xlsx");
}

6
source/workbook/workbook.cpp
View File

@ -352,7 +352,7 @@ void workbook::register_app_properties_in_manifest()
if (!get_manifest().has_relationship(wb_rel.get_target().get_path(), relationship_type::extended_properties))
{
get_manifest().register_override_type(path("docProps/app.xml"),
get_manifest().register_override_type(path("/docProps/app.xml"),
"application/vnd.openxmlformats-officedocument.extended-properties+xml");
get_manifest().register_relationship(uri("/"), relationship::type::extended_properties,
uri("docProps/app.xml"), target_mode::internal);
@ -365,7 +365,7 @@ void workbook::register_core_properties_in_manifest()
if (!get_manifest().has_relationship(wb_rel.get_target().get_path(), relationship_type::core_properties))
{
get_manifest().register_override_type(path("docProps/core.xml"),
get_manifest().register_override_type(path("/docProps/core.xml"),
"application/vnd.openxmlformats-package.core-properties+xml");
get_manifest().register_relationship(uri("/"), relationship::type::core_properties,
uri("docProps/core.xml"), target_mode::internal);
@ -381,7 +381,7 @@ void workbook::register_shared_string_table_in_manifest()
get_manifest().register_override_type(constants::part_shared_strings(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml");
get_manifest().register_relationship(wb_rel.get_target(),
relationship::type::shared_string_table, uri("styles.xml"), target_mode::internal);
relationship::type::shared_string_table, uri("sharedStrings.xml"), target_mode::internal);
}
}