Merge to XFA: Kill CFX_Object.

xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h

Index: xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h
index 7844fb556f4a5ee3c4e4ddb685e6a904683c2770..eaa1a9b15cebe22339138c806a314bf200e25190 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);