mirror of
https://github.com/tfussell/xlnt.git
synced 2024-03-22 13:11:17 +08:00
fix for windows build
This commit is contained in:
parent
ec1d9f7ecb
commit
71e50ed70a
|
@ -8,7 +8,7 @@ class comment
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
comment();
|
comment();
|
||||||
comment(const std::string &text, const std::string &author);
|
comment(const std::string &text, const std::string &auth);
|
||||||
~comment();
|
~comment();
|
||||||
|
|
||||||
std::string get_text() const;
|
std::string get_text() const;
|
||||||
|
|
|
@ -51,6 +51,4 @@ const std::string download_url = "https://github.com/tfussell/xlnt/archive/maste
|
||||||
#include "cell/value.hpp"
|
#include "cell/value.hpp"
|
||||||
#include "cell/comment.hpp"
|
#include "cell/comment.hpp"
|
||||||
|
|
||||||
#pragma comment(lib, "pugixml.lib")
|
|
||||||
#pragma comment(lib, "zlib.lib")
|
|
||||||
#pragma comment(lib, "xlnt.lib")
|
#pragma comment(lib, "xlnt.lib")
|
|
@ -125,7 +125,7 @@ void zip_file::read_all()
|
||||||
change_state(state::read);
|
change_state(state::read);
|
||||||
|
|
||||||
auto num_files = zip_file_.m_total_files;
|
auto num_files = zip_file_.m_total_files;
|
||||||
std::size_t i = 0;
|
mz_uint i = 0;
|
||||||
|
|
||||||
for(;i < num_files; i++)
|
for(;i < num_files; i++)
|
||||||
{
|
{
|
||||||
|
@ -180,7 +180,7 @@ std::string zip_file::read_from_zip(const std::string &filename)
|
||||||
change_state(state::read);
|
change_state(state::read);
|
||||||
|
|
||||||
auto num_files = (std::size_t)mz_zip_reader_get_num_files(&zip_file_);
|
auto num_files = (std::size_t)mz_zip_reader_get_num_files(&zip_file_);
|
||||||
std::size_t i = 0;
|
mz_uint i = 0;
|
||||||
|
|
||||||
for(;i < num_files; i++)
|
for(;i < num_files; i++)
|
||||||
{
|
{
|
||||||
|
|
|
@ -21,7 +21,7 @@ int main( int argc, char *argv[] ) {
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
bool suite_test_cell_init = false;
|
bool suite_test_cell_init = false;
|
||||||
#include "/Users/thomas/Development/xlnt/tests/test_cell.hpp"
|
#include "C:\Users\Thomas\Development\xlnt\tests\test_cell.hpp"
|
||||||
|
|
||||||
static test_cell suite_test_cell;
|
static test_cell suite_test_cell;
|
||||||
|
|
||||||
|
@ -256,7 +256,7 @@ public:
|
||||||
void runTest() { suite_test_cell.test_cell_offset(); }
|
void runTest() { suite_test_cell.test_cell_offset(); }
|
||||||
} testDescription_suite_test_cell_test_cell_offset;
|
} testDescription_suite_test_cell_test_cell_offset;
|
||||||
|
|
||||||
#include "/Users/thomas/Development/xlnt/tests/test_chart.hpp"
|
#include "C:\Users\Thomas\Development\xlnt\tests\test_chart.hpp"
|
||||||
|
|
||||||
static test_chart suite_test_chart;
|
static test_chart suite_test_chart;
|
||||||
|
|
||||||
|
@ -347,7 +347,7 @@ public:
|
||||||
void runTest() { suite_test_chart.test_write_chart_scatter(); }
|
void runTest() { suite_test_chart.test_write_chart_scatter(); }
|
||||||
} testDescription_suite_test_chart_test_write_chart_scatter;
|
} testDescription_suite_test_chart_test_write_chart_scatter;
|
||||||
|
|
||||||
#include "/Users/thomas/Development/xlnt/tests/test_named_range.hpp"
|
#include "C:\Users\Thomas\Development\xlnt\tests\test_named_range.hpp"
|
||||||
|
|
||||||
static test_named_range suite_test_named_range;
|
static test_named_range suite_test_named_range;
|
||||||
|
|
||||||
|
@ -438,7 +438,7 @@ public:
|
||||||
void runTest() { suite_test_named_range.test_can_be_saved(); }
|
void runTest() { suite_test_named_range.test_can_be_saved(); }
|
||||||
} testDescription_suite_test_named_range_test_can_be_saved;
|
} testDescription_suite_test_named_range_test_can_be_saved;
|
||||||
|
|
||||||
#include "/Users/thomas/Development/xlnt/tests/test_number_format.hpp"
|
#include "C:\Users\Thomas\Development\xlnt\tests\test_number_format.hpp"
|
||||||
|
|
||||||
static test_number_format suite_test_number_format;
|
static test_number_format suite_test_number_format;
|
||||||
|
|
||||||
|
@ -541,7 +541,7 @@ public:
|
||||||
void runTest() { suite_test_number_format.test_mac_date(); }
|
void runTest() { suite_test_number_format.test_mac_date(); }
|
||||||
} testDescription_suite_test_number_format_test_mac_date;
|
} testDescription_suite_test_number_format_test_mac_date;
|
||||||
|
|
||||||
#include "/Users/thomas/Development/xlnt/tests/test_props.hpp"
|
#include "C:\Users\Thomas\Development\xlnt\tests\test_props.hpp"
|
||||||
|
|
||||||
static test_props suite_test_props;
|
static test_props suite_test_props;
|
||||||
|
|
||||||
|
@ -584,7 +584,7 @@ public:
|
||||||
void runTest() { suite_test_props.test_write_properties_app(); }
|
void runTest() { suite_test_props.test_write_properties_app(); }
|
||||||
} testDescription_suite_test_props_test_write_properties_app;
|
} testDescription_suite_test_props_test_write_properties_app;
|
||||||
|
|
||||||
#include "/Users/thomas/Development/xlnt/tests/test_read.hpp"
|
#include "C:\Users\Thomas\Development\xlnt\tests\test_read.hpp"
|
||||||
|
|
||||||
static test_read suite_test_read;
|
static test_read suite_test_read;
|
||||||
|
|
||||||
|
@ -777,7 +777,7 @@ public:
|
||||||
void runTest() { suite_test_read.test_bad_formats_no(); }
|
void runTest() { suite_test_read.test_bad_formats_no(); }
|
||||||
} testDescription_suite_test_read_test_bad_formats_no;
|
} testDescription_suite_test_read_test_bad_formats_no;
|
||||||
|
|
||||||
#include "/Users/thomas/Development/xlnt/tests/test_strings.hpp"
|
#include "C:\Users\Thomas\Development\xlnt\tests\test_strings.hpp"
|
||||||
|
|
||||||
static test_strings suite_test_strings;
|
static test_strings suite_test_strings;
|
||||||
|
|
||||||
|
@ -808,7 +808,7 @@ public:
|
||||||
void runTest() { suite_test_strings.test_formatted_string_table(); }
|
void runTest() { suite_test_strings.test_formatted_string_table(); }
|
||||||
} testDescription_suite_test_strings_test_formatted_string_table;
|
} testDescription_suite_test_strings_test_formatted_string_table;
|
||||||
|
|
||||||
#include "/Users/thomas/Development/xlnt/tests/test_style.hpp"
|
#include "C:\Users\Thomas\Development\xlnt\tests\test_style.hpp"
|
||||||
|
|
||||||
static test_style suite_test_style;
|
static test_style suite_test_style;
|
||||||
|
|
||||||
|
@ -917,7 +917,7 @@ public:
|
||||||
void runTest() { suite_test_style.test_protection(); }
|
void runTest() { suite_test_style.test_protection(); }
|
||||||
} testDescription_suite_test_style_test_protection;
|
} testDescription_suite_test_style_test_protection;
|
||||||
|
|
||||||
#include "/Users/thomas/Development/xlnt/tests/test_theme.hpp"
|
#include "C:\Users\Thomas\Development\xlnt\tests\test_theme.hpp"
|
||||||
|
|
||||||
static test_theme suite_test_theme;
|
static test_theme suite_test_theme;
|
||||||
|
|
||||||
|
@ -930,7 +930,7 @@ public:
|
||||||
void runTest() { suite_test_theme.test_write_theme(); }
|
void runTest() { suite_test_theme.test_write_theme(); }
|
||||||
} testDescription_suite_test_theme_test_write_theme;
|
} testDescription_suite_test_theme_test_write_theme;
|
||||||
|
|
||||||
#include "/Users/thomas/Development/xlnt/tests/test_workbook.hpp"
|
#include "C:\Users\Thomas\Development\xlnt\tests\test_workbook.hpp"
|
||||||
|
|
||||||
static test_workbook suite_test_workbook;
|
static test_workbook suite_test_workbook;
|
||||||
|
|
||||||
|
@ -1051,7 +1051,7 @@ public:
|
||||||
void runTest() { suite_test_workbook.test_write_regular_float(); }
|
void runTest() { suite_test_workbook.test_write_regular_float(); }
|
||||||
} testDescription_suite_test_workbook_test_write_regular_float;
|
} testDescription_suite_test_workbook_test_write_regular_float;
|
||||||
|
|
||||||
#include "/Users/thomas/Development/xlnt/tests/test_worksheet.hpp"
|
#include "C:\Users\Thomas\Development\xlnt\tests\test_worksheet.hpp"
|
||||||
|
|
||||||
static test_worksheet suite_test_worksheet;
|
static test_worksheet suite_test_worksheet;
|
||||||
|
|
||||||
|
@ -1292,7 +1292,7 @@ public:
|
||||||
void runTest() { suite_test_worksheet.test_page_options(); }
|
void runTest() { suite_test_worksheet.test_page_options(); }
|
||||||
} testDescription_suite_test_worksheet_test_page_options;
|
} testDescription_suite_test_worksheet_test_page_options;
|
||||||
|
|
||||||
#include "/Users/thomas/Development/xlnt/tests/test_write.hpp"
|
#include "C:\Users\Thomas\Development\xlnt\tests\test_write.hpp"
|
||||||
|
|
||||||
static test_write suite_test_write;
|
static test_write suite_test_write;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user