From 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 14 Apr 2015 13:50:34 -0700 Subject: 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 --- core/include/fpdfapi/fpdf_module.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/include/fpdfapi/fpdf_module.h') diff --git a/core/include/fpdfapi/fpdf_module.h b/core/include/fpdfapi/fpdf_module.h index cec8155d41..9b3a5bf7dc 100644 --- a/core/include/fpdfapi/fpdf_module.h +++ b/core/include/fpdfapi/fpdf_module.h @@ -23,7 +23,7 @@ class ICodec_IccModule; class ICodec_FlateModule; #define ADDIN_NAME_CJK "Eastern Asian Language Support" #define ADDIN_NAME_DECODER "JPEG2000 and JBIG2 Image Decoders" -class CPDF_ModuleMgr : public CFX_Object +class CPDF_ModuleMgr { public: @@ -123,7 +123,7 @@ class CPDF_FontGlobals; class IPDF_FontMgr; class IPDF_FontMapper; class CPDF_ColorSpace; -class CPDF_PageModuleDef : public CFX_Object +class CPDF_PageModuleDef { public: virtual ~CPDF_PageModuleDef() {} @@ -161,7 +161,7 @@ class CPDF_Stream; class CFX_DIBSource; class CPDF_RenderConfig; class CPDF_Image; -class CPDF_RenderModuleDef : public CFX_Object +class CPDF_RenderModuleDef { public: virtual ~CPDF_RenderModuleDef() {} -- cgit v1.2.3