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/formfiller/FFL_CBA_Fontmap.h | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'fpdfsdk/include/formfiller') diff --git a/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h b/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h index 0215b868dd..c3e2e99646 100644 --- a/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h +++ b/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h @@ -15,39 +15,31 @@ class CPDFSDK_Annot; class CBA_FontMap : public CPWL_FontMap { public: CBA_FontMap(CPDFSDK_Annot* pAnnot, IFX_SystemHandler* pSystemHandler); - CBA_FontMap(CPDF_Document* pDocument, - CPDF_Dictionary* pAnnotDict, - IFX_SystemHandler* pSystemHandler); - ~CBA_FontMap() override; - virtual void Initial(const FX_CHAR* fontname = NULL); - - public: void SetDefaultFont(CPDF_Font* pFont, const CFX_ByteString& sFontName); void Reset(); void SetAPType(const CFX_ByteString& sAPType); - protected: - virtual CPDF_Font* FindFontSameCharset(CFX_ByteString& sFontAlias, - int32_t nCharset); - virtual void AddedFont(CPDF_Font* pFont, const CFX_ByteString& sFontAlias); - virtual CPDF_Document* GetDocument(); - private: + // CPWL_FontMap: + void Initialize() override; + CPDF_Document* GetDocument() override; + CPDF_Font* FindFontSameCharset(CFX_ByteString& sFontAlias, + int32_t nCharset) override; + void AddedFont(CPDF_Font* pFont, const CFX_ByteString& sFontAlias) override; + CPDF_Font* FindResFontSameCharset(CPDF_Dictionary* pResDict, CFX_ByteString& sFontAlias, int32_t nCharset); CPDF_Font* GetAnnotDefaultFont(CFX_ByteString& csNameTag); void AddFontToAnnotDict(CPDF_Font* pFont, const CFX_ByteString& sAlias); - private: CPDF_Document* m_pDocument; CPDF_Dictionary* m_pAnnotDict; CPDF_Font* m_pDefaultFont; CFX_ByteString m_sDefaultFontName; - CFX_ByteString m_sAPType; }; -- cgit v1.2.3