Merge to XFA: Kill CFX_Object.

xfa/src/fee/include/ifde_txtedtengine.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 _IFDE_TXTEDTENGINE_H
 #define _IFDE_TXTEDTENGINE_H
 class IFDE_TxtEdtBuf;
 class IFDE_TxtEdtPage;
@@ skipping 61 matching lines @@
     FDE_TXTEDT_MODIFY_RET_S_Part                = 2,
     FDE_TXTEDT_MODIFY_RET_S_Empty               = 3,
     FDE_TXTEDT_MODIFY_RET_T_Tab                 = 4,
 };
 enum FDE_TXTEDIT_LINEEND {
     FDE_TXTEDIT_LINEEND_Auto,
     FDE_TXTEDIT_LINEEND_CRLF,
     FDE_TXTEDIT_LINEEND_CR,
     FDE_TXTEDIT_LINEEND_LF,
 };
-struct _FDE_TXTEDTPARAMS : public CFX_Object {
+struct _FDE_TXTEDTPARAMS {
     _FDE_TXTEDTPARAMS()
         : fPlateWidth(0)
         , fPlateHeight(0)
         , nLineCount(0)
         , dwLayoutStyles(0)
         , dwAlignment(0)
         , dwMode(0)
         , pFont(NULL)
         , fFontSize(10.0f)
         , dwFontColor(0xff000000)
@@ skipping 29 matching lines @@
     FX_FLOAT    fCharSpace;
     IFDE_TxtEdtEventSink * pEventSink;
 };
 typedef _FDE_TXTEDTPARAMS       FDE_TXTEDTPARAMS;
 typedef _FDE_TXTEDTPARAMS*      FDE_LPTXTEDTPARAMS;
 enum FDE_TXTEDT_TEXTCHANGE_TYPE {
     FDE_TXTEDT_TEXTCHANGE_TYPE_Insert   = 0     ,
     FDE_TXTEDT_TEXTCHANGE_TYPE_Delete           ,
     FDE_TXTEDT_TEXTCHANGE_TYPE_Replace          ,
 };
-struct _FDE_TXTEDT_TEXTCHANGE_INFO : public CFX_Object {
+struct _FDE_TXTEDT_TEXTCHANGE_INFO {
     FX_INT32            nChangeType;
     CFX_WideString      wsInsert;
     CFX_WideString      wsDelete;
     CFX_WideString  wsPrevText;
 };
 typedef _FDE_TXTEDT_TEXTCHANGE_INFO             FDE_TXTEDT_TEXTCHANGE_INFO;
 typedef _FDE_TXTEDT_TEXTCHANGE_INFO*    FDE_LPTXTEDT_TEXTCHANGE_INFO;
 class IFDE_TxtEdtEventSink
 {
 public:
@@ skipping 81 matching lines @@
 };
 class IFDE_TxtEdtParag
 {
 public:
     virtual FX_INT32                    GetTextLength() const = 0;
     virtual     FX_INT32                        GetStartIndex() const = 0;
     virtual FX_INT32                    CountLines() const = 0;
     virtual void                                GetLineRange(FX_INT32 nLineIndex, FX_INT32& nStart, FX_INT32& nCount) const = 0;
 };
 #endif