From e6de6f9851137fae7963ac5d8f0c7307a9a82017 Mon Sep 17 00:00:00 2001 From: Jan Marvin Garbuszus Date: Mon, 17 Jul 2023 01:01:40 +0200 Subject: [PATCH] windows --- src/xlcpp/xlcpp-pimpl.h | 12 ------------ src/xlcpp/xlcpp.cpp | 17 +++-------------- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/src/xlcpp/xlcpp-pimpl.h b/src/xlcpp/xlcpp-pimpl.h index 39431b29e..151446758 100644 --- a/src/xlcpp/xlcpp-pimpl.h +++ b/src/xlcpp/xlcpp-pimpl.h @@ -34,18 +34,6 @@ class workbook_pimpl { // la_ssize_t write_callback(struct archive* a, const void* buffer, size_t length) const; void load_archive(struct archive* a); -#ifdef _WIN32 - void rename(const std::filesystem::path& fn) const; -#endif - - mutable std::string buf; - -#ifdef _WIN32 - unique_handle h; - HANDLE h2; - uint8_t readbuf[1048576]; -#endif - private: void load_from_memory(std::span sv, std::string_view password, std::string_view outfile); }; diff --git a/src/xlcpp/xlcpp.cpp b/src/xlcpp/xlcpp.cpp index 50bc5d72a..f2df91002 100644 --- a/src/xlcpp/xlcpp.cpp +++ b/src/xlcpp/xlcpp.cpp @@ -10,13 +10,10 @@ #include #include -// #ifdef _WIN32 +#ifdef _WIN32 +#include // #include -// #endif - -// #define FMT_HEADER_ONLY -// #include -// #include +#endif #define BLOCK_SIZE 20480 @@ -31,13 +28,6 @@ static const string NS_CONTENT_TYPES = "http://schemas.openxmlformats.org/packag #define NUMFMT_OFFSET 165 -// static string try_decode(const optional& sv) { -// if (!sv) -// return ""; -// -// return sv.value().decode(); -// } - namespace xlcpp { /* needed??? */ @@ -83,7 +73,6 @@ std::vector loadFile(const std::string& filename) { } } - workbook_pimpl::workbook_pimpl(const filesystem::path& fn, string_view password, string_view outfile) { std::string path = fn;