From 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 14 Apr 2015 13:50:34 -0700 Subject: Merge to XFA: Kill CFX_Object. Not just a simple merge, but changes to remove CFX_Object from XFA. Original Review URL: https://codereview.chromium.org/1088733002 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1087053002 --- core/src/fxcrt/fx_arabic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/src/fxcrt/fx_arabic.h') diff --git a/core/src/fxcrt/fx_arabic.h b/core/src/fxcrt/fx_arabic.h index f55f7c60cf..eb05801849 100644 --- a/core/src/fxcrt/fx_arabic.h +++ b/core/src/fxcrt/fx_arabic.h @@ -10,7 +10,7 @@ typedef struct _FX_ARABICCHARRANGE { FX_WCHAR wStart; FX_WCHAR wEnd; } FX_ARABICCHARRANGE; -class CFX_ArabicChar : public IFX_ArabicChar, public CFX_Object +class CFX_ArabicChar : public IFX_ArabicChar { public: virtual void Release() @@ -179,7 +179,7 @@ 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 : public IFX_BidiChar, public CFX_Object +class CFX_BidiChar FX_FINAL : public IFX_BidiChar { public: CFX_BidiChar(); -- cgit v1.2.3