From 9d312ee7f408732d34a57999a410df7095166d50 Mon Sep 17 00:00:00 2001
From: Thomas Fussell <thomas.fussell@gmail.com>
Date: Wed, 14 Jun 2017 15:43:25 -0400
Subject: [PATCH] make the code compile
---
.../workbook/streaming_workbook_reader.hpp | 18 ++++++++++++++----
source/workbook/streaming_workbook_reader.cpp | 11 ++++++-----
2 files changed, 20 insertions(+), 9 deletions(-)
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 <cstddef>
-#include <iterator>
+#include <functional>
+#include <iostream>
+#include <memory>
+#include <vector>
#include <xlnt/xlnt_config.hpp>
namespace xlnt {
+class cell;
+class path;
+class worksheet;
+
+namespace detail {
+class xlsx_consumer;
+}
+
/// <summary>
/// workbook is the container for all other parts of the document.
/// </summary>
@@ -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.
/// </summary>
- close();
+ void close();
/// <summary>
/// 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.
/// </summary>
- void open(const xlnt::path &filename);
+ void open(const path &filename);
/// <summary>
/// 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 <detail/serialization/xlsx_consumer.hpp>
#include <xlnt/workbook/streaming_workbook_reader.hpp>
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<void(cell)> callback)
{
- consumer_->on_cell(callback);
+ //consumer_->on_cell(callback);
}
void streaming_workbook_reader::on_worksheet_start(std::function<void(std::string)> callback)
{
- consumer_->on_worksheet_start(callback);
+ //consumer_->on_worksheet_start(callback);
}
void streaming_workbook_reader::on_worksheet_end(std::function<void(worksheet)> callback)
{
- consumer_->on_worksheet_end(callback);
+ //consumer_->on_worksheet_end(callback);
}
void streaming_workbook_reader::open(const std::vector<std::uint8_t> &data)
{
-
+
}
void streaming_workbook_reader::open(const std::string &filename)