From 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 14 Apr 2015 13:50:34 -0700 Subject: 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 --- xfa/include/fxfa/fxfa.h | 4 ++-- xfa/include/fxfa/fxfa_objectacc.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/include/fxfa') diff --git a/xfa/include/fxfa/fxfa.h b/xfa/include/fxfa/fxfa.h index 57ee6d82b8..ef2a1a837f 100644 --- a/xfa/include/fxfa/fxfa.h +++ b/xfa/include/fxfa/fxfa.h @@ -385,7 +385,7 @@ enum XFA_EVENTTYPE { #define XFA_VALIDATE_prePrint 2 #define XFA_VALIDATE_preExecute 3 #define XFA_VALIDATE_preSave 4 -class CXFA_EventParam : public CFX_Object +class CXFA_EventParam { public: CXFA_EventParam() @@ -492,7 +492,7 @@ public: virtual XFA_HWIDGET GetWidgetByPos(FX_FLOAT fx, FX_FLOAT fy) = 0; virtual IXFA_WidgetIterator* CreateWidgetIterator(FX_DWORD dwTraverseWay = XFA_TRAVERSEWAY_Form, FX_DWORD dwWidgetFilter = XFA_WIDGETFILTER_Visible | XFA_WIDGETFILTER_Viewable | XFA_WIDGETFILTER_AllType) = 0; }; -class CXFA_RenderOptions : public CFX_Object +class CXFA_RenderOptions { public: CXFA_RenderOptions() diff --git a/xfa/include/fxfa/fxfa_objectacc.h b/xfa/include/fxfa/fxfa_objectacc.h index 14bd1ed69d..b03ebb5a23 100644 --- a/xfa/include/fxfa/fxfa_objectacc.h +++ b/xfa/include/fxfa/fxfa_objectacc.h @@ -59,7 +59,7 @@ inline FX_BOOL XFA_IsDigit(FX_WCHAR c) } typedef CFX_ArrayTemplate CXFA_NodeArray; typedef CFX_ArrayTemplate CXFA_ObjArray; -class CXFA_Data : public CFX_Object +class CXFA_Data { public: CXFA_Data(CXFA_Node* pNode) : m_pNode(pNode) {} -- cgit v1.2.3