diff options
Diffstat (limited to 'xfa/fgas/font/cfgas_defaultfontmanager.cpp')
| -rw-r--r-- | xfa/fgas/font/cfgas_defaultfontmanager.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/xfa/fgas/font/cfgas_defaultfontmanager.cpp b/xfa/fgas/font/cfgas_defaultfontmanager.cpp index d3864be16a..4b9091f690 100644 --- a/xfa/fgas/font/cfgas_defaultfontmanager.cpp +++ b/xfa/fgas/font/cfgas_defaultfontmanager.cpp @@ -15,11 +15,10 @@ CFGAS_DefaultFontManager::~CFGAS_DefaultFontManager() {} RetainPtr<CFGAS_GEFont> CFGAS_DefaultFontManager::GetFont( CFGAS_FontMgr* pFontMgr, const WideStringView& wsFontFamily, - uint32_t dwFontStyles, - uint16_t wCodePage) { + uint32_t dwFontStyles) { WideString wsFontName(wsFontFamily); RetainPtr<CFGAS_GEFont> pFont = - pFontMgr->LoadFont(wsFontName.c_str(), dwFontStyles, wCodePage); + pFontMgr->LoadFont(wsFontName.c_str(), dwFontStyles, 0xFFFF); if (!pFont) { const FGAS_FontInfo* pCurFont = FGAS_FontInfoByFontName(wsFontName.AsStringView()); @@ -39,7 +38,7 @@ RetainPtr<CFGAS_GEFont> CFGAS_DefaultFontManager::GetFont( iLength--; } WideString wsReplace = WideString(pReplace, pNameText - pReplace); - pFont = pFontMgr->LoadFont(wsReplace.c_str(), dwStyle, wCodePage); + pFont = pFontMgr->LoadFont(wsReplace.c_str(), dwStyle, 0xFFFF); if (pFont) break; @@ -57,13 +56,12 @@ RetainPtr<CFGAS_GEFont> CFGAS_DefaultFontManager::GetFont( RetainPtr<CFGAS_GEFont> CFGAS_DefaultFontManager::GetDefaultFont( CFGAS_FontMgr* pFontMgr, const WideStringView& wsFontFamily, - uint32_t dwFontStyles, - uint16_t wCodePage) { + uint32_t dwFontStyles) { RetainPtr<CFGAS_GEFont> pFont = - pFontMgr->LoadFont(L"Arial Narrow", dwFontStyles, wCodePage); + pFontMgr->LoadFont(L"Arial Narrow", dwFontStyles, 0xFFFF); if (!pFont) { pFont = pFontMgr->LoadFont(static_cast<const wchar_t*>(nullptr), - dwFontStyles, wCodePage); + dwFontStyles, 0xFFFF); } if (pFont) m_CacheFonts.push_back(pFont); |