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

41 files changed, 67 insertions, 67 deletions

diff --git a/xfa/src/fxfa/src/app/xfa_checksum.h b/xfa/src/fxfa/src/app/xfa_checksum.h
index 5e2eca72f0..dc080096bd 100644
--- a/xfa/src/fxfa/src/app/xfa_checksum.h
+++ b/xfa/src/fxfa/src/app/xfa_checksum.h
@@ -8,7 +8,7 @@
 #define _FXFA_FORMFILLER_CHECKSUM_IMP_H

 class CXFA_SAXReaderHandler;

 class CXFA_ChecksumContext;

-class CXFA_SAXContext : public CFX_Object

+class CXFA_SAXContext

 {

 public:

     CXFA_SAXContext() : m_eNode(FX_SAXNODE_Unknown)

@@ -18,7 +18,7 @@ public:
     CFX_ByteString		m_bsTagName;

     FX_SAXNODE			m_eNode;

 };

-class CXFA_SAXReaderHandler : public IFX_SAXReaderHandler, public CFX_Object

+class CXFA_SAXReaderHandler : public IFX_SAXReaderHandler

 {

 public:

     CXFA_SAXReaderHandler(CXFA_ChecksumContext *pContext);

@@ -36,7 +36,7 @@ protected:
     CXFA_ChecksumContext	*m_pContext;

     CXFA_SAXContext			m_SAXContext;

 };

-class CXFA_ChecksumContext : public IXFA_ChecksumContext, public CFX_Object

+class CXFA_ChecksumContext : public IXFA_ChecksumContext

 {

 public:

     CXFA_ChecksumContext();

diff --git a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.h b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.h
index 9cd7fc345a..73237b9f01 100644
--- a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.h
+++ b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.h
@@ -6,7 +6,7 @@
 

 #ifndef _FXFA_FORMFILLERCONFIGACC_IMP_H

 #define _FXFA_FORMFILLERCONFIGACC_IMP_H

-class CXFA_FFConfigAcc : public CFX_Object

+class CXFA_FFConfigAcc

 {

 public:

     CXFA_FFConfigAcc(CXFA_Node *pNode);

diff --git a/xfa/src/fxfa/src/app/xfa_ffapp.h b/xfa/src/fxfa/src/app/xfa_ffapp.h
index 8df5fcde65..82d0b95e02 100644
--- a/xfa/src/fxfa/src/app/xfa_ffapp.h
+++ b/xfa/src/fxfa/src/app/xfa_ffapp.h
@@ -6,7 +6,7 @@
 

 #ifndef _FXFA_FORMFILLER_APP_IMP_H

 #define _FXFA_FORMFILLER_APP_IMP_H

-class CXFA_FileRead : public IFX_FileRead, public CFX_Object

+class CXFA_FileRead : public IFX_FileRead

 {

 public:

     CXFA_FileRead(const CFX_ArrayTemplate<CPDF_Stream*> &streams);

@@ -22,7 +22,7 @@ protected:
     CFX_DWordArray							m_StreamSize;

     FX_DWORD								m_dwSize;

 };

-class CXFA_FileRead2 : public IFX_FileRead, public CFX_Object

+class CXFA_FileRead2 : public IFX_FileRead

 {

 public:

     CXFA_FileRead2(const CFX_ArrayTemplate<CPDF_Stream*> &streams);

@@ -43,7 +43,7 @@ class CXFA_FWLTheme;
 class CXFA_FFDocHandler;

 class CXFA_FFMenuHandler;

 class CXFA_FontMgr;

-class CXFA_FFApp : public IXFA_App, public IFWL_AdapterNative, public CFX_Object

+class CXFA_FFApp : public IXFA_App, public IFWL_AdapterNative

 {

 public:

     CXFA_FFApp(IXFA_AppProvider* pProvider);

diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.h b/xfa/src/fxfa/src/app/xfa_ffdoc.h
index c11c675ea6..0f95d0b2ff 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdoc.h
+++ b/xfa/src/fxfa/src/app/xfa_ffdoc.h
@@ -15,7 +15,7 @@ typedef struct _FX_IMAGEDIB_AND_DPI {
     FX_INT32	   iImageXDpi;

     FX_INT32	   iImageYDpi;

 } FX_IMAGEDIB_AND_DPI;

-class CXFA_FFDoc : public CFX_Object

+class CXFA_FFDoc

 {

 public:

     CXFA_FFDoc(CXFA_FFApp* pApp, IXFA_DocProvider* pDocProvider);

diff --git a/xfa/src/fxfa/src/app/xfa_ffdochandler.h b/xfa/src/fxfa/src/app/xfa_ffdochandler.h
index c4c0853f12..27b5b920be 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdochandler.h
+++ b/xfa/src/fxfa/src/app/xfa_ffdochandler.h
@@ -6,7 +6,7 @@
 

 #ifndef _FXFA_FORMFILLER_DOCHANDLER_IMP_H

 #define _FXFA_FORMFILLER_DOCHANDLER_IMP_H

-class CXFA_FFDocHandler : public IXFA_DocHandler, public CFX_Object

+class CXFA_FFDocHandler : public IXFA_DocHandler

 {

 public:

     CXFA_FFDocHandler();

diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.h b/xfa/src/fxfa/src/app/xfa_ffdocview.h
index 1e73499032..2f7919bded 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdocview.h
+++ b/xfa/src/fxfa/src/app/xfa_ffdocview.h
@@ -28,7 +28,7 @@ enum XFA_DOCVIEW_LAYOUTSTATUS {
     XFA_DOCVIEW_LAYOUTSTATUS_End,

     XFA_DOCVIEW_LAYOUTSTATUS_Next,

 };

-class CXFA_FFDocView : public IXFA_DocView, public CFX_Object

+class CXFA_FFDocView : public IXFA_DocView

 {

 public:

     CXFA_FFDocView(CXFA_FFDoc* pDoc);

@@ -116,7 +116,7 @@ protected:
     FX_INT32							m_iLock;

     friend class CXFA_FFNotify;

 };

-class CXFA_FFDocWidgetIterator : public IXFA_WidgetIterator, public CFX_Object

+class CXFA_FFDocWidgetIterator : public IXFA_WidgetIterator

 {

 public:

     CXFA_FFDocWidgetIterator(CXFA_FFDocView* pDocView, CXFA_Node* pTravelRoot);

@@ -139,7 +139,7 @@ protected:
     CXFA_FFDocView*				m_pDocView;

     CXFA_FFWidget*				m_pCurWidget;

 };

-class CXFA_WidgetAccIterator : public IXFA_WidgetAccIterator, public CFX_Object

+class CXFA_WidgetAccIterator : public IXFA_WidgetAccIterator

 {

 public:

     CXFA_WidgetAccIterator(CXFA_FFDocView* pDocView, CXFA_Node* pTravelRoot);

diff --git a/xfa/src/fxfa/src/app/xfa_ffnotify.h b/xfa/src/fxfa/src/app/xfa_ffnotify.h
index dd2b80ed29..a0f0820cbb 100644
--- a/xfa/src/fxfa/src/app/xfa_ffnotify.h
+++ b/xfa/src/fxfa/src/app/xfa_ffnotify.h
@@ -6,7 +6,7 @@
 

 #ifndef _FXFA_FFNOTIFY_H_

 #define _FXFA_FFNOTIFY_H_

-class CXFA_FFNotify : public IXFA_Notify, public CFX_Object

+class CXFA_FFNotify : public IXFA_Notify

 {

 public:

     CXFA_FFNotify(CXFA_FFDoc* pDoc);

diff --git a/xfa/src/fxfa/src/app/xfa_ffpageview.h b/xfa/src/fxfa/src/app/xfa_ffpageview.h
index 3ebe1b9d31..019c324174 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpageview.h
+++ b/xfa/src/fxfa/src/app/xfa_ffpageview.h
@@ -33,7 +33,7 @@ protected:
     FX_BOOL					m_bLoaded;

 };

 typedef		CXFA_NodeIteratorTemplate<CXFA_LayoutItem, CXFA_TraverseStrategy_LayoutItem> CXFA_LayoutItemIterator;

-class CXFA_FFPageWidgetIterator : public IXFA_WidgetIterator, public CFX_Object

+class CXFA_FFPageWidgetIterator : public IXFA_WidgetIterator

 {

 public:

     CXFA_FFPageWidgetIterator(CXFA_FFPageView* pPageView, FX_DWORD dwFilter);

@@ -59,7 +59,7 @@ protected:
     CXFA_LayoutItemIterator		m_sIterator;

 };

 typedef 	CFX_ArrayTemplate<CXFA_FFWidget*> CXFA_WidgetArray;

-class CXFA_TabParam : public CFX_Object

+class CXFA_TabParam

 {

 public:

     CXFA_TabParam() : m_pWidget(NULL) {}

@@ -68,7 +68,7 @@ public:
     CXFA_FFWidget*		m_pWidget;

     CXFA_WidgetArray		m_Children;

 };

-class CXFA_FFTabOrderPageWidgetIterator : public IXFA_WidgetIterator, public CFX_Object

+class CXFA_FFTabOrderPageWidgetIterator : public IXFA_WidgetIterator

 {

 public:

     CXFA_FFTabOrderPageWidgetIterator(CXFA_FFPageView* pPageView, FX_DWORD dwFilter);

diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.h b/xfa/src/fxfa/src/app/xfa_ffwidget.h
index bfac36e398..2e757238e6 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidget.h
+++ b/xfa/src/fxfa/src/app/xfa_ffwidget.h
@@ -23,7 +23,7 @@ enum XFA_WIDGETITEM {
     XFA_WIDGETITEM_NextSibling,

     XFA_WIDGETITEM_PrevSibling,

 };

-class CXFA_CalcData : public CFX_Object

+class CXFA_CalcData

 {

 public:

     CXFA_CalcData() : m_iRefCount(0) {}

diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp
index df9ad9f466..d51b1faabf 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp
@@ -25,7 +25,7 @@ static void XFA_FFDeleteCalcData(FX_LPVOID pData)
     }

 }

 static XFA_MAPDATABLOCKCALLBACKINFO gs_XFADeleteCalcData = {XFA_FFDeleteCalcData, NULL};

-class CXFA_WidgetLayoutData : public CFX_Object

+class CXFA_WidgetLayoutData

 {

 public:

     CXFA_WidgetLayoutData()

diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h
index 38f9678140..6c6ccea8cb 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h
+++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h
@@ -14,7 +14,7 @@ enum XFA_TEXTPROVIDERTYPE {
     XFA_TEXTPROVIDERTYPE_Rollover,

     XFA_TEXTPROVIDERTYPE_Down,

 };

-class CXFA_TextProvider : public IXFA_TextProvider, public CFX_Object

+class CXFA_TextProvider : public IXFA_TextProvider

 {

 public:

     CXFA_TextProvider(CXFA_WidgetAcc *pWidgetAcc, XFA_TEXTPROVIDERTYPE eType, CXFA_Node* pTextNode = NULL)

diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h
index 1d58790a02..286770a0ad 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h
+++ b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h
@@ -7,7 +7,7 @@
 #ifndef _FXFA_FORMFILLER_ANNOTHANDLER_IMP_H

 #define _FXFA_FORMFILLER_ANNOTHANDLER_IMP_H

 class CXFA_FFDocView;

-class CXFA_FFWidgetHandler : public IXFA_WidgetHandler, public CFX_Object

+class CXFA_FFWidgetHandler : public IXFA_WidgetHandler

 {

 public:

     CXFA_FFWidgetHandler(CXFA_FFDocView* pDocView);

@@ -77,7 +77,7 @@ protected:
 

     CXFA_FFDocView*		m_pDocView;

 };

-class CXFA_FFMenuHandler : public IXFA_MenuHandler, public CFX_Object

+class CXFA_FFMenuHandler : public IXFA_MenuHandler

 {

 public:

     CXFA_FFMenuHandler();

diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.h b/xfa/src/fxfa/src/app/xfa_fontmgr.h
index b5781c4954..09e0d19096 100644
--- a/xfa/src/fxfa/src/app/xfa_fontmgr.h
+++ b/xfa/src/fxfa/src/app/xfa_fontmgr.h
@@ -13,7 +13,7 @@ struct XFA_FONTINFO {
     FX_WORD		dwStyles;

     FX_WORD		wCodePage;

 };

-class CXFA_DefFontMgr : public IXFA_FontMgr, public CFX_Object

+class CXFA_DefFontMgr : public IXFA_FontMgr

 {

 public:

     CXFA_DefFontMgr() {}

@@ -27,7 +27,7 @@ public:
 protected:

     CFX_PtrArray			m_CacheFonts;

 };

-class CXFA_PDFFontMgr : public IFX_FontProvider, public CFX_Object

+class CXFA_PDFFontMgr : public IFX_FontProvider

 {

 public:

     CXFA_PDFFontMgr(CXFA_FFDoc* pDoc);

@@ -42,7 +42,7 @@ protected:
     CXFA_FFDoc*								m_pDoc;

     CFX_CMapByteStringToPtr					m_FontArray;

 };

-class CXFA_FontMgr : public CFX_Object

+class CXFA_FontMgr

 {

 public:

     CXFA_FontMgr();

diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.h b/xfa/src/fxfa/src/app/xfa_fwltheme.h
index beb5e6abf6..34003b4eb1 100644
--- a/xfa/src/fxfa/src/app/xfa_fwltheme.h
+++ b/xfa/src/fxfa/src/app/xfa_fwltheme.h
@@ -6,7 +6,7 @@
 

 #ifndef _XFA_FWL_THEME_IMP_H

 #define _XFA_FWL_THEME_IMP_H

-class CXFA_FWLTheme : public IFWL_ThemeProvider, public CFX_Object

+class CXFA_FWLTheme : public IFWL_ThemeProvider

 {

 public:

     CXFA_FWLTheme(CXFA_FFApp *pApp);

diff --git a/xfa/src/fxfa/src/app/xfa_rendercontext.h b/xfa/src/fxfa/src/app/xfa_rendercontext.h
index f50adddec1..974f0a3492 100644
--- a/xfa/src/fxfa/src/app/xfa_rendercontext.h
+++ b/xfa/src/fxfa/src/app/xfa_rendercontext.h
@@ -6,7 +6,7 @@
 

 #ifndef	_FXFA_FORMFILLER_RENDERCONTEXT_IMP_H

 #define _FXFA_FORMFILLER_RENDERCONTEXT_IMP_H

-class CXFA_RenderContext : public IXFA_RenderContext, public CFX_Object

+class CXFA_RenderContext : public IXFA_RenderContext

 {

 public:

     CXFA_RenderContext();

diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.h b/xfa/src/fxfa/src/app/xfa_textlayout.h
index 47b37720ed..a47189cb3f 100644
--- a/xfa/src/fxfa/src/app/xfa_textlayout.h
+++ b/xfa/src/fxfa/src/app/xfa_textlayout.h
@@ -18,7 +18,7 @@ public:
     virtual	CXFA_FFDoc*			GetDocNode() = 0;

     virtual FX_BOOL				GetEmbbedObj(FX_BOOL bURI, FX_BOOL bRaw, const CFX_WideString &wsAttr, CFX_WideString &wsValue) = 0;

 };

-class CXFA_CSSTagProvider : public IFDE_CSSTagProvider, public CFX_Object

+class CXFA_CSSTagProvider : public IFDE_CSSTagProvider

 {

 public:

     CXFA_CSSTagProvider ()

@@ -79,7 +79,7 @@ protected:
     FX_DWORD				m_dwMatchedDecls : 28;

     FDE_CSSDISPLAY			m_eDisplay		 : 4;

 };

-class CXFA_TextParser : public CFX_Object

+class CXFA_TextParser

 {

 public:

     CXFA_TextParser() : m_pAllocator(NULL), m_pSelector(NULL), m_pUASheet(NULL) {}

@@ -120,7 +120,7 @@ private:
     IFDE_CSSStyleSheet		*m_pUASheet;

     CFX_MapPtrTemplate<IFDE_XMLNode*, CXFA_TextParseContext*>	m_mapXMLNodeToParseContext;

 };

-class CXFA_LoaderContext : public CFX_Object

+class CXFA_LoaderContext

 {

 public:

     CXFA_LoaderContext() : m_bSaveLineHeight(FALSE)

@@ -278,7 +278,7 @@ struct XFA_TABSTOPS {
     FX_DWORD dwAlign;

     FX_FLOAT fTabstops;

 };

-class CXFA_TextTabstopsContext : public CFX_Object

+class CXFA_TextTabstopsContext

 {

 public:

     CXFA_TextTabstopsContext() : m_iTabCount(0), m_iTabIndex(-1), m_bTabstops(FALSE), m_fTabWidth(0), m_fLeft(0) {}

@@ -317,7 +317,7 @@ public:
     FX_FLOAT		m_fTabWidth;

     FX_FLOAT		m_fLeft;

 };

-class CXFA_TextLayout : public CFX_Object

+class CXFA_TextLayout

 {

 public:

     CXFA_TextLayout(IXFA_TextProvider *pTextProvider);

diff --git a/xfa/src/fxfa/src/common/fxfa_localevalue.h b/xfa/src/fxfa/src/common/fxfa_localevalue.h
index 7e4ceed134..b6a3db5096 100644
--- a/xfa/src/fxfa/src/common/fxfa_localevalue.h
+++ b/xfa/src/fxfa/src/common/fxfa_localevalue.h
@@ -18,7 +18,7 @@ class CXFA_LocaleMgr;
 #define XFA_VT_DATE					32

 #define XFA_VT_TIME					64

 #define XFA_VT_DATETIME				128

-class CXFA_LocaleValue : public CFX_Object

+class CXFA_LocaleValue

 {

 public:

     CXFA_LocaleValue();

diff --git a/xfa/src/fxfa/src/common/xfa_doclayout.h b/xfa/src/fxfa/src/common/xfa_doclayout.h
index 3d6df9f199..d5aaaa9cf8 100644
--- a/xfa/src/fxfa/src/common/xfa_doclayout.h
+++ b/xfa/src/fxfa/src/common/xfa_doclayout.h
@@ -23,7 +23,7 @@ public:
     CXFA_LayoutItem*	GetNext() const;

     CXFA_LayoutItem*	GetLast() const;

 };

-class CXFA_LayoutItemImpl : public CFX_Object

+class CXFA_LayoutItemImpl

 {

 public:

     CXFA_LayoutItemImpl(CXFA_Node *pNode, FX_BOOL bIsContentLayoutItem);

diff --git a/xfa/src/fxfa/src/common/xfa_document.h b/xfa/src/fxfa/src/common/xfa_document.h
index 502aa2591a..e935940c37 100644
--- a/xfa/src/fxfa/src/common/xfa_document.h
+++ b/xfa/src/fxfa/src/common/xfa_document.h
@@ -106,7 +106,7 @@ class CScript_HostPseudoModel;
 class CScript_LogPseudoModel;

 class CScript_LayoutPseudoModel;

 class CScript_SignaturePseudoModel;

-class CXFA_Document : public IXFA_ObjFactory, public CFX_Object

+class CXFA_Document : public IXFA_ObjFactory

 {

 public:

     CXFA_Document(IXFA_DocParser *pParser);

diff --git a/xfa/src/fxfa/src/common/xfa_localemgr.h b/xfa/src/fxfa/src/common/xfa_localemgr.h
index f425a903fc..ff3ab3927f 100644
--- a/xfa/src/fxfa/src/common/xfa_localemgr.h
+++ b/xfa/src/fxfa/src/common/xfa_localemgr.h
@@ -25,7 +25,7 @@ class CXFA_LocaleMgr;
 #define XFA_LANGID_pt_BR	0x0416

 #define XFA_LANGID_nl_NL	0x0413

 #define XFA_LANGID_ru_RU	0x0419

-class CXFA_LocaleMgr : public IFX_LocaleMgr, public CFX_Object

+class CXFA_LocaleMgr : public IFX_LocaleMgr

 {

 public:

     CXFA_LocaleMgr(CXFA_Node* pLocaleSet, CFX_WideString wsDeflcid);

@@ -56,7 +56,7 @@ public:
 

     virtual void		GetTimeZone(FX_TIMEZONE& tz) = 0;

 };

-class CXFA_TimeZoneProvider : public IXFA_TimeZoneProvider, public CFX_Object

+class CXFA_TimeZoneProvider : public IXFA_TimeZoneProvider

 {

 public:

     CXFA_TimeZoneProvider();

diff --git a/xfa/src/fxfa/src/common/xfa_object.h b/xfa/src/fxfa/src/common/xfa_object.h
index c285b9d902..d2b0f1df96 100644
--- a/xfa/src/fxfa/src/common/xfa_object.h
+++ b/xfa/src/fxfa/src/common/xfa_object.h
@@ -38,7 +38,7 @@ enum XFA_OBJECTTYPE {
     XFA_NODEFLAG_UnusedNode       = 0x08000,

     XFA_NODEFLAG_LayoutGeneratedNode = 0x10000,

 };

-class CXFA_Object : public CFX_Object

+class CXFA_Object

 {

 public:

     CXFA_Object(CXFA_Document* pDocument, FX_DWORD uFlags);

@@ -109,7 +109,7 @@ typedef struct _XFA_MAPDATABLOCKCALLBACKINFO {
     PD_CALLBACK_FREEDATA		pFree;

     PD_CALLBACK_DUPLICATEDATA	pCopy;

 } XFA_MAPDATABLOCKCALLBACKINFO;

-typedef struct _XFA_MAPDATABLOCK : public CFX_Object {

+typedef struct _XFA_MAPDATABLOCK {

     FX_LPBYTE				GetData() const

     {

         return (FX_LPBYTE)this + sizeof(_XFA_MAPDATABLOCK);

@@ -117,7 +117,7 @@ typedef struct _XFA_MAPDATABLOCK : public CFX_Object {
     XFA_MAPDATABLOCKCALLBACKINFO*	pCallbackInfo;

     FX_INT32						iBytes;

 } XFA_MAPDATABLOCK, * XFA_LPMAPDATABLOCK;

-typedef struct _XFA_MAPMODULEDATA : public CFX_Object {

+typedef struct _XFA_MAPMODULEDATA {

     CFX_MapPtrToPtr			m_ValueMap;

     CFX_MapPtrTemplate<FX_LPVOID, XFA_LPMAPDATABLOCK> m_BufferMap;

 } XFA_MAPMODULEDATA, * XFA_LPMAPMODULEDATA;

diff --git a/xfa/src/fxfa/src/common/xfa_script.h b/xfa/src/fxfa/src/common/xfa_script.h
index eb3b8472d4..a61dc959b3 100644
--- a/xfa/src/fxfa/src/common/xfa_script.h
+++ b/xfa/src/fxfa/src/common/xfa_script.h
@@ -48,7 +48,7 @@ public:
     }

     FXJSE_HRUNTIME		m_hRunTime;

 };

-typedef struct _XFA_RESOLVENODE_RS : public CFX_Object {

+typedef struct _XFA_RESOLVENODE_RS {

     _XFA_RESOLVENODE_RS() : dwFlags(XFA_RESOVENODE_RSTYPE_Nodes), pScriptAttribute(NULL) { }

     ~_XFA_RESOLVENODE_RS()

     {

diff --git a/xfa/src/fxfa/src/common/xfa_utils.h b/xfa/src/fxfa/src/common/xfa_utils.h
index df51ff6baa..c6f0c4773b 100644
--- a/xfa/src/fxfa/src/common/xfa_utils.h
+++ b/xfa/src/fxfa/src/common/xfa_utils.h
@@ -8,7 +8,7 @@
 #define _XFA_UTILS_H_

 FX_BOOL XFA_FDEExtension_ResolveNamespaceQualifier(IFDE_XMLElement* pNode, FX_WSTR wsQualifier, CFX_WideString& wsNamespaceURI);

 template <class NodeType, class TraverseStrategy>

-class CXFA_NodeIteratorTemplate : public CFX_Object

+class CXFA_NodeIteratorTemplate

 {

 public:

     CXFA_NodeIteratorTemplate(NodeType* pRootNode = NULL)

diff --git a/xfa/src/fxfa/src/fm2js/xfa_error.h b/xfa/src/fxfa/src/fm2js/xfa_error.h
index 8ec0250b22..84f3917c94 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_error.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_error.h
@@ -17,7 +17,7 @@ enum XFA_FM_ERRMSG {
     FMERR_EXPTECTED_OPERATOR,

     FMERR_MAXIMUM

 };

-class CXFA_FMErrorInfo : public CFX_Object

+class CXFA_FMErrorInfo

 {

 public:

     CXFA_FMErrorInfo() : linenum(0) {};

diff --git a/xfa/src/fxfa/src/fm2js/xfa_expression.h b/xfa/src/fxfa/src/fm2js/xfa_expression.h
index ffd7cf2442..6a51925527 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_expression.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_expression.h
@@ -16,7 +16,7 @@ enum XFA_FM_EXPTYPE {
     XFA_FM_EXPTYPE_BREAK,

     XFA_FM_EXPTYPE_CONTINUE,

 };

-class CXFA_FMExpression : public CFX_Object

+class CXFA_FMExpression

 {

 public:

     CXFA_FMExpression(FX_DWORD line);

diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h
index 95451bbd7b..466050d662 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h
@@ -6,7 +6,7 @@
 

 #ifndef _XFA_FM2JS_CONTEXT_H

 #define _XFA_FM2JS_CONTEXT_H

-class CXFA_FM2JSContext : public CFX_Object

+class CXFA_FM2JSContext

 {

 public:

     static void Abs		(FXJSE_HOBJECT hThis,	FX_BSTR szFuncName, CFXJSE_Arguments &args);

diff --git a/xfa/src/fxfa/src/fm2js/xfa_fmparse.h b/xfa/src/fxfa/src/fm2js/xfa_fmparse.h
index 06df65135f..d3adca7075 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_fmparse.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_fmparse.h
@@ -6,7 +6,7 @@
 

 #ifndef _XFA_FM_PARSE_H

 #define _XFA_FM_PARSE_H

-class CXFA_FMParse : public CFX_Object

+class CXFA_FMParse

 {

 public:

     CXFA_FMParse();

diff --git a/xfa/src/fxfa/src/fm2js/xfa_lexer.h b/xfa/src/fxfa/src/fm2js/xfa_lexer.h
index b073ceb047..3047a5028d 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_lexer.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_lexer.h
@@ -27,7 +27,7 @@ struct XFA_FMKeyword {
     FX_LPCWSTR		m_keword;

 };

 FX_LPCWSTR XFA_FM_KeywordToString(XFA_FM_TOKEN op);

-class CXFA_FMToken : public CFX_Object

+class CXFA_FMToken

 {

 public:

     CXFA_FMToken();

@@ -38,7 +38,7 @@ public:
     FX_DWORD		m_uLinenum;

     CXFA_FMToken*	m_pNext;

 };

-class CXFA_FMLexer : public CFX_Object

+class CXFA_FMLexer

 {

 public:

     CXFA_FMLexer(FX_WSTR wsFormcalc, CXFA_FMErrorInfo *pErrorInfo);

diff --git a/xfa/src/fxfa/src/fm2js/xfa_program.h b/xfa/src/fxfa/src/fm2js/xfa_program.h
index a90af5e32f..157d1e1faa 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_program.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_program.h
@@ -6,7 +6,7 @@
 

 #ifndef _XFA_FM_PROGRAM_H

 #define _XFA_FM_PROGRAM_H

-class CXFA_FMProgram : public CFX_Object

+class CXFA_FMProgram

 {

 public:

     CXFA_FMProgram();

diff --git a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h
index 2a6245d348..b492b80e04 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h
@@ -49,7 +49,7 @@ enum XFA_FM_AccessorIndex {
     ACCESSOR_POSITIVE_INDEX,

     ACCESSOR_NEGATIVE_INDEX

 };

-class CXFA_FMSimpleExpression : public CFX_Object

+class CXFA_FMSimpleExpression

 {

 public:

     CXFA_FMSimpleExpression(FX_DWORD line, XFA_FM_TOKEN op);

diff --git a/xfa/src/fxfa/src/parser/xfa_basic_imp.h b/xfa/src/fxfa/src/parser/xfa_basic_imp.h
index 7fced07a05..71bcbb6167 100644
--- a/xfa/src/fxfa/src/parser/xfa_basic_imp.h
+++ b/xfa/src/fxfa/src/parser/xfa_basic_imp.h
@@ -14,7 +14,7 @@ typedef struct _XFA_NOTSUREATTRIBUTE {
 } XFA_NOTSUREATTRIBUTE, * XFA_LPNOTSUREATTRIBUTE;

 typedef XFA_NOTSUREATTRIBUTE const * XFA_LPCNOTSUREATTRIBUTE;

 XFA_LPCNOTSUREATTRIBUTE XFA_GetNotsureAttribute(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, XFA_ATTRIBUTETYPE eType = XFA_ATTRIBUTETYPE_NOTSURE);

-class CXFA_WideTextRead : public IFX_Stream, public CFX_Object

+class CXFA_WideTextRead : public IFX_Stream

 {

 public:

     CXFA_WideTextRead(const CFX_WideString &wsBuffer);

diff --git a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h
index 178268caf9..b1c9e0bc14 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h
+++ b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h
@@ -10,7 +10,7 @@ class CXFA_ItemLayoutProcessor;
 class CXFA_LayoutPageMgr;

 class CXFA_LayoutAppAdapter;

 class CXFA_ContainerLayoutItemImpl;

-class CXFA_LayoutProcessor : public IXFA_DocLayout, public CFX_Object

+class CXFA_LayoutProcessor : public IXFA_DocLayout

 {

 public:

     CXFA_LayoutProcessor(CXFA_Document* pDocument);

diff --git a/xfa/src/fxfa/src/parser/xfa_document_serialize.h b/xfa/src/fxfa/src/parser/xfa_document_serialize.h
index 1caf96a76c..b4548de07c 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_serialize.h
+++ b/xfa/src/fxfa/src/parser/xfa_document_serialize.h
@@ -6,7 +6,7 @@
 

 #ifndef _XFA_DOCUMENT_SERIALIZE_H_

 #define _XFA_DOCUMENT_SERIALIZE_H_

-class CXFA_DataImporter : public IXFA_PacketImport, public CFX_Object

+class CXFA_DataImporter : public IXFA_PacketImport

 {

 public:

     CXFA_DataImporter(CXFA_Document *pDocument);

@@ -18,7 +18,7 @@ public:
 protected:

     CXFA_Document				*m_pDocument;

 };

-class CXFA_DataExporter : public IXFA_PacketExport, public CFX_Object

+class CXFA_DataExporter : public IXFA_PacketExport

 {

 public:

     CXFA_DataExporter(CXFA_Document *pDocument);

diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h
index 7844fb556f..eaa1a9b15c 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h
+++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h
@@ -30,7 +30,7 @@ enum XFA_ItemLayoutProcessorStages {
     XFA_ItemLayoutProcessorStages_BookendTrailer,

     XFA_ItemLayoutProcessorStages_Done,

 };

-class CXFA_LayoutContext : public CFX_Object

+class CXFA_LayoutContext

 {

 public:

     CXFA_LayoutContext(): m_prgSpecifiedColumnWidths(NULL)

@@ -50,7 +50,7 @@ public:
     CXFA_ItemLayoutProcessor*		m_pOverflowProcessor;

     CXFA_Node*						m_pOverflowNode;

 };

-class CXFA_ItemLayoutProcessor : public CFX_Object

+class CXFA_ItemLayoutProcessor

 {

 public:

     CXFA_ItemLayoutProcessor(CXFA_Node *pNode, CXFA_LayoutPageMgr* pPageMgr);

diff --git a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h
index dcaf01c739..4faf9e30db 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h
+++ b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h
@@ -6,7 +6,7 @@
 

 #ifndef _XFA_LAYOUT_PAGEMGR_H_

 #define _XFA_LAYOUT_PAGEMGR_H_

-class CXFA_ContainerRecord : public CFX_Object

+class CXFA_ContainerRecord

 {

 public:

     CXFA_ContainerRecord(CXFA_ContainerLayoutItemImpl* pPageSet = NULL, CXFA_ContainerLayoutItemImpl* pPageArea = NULL, CXFA_ContainerLayoutItemImpl* pContentArea = NULL)

@@ -17,7 +17,7 @@ public:
     CXFA_ContainerLayoutItemImpl* pCurPageArea;

     CXFA_ContainerLayoutItemImpl* pCurContentArea;

 };

-class CXFA_LayoutPageMgr : public CFX_Object

+class CXFA_LayoutPageMgr

 {

 public:

     CXFA_LayoutPageMgr(CXFA_LayoutProcessor* pLayoutProcessor);

diff --git a/xfa/src/fxfa/src/parser/xfa_locale.h b/xfa/src/fxfa/src/parser/xfa_locale.h
index 3f0b13a20d..ccea088741 100644
--- a/xfa/src/fxfa/src/parser/xfa_locale.h
+++ b/xfa/src/fxfa/src/parser/xfa_locale.h
@@ -6,7 +6,7 @@
 

 #ifndef _FXFA_LOCALE_H

 #define _FXFA_LOCALE_H

-class CXFA_XMLLocale : public IFX_Locale, public CFX_Object

+class CXFA_XMLLocale : public IFX_Locale

 {

 public:

     CXFA_XMLLocale(CXML_Element* pLocaleData);

@@ -32,7 +32,7 @@ protected:
 private:

     CXML_Element*	m_pLocaleData;

 };

-class CXFA_NodeLocale : public IFX_Locale, public CFX_Object

+class CXFA_NodeLocale : public IFX_Locale

 {

 public:

     CXFA_NodeLocale(CXFA_Node* pLocale);

diff --git a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp
index 789cd10a87..cdbe2ad85b 100644
--- a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp
@@ -2714,7 +2714,7 @@ static void XFA_ScriptInstanceManager_ReorderDataNodes_SortNodeArrayByDocumentId
         }

     }

 }

-struct CXFA_DualNodeArray : CFX_Object {

+struct CXFA_DualNodeArray {

     CXFA_NodeSet firstNodeList;

     CXFA_NodeSet secondNodeList;

 };

diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.h b/xfa/src/fxfa/src/parser/xfa_parser_imp.h
index 41b1462b94..626141a02c 100644
--- a/xfa/src/fxfa/src/parser/xfa_parser_imp.h
+++ b/xfa/src/fxfa/src/parser/xfa_parser_imp.h
@@ -8,7 +8,7 @@
 #define _XFA_PARSER_IMP

 #define _XFA_VERIFY_Checksum_

 class CXFA_XMLParser;

-class CXFA_SimpleParser : public IXFA_Parser, public CFX_Object

+class CXFA_SimpleParser : public IXFA_Parser

 {

 public:

     CXFA_SimpleParser(IXFA_ObjFactory *pFactory, FX_BOOL bDocumentParser = FALSE);

@@ -63,7 +63,7 @@ protected:
     FX_BOOL						m_bDocumentParser;

     friend class CXFA_DocumentParser;

 };

-class CXFA_DocumentParser : public IXFA_DocParser, public CFX_Object

+class CXFA_DocumentParser : public IXFA_DocParser

 {

 public:

     CXFA_DocumentParser(IXFA_Notify *pNotify);

@@ -103,7 +103,7 @@ protected:
     CXFA_Document*				m_pDocument;

 };

 typedef CFX_StackTemplate<IFDE_XMLNode*> CXFA_XMLNodeStack;

-class CXFA_XMLParser : public IFDE_XMLParser, public CFX_Object

+class CXFA_XMLParser : public IFDE_XMLParser

 {

 public:

     CXFA_XMLParser(IFDE_XMLNode *pRoot, IFX_Stream *pStream);

diff --git a/xfa/src/fxfa/src/parser/xfa_script_imp.h b/xfa/src/fxfa/src/parser/xfa_script_imp.h
index d8aec1a2f6..9ffb8bcda0 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_imp.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_imp.h
@@ -10,7 +10,7 @@
 #define XFA_JSBUILTIN_Initialized			0x0001

 #define XFA_JSBUILTIN_HasCount				0x0002

 class CXFA_ResolveProcessor;

-class CXFA_ScriptContext : public IXFA_ScriptContext, public CFX_Object

+class CXFA_ScriptContext : public IXFA_ScriptContext

 {

 public:

     CXFA_ScriptContext(CXFA_Document* pDocument);

diff --git a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h
index 5b3be76803..2c3faea324 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h
@@ -11,7 +11,7 @@ enum  XFA_LOGIC_TYPE {
     XFA_LOGIC_NoTransparent,

     XFA_LOGIC_Transparent,

 };

-class CXFA_NodeHelper : public CFX_Object

+class CXFA_NodeHelper

 {

 public:

     CXFA_NodeHelper(void);

diff --git a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h
index 08fe52ddca..3555b0a470 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h
@@ -8,7 +8,7 @@
 #define _XFA_RESOLVEPROCESSOR_H_

 class CXFA_NodeHelper;

 class CXFA_ScriptContext;

-class CXFA_ResolveNodesData : public CFX_Object

+class CXFA_ResolveNodesData

 {

 public:

     CXFA_ResolveNodesData(CXFA_ScriptContext *pSC = NULL)

@@ -39,7 +39,7 @@ public:
     XFA_LPCSCRIPTATTRIBUTEINFO	m_pScriptAttribute;

     XFA_RESOVENODE_RSTYPE		m_dwFlag;

 };

-class CXFA_ResolveProcessor : public CFX_Object

+class CXFA_ResolveProcessor

 {

 public:

     CXFA_ResolveProcessor(void);