Kill CFX_Object.

core/src/fpdfdoc/pdf_vt.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_VT_H_
 #define _PDF_VT_H_
 
 class CPVT_Size;
@@ skipping 118 matching lines @@
     }
     FX_INT32                                    nTotalWord;
     FX_INT32                                    nBeginWordIndex;
     FX_INT32                                    nEndWordIndex;
     FX_FLOAT                                    fLineX;
     FX_FLOAT                                    fLineY;
     FX_FLOAT                                    fLineWidth;
     FX_FLOAT                                    fLineAscent;
     FX_FLOAT                                    fLineDescent;
 };
-struct CPVT_WordInfo : public CFX_Object {
+struct CPVT_WordInfo  {
     CPVT_WordInfo() : Word(0), nCharset(0),
         fWordX(0.0f), fWordY(0.0f), fWordTail(0.0f), nFontIndex(-1), pWordProps(NULL)
     {
     }
     CPVT_WordInfo(FX_WORD word, FX_INT32 charset, FX_INT32 fontIndex, CPVT_WordProps * pProps):
         Word(word), nCharset(charset), fWordX(0.0f), fWordY(0.0f), fWordTail(0.0f),
         nFontIndex(fontIndex), pWordProps(pProps)
     {
     }
     virtual ~CPVT_WordInfo()
@@ skipping 58 matching lines @@
         }
         return NULL;
     }
     void RemoveAt(int nIndex)
     {
         if (nIndex >= 0 && nIndex < CFX_ArrayTemplate<TYPE>::GetSize()) {
             CFX_ArrayTemplate<TYPE>::RemoveAt(nIndex);
         }
     }
 };
-class CLine : public CFX_Object
+class CLine 
 {
 public:
     CLine();
     virtual ~CLine();
     CPVT_WordPlace                                                      GetBeginWordPlace() const;
     CPVT_WordPlace                                                      GetEndWordPlace() const;
     CPVT_WordPlace                                                      GetPrevWordPlace(const CPVT_WordPlace & place) const;
     CPVT_WordPlace                                                      GetNextWordPlace(const CPVT_WordPlace & place) const;
     CPVT_WordPlace                                                      LinePlace;
     CPVT_LineInfo                                                       m_LineInfo;
@@ skipping 46 matching lines @@
     {
         for (FX_INT32 i = GetSize() - 1; i >= m_nTotal; i--) {
             delete GetAt(i);
             m_Lines.RemoveAt(i);
         }
     }
 private:
     CPVT_ArrayTemplate<CLine*>                          m_Lines;
     FX_INT32                                                            m_nTotal;
 };
-class CSection : public CFX_Object
+class CSection 
 {
     friend class CTypeset;
 public:
     CSection(CPDF_VariableText * pVT);
     virtual ~CSection();
     void                                                                        ResetAll();
     void                                                                        ResetLineArray();
     void                                                                        ResetWordArray();
     void                                                                        ResetLinePlace();
     CPVT_WordPlace                                                      AddWord(const CPVT_WordPlace & place, const CPVT_WordInfo & wordinfo);
@@ skipping 97 matching lines @@
     {
         CPDF_Point ptLeftTop = OutToIn(CPDF_Point(rect.left, rect.top));
         CPDF_Point ptRightBottom = OutToIn(CPDF_Point(rect.right, rect.bottom));
         return CPVT_FloatRect(ptLeftTop.x, ptLeftTop.y, ptRightBottom.x, ptRightBottom.y);
     };
 
 private:
     CPDF_Rect                                                           m_rcPlate;
     CPVT_FloatRect                                                      m_rcContent;
 };
-class CPDF_VariableText : public IPDF_VariableText, public CFX_Object, private CPDF_EditContainer
+class CPDF_VariableText : public IPDF_VariableText, private CPDF_EditContainer
 {
     friend class CTypeset;
     friend class CSection;
     friend class CPDF_VariableText_Iterator;
 public:
     CPDF_VariableText();
     virtual ~CPDF_VariableText();
     IPDF_VariableText_Provider*                         SetProvider(IPDF_VariableText_Provider * pProvider);
     IPDF_VariableText_Iterator*                         GetIterator();
     void                                                                        SetPlateRect(const CPDF_Rect & rect)
@@ skipping 192 matching lines @@
     FX_INT32                                                            m_nHorzScale;
     FX_WORD                                                                     m_wSubWord;
     FX_FLOAT                                                            m_fFontSize;
 
 private:
     FX_BOOL                                                                     m_bInitial;
     FX_BOOL                                                                     m_bRichText;
     IPDF_VariableText_Provider *                        m_pVTProvider;
     CPDF_VariableText_Iterator *                        m_pVTIterator;
 };
-class CPDF_VariableText_Iterator : public IPDF_VariableText_Iterator, public CFX_Object
+class CPDF_VariableText_Iterator : public IPDF_VariableText_Iterator
 {
 public:
     CPDF_VariableText_Iterator(CPDF_VariableText * pVT);
     virtual ~CPDF_VariableText_Iterator();
     FX_BOOL                                                                     NextWord();
     FX_BOOL                                                                     PrevWord();
     FX_BOOL                                                                     NextLine();
     FX_BOOL                                                                     PrevLine();
     FX_BOOL                                                                     NextSection();
     FX_BOOL                                                                     PrevSection();
     FX_BOOL                                                                     SetWord(const CPVT_Word & word);
     FX_BOOL                                                                     GetWord(CPVT_Word & word) const;
     FX_BOOL                                                                     GetLine(CPVT_Line & line) const;
     FX_BOOL                                                                     GetSection(CPVT_Section & section) const;
     FX_BOOL                                                                     SetSection(const CPVT_Section & section);
     void                                                                        SetAt(FX_INT32 nWordIndex);
     void                                                                        SetAt(const CPVT_WordPlace & place);
     const CPVT_WordPlace &                                      GetAt() const
     {
         return m_CurPos;
     };
 private:
     CPVT_WordPlace                                                      m_CurPos;
     CPDF_VariableText *                                         m_pVT;
 };
 
 #endif  // _PDF_VT_H_