diff options
Diffstat (limited to 'xfa')
-rw-r--r-- | xfa/fgas/font/cfgas_fontmgr.cpp | 10 | ||||
-rw-r--r-- | xfa/fgas/font/cfgas_fontmgr.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/xfa/fgas/font/cfgas_fontmgr.cpp b/xfa/fgas/font/cfgas_fontmgr.cpp index 8102a0d6dc..b4e6bdc912 100644 --- a/xfa/fgas/font/cfgas_fontmgr.cpp +++ b/xfa/fgas/font/cfgas_fontmgr.cpp @@ -17,7 +17,7 @@ #include "core/fxge/cfx_fontmgr.h" #include "core/fxge/cfx_gemodule.h" #include "core/fxge/fx_font.h" -#include "core/fxge/ifx_systemfontinfo.h" +#include "core/fxge/systemfontinfo_iface.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" #include "xfa/fgas/font/cfgas_gefont.h" @@ -527,7 +527,7 @@ bool CFGAS_FontMgr::EnumFontsFromFontMapper() { if (!pFontMapper) return false; - IFX_SystemFontInfo* pSystemFontInfo = pFontMapper->GetSystemFontInfo(); + SystemFontInfoIface* pSystemFontInfo = pFontMapper->GetSystemFontInfo(); if (!pSystemFontInfo) return false; @@ -593,7 +593,7 @@ RetainPtr<CFGAS_GEFont> CFGAS_FontMgr::LoadFont(const WideString& wsFaceName, if (!pFontMapper) return nullptr; - IFX_SystemFontInfo* pSystemFontInfo = pFontMapper->GetSystemFontInfo(); + SystemFontInfoIface* pSystemFontInfo = pFontMapper->GetSystemFontInfo(); if (!pSystemFontInfo) return nullptr; @@ -661,7 +661,7 @@ FXFT_Face CFGAS_FontMgr::LoadFace( RetainPtr<IFX_SeekableReadStream> CFGAS_FontMgr::CreateFontStream( CFX_FontMapper* pFontMapper, - IFX_SystemFontInfo* pSystemFontInfo, + SystemFontInfoIface* pSystemFontInfo, uint32_t index) { void* hFont = pSystemFontInfo->MapFont( 0, 0, FX_CHARSET_Default, 0, pFontMapper->GetFaceName(index).c_str()); @@ -685,7 +685,7 @@ RetainPtr<IFX_SeekableReadStream> CFGAS_FontMgr::CreateFontStream( if (!pFontMapper) return nullptr; - IFX_SystemFontInfo* pSystemFontInfo = pFontMapper->GetSystemFontInfo(); + SystemFontInfoIface* pSystemFontInfo = pFontMapper->GetSystemFontInfo(); if (!pSystemFontInfo) return nullptr; diff --git a/xfa/fgas/font/cfgas_fontmgr.h b/xfa/fgas/font/cfgas_fontmgr.h index 210b5643bb..6b98fbe394 100644 --- a/xfa/fgas/font/cfgas_fontmgr.h +++ b/xfa/fgas/font/cfgas_fontmgr.h @@ -19,7 +19,7 @@ #include "core/fxcrt/observable.h" #include "core/fxcrt/retain_ptr.h" #include "core/fxge/fx_freetype.h" -#include "core/fxge/ifx_systemfontinfo.h" +#include "core/fxge/systemfontinfo_iface.h" #include "xfa/fgas/font/cfgas_pdffontmgr.h" class CFGAS_GEFont; @@ -179,7 +179,7 @@ class CFGAS_FontMgr : public Observable<CFGAS_FontMgr> { int32_t iFaceIndex); RetainPtr<IFX_SeekableReadStream> CreateFontStream( CFX_FontMapper* pFontMapper, - IFX_SystemFontInfo* pSystemFontInfo, + SystemFontInfoIface* pSystemFontInfo, uint32_t index); RetainPtr<IFX_SeekableReadStream> CreateFontStream( const ByteString& bsFaceName); |