diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-24 21:07:28 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-24 21:07:28 -0800 |
| commit | fcfa3b828b92013a45c6bc6d44b04f42a912eff7 (patch) | |
| tree | f0172a20fc1eb9a49abbc62a125b87a8d2c79cd3 /fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp | |
| parent | aa8bf7e42b8c73a9bc07ed6781364ba05f5a9776 (diff) | |
| download | pdfium-fcfa3b828b92013a45c6bc6d44b04f42a912eff7.tar.xz | |
Merge to XFA: Fix a bad virtual keyword removal from commit 0f6b51c.
BUG=546744
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1542373002 .
(cherry picked from commit ae58ed8bccc56dd78c12d89972b19d58de94f790)
Review URL: https://codereview.chromium.org/1548093002 .
Diffstat (limited to 'fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp')
| -rw-r--r-- | fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp index dd58180e61..b08ce35d41 100644 --- a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp +++ b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp @@ -18,17 +18,9 @@ CBA_FontMap::CBA_FontMap(CPDFSDK_Annot* pAnnot, m_pDocument = pPage->m_pDocument; m_pAnnotDict = pAnnot->GetPDFAnnot()->GetAnnotDict(); + Initialize(); } -CBA_FontMap::CBA_FontMap(CPDF_Document* pDocument, - CPDF_Dictionary* pAnnotDict, - IFX_SystemHandler* pSystemHandler) - : CPWL_FontMap(pSystemHandler), - m_pDocument(pDocument), - m_pAnnotDict(pAnnotDict), - m_pDefaultFont(NULL), - m_sAPType("N") {} - CBA_FontMap::~CBA_FontMap() {} void CBA_FontMap::Reset() { @@ -37,7 +29,7 @@ void CBA_FontMap::Reset() { m_sDefaultFontName = ""; } -void CBA_FontMap::Initial(const FX_CHAR* fontname) { +void CBA_FontMap::Initialize() { int32_t nCharset = DEFAULT_CHARSET; if (!m_pDefaultFont) { @@ -60,7 +52,7 @@ void CBA_FontMap::Initial(const FX_CHAR* fontname) { } if (nCharset != ANSI_CHARSET) - CPWL_FontMap::Initial(fontname); + CPWL_FontMap::Initialize(); } void CBA_FontMap::SetDefaultFont(CPDF_Font* pFont, @@ -73,9 +65,6 @@ void CBA_FontMap::SetDefaultFont(CPDF_Font* pFont, m_pDefaultFont = pFont; m_sDefaultFontName = sFontName; - // if (m_sDefaultFontName.IsEmpty()) - // m_sDefaultFontName = pFont->GetFontTypeName(); - int32_t nCharset = DEFAULT_CHARSET; if (const CFX_SubstFont* pSubstFont = m_pDefaultFont->GetSubstFont()) nCharset = pSubstFont->m_Charset; @@ -278,5 +267,5 @@ void CBA_FontMap::SetAPType(const CFX_ByteString& sAPType) { m_sAPType = sAPType; Reset(); - Initial(); + Initialize(); } |