Merge to XFA: Kill CFX_Object.

xfa/src/fxfa/src/app/xfa_ffdocview.h

Index: xfa/src/fxfa/src/app/xfa_ffdocview.h
diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.h b/xfa/src/fxfa/src/app/xfa_ffdocview.h
index 1e734990321a7ec5d13215653c0767dcd9b9a03f..2f7919bded9084fe425a702dd4777a21fe8c5c30 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);