From 937a11304dbf7abd97b76da8154e2b3bf5141aeb Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 23 Jun 2016 07:52:01 -0700 Subject: Remove CXFA_OrdinaryObject class The CXFA_OrdinaryObject class no longer has any functionality but is just wraps CXFA_Object and sets the object type for the sub classes. This Cl removes the class and has the subclass set the object type themselves. This CL also renames the OrdinaryObject type to just Object. Review-Url: https://codereview.chromium.org/2082343003 --- xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp') diff --git a/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp index 128f5e1d47..81c7335e30 100644 --- a/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp +++ b/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp @@ -24,8 +24,9 @@ #include "xfa/fxfa/parser/xfa_utils.h" CScript_LayoutPseudoModel::CScript_LayoutPseudoModel(CXFA_Document* pDocument) - : CXFA_OrdinaryObject(pDocument, XFA_Element::LayoutPseudoModel) { -} + : CXFA_Object(pDocument, + XFA_ObjectType::Object, + XFA_Element::LayoutPseudoModel) {} CScript_LayoutPseudoModel::~CScript_LayoutPseudoModel() {} void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_Ready( CFXJSE_Value* pValue, -- cgit v1.2.3