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/include/pdfwindow/PWL_FontMap.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'fpdfsdk/include/pdfwindow') diff --git a/fpdfsdk/include/pdfwindow/PWL_FontMap.h b/fpdfsdk/include/pdfwindow/PWL_FontMap.h index c17483439c..c8c8722c11 100644 --- a/fpdfsdk/include/pdfwindow/PWL_FontMap.h +++ b/fpdfsdk/include/pdfwindow/PWL_FontMap.h @@ -80,10 +80,11 @@ class CPWL_FontMap : public IFX_Edit_FontMap { uint8_t nCharset); protected: - void Initial(const FX_CHAR* fontname = NULL); - CPDF_Document* GetDocument(); - CPDF_Font* FindFontSameCharset(CFX_ByteString& sFontAlias, int32_t nCharset); - void AddedFont(CPDF_Font* pFont, const CFX_ByteString& sFontAlias); + virtual void Initialize(); + virtual CPDF_Document* GetDocument(); + virtual CPDF_Font* FindFontSameCharset(CFX_ByteString& sFontAlias, + int32_t nCharset); + virtual void AddedFont(CPDF_Font* pFont, const CFX_ByteString& sFontAlias); FX_BOOL KnowWord(int32_t nFontIndex, FX_WORD word); @@ -126,9 +127,10 @@ class CPWL_DocFontMap : public CPWL_FontMap { CPDF_Document* pAttachedDoc); ~CPWL_DocFontMap() override; - virtual CPDF_Document* GetDocument(); - private: + // CPWL_FontMap: + CPDF_Document* GetDocument() override; + CPDF_Document* m_pAttachedDoc; }; -- cgit v1.2.3