Merge branch 'master' of github.com:tfussell/xlnt

This commit is contained in:
Thomas Fussell 2017-01-02 18:32:17 -05:00
commit 186ec184e2
2 changed files with 12 additions and 12 deletions

View File

@ -146,7 +146,7 @@ if(NOT STATIC)
) )
endif() endif()
else() else()
add_library(xlnt STATIC ${XLNT_HEADERS} ${XLNT_SOURCES} xlnt.third-party) add_library(xlnt STATIC ${XLNT_HEADERS} ${XLNT_SOURCES})
target_compile_definitions(xlnt PUBLIC XLNT_STATIC=1) target_compile_definitions(xlnt PUBLIC XLNT_STATIC=1)
if(MSVC) if(MSVC)

View File

@ -113,25 +113,25 @@ bool workbook::has_core_property(const std::string &property_name) const
} }
template <> template <>
std::string workbook::core_property(const std::string &property_name) const XLNT_API std::string workbook::core_property(const std::string &property_name) const
{ {
return d_->core_properties_.at(property_name); return d_->core_properties_.at(property_name);
} }
template <> template <>
void workbook::core_property(const std::string &property_name, const std::string value) XLNT_API void workbook::core_property(const std::string &property_name, const std::string value)
{ {
d_->core_properties_[property_name] = value; d_->core_properties_[property_name] = value;
} }
template <> template <>
void workbook::core_property(const std::string &property_name, const char *value) XLNT_API void workbook::core_property(const std::string &property_name, const char *value)
{ {
d_->core_properties_[property_name] = value; d_->core_properties_[property_name] = value;
} }
template <> template <>
void workbook::core_property(const std::string &property_name, const datetime value) XLNT_API void workbook::core_property(const std::string &property_name, const datetime value)
{ {
d_->core_properties_[property_name] = value.to_iso_string(); d_->core_properties_[property_name] = value.to_iso_string();
} }
@ -142,25 +142,25 @@ bool workbook::has_extended_property(const std::string &property_name) const
} }
template <> template <>
void workbook::extended_property(const std::string &property_name, const std::string value) XLNT_API void workbook::extended_property(const std::string &property_name, const std::string value)
{ {
d_->extended_properties_[property_name] = value; d_->extended_properties_[property_name] = value;
} }
template <> template <>
void workbook::extended_property(const std::string &property_name, const char *value) XLNT_API void workbook::extended_property(const std::string &property_name, const char *value)
{ {
d_->extended_properties_[property_name] = value; d_->extended_properties_[property_name] = value;
} }
template <> template <>
void workbook::extended_property(const std::string &property_name, const datetime value) XLNT_API void workbook::extended_property(const std::string &property_name, const datetime value)
{ {
d_->extended_properties_[property_name] = value.to_iso_string(); d_->extended_properties_[property_name] = value.to_iso_string();
} }
template <> template <>
std::string workbook::extended_property(const std::string &property_name) const XLNT_API std::string workbook::extended_property(const std::string &property_name) const
{ {
return d_->extended_properties_.at(property_name); return d_->extended_properties_.at(property_name);
} }
@ -172,19 +172,19 @@ bool workbook::has_custom_property(const std::string &property_name) const
} }
template <> template <>
void workbook::custom_property(const std::string &property_name, const std::string value) XLNT_API void workbook::custom_property(const std::string &property_name, const std::string value)
{ {
d_->custom_properties_[property_name] = value; d_->custom_properties_[property_name] = value;
} }
template <> template <>
void workbook::custom_property(const std::string &property_name, const char *value) XLNT_API void workbook::custom_property(const std::string &property_name, const char *value)
{ {
d_->custom_properties_[property_name] = value; d_->custom_properties_[property_name] = value;
} }
template <> template <>
std::string workbook::custom_property(const std::string &property_name) const XLNT_API std::string workbook::custom_property(const std::string &property_name) const
{ {
return d_->custom_properties_.at(property_name); return d_->custom_properties_.at(property_name);
} }