diff options
| author | npm <npm@chromium.org> | 2016-09-19 07:24:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-09-19 07:24:33 -0700 |
| commit | ea3c3be83dae12ef682c68fc7cf906d790fd9f84 (patch) | |
| tree | cdaca6bc4a4b9de627e45b90c64d4bd197fd8940 /fpdfsdk/formfiller | |
| parent | 2f8568ef91156d2deb8411c427fbb52f880ccc34 (diff) | |
| download | pdfium-ea3c3be83dae12ef682c68fc7cf906d790fd9f84.tar.xz | |
Remove duplicated charset definitions, and move them to fx_font.h
PWL_FontMap does not need its own charset definitions. fx_edit.h does
not need to define DEFAULT_CHARSET. XFA have their own definitions.
They look different in that most are MAC or MSWin charset definitions.
So they are left untouched. public/fpdf_sysfontinfo.h duplicate ones
were left untouched due to being in public folder.
Review-Url: https://codereview.chromium.org/2347313002
Diffstat (limited to 'fpdfsdk/formfiller')
| -rw-r--r-- | fpdfsdk/formfiller/cba_fontmap.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fpdfsdk/formfiller/cba_fontmap.cpp b/fpdfsdk/formfiller/cba_fontmap.cpp index 8a981690f1..264366bfa4 100644 --- a/fpdfsdk/formfiller/cba_fontmap.cpp +++ b/fpdfsdk/formfiller/cba_fontmap.cpp @@ -39,7 +39,7 @@ void CBA_FontMap::Reset() { } void CBA_FontMap::Initialize() { - int32_t nCharset = DEFAULT_CHARSET; + int32_t nCharset = FXFONT_DEFAULT_CHARSET; if (!m_pDefaultFont) { m_pDefaultFont = GetAnnotDefaultFont(m_sDefaultFontName); @@ -51,16 +51,16 @@ void CBA_FontMap::Initialize() { m_sDefaultFontName == "Wingdings2" || m_sDefaultFontName == "Wingdings3" || m_sDefaultFontName == "Webdings") - nCharset = SYMBOL_CHARSET; + nCharset = FXFONT_SYMBOL_CHARSET; else - nCharset = ANSI_CHARSET; + nCharset = FXFONT_ANSI_CHARSET; } AddFontData(m_pDefaultFont, m_sDefaultFontName, nCharset); AddFontToAnnotDict(m_pDefaultFont, m_sDefaultFontName); } } - if (nCharset != ANSI_CHARSET) + if (nCharset != FXFONT_ANSI_CHARSET) CPWL_FontMap::Initialize(); } @@ -74,7 +74,7 @@ void CBA_FontMap::SetDefaultFont(CPDF_Font* pFont, m_pDefaultFont = pFont; m_sDefaultFontName = sFontName; - int32_t nCharset = DEFAULT_CHARSET; + int32_t nCharset = FXFONT_DEFAULT_CHARSET; if (const CFX_SubstFont* pSubstFont = m_pDefaultFont->GetSubstFont()) nCharset = pSubstFont->m_Charset; AddFontData(m_pDefaultFont, m_sDefaultFontName, nCharset); |