Merge to XFA: Kill CFX_Object.

core/src/fpdfdoc/doc_form.cpp

 // 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
 
 #include "../../include/fpdfdoc/fpdf_doc.h"
 #include "../../include/fxcrt/fx_xml.h"
 CFX_WideString  GetFullName(CPDF_Dictionary* pFieldDict);
 void                    InitInterFormDict(CPDF_Dictionary*& pFormDict, CPDF_Document* pDocument);
@@ skipping 11 matching lines @@
 void                    RemoveInterFormFont(CPDF_Dictionary* pFormDict, const CPDF_Font* pFont);
 void                    RemoveInterFormFont(CPDF_Dictionary* pFormDict, CFX_ByteString csNameTag);
 CPDF_Font*              GetDefaultInterFormFont(CPDF_Dictionary* pFormDict, CPDF_Document* pDocument);
 void                    SetDefaultInterFormFont(CPDF_Dictionary*& pFormDict, CPDF_Document* pDocument, const CPDF_Font* pFont);
 void                    SaveCheckedFieldStatus(CPDF_FormField* pField, CFX_ByteArray& statusArray);
 FX_BOOL                 NeedPDFEncodeForFieldFullName(const CFX_WideString& csFieldName);
 FX_BOOL                 NeedPDFEncodeForFieldTree(CPDF_Dictionary* pFieldDict, int nLevel = 0);
 void                    EncodeFieldName(const CFX_WideString& csName, CFX_ByteString& csT);
 void                    UpdateEncodeFieldName(CPDF_Dictionary* pFieldDict, int nLevel = 0);
 const int nMaxRecursion = 32;
-class _CFieldNameExtractor : public CFX_Object
+class _CFieldNameExtractor 
 {
 public:
     _CFieldNameExtractor(const CFX_WideString& full_name)
     {
         m_pStart = full_name;
         m_pEnd = m_pStart + full_name.GetLength();
         m_pCur = m_pStart;
     }
     void GetNext(FX_LPCWSTR &pSubName, FX_STRSIZE& size)
     {
         pSubName = m_pCur;
         while (m_pCur < m_pEnd && m_pCur[0] != L'.') {
             m_pCur++;
         }
         size = (FX_STRSIZE)(m_pCur - pSubName);
         if (m_pCur < m_pEnd && m_pCur[0] == L'.') {
             m_pCur++;
         }
     }
 protected:
     FX_LPCWSTR m_pStart;
     FX_LPCWSTR m_pEnd;
     FX_LPCWSTR m_pCur;
 };
-class CFieldTree : public CFX_Object
+class CFieldTree 
 {
 public:
-    struct _Node : public CFX_Object {
+    struct _Node  {
         _Node *parent;
         CFX_PtrArray children;
         CFX_WideString short_name;
         CPDF_FormField *field_ptr;
         int CountFields(int nLevel = 0)
         {
             if (nLevel > nMaxRecursion) {
                 return 0;
             }
             if (field_ptr) {
@@ skipping 1584 matching lines @@
                 continue;
             }
             CPDF_FormControl* pControl = NULL;
             if (m_ControlMap.Lookup(pAnnotDict, (void*&)pControl)) {
                 return iNewPage;
             }
         }
     } while (TRUE);
     return -1;
 }