Fix warnings + CI compile error

This commit is contained in:
Crzyrndm 2018-06-25 21:28:17 +12:00
parent 840d1bcefc
commit 49bd0c8fb4
2 changed files with 4 additions and 4 deletions

View File

@ -29,12 +29,12 @@
namespace xlnt { namespace xlnt {
rich_text::rich_text(const std::string &plain_text) rich_text::rich_text(const std::string &plain_text)
: rich_text(rich_text_run{plain_text, optional<font>()}) : rich_text({plain_text, optional<font>()})
{ {
} }
rich_text::rich_text(const std::string &plain_text, const class font &text_font) rich_text::rich_text(const std::string &plain_text, const class font &text_font)
: rich_text(rich_text_run{plain_text, optional<font>(text_font)}) : rich_text({plain_text, optional<font>(text_font)})
{ {
} }
@ -51,7 +51,7 @@ void rich_text::clear()
void rich_text::plain_text(const std::string &s, bool preserve_space = false) void rich_text::plain_text(const std::string &s, bool preserve_space = false)
{ {
clear(); clear();
add_run(rich_text_run{s, {}, preserve_space}); add_run({s, {}, preserve_space});
} }
std::string rich_text::plain_text() const std::string rich_text::plain_text() const

View File

@ -74,7 +74,7 @@ ext_list::ext::ext(const uri &ID, const std::string &serialised)
: extension_ID_(ID), serialised_value_(serialised) : extension_ID_(ID), serialised_value_(serialised)
{} {}
void ext_list::ext::serialise(xml::serializer &serialiser, const std::string& ns) void ext_list::ext::serialise(xml::serializer &serialiser, const std::string&)
{ {
std::istringstream ser(serialised_value_); std::istringstream ser(serialised_value_);
xml::parser p(ser, "", xml::parser::receive_default); xml::parser p(ser, "", xml::parser::receive_default);