summaryrefslogtreecommitdiff
path: root/fpdfsdk/include/formfiller
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-12-24 21:07:28 -0800
committerLei Zhang <thestig@chromium.org>2015-12-24 21:07:28 -0800
commitfcfa3b828b92013a45c6bc6d44b04f42a912eff7 (patch)
treef0172a20fc1eb9a49abbc62a125b87a8d2c79cd3 /fpdfsdk/include/formfiller
parentaa8bf7e42b8c73a9bc07ed6781364ba05f5a9776 (diff)
downloadpdfium-fcfa3b828b92013a45c6bc6d44b04f42a912eff7.tar.xz
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 .
Diffstat (limited to 'fpdfsdk/include/formfiller')
-rw-r--r--fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h22
1 files changed, 7 insertions, 15 deletions
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;
};