Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(450)

Unified Diff: fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp

Issue 1542373002: Fix a bad virtual keyword removal from commit 0f6b51c. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp
diff --git a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp
index dd58180e61a4a9e2ab625cd27a9a898538223757..f9df7536c64f8a233d9b6ad631333e3a9bc22e48 100644
--- a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp
+++ b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp
@@ -37,7 +37,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 +60,7 @@ void CBA_FontMap::Initial(const FX_CHAR* fontname) {
}
if (nCharset != ANSI_CHARSET)
- CPWL_FontMap::Initial(fontname);
+ CPWL_FontMap::Init();
}
void CBA_FontMap::SetDefaultFont(CPDF_Font* pFont,
@@ -73,9 +73,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 +275,5 @@ void CBA_FontMap::SetAPType(const CFX_ByteString& sAPType) {
m_sAPType = sAPType;
Reset();
- Initial();
+ Initialize();
}

Powered by Google App Engine
This is Rietveld 408576698