diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-27 14:20:25 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-28 08:55:04 +0200 |
commit | e80aef4e032f08ef0c4cfbb028bf83b81002f112 (patch) | |
tree | abb1d7e2ae7f46623d2769b5820e716ad063b4eb /shell/inc/zipfile.hxx | |
parent | 09917566b6ce86ea65a246f2055b5d1f41df4e76 (diff) |
shell: use Unicode on Windows
Change-Id: I9f7962db320f8832879ba327108425a7592b4b77
Reviewed-on: https://gerrit.libreoffice.org/42885
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'shell/inc/zipfile.hxx')
-rw-r--r-- | shell/inc/zipfile.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/shell/inc/zipfile.hxx b/shell/inc/zipfile.hxx index 4f4b4c2331b1..4e31ca7ef246 100644 --- a/shell/inc/zipfile.hxx +++ b/shell/inc/zipfile.hxx @@ -25,6 +25,7 @@ #include <string> #include <vector> #include <memory> +#include <filepath.hxx> class StreamInterface; @@ -34,7 +35,6 @@ class StreamInterface; class ZipFile { public: - typedef std::vector<std::string> Directory_t; typedef std::unique_ptr<Directory_t> DirectoryPtr_t; typedef std::vector<char> ZipContentBuffer_t; @@ -54,7 +54,7 @@ public: IOException if the specified file doesn't exist AccessViolationException if read access to the file is denied */ - static bool IsZipFile(const std::string &FileName); + static bool IsZipFile(const Filepath_t &FileName); static bool IsZipFile(void *stream); @@ -74,7 +74,7 @@ public: IOException if the specified file doesn't exist or is no zip file AccessViolationException if read access to the file is denied */ - static bool IsValidZipFileVersionNumber(const std::string &FileName); + static bool IsValidZipFileVersionNumber(const Filepath_t &FileName); static bool IsValidZipFileVersionNumber(void *stream); @@ -92,7 +92,7 @@ public: WrongZipVersionException if the zip file cannot be uncompressed with the used zlib version */ - ZipFile(const std::string &FileName); + ZipFile(const Filepath_t &FileName); ZipFile(StreamInterface *stream); |