From 2e8cc01dd9e416c17a90a8d484d882d1c257c081 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 12 Dec 2017 20:13:38 +0000 Subject: Move Script_Som_{Fill|Font}Color to CJX_Object The CJX_Node isn't the root of the CJX hierarchy. This causes issues now that CJX_Object has child objects which don't inherit from CJX_Node. This CL moves Script_Som_{Fill|Font}Color from CJX_Node to CJX_Object. Change-Id: I681d2c09a7560eb96967bbbbcb050246f4b879c0 Reviewed-on: https://pdfium-review.googlesource.com/20991 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- xfa/fxfa/parser/xfa_basic_data_element_script.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa') diff --git a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp index 071612ee34..88fdfdca1a 100644 --- a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp +++ b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp @@ -1044,7 +1044,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Rotate, XFA_ScriptType::Basic}, {0x3b1ddd06, L"fillColor", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_FillColor, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_FillColor, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x54c399e3, L"formattedValue", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_FormattedValue, @@ -1302,7 +1302,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Access, XFA_ScriptType::Basic}, {0x3b1ddd06, L"fillColor", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_FillColor, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_FillColor, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x570ce835, L"presence", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -1532,7 +1532,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Access, XFA_ScriptType::Basic}, {0x3b1ddd06, L"fillColor", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_FillColor, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_FillColor, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x570ce835, L"presence", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, -- cgit v1.2.3