Merge to XFA: Kill CFX_Object.

xfa/include/fxfa/fxfa_objectacc.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 _FXFA_NODEACC_H
 #define _FXFA_NODEACC_H
 class CXFA_Node;
 class IFX_Locale;
@@ skipping 41 matching lines @@
 inline FX_BOOL XFA_IsSpace(FX_WCHAR c)
 {
     return (c == 0x20) || (c == 0x0d) || (c == 0x0a) || (c == 0x09);
 }
 inline FX_BOOL XFA_IsDigit(FX_WCHAR c)
 {
     return c >= '0' && c <= '9';
 }
 typedef CFX_ArrayTemplate<CXFA_Node*> CXFA_NodeArray;
 typedef CFX_ArrayTemplate<CXFA_Object*> CXFA_ObjArray;
-class CXFA_Data : public CFX_Object
+class CXFA_Data
 {
 public:
     CXFA_Data(CXFA_Node* pNode) : m_pNode(pNode) {}
     operator CXFA_Node*() const
     {
         return m_pNode;
     }
     CXFA_Node*  GetNode()
     {
         return m_pNode;
@@ skipping 849 matching lines @@
 };
 class CXFA_Manifest : public CXFA_Data
 {
 public:
     CXFA_Manifest(CXFA_Node* pNode) : CXFA_Data(pNode) {}
     XFA_ATTRIBUTEENUM   GetAction();
     FX_INT32                    CountReives();
     CFX_WideString              GetRefContent(FX_INT32 nIndex);
 };
 #endif