diff --git a/source/utils/path.cpp b/source/utils/path.cpp index 93540bfe..02bb1d45 100644 --- a/source/utils/path.cpp +++ b/source/utils/path.cpp @@ -231,7 +231,7 @@ const std::string &path::string() const #ifdef _MSC_VER std::wstring path::wstring() const { - std::wstring_convert> convert; + std::wstring_convert> convert; return convert.from_bytes(string()); } #endif diff --git "a/tests/data/9_unicode_\316\233.xlsx" "b/tests/data/9_unicode_\316\233_\360\237\230\207.xlsx" similarity index 100% rename from "tests/data/9_unicode_\316\233.xlsx" rename to "tests/data/9_unicode_\316\233_\360\237\230\207.xlsx" diff --git a/tests/workbook/serialization_test_suite.cpp b/tests/workbook/serialization_test_suite.cpp index 73bdc32d..14d27f24 100644 --- a/tests/workbook/serialization_test_suite.cpp +++ b/tests/workbook/serialization_test_suite.cpp @@ -366,18 +366,18 @@ class serialization_test_suite : public test_suite { #ifdef _MSC_VER xlnt::workbook wb; - // L"/9_unicode_Λ.xlsx" doesn't use wchar_t(0x039B) for the capital lambda... - // L"/9_unicode_\u039B.xlsx" gives the corrct output - const auto path = LSTRING_LITERAL(XLNT_TEST_DATA_DIR) L"/9_unicode_\u039B.xlsx"; // L"/9_unicode_Λ.xlsx" + // L"/9_unicode_Λ_😇.xlsx" doesn't use wchar_t(0x039B) for the capital lambda... + // L"/9_unicode_\u039B_\U0001F607.xlsx" gives the correct output + const auto path = LSTRING_LITERAL(XLNT_TEST_DATA_DIR) L"/9_unicode_\u039B_\U0001F607.xlsx"; // L"/9_unicode_Λ_😇.xlsx" wb.load(path); xlnt_assert_equals(wb.active_sheet().cell("A1").value(), u8"un\u00EFc\u00F4d\u0117!"); // u8"unïcôdė!" #endif #ifndef __MINGW32__ xlnt::workbook wb2; - // u8"/9_unicode_Λ.xlsx" doesn't use 0xc3aa for the capital lambda... - // u8"/9_unicode_\u039B.xlsx" gives the corrct output - const auto path2 = U8STRING_LITERAL(XLNT_TEST_DATA_DIR) u8"/9_unicode_\u039B.xlsx"; // u8"/9_unicode_Λ.xlsx" + // u8"/9_unicode_Λ_😇.xlsx" doesn't use 0xC3AA for the capital lambda... + // u8"/9_unicode_\u039B_\U0001F607.xlsx" gives the correct output + const auto path2 = U8STRING_LITERAL(XLNT_TEST_DATA_DIR) u8"/9_unicode_\u039B_\U0001F607.xlsx"; // u8"/9_unicode_Λ_😇.xlsx" wb2.load(path2); xlnt_assert_equals(wb2.active_sheet().cell("A1").value(), u8"un\u00EFc\u00F4d\u0117!"); // u8"unïcôdė!" #endif @@ -633,9 +633,9 @@ class serialization_test_suite : public test_suite void test_round_trip_rw_unicode() { - // u8"/9_unicode_Λ.xlsx" doesn't use 0xc3aa for the capital lambda... - // u8"/9_unicode_\u039B.xlsx" gives the corrct output - xlnt_assert(round_trip_matches_rw(path_helper::test_file(u8"9_unicode_\u039B.xlsx"))); + // u8"/9_unicode_Λ_😇.xlsx" doesn't use 0xC3AA for the capital lambda... + // u8"/9_unicode_\u039B_\U0001F607.xlsx" gives the correct output + xlnt_assert(round_trip_matches_rw(path_helper::test_file(u8"9_unicode_\u039B_\U0001F607.xlsx"))); } void test_round_trip_rw_comments_hyperlinks_formulae()