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_page.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/include/fpdfapi/fpdf_page.h') diff --git a/core/include/fpdfapi/fpdf_page.h b/core/include/fpdfapi/fpdf_page.h index 3fea866730..0bac0595c2 100644 --- a/core/include/fpdfapi/fpdf_page.h +++ b/core/include/fpdfapi/fpdf_page.h @@ -32,7 +32,7 @@ class CPDF_ResourceNaming; #define PDF_CONTENT_NOT_PARSED 0 #define PDF_CONTENT_PARSING 1 #define PDF_CONTENT_PARSED 2 -class CPDF_PageObjects : public CFX_Object +class CPDF_PageObjects { public: @@ -199,7 +199,7 @@ protected: CPDF_PageRenderCache* m_pPageRender; }; -class CPDF_ParseOptions : public CFX_Object +class CPDF_ParseOptions { public: @@ -229,7 +229,7 @@ public: CPDF_Form* Clone() const; }; -class CPDF_PageContentGenerate : public CFX_Object +class CPDF_PageContentGenerate { public: CPDF_PageContentGenerate(CPDF_Page* pPage); -- cgit v1.2.3