summaryrefslogtreecommitdiff
path: root/xfa
diff options
context:
space:
mode:
Diffstat (limited to 'xfa')
-rw-r--r--xfa/fgas/font/cfgas_fontmgr.cpp11
-rw-r--r--xfa/fgas/font/cfgas_fontmgr.h5
2 files changed, 5 insertions, 11 deletions
diff --git a/xfa/fgas/font/cfgas_fontmgr.cpp b/xfa/fgas/font/cfgas_fontmgr.cpp
index 99120a0d51..4df9863692 100644
--- a/xfa/fgas/font/cfgas_fontmgr.cpp
+++ b/xfa/fgas/font/cfgas_fontmgr.cpp
@@ -200,12 +200,11 @@ void EnumGdiFonts(std::deque<FX_FONTDESCRIPTOR>* fonts,
} // namespace
-CFGAS_FontMgr::CFGAS_FontMgr() : m_pEnumerator(EnumGdiFonts), m_FontFaces(100) {
- if (m_pEnumerator)
- m_pEnumerator(&m_FontFaces, nullptr, 0xFEFF);
+CFGAS_FontMgr::CFGAS_FontMgr() : m_FontFaces(100) {
+ EnumGdiFonts(&m_FontFaces, nullptr, 0xFEFF);
}
-CFGAS_FontMgr::~CFGAS_FontMgr() {}
+CFGAS_FontMgr::~CFGAS_FontMgr() = default;
bool CFGAS_FontMgr::EnumFonts() {
return true;
@@ -229,11 +228,11 @@ const FX_FONTDESCRIPTOR* CFGAS_FontMgr::FindFont(const wchar_t* pszFontFamily,
if (pDesc)
return pDesc;
- if (!pszFontFamily || !m_pEnumerator)
+ if (!pszFontFamily)
return nullptr;
std::deque<FX_FONTDESCRIPTOR> namedFonts;
- m_pEnumerator(&namedFonts, pszFontFamily, wUnicode);
+ EnumGdiFonts(&namedFonts, pszFontFamily, wUnicode);
params.pwsFamily = nullptr;
pDesc = MatchDefaultFont(&params, namedFonts);
if (!pDesc)
diff --git a/xfa/fgas/font/cfgas_fontmgr.h b/xfa/fgas/font/cfgas_fontmgr.h
index 445b318a26..210b5643bb 100644
--- a/xfa/fgas/font/cfgas_fontmgr.h
+++ b/xfa/fgas/font/cfgas_fontmgr.h
@@ -63,10 +63,6 @@ inline bool operator==(const FX_FONTDESCRIPTOR& left,
wcscmp(left.wsFontFace, right.wsFontFace) == 0;
}
-typedef void (*FX_LPEnumAllFonts)(std::deque<FX_FONTDESCRIPTOR>* fonts,
- const wchar_t* pwsFaceName,
- wchar_t wUnicode);
-
#else // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
class CFX_FontDescriptor {
@@ -153,7 +149,6 @@ class CFGAS_FontMgr : public Observable<CFGAS_FontMgr> {
uint32_t dwUSB,
wchar_t wUnicode);
- FX_LPEnumAllFonts m_pEnumerator;
std::deque<FX_FONTDESCRIPTOR> m_FontFaces;
#else // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
bool EnumFontsFromFontMapper();