From fcfa3b828b92013a45c6bc6d44b04f42a912eff7 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 24 Dec 2015 21:07:28 -0800 Subject: 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 . --- fpdfsdk/src/pdfwindow/PWL_FontMap.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'fpdfsdk/src/pdfwindow') diff --git a/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp index d5ca376882..fadea905d4 100644 --- a/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp @@ -151,13 +151,8 @@ void CPWL_FontMap::Empty() { } } -void CPWL_FontMap::Initial(const FX_CHAR* fontname) { - CFX_ByteString sFontName = fontname; - - if (sFontName.IsEmpty()) - sFontName = DEFAULT_FONT_NAME; - - GetFontIndex(sFontName, ANSI_CHARSET, FALSE); +void CPWL_FontMap::Initialize() { + GetFontIndex(DEFAULT_FONT_NAME, ANSI_CHARSET, FALSE); } /* -- cgit v1.2.3