Fix a bad virtual keyword removal from commit 0f6b51c.

BUG=546744
R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1542373002 .

4 files changed, 7 insertions, 25 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();
 }
diff --git a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp b/fpdfsdk/src/formfiller/FFL_ComboBox.cpp
index 9458a14764..9c9384b3f0 100644
--- a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp
+++ b/fpdfsdk/src/formfiller/FFL_ComboBox.cpp
@@ -32,11 +32,8 @@ PWL_CREATEPARAM CFFL_ComboBox::GetCreateParam() {
     cp.dwFlags |= PCBS_ALLOWCUSTOMTEXT;
   }
 
-  if (!m_pFontMap) {
+  if (!m_pFontMap)
     m_pFontMap = new CBA_FontMap(m_pWidget, GetSystemHandler());
-    m_pFontMap->Initial();
-  }
-
   cp.pFontMap = m_pFontMap;
   cp.pFocusHandler = this;
 
diff --git a/fpdfsdk/src/formfiller/FFL_ListBox.cpp b/fpdfsdk/src/formfiller/FFL_ListBox.cpp
index d00bfb12ff..d9244e699f 100644
--- a/fpdfsdk/src/formfiller/FFL_ListBox.cpp
+++ b/fpdfsdk/src/formfiller/FFL_ListBox.cpp
@@ -36,10 +36,8 @@ PWL_CREATEPARAM CFFL_ListBox::GetCreateParam() {
   if (cp.dwFlags & PWS_AUTOFONTSIZE)
     cp.fFontSize = FFL_DEFAULTLISTBOXFONTSIZE;
 
-  if (!m_pFontMap) {
+  if (!m_pFontMap)
     m_pFontMap = new CBA_FontMap(m_pWidget, m_pApp->GetSysHandler());
-    m_pFontMap->Initial();
-  }
   cp.pFontMap = m_pFontMap;
 
   return cp;
diff --git a/fpdfsdk/src/formfiller/FFL_TextField.cpp b/fpdfsdk/src/formfiller/FFL_TextField.cpp
index 2e67ebf0f3..10a1339703 100644
--- a/fpdfsdk/src/formfiller/FFL_TextField.cpp
+++ b/fpdfsdk/src/formfiller/FFL_TextField.cpp
@@ -68,10 +68,8 @@ PWL_CREATEPARAM CFFL_TextField::GetCreateParam() {
       break;
   }
 
-  if (!m_pFontMap) {
+  if (!m_pFontMap)
     m_pFontMap = new CBA_FontMap(m_pWidget, m_pApp->GetSysHandler());
-    m_pFontMap->Initial();
-  }
   cp.pFontMap = m_pFontMap;
   cp.pFocusHandler = this;