Merge to XFA: Kill CFX_Object.

xfa/src/fxfa/src/app/xfa_ffwidgethandler.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 _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);
     ~CXFA_FFWidgetHandler();
     virtual XFA_HWIDGET         CreateWidget(XFA_HWIDGET hParent, XFA_WIDGETTYPE eType, XFA_HWIDGET hBefore = NULL);
     virtual IXFA_PageView*      GetPageView(XFA_HWIDGET hWidget);
     virtual void                        GetRect(XFA_HWIDGET hWidget, CFX_RectF &rt);
     virtual FX_DWORD            GetStatus(XFA_HWIDGET hWidget);
     virtual FX_BOOL                     GetBBox(XFA_HWIDGET hWidget, CFX_RectF &rtBox, FX_DWORD dwStatus, FX_BOOL bDrawFocus = FALSE);
     virtual CXFA_WidgetAcc*     GetDataAcc(XFA_HWIDGET hWidget);
@@ skipping 49 matching lines @@
     CXFA_Node*                  CreateCopyNode(XFA_ELEMENT eElement, CXFA_Node* pParent, CXFA_Node* pBefore = NULL) const;
     CXFA_Node*                  CreateTemplateNode(XFA_ELEMENT eElement, CXFA_Node* pParent, CXFA_Node* pBefore) const;
     CXFA_Node*                  CreateFontNode(CXFA_Node* pParent) const;
     CXFA_Node*                  CreateMarginNode(CXFA_Node* pParent, FX_DWORD dwFlags, FX_FLOAT fInsets[4]) const;
     CXFA_Node*                  CreateValueNode(XFA_ELEMENT eValue, CXFA_Node* pParent) const;
     IXFA_ObjFactory*    GetObjFactory() const;
     CXFA_Document*              GetXFADoc() const;
 
     CXFA_FFDocView*             m_pDocView;
 };
-class CXFA_FFMenuHandler : public IXFA_MenuHandler, public CFX_Object
+class CXFA_FFMenuHandler : public IXFA_MenuHandler
 {
 public:
     CXFA_FFMenuHandler();
     ~CXFA_FFMenuHandler();
     virtual FX_BOOL             CanCopy(XFA_HWIDGET hWidget);
     virtual FX_BOOL             CanCut(XFA_HWIDGET hWidget);
     virtual FX_BOOL             CanPaste(XFA_HWIDGET hWidget);
     virtual FX_BOOL             CanSelectAll(XFA_HWIDGET hWidget);
     virtual FX_BOOL             CanDelete(XFA_HWIDGET hWidget);
     virtual FX_BOOL             CanDeSelect(XFA_HWIDGET hWidget);
     virtual FX_BOOL             Copy(XFA_HWIDGET hWidget, CFX_WideString &wsText);
     virtual FX_BOOL             Cut(XFA_HWIDGET hWidget, CFX_WideString &wsText);
     virtual FX_BOOL             Paste(XFA_HWIDGET hWidget, const CFX_WideString &wsText);
     virtual FX_BOOL             SelectAll(XFA_HWIDGET hWidget);
     virtual FX_BOOL             Delete(XFA_HWIDGET hWidget);
     virtual FX_BOOL             DeSelect(XFA_HWIDGET hWidget);
     virtual FX_BOOL             CanUndo(XFA_HWIDGET hWidget);
     virtual FX_BOOL             CanRedo(XFA_HWIDGET hWidget);
     virtual FX_BOOL             Undo(XFA_HWIDGET hWidget);
     virtual FX_BOOL             Redo(XFA_HWIDGET hWidget);
     virtual FX_BOOL             GetSuggestWords(XFA_HWIDGET hWidget, CFX_PointF pointf, CFX_ByteStringArray &sSuggest);
     virtual FX_BOOL             ReplaceSpellCheckWord(XFA_HWIDGET hWidget, CFX_PointF pointf, FX_BSTR bsReplace);
 };
 #endif