diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
| commit | 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 (patch) | |
| tree | e2fc5ec44d0e83e7f8d066b14d1628b8f5cebe87 /xfa/src/fxfa/src/app/xfa_fontmgr.h | |
| parent | 63de95b699a4374982c2ddffced89e0da028fe4c (diff) | |
| download | pdfium-6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33.tar.xz | |
Merge to XFA: Kill CFX_Object.
Not just a simple merge, but changes to remove CFX_Object from XFA.
Original Review URL: https://codereview.chromium.org/1088733002
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1087053002
Diffstat (limited to 'xfa/src/fxfa/src/app/xfa_fontmgr.h')
| -rw-r--r-- | xfa/src/fxfa/src/app/xfa_fontmgr.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.h b/xfa/src/fxfa/src/app/xfa_fontmgr.h index b5781c4954..09e0d19096 100644 --- a/xfa/src/fxfa/src/app/xfa_fontmgr.h +++ b/xfa/src/fxfa/src/app/xfa_fontmgr.h @@ -13,7 +13,7 @@ struct XFA_FONTINFO { FX_WORD dwStyles;
FX_WORD wCodePage;
};
-class CXFA_DefFontMgr : public IXFA_FontMgr, public CFX_Object
+class CXFA_DefFontMgr : public IXFA_FontMgr
{
public:
CXFA_DefFontMgr() {}
@@ -27,7 +27,7 @@ public: protected:
CFX_PtrArray m_CacheFonts;
};
-class CXFA_PDFFontMgr : public IFX_FontProvider, public CFX_Object
+class CXFA_PDFFontMgr : public IFX_FontProvider
{
public:
CXFA_PDFFontMgr(CXFA_FFDoc* pDoc);
@@ -42,7 +42,7 @@ protected: CXFA_FFDoc* m_pDoc;
CFX_CMapByteStringToPtr m_FontArray;
};
-class CXFA_FontMgr : public CFX_Object
+class CXFA_FontMgr
{
public:
CXFA_FontMgr();
|