diff --git a/include/xlnt/workbook/streaming_workbook_reader.hpp b/include/xlnt/workbook/streaming_workbook_reader.hpp index c00905d8..0ee680cc 100644 --- a/include/xlnt/workbook/streaming_workbook_reader.hpp +++ b/include/xlnt/workbook/streaming_workbook_reader.hpp @@ -23,13 +23,23 @@ // @author: see AUTHORS file #pragma once -#include -#include +#include +#include +#include +#include #include namespace xlnt { +class cell; +class path; +class worksheet; + +namespace detail { +class xlsx_consumer; +} + /// /// workbook is the container for all other parts of the document. /// @@ -42,7 +52,7 @@ public: /// Closes currently open read stream. This will be called automatically /// by the destructor if it hasn't already been called manually. /// - close(); + void close(); /// /// Registers callback as the function to be called when a cell is read. @@ -88,7 +98,7 @@ public: /// Interprets file with the given filename as an XLSX file and sets the /// content of this workbook to match that file. /// - void open(const xlnt::path &filename); + void open(const path &filename); /// /// Interprets data in stream as an XLSX file and sets the content of this diff --git a/source/workbook/streaming_workbook_reader.cpp b/source/workbook/streaming_workbook_reader.cpp index 09308272..e3dbe9a3 100644 --- a/source/workbook/streaming_workbook_reader.cpp +++ b/source/workbook/streaming_workbook_reader.cpp @@ -22,6 +22,7 @@ // @license: http://www.opensource.org/licenses/mit-license.php // @author: see AUTHORS file +#include #include namespace xlnt { @@ -31,7 +32,7 @@ streaming_workbook_reader::~streaming_workbook_reader() close(); } -streaming_workbook_reader::close() +void streaming_workbook_reader::close() { if (consumer_) { @@ -41,22 +42,22 @@ streaming_workbook_reader::close() void streaming_workbook_reader::on_cell(std::function callback) { - consumer_->on_cell(callback); + //consumer_->on_cell(callback); } void streaming_workbook_reader::on_worksheet_start(std::function callback) { - consumer_->on_worksheet_start(callback); + //consumer_->on_worksheet_start(callback); } void streaming_workbook_reader::on_worksheet_end(std::function callback) { - consumer_->on_worksheet_end(callback); + //consumer_->on_worksheet_end(callback); } void streaming_workbook_reader::open(const std::vector &data) { - + } void streaming_workbook_reader::open(const std::string &filename)