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

Merge branch 'sukoi26-master'

Browse Source
This commit is contained in:
Thomas Fussell 2017-02-10 13:12:02 -08:00
commit 81258f1498
5 changed files with 173 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
include/xlnt/styles/font.hpp
View File

@ -97,6 +97,26 @@ public:
/// </summary>
bool strikethrough() const;
/// <summary>
///
/// </summary>
font &outlinethrough(bool outlinethrough);
/// <summary>
///
/// </summary>
bool outlinethrough() const;
/// <summary>
///
/// </summary>
font &shadowthrough(bool shadowthrough);
/// <summary>
///
/// </summary>
bool shadowthrough() const;
/// <summary>
///
/// </summary>
@ -172,6 +192,21 @@ public:
/// </summary>
std::size_t family() const;
/// <summary>
///
/// </summary>
bool has_charset() const;
/// <summary>
///
/// </summary>
font &charset(std::size_t charset);
/// <summary>
///
/// </summary>
std::size_t charset() const;
/// <summary>
///
/// </summary>
@ -238,6 +273,16 @@ private:
/// </summary>
bool strikethrough_ = false;
/// <summary>
///
/// </summary>
bool outlinethrough_ = false;
/// <summary>
///
/// </summary>
bool shadowthrough_ = false;
/// <summary>
///
/// </summary>
@ -253,6 +298,12 @@ private:
/// </summary>
optional<std::size_t> family_;
/// <summary>
///
/// </summary>
optional<std::size_t> charset_;
/// <summary>
///
/// </summary>

6
source/cell/cell.cpp
View File

@ -528,15 +528,15 @@ std::pair<int, int> cell::anchor() const
for (column_t column_index = 1; column_index <= d_->column_ - 1; column_index++)
{
left += worksheet().cell(column_index, row()).width();
left += worksheet().column_width(column_index);
}
double top = 0;
for (row_t row_index = 1; row_index <= d_->row_ - 1; row_index++)
{
top += worksheet().cell(column(), row_index).height();
}
top += worksheet().row_height(row_index);
}
return {static_cast<int>(left), static_cast<int>(top)};
}

50
source/detail/xlsx_consumer.cpp
View File

@ -1345,6 +1345,28 @@ void xlsx_consumer::read_stylesheet()
new_font.strikethrough(true);
}
}
else if (font_property_element == qn("spreadsheetml", "outline"))
{
if (parser().attribute_present("val"))
{
new_font.outlinethrough(is_true(parser().attribute("val")));
}
else
{
new_font.outlinethrough(true);
}
}
else if (font_property_element == qn("spreadsheetml", "shadow"))
{
if (parser().attribute_present("val"))
{
new_font.shadowthrough(is_true(parser().attribute("val")));
}
else
{
new_font.shadowthrough(true);
}
}
else if (font_property_element == qn("spreadsheetml", "i"))
{
if (parser().attribute_present("val"))
@ -1575,11 +1597,11 @@ void xlsx_consumer::read_stylesheet()
auto count = parser().attribute<std::size_t>("count");
std::size_t processed = 0;
while (in_element(qn("spreadsheetml", "dxfs")))
while (in_element(current_style_element))
{
auto current_element = expect_start_element(xml::content::complex);
auto current_element = expect_start_element(xml::content::mixed);
skip_remaining_content(current_element);
expect_end_element(current_element);
++processed;
}
@ -1600,7 +1622,7 @@ void xlsx_consumer::read_stylesheet()
{
auto current_element = expect_start_element(xml::content::complex);
skip_remaining_content(current_element);
expect_end_element(current_element);
++processed;
}
@ -1674,7 +1696,7 @@ void xlsx_consumer::read_stylesheet()
*/
/*
std::size_t xf_id = 0;
for (const auto &record : style_records)
{
auto style_iter = std::find_if(styles.begin(), styles.end(),
@ -2438,7 +2460,8 @@ void xlsx_consumer::read_comments(worksheet ws)
{
expect_start_element(qn("spreadsheetml", "comment"), xml::content::complex);
auto cell_ref = parser().attribute("ref");
skip_attribute("shapeId");
auto cell_ref = parser().attribute("ref");
auto author_id = parser().attribute<std::size_t>("authorId");
expect_start_element(qn("spreadsheetml", "text"), xml::content::complex);
@ -2510,7 +2533,7 @@ variant xlsx_consumer::read_variant()
// bool could be "0" or "false"
bool bvalue;
if (text[0] == '0' or text[0] == 'f' or text[0]=='F') bvalue = false;
else bvalue = true;
else bvalue = true;
value = variant(bvalue);
}
else if (element == qn("vt", "vector"))
@ -2627,11 +2650,11 @@ std::vector<std::string> xlsx_consumer::read_namespaces()
bool xlsx_consumer::in_element(const xml::qname &name)
{
if (parser().peek() == xml::parser::event_type::end_element || stack_.back() != name)
if ((parser().peek() == xml::parser::event_type::end_element ) && (stack_.back() == name ))
{
return false;
}
return true;
}
@ -2717,6 +2740,10 @@ rich_text xlsx_consumer::read_rich_text(const xml::qname &parent)
{
run.second.get().family(parser().attribute<std::size_t>("val"));
}
else if (current_run_property_element == xml::qname(xmlns, "charset"))
{
run.second.get().charset(parser().attribute<std::size_t>("val"));
}
else if (current_run_property_element == xml::qname(xmlns, "scheme"))
{
run.second.get().scheme(parser().attribute("val"));
@ -2726,6 +2753,11 @@ rich_text xlsx_consumer::read_rich_text(const xml::qname &parent)
run.second.get().bold(
parser().attribute_present("val") ? is_true(parser().attribute("val")) : true);
}
else if (current_run_property_element == xml::qname(xmlns, "i"))
{
run.second.get().bold(
parser().attribute_present("val") ? is_true(parser().attribute("val")) : true);
}
else if (current_run_property_element == xml::qname(xmlns, "u"))
{
if (parser().attribute_present("val"))

35
source/styles/font.cpp
View File

@ -36,6 +36,8 @@ font::font()
superscript_(false),
subscript_(false),
strikethrough_(false),
outlinethrough_(false),
shadowthrough_(false),
underline_(underline_style::none)
{
}
@ -84,6 +86,28 @@ bool font::strikethrough() const
return strikethrough_;
}
font &font::outlinethrough(bool outlinethrough)
{
outlinethrough_ = outlinethrough;
return *this;
}
bool font::outlinethrough() const
{
return outlinethrough_;
}
font &font::shadowthrough(bool shadowthrough)
{
shadowthrough_ = shadowthrough;
return *this;
}
bool font::shadowthrough() const
{
return shadowthrough_;
}
font &font::underline(underline_style new_underline)
{
underline_ = new_underline;
@ -154,6 +178,17 @@ font &font::family(std::size_t family)
return *this;
}
bool font::has_charset() const
{
return charset_.is_set();
}
font &font::charset(std::size_t charset)
{
charset_ = charset;
return *this;
}
bool font::has_scheme() const
{
return scheme_.is_set();

48
source/workbook/workbook.cpp
View File

@ -474,7 +474,7 @@ void workbook::register_package_part(relationship_type type)
{
manifest().register_override_type(default_path(type), content_type(type));
manifest().register_relationship(uri("/"), type,
uri(default_path(type).relative_to(path("/")).string()),
uri(default_path(type).relative_to(path("/")).string()),
target_mode::internal);
}
}
@ -700,7 +700,7 @@ worksheet workbook::copy_sheet(worksheet to_copy)
auto new_sheet = create_sheet();
impl.title_ = new_sheet.title();
*new_sheet.d_ = impl;
return new_sheet;
}
@ -719,7 +719,7 @@ worksheet workbook::copy_sheet(worksheet to_copy, std::size_t index)
d_->worksheets_.insert(iter, d_->worksheets_.back());
d_->worksheets_.pop_back();
}
return sheet_by_index(index);
}
@ -793,6 +793,25 @@ void workbook::load(const std::vector<std::uint8_t> &data)
void workbook::load(const std::string &filename)
{
if (filename.find_last_of(".") != std::string::npos) // check extension
{
std::string file_format = path(filename).extension();
if (file_format == "xls") {
throw xlnt::exception(" xlnt does not support the old .xls file format");
}
else if (file_format == "xlsb") {
throw xlnt::exception(" xlnt does not support the .xlsb file format");
}
else if (file_format != "xlsx") {
throw xlnt::exception(" xlnt does not support the ."+file_format+ " file format");
}
}
else
{
throw xlnt::exception("file has no extension .xlsx");
}
return load(path(filename));
}
@ -811,6 +830,25 @@ void workbook::load(const path &filename)
void workbook::load(const std::string &filename, const std::string &password)
{
if (filename.find_last_of(".") != std::string::npos) // check extension
{
std::string file_format = path(filename).extension();
if (file_format == "xls") {
throw xlnt::exception(" xlnt does not support the old .xls file format");
}
else if (file_format == "xlsb") {
throw xlnt::exception(" xlnt does not support the .xlsb file format");
}
else if (file_format != "xlsx") {
throw xlnt::exception(" xlnt does not support the ."+file_format+ " file format");
}
}
else
{
throw xlnt::exception("file has no extension .xlsx");
}
return load(path(filename), password);
}
@ -1229,13 +1267,13 @@ bool workbook::contains(const std::string &sheet_title) const
return false;
}
void workbook::thumbnail(const std::vector<std::uint8_t> &thumbnail,
void workbook::thumbnail(const std::vector<std::uint8_t> &thumbnail,
const std::string &extension, const std::string &content_type)
{
if (!d_->manifest_.has_relationship(path("/"), relationship_type::thumbnail))
{
d_->manifest_.register_default_type(extension, content_type);
d_->manifest_.register_relationship(uri("/"), relationship_type::thumbnail,
d_->manifest_.register_relationship(uri("/"), relationship_type::thumbnail,
uri("docProps/thumbnail.jpeg"), target_mode::internal);
}