Merge to XFA: Kill CFX_Object.

core/src/fpdftext/text_int.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 _PDF_TEXT_INT_H_
 #define _PDF_TEXT_INT_H_
-class CPDF_TextParseOptions : public CFX_Object
+class CPDF_TextParseOptions 
 {
 public:
     CPDF_TextParseOptions();
     FX_BOOL                     m_bCheckObjectOrder;
     FX_BOOL                     m_bCheckDirection;
     int                         m_nCheckSameObject;
 };
 class CPDF_TextPage;
 class CPDF_LinkExtract;
 class CPDF_TextPageFind;
 class CPDF_DocProgressiveSearch;
 #define FPDFTEXT_CHAR_ERROR                     -1
 #define FPDFTEXT_CHAR_NORMAL            0
 #define FPDFTEXT_CHAR_GENERATED         1
 #define FPDFTEXT_CHAR_UNUNICODE         2
 #define FPDFTEXT_CHAR_HYPHEN            3
 #define FPDFTEXT_CHAR_PIECE                     4
 #define FPDFTEXT_MC_PASS                        0
 #define FPDFTEXT_MC_DONE                        1
 #define FPDFTEXT_MC_DELAY                       2
-typedef struct _PAGECHAR_INFO: public CFX_Object {
+typedef struct _PAGECHAR_INFO {
     int                                 m_CharCode;
     FX_WCHAR                    m_Unicode;
     FX_FLOAT                    m_OriginX;
     FX_FLOAT                    m_OriginY;
     FX_INT32                    m_Flag;
     CFX_FloatRect               m_CharBox;
     CPDF_TextObject*    m_pTextObj;
     CFX_AffineMatrix    m_Matrix;
     int                                 m_Index;
 } PAGECHAR_INFO;
@@ skipping 124 matching lines @@
     CFX_WideStringArray                         m_csFindWhatArray;
     int                                                         m_findNextStart;
     int                                                         m_findPreStart;
     FX_BOOL                                                     m_bMatchCase;
     FX_BOOL                                                     m_bMatchWholeWord;
     int                                                         m_resStart;
     int                                                         m_resEnd;
     CFX_RectArray                                       m_resArray;
     FX_BOOL                                                     m_IsFind;
 };
-class CPDF_LinkExt: public CFX_Object
+class CPDF_LinkExt
 {
 public:
     CPDF_LinkExt() {};
     int                                                         m_Start;
     int                                                         m_Count;
     CFX_WideString                                      m_strUrl;
     virtual                                                     ~CPDF_LinkExt() {};
 };
 typedef CFX_ArrayTemplate<CPDF_LinkExt*> LINK_InfoArray;
 class CPDF_LinkExtract: public IPDF_LinkExtract
@@ skipping 20 matching lines @@
 private:
     LINK_InfoArray                                      m_LinkList;
     const CPDF_TextPage*                        m_pTextPage;
     CFX_WideString                                      m_strPageText;
     FX_BOOL                                                     m_IsParserd;
 };
 FX_STRSIZE FX_Unicode_GetNormalization(FX_WCHAR wch, FX_LPWSTR pDst);
 void NormalizeString(CFX_WideString& str);
 void NormalizeCompositeChar(FX_WCHAR wChar, CFX_WideString& sDest);
 #endif