Merge to XFA: Kill CFX_Object.

core/include/fxcrt/fx_ucd.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef _FX_UNICODE_
 #define _FX_UNICODE_
 
 #include "fx_basic.h"
@@ skipping 94 matching lines @@
         FX_DWORD        dwCharProps;
     };
 } FX_CHARPROPERTIES;
 FX_DWORD FX_GetUnicodeProperties(FX_WCHAR wch);
 FX_BOOL FX_IsCtrlCode(FX_WCHAR ch);
 FX_BOOL FX_IsRotationCode(FX_WCHAR ch);
 FX_BOOL FX_IsCombinationChar(FX_WCHAR wch);
 FX_BOOL FX_IsBidiChar(FX_WCHAR wch);
 FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_BOOL bRTL, FX_BOOL bVertical);
 FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_DWORD dwProps, FX_BOOL bRTL, FX_BOOL bVertical);
-class CFX_Char : public CFX_Object
+class CFX_Char
 {
 public:
     CFX_Char() : m_wCharCode(0)
         , m_nBreakType(0)
         , m_nRotation(0)
         , m_dwCharProps(0)
         , m_dwCharStyles(0)
         , m_iCharWidth(0)
         , m_iHorizontalScale(100)
         , m_iVertialScale(100)
@@ skipping 65 matching lines @@
     FX_INT16                    m_iBidiClass;
     FX_INT16                    m_iBidiLevel;
     FX_INT16                    m_iBidiPos;
     FX_INT16                    m_iBidiOrder;
     FX_DWORD                    m_dwLayoutStyles;
     FX_DWORD                    m_dwIdentity;
     IFX_Unknown                 *m_pUserData;
 };
 typedef CFX_ArrayTemplate<CFX_RTFChar>  CFX_RTFCharArray;
 #endif