diff options
| author | Tom Sepez <tsepez@chromium.org> | 2014-08-13 17:12:28 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2014-08-13 17:12:28 -0700 |
| commit | 368ed462dd6e5e63977ca2b2e56a7e83b3a3bdda (patch) | |
| tree | d6e9f37c824646a245d2753fe93a8404da52dbff /fpdfsdk/src/fpdf_sysfontinfo.cpp | |
| parent | 2fd7b0be4473f4c9877fed2c2ade403c71ded395 (diff) | |
| download | pdfium-368ed462dd6e5e63977ca2b2e56a7e83b3a3bdda.tar.xz | |
Add FX_OVERRIDE and use it for virtual functions of FX_FINAL classes.
Should there be cases where this fails to compile, it indicates a mistake,
either an incorrectly declared overrriden virtual method, or a method that
should be declared non-virtual.
The only issues were with CPDF_CustomAccess::GetBlock(), CPDF_CustomAccess::GetByte(),
and CPDF_CustomAccess::GetFullPath(). These don't appear to be used anywhere,
and are removed. Two members are removed that are no longer needed once those
methods are removed.
R=jam@chromium.org, jun_fang@foxitsoftware.com
Review URL: https://codereview.chromium.org/454983003
Diffstat (limited to 'fpdfsdk/src/fpdf_sysfontinfo.cpp')
| -rw-r--r-- | fpdfsdk/src/fpdf_sysfontinfo.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fpdfsdk/src/fpdf_sysfontinfo.cpp b/fpdfsdk/src/fpdf_sysfontinfo.cpp index cc75e635b3..0e0114b372 100644 --- a/fpdfsdk/src/fpdf_sysfontinfo.cpp +++ b/fpdfsdk/src/fpdf_sysfontinfo.cpp @@ -12,14 +12,14 @@ class CSysFontInfo_Ext FX_FINAL : public IFX_SystemFontInfo public: FPDF_SYSFONTINFO* m_pInfo; - virtual void Release() + virtual void Release() FX_OVERRIDE { if (m_pInfo->Release) m_pInfo->Release(m_pInfo); delete this; } - virtual FX_BOOL EnumFontList(CFX_FontMapper* pMapper) + virtual FX_BOOL EnumFontList(CFX_FontMapper* pMapper) FX_OVERRIDE { if (m_pInfo->EnumFonts) { m_pInfo->EnumFonts(m_pInfo, pMapper); @@ -28,28 +28,28 @@ public: return FALSE; } - virtual void* MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, FX_LPCSTR family, FX_BOOL& bExact) + virtual void* MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, FX_LPCSTR family, FX_BOOL& bExact) FX_OVERRIDE { if (m_pInfo->MapFont) return m_pInfo->MapFont(m_pInfo, weight, bItalic, charset, pitch_family, family, &bExact); return NULL; } - virtual void* GetFont(FX_LPCSTR family) + virtual void* GetFont(FX_LPCSTR family) FX_OVERRIDE { if (m_pInfo->GetFont) return m_pInfo->GetFont(m_pInfo, family); return NULL; } - virtual FX_DWORD GetFontData(void* hFont, FX_DWORD table, FX_LPBYTE buffer, FX_DWORD size) + virtual FX_DWORD GetFontData(void* hFont, FX_DWORD table, FX_LPBYTE buffer, FX_DWORD size) FX_OVERRIDE { if (m_pInfo->GetFontData) return m_pInfo->GetFontData(m_pInfo, hFont, table, buffer, size); return 0; } - virtual FX_BOOL GetFaceName(void* hFont, CFX_ByteString& name) + virtual FX_BOOL GetFaceName(void* hFont, CFX_ByteString& name) FX_OVERRIDE { if (m_pInfo->GetFaceName == NULL) return FALSE; FX_DWORD size = m_pInfo->GetFaceName(m_pInfo, hFont, NULL, 0); @@ -61,7 +61,7 @@ public: return TRUE; } - virtual FX_BOOL GetFontCharset(void* hFont, int& charset) + virtual FX_BOOL GetFontCharset(void* hFont, int& charset) FX_OVERRIDE { if (m_pInfo->GetFontCharset) { charset = m_pInfo->GetFontCharset(m_pInfo, hFont); @@ -70,7 +70,7 @@ public: return FALSE; } - virtual void DeleteFont(void* hFont) + virtual void DeleteFont(void* hFont) FX_OVERRIDE { if (m_pInfo->DeleteFont) m_pInfo->DeleteFont(m_pInfo, hFont); |