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 /core/src/fxcrt/fx_arabic.h | |
| 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 'core/src/fxcrt/fx_arabic.h')
| -rw-r--r-- | core/src/fxcrt/fx_arabic.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/src/fxcrt/fx_arabic.h b/core/src/fxcrt/fx_arabic.h index cf221301f2..66e8bc8000 100644 --- a/core/src/fxcrt/fx_arabic.h +++ b/core/src/fxcrt/fx_arabic.h @@ -180,22 +180,22 @@ void FX_BidiResolveImplicit(const CFX_Int32Array &classes, CFX_Int32Array &level void FX_BidiResolveWhitespace(FX_INT32 iBaseLevel, const CFX_Int32Array &classes, CFX_Int32Array &levels); FX_INT32 FX_BidiReorderLevel(FX_INT32 iBaseLevel, CFX_WideString &wsText, const CFX_Int32Array &levels, FX_INT32 iStart, FX_BOOL bReverse = FALSE); void FX_BidiReorder(FX_INT32 iBaseLevel, CFX_WideString &wsText, const CFX_Int32Array &levels); -class CFX_BidiChar FX_FINAL : public IFX_BidiChar +class CFX_BidiChar final : public IFX_BidiChar { public: CFX_BidiChar(); - virtual void Release() FX_OVERRIDE + virtual void Release() override { delete this; } - virtual void SetPolicy(FX_BOOL bSeparateNeutral = TRUE) FX_OVERRIDE + virtual void SetPolicy(FX_BOOL bSeparateNeutral = TRUE) override { m_bSeparateNeutral = bSeparateNeutral; } - virtual FX_BOOL AppendChar(FX_WCHAR wch) FX_OVERRIDE; - virtual FX_BOOL EndChar() FX_OVERRIDE; - virtual FX_INT32 GetBidiInfo(FX_INT32 &iStart, FX_INT32 &iCount) FX_OVERRIDE; - virtual void Reset() FX_OVERRIDE; + virtual FX_BOOL AppendChar(FX_WCHAR wch) override; + virtual FX_BOOL EndChar() override; + virtual FX_INT32 GetBidiInfo(FX_INT32 &iStart, FX_INT32 &iCount) override; + virtual void Reset() override; private: ~CFX_BidiChar() { } |