From b116136da234afcad018bb44a3ccb64b9ad2a554 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 9 Jun 2015 11:29:12 -0700 Subject: Merge to XFA: Remove more cruft from fx_system.h New manual edits in the following to fix compilation: fx_bmp.h, fx_gif.h, fx_graphics.h Original Review URL: https://codereview.chromium.org/1169963003 R=thestig@chromium.org Review URL: https://codereview.chromium.org/1170103004 --- fpdfsdk/include/fsdk_mgr.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/include/fsdk_mgr.h') diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index 7f68dd9cca..d90ab3be4f 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -30,7 +30,7 @@ class CJS_RuntimeFactory; #include "javascript/IJavaScript.h" -class CPDFDoc_Environment FX_FINAL +class CPDFDoc_Environment final { public: CPDFDoc_Environment(CPDFXFA_Document * pDoc); @@ -763,8 +763,7 @@ private: CPDF_OCContext * m_pOccontent; FX_BOOL m_bChangeMask; }; - -class CPDFSDK_PageView FX_FINAL +class CPDFSDK_PageView final { public: CPDFSDK_PageView(CPDFSDK_Document* pSDKDoc,CPDFXFA_Page* page); -- cgit v1.2.3