diff options
Diffstat (limited to 'xfa/fgas/font')
| -rw-r--r-- | xfa/fgas/font/fgas_gefont.cpp | 5 | ||||
| -rw-r--r-- | xfa/fgas/font/fgas_stdfontmgr.cpp | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/xfa/fgas/font/fgas_gefont.cpp b/xfa/fgas/font/fgas_gefont.cpp index 8652c742fc..0ef80a3075 100644 --- a/xfa/fgas/font/fgas_gefont.cpp +++ b/xfa/fgas/font/fgas_gefont.cpp @@ -347,11 +347,10 @@ 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().AsByteStringC()); + wsFamily = CFX_WideString::FromLocal(m_pFont->GetFamilyName().AsStringC()); } else { wsFamily = CFX_WideString::FromLocal( - m_pFont->GetSubstFont()->m_Family.AsByteStringC()); + m_pFont->GetSubstFont()->m_Family.AsStringC()); } } void CFX_GEFont::GetPsName(CFX_WideString& wsName) const { diff --git a/xfa/fgas/font/fgas_stdfontmgr.cpp b/xfa/fgas/font/fgas_stdfontmgr.cpp index 2b403e8ee8..37c9e78c3c 100644 --- a/xfa/fgas/font/fgas_stdfontmgr.cpp +++ b/xfa/fgas/font/fgas_stdfontmgr.cpp @@ -561,8 +561,7 @@ FX_POSITION CFX_FontSourceEnum_File::GetStartPosition(void* pUserData) { } IFX_FileAccess* CFX_FontSourceEnum_File::GetNext(FX_POSITION& pos, void* pUserData) { - IFX_FileAccess* pAccess = - FX_CreateDefaultFileAccess(m_wsNext.AsWideStringC()); + IFX_FileAccess* pAccess = FX_CreateDefaultFileAccess(m_wsNext.AsStringC()); m_wsNext = GetNextFile().UTF8Decode(); pos = 0 != m_wsNext.GetLength() ? pAccess : NULL; return (IFX_FileAccess*)pAccess; |