Merge to XFA: Kill CFX_Object.

core/include/fpdfdoc/fpdf_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 _FPDF_VT_H_
 #define _FPDF_VT_H_
 
 #include "../fpdfapi/fpdf_parser.h"
@@ skipping 146 matching lines @@
             CPVT_WordPlace place = EndPos;
             EndPos = BeginPos;
             BeginPos = place;
         }
     }
 
     CPVT_WordPlace BeginPos;
 
     CPVT_WordPlace EndPos;
 };
-struct CPVT_SecProps : public CFX_Object {
+struct CPVT_SecProps  {
 
     CPVT_SecProps() : fLineLeading(0.0f), fLineIndent(0.0f), nAlignment(0)
     {
     }
 
     CPVT_SecProps(FX_FLOAT lineLeading, FX_FLOAT lineIndent, FX_INT32 alignment) :
         fLineLeading(lineLeading), fLineIndent(lineIndent), nAlignment(alignment)
     {
     }
 
     CPVT_SecProps(const CPVT_SecProps & other) :
         fLineLeading(other.fLineLeading), fLineIndent(other.fLineIndent), nAlignment(other.nAlignment)
     {
     }
 
     FX_FLOAT                    fLineLeading;
 
     FX_FLOAT                    fLineIndent;
 
     FX_INT32                    nAlignment;
 };
-struct CPVT_WordProps : public CFX_Object {
+struct CPVT_WordProps  {
 
     CPVT_WordProps() : nFontIndex(-1), fFontSize(0.0f), dwWordColor(0), nScriptType(0), nWordStyle(0),
         fCharSpace(0.0f), nHorzScale(0)
     {
     }
 
     CPVT_WordProps(FX_INT32     fontIndex, FX_FLOAT fontSize, FX_COLORREF wordColor = 0, FX_INT32 scriptType = 0, FX_INT32 wordStyle = 0,
                    FX_FLOAT charSpace = 0, FX_INT32 horzScale = 100) :
         nFontIndex(fontIndex), fFontSize(fontSize), dwWordColor(wordColor), nScriptType(scriptType),
         nWordStyle(wordStyle), fCharSpace(charSpace), nHorzScale(horzScale)
@@ skipping 242 matching lines @@
     virtual CPVT_WordPlace                                      AjustLineHeader(const CPVT_WordPlace & place, FX_BOOL bPrevOrNext) const = 0;
 
     virtual FX_INT32                                            WordPlaceToWordIndex(const CPVT_WordPlace & place) const = 0;
 
     virtual CPVT_WordPlace                                      WordIndexToWordPlace(FX_INT32 index) const = 0;
 
 protected:
     ~IPDF_VariableText() { }
 };
 #endif