Xisco Fauli
3709789a58
Change-Id: I195dbafff63e21a22edf438f5b9ed5beee4dac03 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183784 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
21 lines
704 B
Diff
21 lines
704 B
Diff
To allow opening files on Unicode paths on Windpws, expect passed 8-bit
|
|
strings to be UTF-8-encoded, and convert them to wchar_t. Fallback to
|
|
ACP strings for backward compatibility.
|
|
|
|
diff --git a/src/Numbertext.cxx b/src/Numbertext.cxx
|
|
--- a/src/Numbertext.cxx
|
|
+++ b/src/Numbertext.cxx
|
|
@@ -27,7 +27,11 @@
|
|
bool readfile(const std::string& filename, std::wstring& result)
|
|
{
|
|
#ifdef _WIN32
|
|
- std::ifstream ifs(filename);
|
|
+ // First try to convert from UTF-8
|
|
+ std::ifstream ifs(Numbertext::string2wstring(filename));
|
|
+ // Fallback to ACP string for backward compatibility
|
|
+ if (ifs.fail())
|
|
+ ifs.open(filename);
|
|
if (ifs.fail())
|
|
return false;
|
|
std::stringstream ss;
|