diff options
Diffstat (limited to 'xfa/fxfa')
-rw-r--r-- | xfa/fxfa/app/xfa_ffapp.cpp | 6 | ||||
-rw-r--r-- | xfa/fxfa/app/xfa_fontmgr.cpp | 6 | ||||
-rw-r--r-- | xfa/fxfa/app/xfa_textlayout.cpp | 2 | ||||
-rw-r--r-- | xfa/fxfa/include/xfa_ffapp.h | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/xfa/fxfa/app/xfa_ffapp.cpp b/xfa/fxfa/app/xfa_ffapp.cpp index a26e2c99cf..f2a6ad5e0d 100644 --- a/xfa/fxfa/app/xfa_ffapp.cpp +++ b/xfa/fxfa/app/xfa_ffapp.cpp @@ -142,13 +142,13 @@ CXFA_FontMgr* CXFA_FFApp::GetXFAFontMgr() { return m_pFontMgr; } -IFX_FontMgr* CXFA_FFApp::GetFDEFontMgr() { +IFGAS_FontMgr* CXFA_FFApp::GetFDEFontMgr() { if (!m_pFDEFontMgr) { #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ - m_pFDEFontMgr = IFX_FontMgr::Create(FX_GetDefFontEnumerator()); + m_pFDEFontMgr = IFGAS_FontMgr::Create(FX_GetDefFontEnumerator()); #else m_pFontSource = new CFX_FontSourceEnum_File; - m_pFDEFontMgr = IFX_FontMgr::Create(m_pFontSource); + m_pFDEFontMgr = IFGAS_FontMgr::Create(m_pFontSource); #endif } return m_pFDEFontMgr; diff --git a/xfa/fxfa/app/xfa_fontmgr.cpp b/xfa/fxfa/app/xfa_fontmgr.cpp index fcf27a1846..ed93b16ad2 100644 --- a/xfa/fxfa/app/xfa_fontmgr.cpp +++ b/xfa/fxfa/app/xfa_fontmgr.cpp @@ -1747,7 +1747,7 @@ IFGAS_Font* CXFA_DefFontMgr::GetFont(CXFA_FFDoc* hDoc, uint32_t dwFontStyles, uint16_t wCodePage) { CFX_WideString wsFontName(wsFontFamily); - IFX_FontMgr* pFDEFontMgr = hDoc->GetApp()->GetFDEFontMgr(); + IFGAS_FontMgr* pFDEFontMgr = hDoc->GetApp()->GetFDEFontMgr(); IFGAS_Font* pFont = pFDEFontMgr->LoadFont(wsFontName.c_str(), dwFontStyles, wCodePage); if (!pFont) { @@ -1791,7 +1791,7 @@ IFGAS_Font* CXFA_DefFontMgr::GetDefaultFont(CXFA_FFDoc* hDoc, const CFX_WideStringC& wsFontFamily, uint32_t dwFontStyles, uint16_t wCodePage) { - IFX_FontMgr* pFDEFontMgr = hDoc->GetApp()->GetFDEFontMgr(); + IFGAS_FontMgr* pFDEFontMgr = hDoc->GetApp()->GetFDEFontMgr(); IFGAS_Font* pFont = pFDEFontMgr->LoadFont(L"Arial Narrow", dwFontStyles, wCodePage); if (!pFont) @@ -1843,7 +1843,7 @@ IFGAS_Font* CXFA_PDFFontMgr::FindFont(CFX_ByteString strPsName, return NULL; } strPsName.Remove(' '); - IFX_FontMgr* pFDEFontMgr = m_pDoc->GetApp()->GetFDEFontMgr(); + IFGAS_FontMgr* pFDEFontMgr = m_pDoc->GetApp()->GetFDEFontMgr(); for (const auto& it : *pFontSetDict) { const CFX_ByteString& key = it.first; CPDF_Object* pObj = it.second; diff --git a/xfa/fxfa/app/xfa_textlayout.cpp b/xfa/fxfa/app/xfa_textlayout.cpp index 1966cca67d..df35c39ed4 100644 --- a/xfa/fxfa/app/xfa_textlayout.cpp +++ b/xfa/fxfa/app/xfa_textlayout.cpp @@ -68,7 +68,7 @@ void CXFA_TextParser::InitCSSData(CXFA_TextProvider* pTextProvider) { if (!m_pSelector) { CXFA_FFDoc* pDoc = pTextProvider->GetDocNode(); - IFX_FontMgr* pFontMgr = pDoc->GetApp()->GetFDEFontMgr(); + IFGAS_FontMgr* pFontMgr = pDoc->GetApp()->GetFDEFontMgr(); ASSERT(pFontMgr); m_pSelector.reset(new CFDE_CSSStyleSelector); m_pSelector->SetFontMgr(pFontMgr); diff --git a/xfa/fxfa/include/xfa_ffapp.h b/xfa/fxfa/include/xfa_ffapp.h index 191bb14174..1e8bf5b117 100644 --- a/xfa/fxfa/include/xfa_ffapp.h +++ b/xfa/fxfa/include/xfa_ffapp.h @@ -51,7 +51,7 @@ class CXFA_FFApp { IFWL_AdapterTimerMgr* GetTimerMgr(); CXFA_FontMgr* GetXFAFontMgr(); - IFX_FontMgr* GetFDEFontMgr(); + IFGAS_FontMgr* GetFDEFontMgr(); CXFA_FWLTheme* GetFWLTheme(); CFWL_WidgetMgrDelegate* GetWidgetMgrDelegate() { return m_pWidgetMgrDelegate; @@ -68,7 +68,7 @@ class CXFA_FFApp { #endif CXFA_FWLAdapterWidgetMgr* m_pAdapterWidgetMgr; CFWL_WidgetMgrDelegate* m_pWidgetMgrDelegate; - IFX_FontMgr* m_pFDEFontMgr; + IFGAS_FontMgr* m_pFDEFontMgr; }; #endif // XFA_FXFA_INCLUDE_XFA_FFAPP_H_ |