diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-19 22:20:59 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-19 22:20:59 -0800 |
| commit | 5fd907b8266766152377a9836abfcac0161832fc (patch) | |
| tree | 2b3f94e1b8a5e7f0c816139ceec79b2bca4eff0c /fpdfsdk/include/fxedit/fxet_edit.h | |
| parent | 237c3653bf7235ac5cab86bb61cfbd4ed8f18f75 (diff) | |
| download | pdfium-5fd907b8266766152377a9836abfcac0161832fc.tar.xz | |
Merge to XFA: Add more overrides.
Using Chromium's clang + build options, there's more override warnings.
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1453643002 .
(cherry picked from commit 126ba519bdd489ec6c285d1410dcae773e8ef673)
Review URL: https://codereview.chromium.org/1458373002 .
Diffstat (limited to 'fpdfsdk/include/fxedit/fxet_edit.h')
| -rw-r--r-- | fpdfsdk/include/fxedit/fxet_edit.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/fpdfsdk/include/fxedit/fxet_edit.h b/fpdfsdk/include/fxedit/fxet_edit.h index 21ebe6bae1..1ecb70426f 100644 --- a/fpdfsdk/include/fxedit/fxet_edit.h +++ b/fpdfsdk/include/fxedit/fxet_edit.h @@ -814,16 +814,21 @@ class CFX_Edit_Iterator : public IFX_Edit_Iterator { class CFX_Edit_Provider : public IPDF_VariableText_Provider { public: CFX_Edit_Provider(IFX_Edit_FontMap* pFontMap); - virtual ~CFX_Edit_Provider(); + ~CFX_Edit_Provider() override; IFX_Edit_FontMap* GetFontMap(); - int32_t GetCharWidth(int32_t nFontIndex, FX_WORD word, int32_t nWordStyle); - int32_t GetTypeAscent(int32_t nFontIndex); - int32_t GetTypeDescent(int32_t nFontIndex); - int32_t GetWordFontIndex(FX_WORD word, int32_t charset, int32_t nFontIndex); - int32_t GetDefaultFontIndex(); - FX_BOOL IsLatinWord(FX_WORD word); + // IPDF_VariableText_Provider: + int32_t GetCharWidth(int32_t nFontIndex, + FX_WORD word, + int32_t nWordStyle) override; + int32_t GetTypeAscent(int32_t nFontIndex) override; + int32_t GetTypeDescent(int32_t nFontIndex) override; + int32_t GetWordFontIndex(FX_WORD word, + int32_t charset, + int32_t nFontIndex) override; + int32_t GetDefaultFontIndex() override; + FX_BOOL IsLatinWord(FX_WORD word) override; private: IFX_Edit_FontMap* m_pFontMap; |