From 5548984944785d80daa03d98e92698309a3bc604 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 13 Dec 2017 01:19:24 +0000 Subject: Move Script_Som_* methods 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_* from CJX_Node to CJX_Object. Change-Id: Iacb21758d9bf83f148044af225c710ad7d8521d2 Reviewed-on: https://pdfium-review.googlesource.com/20993 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- xfa/fxfa/parser/xfa_basic_data_element_script.cpp | 86 +++++++++++------------ 1 file changed, 43 insertions(+), 43 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 40ccae11c4..3e22316daf 100644 --- a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp +++ b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp @@ -163,7 +163,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Use, XFA_ScriptType::Basic}, {0x1ee2d24d, L"instanceIndex", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_InstanceIndex, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_InstanceIndex, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x8c99377e, L"relation", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -232,7 +232,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Desc, XFA_ScriptType::Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue_Read, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue_Read, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xf6b47749, L"lock", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_BOOL, @@ -892,25 +892,25 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::MaxChars, XFA_ScriptType::Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Usehref, XFA_ScriptType::Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xc0811ed, L"use", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Use, XFA_ScriptType::Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Usehref, XFA_ScriptType::Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xbe52dfbf, L"desc", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -976,13 +976,13 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Use, XFA_ScriptType::Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Usehref, XFA_ScriptType::Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xc0811ed, L"use", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -1035,7 +1035,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Use, XFA_ScriptType::Basic}, {0x1abbd7e0, L"dataNode", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DataNode, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DataNode, XFA_Attribute::Unknown, XFA_ScriptType::Object}, {0x25839852, L"access", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -1056,7 +1056,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_BorderColor, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x5e936ed6, L"fontColor", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_FontColor, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_FontColor, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x6826c408, L"parentSubform", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_ParentSubform, @@ -1080,7 +1080,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::MinW, XFA_ScriptType::Basic}, {0x85fd6faf, L"mandatory", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_Mandatory, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_Mandatory, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x8e1c2921, L"relevant", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -1089,10 +1089,10 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Field_FormatMessage, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xa03cf627, L"rawValue", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xa60dd202, L"length", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_Length, @@ -1296,7 +1296,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_ExclGroup_ErrorText, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x1abbd7e0, L"dataNode", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DataNode, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DataNode, XFA_Attribute::Unknown, XFA_ScriptType::Object}, {0x25839852, L"access", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -1335,7 +1335,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_ExclGroup_Transient, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x85fd6faf, L"mandatory", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_Mandatory, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_Mandatory, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x8e1c2921, L"relevant", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -1431,7 +1431,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::TransferEncoding, XFA_ScriptType::Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue_Read, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue_Read, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -1440,7 +1440,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Aspect, XFA_ScriptType::Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue_Read, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue_Read, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xdb55fec5, L"href", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -1491,13 +1491,13 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::FracDigits, XFA_ScriptType::Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Usehref, XFA_ScriptType::Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xde7f92ba, L"leadDigits", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -1523,10 +1523,10 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::ColumnWidths, XFA_ScriptType::Basic}, {0x1abbd7e0, L"dataNode", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DataNode, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DataNode, XFA_Attribute::Unknown, XFA_ScriptType::Object}, {0x1ee2d24d, L"instanceIndex", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_InstanceIndex, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_InstanceIndex, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x25839852, L"access", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -1713,13 +1713,13 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Use, XFA_ScriptType::Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Usehref, XFA_ScriptType::Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xc0811ed, L"use", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -1758,7 +1758,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Use, XFA_ScriptType::Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -1767,7 +1767,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Desc, XFA_ScriptType::Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xf6b47749, L"lock", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_BOOL, @@ -1929,13 +1929,13 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Use, XFA_ScriptType::Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Usehref, XFA_ScriptType::Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xc0811ed, L"use", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -2079,7 +2079,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Script_Stateless, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xadc4c77b, L"binding", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -2091,7 +2091,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Desc, XFA_ScriptType::Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xf6b47749, L"lock", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_BOOL, @@ -2175,7 +2175,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Desc, XFA_ScriptType::Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xf6b47749, L"lock", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_BOOL, @@ -2244,7 +2244,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::TransferEncoding, XFA_ScriptType::Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -2253,7 +2253,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::MaxLength, XFA_ScriptType::Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xdb55fec5, L"href", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -2283,7 +2283,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Action, XFA_ScriptType::Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -2412,10 +2412,10 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Contains, XFA_ScriptType::Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xe372ae97, L"isNull", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_BOOL, @@ -2568,13 +2568,13 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Use, XFA_ScriptType::Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Usehref, XFA_ScriptType::Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xc0811ed, L"use", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -2636,10 +2636,10 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Relevant, XFA_ScriptType::Basic}, {0xa03cf627, L"rawValue", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xac06e2b0, L"colSpan", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -2822,13 +2822,13 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Use, XFA_ScriptType::Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Usehref, XFA_ScriptType::Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xbe52dfbf, L"desc", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -3286,10 +3286,10 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_ModelClass_AliasNode, XFA_Attribute::Unknown, XFA_ScriptType::Object}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, }; const int32_t g_iSomAttributeCount = FX_ArraySize(g_SomAttributeData); -- cgit v1.2.3