diff options
Diffstat (limited to 'xfa')
| -rw-r--r-- | xfa/fgas/font/fgas_gefont.cpp | 6 | ||||
| -rw-r--r-- | xfa/fxbarcode/BC_UtilCodingConvert.cpp | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/xfa/fgas/font/fgas_gefont.cpp b/xfa/fgas/font/fgas_gefont.cpp index 3d740ba43a..8652c742fc 100644 --- a/xfa/fgas/font/fgas_gefont.cpp +++ b/xfa/fgas/font/fgas_gefont.cpp @@ -347,9 +347,11 @@ uint8_t CFX_GEFont::GetCharSet() const { void CFX_GEFont::GetFamilyName(CFX_WideString& wsFamily) const { if (!m_pFont->GetSubstFont() || m_pFont->GetSubstFont()->m_Family.GetLength() == 0) { - wsFamily = CFX_WideString::FromLocal(m_pFont->GetFamilyName()); + wsFamily = + CFX_WideString::FromLocal(m_pFont->GetFamilyName().AsByteStringC()); } else { - wsFamily = CFX_WideString::FromLocal(m_pFont->GetSubstFont()->m_Family); + wsFamily = CFX_WideString::FromLocal( + m_pFont->GetSubstFont()->m_Family.AsByteStringC()); } } void CFX_GEFont::GetPsName(CFX_WideString& wsName) const { diff --git a/xfa/fxbarcode/BC_UtilCodingConvert.cpp b/xfa/fxbarcode/BC_UtilCodingConvert.cpp index 79311691e2..118e45e95d 100644 --- a/xfa/fxbarcode/BC_UtilCodingConvert.cpp +++ b/xfa/fxbarcode/BC_UtilCodingConvert.cpp @@ -17,13 +17,13 @@ void CBC_UtilCodingConvert::UnicodeToLocale(const CFX_WideString& src, void CBC_UtilCodingConvert::LocaleToUtf8(const CFX_ByteString& src, CFX_ByteString& dst) { - CFX_WideString unicode = CFX_WideString::FromLocal(src); + CFX_WideString unicode = CFX_WideString::FromLocal(src.AsByteStringC()); dst = unicode.UTF8Encode(); } void CBC_UtilCodingConvert::LocaleToUtf8(const CFX_ByteString& src, CFX_ByteArray& dst) { - CFX_WideString unicode = CFX_WideString::FromLocal(src); + CFX_WideString unicode = CFX_WideString::FromLocal(src.AsByteStringC()); CFX_ByteString utf8 = unicode.UTF8Encode(); for (int32_t i = 0; i < utf8.GetLength(); i++) { dst.Add(utf8[i]); |