windows

JanMarvin · Jul 16, 2023 · e6de6f9 · e6de6f9
1 parent c0e8f45
commit e6de6f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 26 deletions.
diff --git 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<uint8_t> sv, std::string_view password, std::string_view outfile);
 };

diff --git a/src/xlcpp/xlcpp.cpp b/src/xlcpp/xlcpp.cpp
@@ -10,13 +10,10 @@
 #include <array>
 #include <charconv>
 
-// #ifdef _WIN32
+#ifdef _WIN32
+#include <stringapiset.h>
 // #include <windows.h>
-// #endif
-
-// #define FMT_HEADER_ONLY
-// #include <fmt/format.h>
-// #include <fmt/compile.h>
+#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<xml_enc_string_view>& sv) {
-// if (!sv)
-// return "";
-//
-// return sv.value().decode();
-// }
-
 namespace xlcpp {
 
 /* needed??? */
@@ -83,7 +73,6 @@ std::vector<uint8_t> loadFile(const std::string& filename) {
  }
 }
 
-
 workbook_pimpl::workbook_pimpl(const filesystem::path& fn, string_view password, string_view outfile) {
 
  std::string path = fn;