Merge to XFA: Kill CFX_Object.

Not just a simple merge, but changes to remove CFX_Object from XFA.

Original Review URL: https://codereview.chromium.org/1088733002
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1087053002

7 files changed, 24 insertions, 24 deletions

diff --git a/xfa/src/fee/include/ifde_txtedtengine.h b/xfa/src/fee/include/ifde_txtedtengine.h
index a47739c3c5..5c16696845 100644
--- a/xfa/src/fee/include/ifde_txtedtengine.h
+++ b/xfa/src/fee/include/ifde_txtedtengine.h
@@ -79,7 +79,7 @@ enum FDE_TXTEDIT_LINEEND {
     FDE_TXTEDIT_LINEEND_CR,

     FDE_TXTEDIT_LINEEND_LF,

 };

-struct _FDE_TXTEDTPARAMS : public CFX_Object {

+struct _FDE_TXTEDTPARAMS {

     _FDE_TXTEDTPARAMS()

         : fPlateWidth(0)

         , fPlateHeight(0)

@@ -129,7 +129,7 @@ enum FDE_TXTEDT_TEXTCHANGE_TYPE {
     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;

diff --git a/xfa/src/fee/src/fee/fde_txtedtblock.h b/xfa/src/fee/src/fee/fde_txtedtblock.h
index 12aee74d39..9ae19ed61f 100644
--- a/xfa/src/fee/src/fee/fde_txtedtblock.h
+++ b/xfa/src/fee/src/fee/fde_txtedtblock.h
@@ -39,7 +39,7 @@ enum FDE_FORMAT_CARET_DIRECTION {
     FDE_FORMAT_CARET_MIDDLE,

     FDE_FORMAT_CARET_BACKWARD

 };

-class CFDE_TxtEdtBlock : public CFX_Object

+class CFDE_TxtEdtBlock

 {

 public:

     CFDE_TxtEdtBlock(CFDE_TxtEdtEngine * pEngine, const CFX_WideString &wsBlock, FX_INT32 nPosition);

@@ -72,7 +72,7 @@ private:
     CFX_ArrayTemplate<CFDE_TxtEdtField*> m_FieldArr;

     CFX_ArrayTemplate<CFDE_TxtEdtField*> m_EditFieldArr;

 };

-class CFDE_TxtEdtFieldFormatParser : public CFX_Object

+class CFDE_TxtEdtFieldFormatParser

 {

 public:

     CFDE_TxtEdtFieldFormatParser();

@@ -81,7 +81,7 @@ public:
     FX_INT32	CountItems() const;

     void		GetItem(FX_INT32 nIndex, CFX_WideString &wsKey, CFX_WideString &wsValue) const;

 private:

-    typedef struct : public CFX_Object {

+    typedef struct {

         FX_INT32 nKeyStart;

         FX_INT32 nKeyCount;

         FX_INT32 nValStart;

@@ -91,7 +91,7 @@ private:
     CFX_WideString m_wsFormat;

     CFX_ArrayTemplate<FDE_LPTXTEDTFORMATITEM> m_ItemArr;

 };

-class CFDE_TxtEdtField : public CFX_Object

+class CFDE_TxtEdtField

 {

 public:

     static CFDE_TxtEdtField * Create(const CFX_WideString &wsField, FX_INT32 nIndex, CFDE_TxtEdtBlock * pBlock);

diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.h b/xfa/src/fee/src/fee/fde_txtedtbuf.h
index 5baeacd2f6..7a9100c833 100644
--- a/xfa/src/fee/src/fee/fde_txtedtbuf.h
+++ b/xfa/src/fee/src/fee/fde_txtedtbuf.h
@@ -9,7 +9,7 @@
 class IFX_CharIter;

 class CFDE_TxtEdtBufIter;

 class CFDE_TxtEdtBuf;

-class CFDE_TxtEdtBufIter : public IFX_CharIter, public CFX_Object

+class CFDE_TxtEdtBufIter : public IFX_CharIter

 {

 public:

 #ifdef FDE_USEFORMATBLOCK

@@ -39,16 +39,16 @@ private:
 #endif

     FX_WCHAR		m_Alias;

 };

-class CFDE_TxtEdtBuf : public IFDE_TxtEdtBuf, public CFX_Object

+class CFDE_TxtEdtBuf : public IFDE_TxtEdtBuf

 {

     friend class CFDE_TxtEdtBufIter;

-    struct _FDE_CHUNKHEADER : public CFX_Object {

+    struct _FDE_CHUNKHEADER {

         FX_INT32	nUsed;

         FX_WCHAR	wChars[1];

     };

     typedef _FDE_CHUNKHEADER	FDE_CHUNKHEADER;

     typedef _FDE_CHUNKHEADER*	FDE_LPCHUNKHEADER;

-    struct _FDE_CHUNKPLACE : public CFX_Object {

+    struct _FDE_CHUNKPLACE {

         FX_INT32	nChunkIndex;

         FX_INT32	nCharIndex;

     };

diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.h b/xfa/src/fee/src/fee/fde_txtedtengine.h
index f9f7a6dc8e..dec152c630 100644
--- a/xfa/src/fee/src/fee/fde_txtedtengine.h
+++ b/xfa/src/fee/src/fee/fde_txtedtengine.h
@@ -35,7 +35,7 @@ public:
     virtual FX_BOOL Undo() = 0;

     virtual void	Serialize(CFX_ByteString &bsDoRecord) const = 0;

 };

-class CFDE_TxtEdtEngine : public IFDE_TxtEdtEngine, public CFX_Object

+class CFDE_TxtEdtEngine : public IFDE_TxtEdtEngine

 {

     friend class CFDE_TxtEdtDoRecord_Insert;

     friend class CFDE_TxtEdtDoRecord_DeleteRange;

@@ -46,13 +46,13 @@ class CFDE_TxtEdtEngine : public IFDE_TxtEdtEngine, public CFX_Object
     friend class CFDE_TxtEdtDoRecord_FormatReplace;

     friend class CFDE_TxtEdtBlock;

 #endif

-    struct _FDE_TXTEDTSELRANGE : public CFX_Object {

+    struct _FDE_TXTEDTSELRANGE {

         FX_INT32 nStart;

         FX_INT32 nCount;

     };

     typedef _FDE_TXTEDTSELRANGE		FDE_TXTEDTSELRANGE;

     typedef _FDE_TXTEDTSELRANGE *	FDE_LPTXTEDTSELRANGE;

-    struct _FDE_TXTEDTPARAGPOS : public CFX_Object {

+    struct _FDE_TXTEDTPARAGPOS {

         FX_INT32	nParagIndex;

         FX_INT32	nCharIndex;

     };

@@ -197,7 +197,7 @@ private:
 

     FDE_TXTEDT_TEXTCHANGE_INFO m_ChangeInfo;

 };

-class CFDE_TxtEdtDoRecord_Insert : public IFDE_TxtEdtDoRecord, public CFX_Object

+class CFDE_TxtEdtDoRecord_Insert : public IFDE_TxtEdtDoRecord

 {

 public:

     CFDE_TxtEdtDoRecord_Insert(FX_BSTR bsDoRecord);

@@ -217,7 +217,7 @@ private:
     FX_INT32			m_nCaret;

     CFX_WideString		m_wsInsert;

 };

-class CFDE_TxtEdtDoRecord_DeleteRange : public IFDE_TxtEdtDoRecord, public CFX_Object

+class CFDE_TxtEdtDoRecord_DeleteRange : public IFDE_TxtEdtDoRecord

 {

 public:

     CFDE_TxtEdtDoRecord_DeleteRange(FX_BSTR bsDoRecord);

@@ -241,7 +241,7 @@ private:
     CFX_WideString		m_wsRange;

 };

 #ifdef FDE_USEFORMATBLOCK

-class CFDE_TxtEdtDoRecord_FieldInsert : public IFDE_TxtEdtDoRecord, public CFX_Object

+class CFDE_TxtEdtDoRecord_FieldInsert : public IFDE_TxtEdtDoRecord

 {

 public:

     CFDE_TxtEdtDoRecord_FieldInsert(FX_BSTR bsDoRecord);

@@ -273,7 +273,7 @@ private:
     CFX_WideString		m_wsIns;

     FX_BOOL				m_bSel;

 };

-class CFDE_TxtEdtDoRecord_FieldDelete : public IFDE_TxtEdtDoRecord, public CFX_Object

+class CFDE_TxtEdtDoRecord_FieldDelete : public IFDE_TxtEdtDoRecord

 {

 public:

     CFDE_TxtEdtDoRecord_FieldDelete(FX_BSTR bsDoRecord);

@@ -304,7 +304,7 @@ private:
     CFX_WideString		m_wsDel;

     FX_BOOL				m_bSel;

 };

-class CFDE_TxtEdtDoRecord_FieldReplace : public IFDE_TxtEdtDoRecord, public CFX_Object

+class CFDE_TxtEdtDoRecord_FieldReplace : public IFDE_TxtEdtDoRecord

 {

 public:

     CFDE_TxtEdtDoRecord_FieldReplace(FX_BSTR bsDoRecord);

diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.h b/xfa/src/fee/src/fee/fde_txtedtpage.h
index 36021b66aa..7c0d0d1ae0 100644
--- a/xfa/src/fee/src/fee/fde_txtedtpage.h
+++ b/xfa/src/fee/src/fee/fde_txtedtpage.h
@@ -43,7 +43,7 @@ static FDE_TXTEDT_CHARTYPE FDE_GetEditSelCharType(FX_WCHAR wChar)
         return FDE_TXTEDT_CHARTYPE_Char;

     }

 }

-typedef struct _FDE_TXTEDTPIECE : public CFX_Object {

+typedef struct _FDE_TXTEDTPIECE {

     FX_INT32	nStart;

     FX_INT32	nCount;

     FX_INT32	nBidiLevel;

@@ -51,7 +51,7 @@ typedef struct _FDE_TXTEDTPIECE : public CFX_Object {
     FX_DWORD	dwCharStyles;

 } FDE_TEXTEDITPIECE, * FDE_LPTEXTEDITPIECE;

 typedef CFX_MassArrayTemplate<FDE_TEXTEDITPIECE> CFDE_TXTEDTPieceMassArray;

-class CFDE_TxtEdtTextSet : public IFDE_TextSet, public CFX_Object

+class CFDE_TxtEdtTextSet : public IFDE_TextSet

 {

 public:

     CFDE_TxtEdtTextSet(CFDE_TxtEdtPage * pPage);

@@ -73,7 +73,7 @@ private:
 

     CFDE_TxtEdtPage * m_pPage;

 };

-class CFDE_TxtEdtPage : public CFX_Object, public IFDE_TxtEdtPage

+class CFDE_TxtEdtPage : public IFDE_TxtEdtPage

 {

 public:

     CFDE_TxtEdtPage(IFDE_TxtEdtEngine * pEngine, FX_INT32 nLineIndex);

diff --git a/xfa/src/fee/src/fee/fde_txtedtparag.h b/xfa/src/fee/src/fee/fde_txtedtparag.h
index 72584feca8..276654e2fa 100644
--- a/xfa/src/fee/src/fee/fde_txtedtparag.h
+++ b/xfa/src/fee/src/fee/fde_txtedtparag.h
@@ -8,7 +8,7 @@
 #define _FDE_TXTEDTPARAG_H

 class CFDE_TxtEdtEngine;

 class CFDE_TxtEdtParag;

-class CFDE_TxtEdtParag : public IFDE_TxtEdtParag, public CFX_Object

+class CFDE_TxtEdtParag : public IFDE_TxtEdtParag

 {

 public:

     CFDE_TxtEdtParag(CFDE_TxtEdtEngine * pEngine);

diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h
index 91895a54d7..d897fc5867 100644
--- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h
+++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h
@@ -24,7 +24,7 @@ enum FX_WordBreakProp {
     FX_WordBreakProp_ExtendNumLet	,

 };

 FX_WordBreakProp FX_GetWordBreakProperty(FX_WCHAR wcCodePoint);

-class CFX_CharIter : public IFX_CharIter, public CFX_Object

+class CFX_CharIter : public IFX_CharIter

 {

 public:

     CFX_CharIter(const CFX_WideString & wsText);

@@ -41,7 +41,7 @@ private:
     const CFX_WideString &m_wsText;

     FX_INT32	m_nIndex;

 };

-class CFX_WordBreak : public IFX_WordBreak, public CFX_Object

+class CFX_WordBreak : public IFX_WordBreak

 {

 public:

     CFX_WordBreak();