From 8362913aa6afa55bd43c35d1187024469b243856 Mon Sep 17 00:00:00 2001 From: Thomas Fussell Date: Mon, 2 Jan 2017 18:09:51 -0500 Subject: [PATCH 1/2] export workbook properties template specializations correctly --- source/workbook/workbook.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/source/workbook/workbook.cpp b/source/workbook/workbook.cpp index c665ebc4..87b9480e 100644 --- a/source/workbook/workbook.cpp +++ b/source/workbook/workbook.cpp @@ -113,25 +113,25 @@ bool workbook::has_core_property(const std::string &property_name) const } 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); } 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; } 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; } 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(); } @@ -142,25 +142,25 @@ bool workbook::has_extended_property(const std::string &property_name) const } 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; } 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; } 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(); } 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); } @@ -172,19 +172,19 @@ bool workbook::has_custom_property(const std::string &property_name) const } 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; } 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; } 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); } From ffdf570907ae3105309dd791718465662be97b3c Mon Sep 17 00:00:00 2001 From: Thomas Fussell Date: Mon, 2 Jan 2017 18:19:24 -0500 Subject: [PATCH 2/2] remove incorrect link on static build --- source/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 139a5419..86761562 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -146,7 +146,7 @@ if(NOT STATIC) ) endif() 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) if(MSVC)