diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-09 11:29:12 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-09 11:29:12 -0700 |
| commit | b116136da234afcad018bb44a3ccb64b9ad2a554 (patch) | |
| tree | e81b2016bc21485d1d6bdc7c1a5c65f610f18b20 /fpdfsdk/include | |
| parent | b69545dd059b8a5bb3695969e622462559c97276 (diff) | |
| download | pdfium-b116136da234afcad018bb44a3ccb64b9ad2a554.tar.xz | |
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
Diffstat (limited to 'fpdfsdk/include')
| -rw-r--r-- | fpdfsdk/include/fsdk_define.h | 11 | ||||
| -rw-r--r-- | fpdfsdk/include/fsdk_mgr.h | 5 |
2 files changed, 7 insertions, 9 deletions
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index 528801795b..fd6beca527 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -75,20 +75,19 @@ typedef unsigned int FX_UINT; #include "../../public/fpdfview.h" -class CPDF_CustomAccess FX_FINAL : public IFX_FileRead +class CPDF_CustomAccess final : public IFX_FileRead { public: CPDF_CustomAccess(FPDF_FILEACCESS* pFileAccess); ~CPDF_CustomAccess() {} - virtual CFX_ByteString GetFullPath() { return ""; } - virtual FX_FILESIZE GetSize() FX_OVERRIDE { return m_FileAccess.m_FileLen; } + virtual CFX_ByteString GetFullPath() { return ""; } + virtual FX_FILESIZE GetSize() override { return m_FileAccess.m_FileLen; } virtual FX_BOOL GetByte(FX_DWORD pos, FX_BYTE& ch); virtual FX_BOOL GetBlock(FX_DWORD pos, FX_LPBYTE pBuf, FX_DWORD size); - virtual void Release() FX_OVERRIDE { delete this; } - - virtual FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) FX_OVERRIDE; + virtual void Release() override { delete this; } + virtual FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override; FPDF_FILEACCESS m_FileAccess; FX_BYTE m_Buffer[512]; 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); |