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_objects.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/include/fpdfapi/fpdf_objects.h') diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h index bb449dd457..df5803c76c 100644 --- a/core/include/fpdfapi/fpdf_objects.h +++ b/core/include/fpdfapi/fpdf_objects.h @@ -35,7 +35,7 @@ class CPDF_CryptoHandler; #define PDFOBJ_NULL 8 #define PDFOBJ_REFERENCE 9 typedef IFX_FileStream* (*FPDF_LPFCloneStreamCallback)(CPDF_Stream *pStream, FX_LPVOID pUserData); -class CPDF_Object : public CFX_Object +class CPDF_Object { public: @@ -568,7 +568,7 @@ protected: friend class CPDF_StreamAcc; friend class CPDF_AttachmentAcc; }; -class CPDF_StreamAcc : public CFX_Object +class CPDF_StreamAcc { public: @@ -622,7 +622,7 @@ protected: }; CFX_DataFilter* FPDF_CreateFilter(FX_BSTR name, const CPDF_Dictionary* pParam, int width = 0, int height = 0); #define FPDF_FILTER_BUFFER_SIZE 20480 -class CPDF_StreamFilter : public CFX_Object +class CPDF_StreamFilter { public: @@ -705,7 +705,7 @@ protected: FX_DWORD m_RefObjNum; friend class CPDF_Object; }; -class CPDF_IndirectObjects : public CFX_Object +class CPDF_IndirectObjects { public: -- cgit v1.2.3