diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-12-12 20:14:29 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-12-12 20:14:29 +0000 |
| commit | 92ee1ccdfbe28b6f7c3b92b35c8ffa0b90bff54b (patch) | |
| tree | 94df5e9725b26681939801026caaa1f05be39dfa /xfa/fxfa/parser/xfa_basic_data_element_script.cpp | |
| parent | 2e8cc01dd9e416c17a90a8d484d882d1c257c081 (diff) | |
| download | pdfium-92ee1ccdfbe28b6f7c3b92b35c8ffa0b90bff54b.tar.xz | |
Move Script_Som_*Message 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_*Message from CJX_Node to CJX_Object.
Change-Id: I04b7e03aa78d14d7d5dba1926a808cef852d5218
Reviewed-on: https://pdfium-review.googlesource.com/20992
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/xfa_basic_data_element_script.cpp')
| -rw-r--r-- | xfa/fxfa/parser/xfa_basic_data_element_script.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp index 88fdfdca1a..40ccae11c4 100644 --- a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp +++ b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp @@ -1062,7 +1062,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_ParentSubform, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x79b67434, L"mandatoryMessage", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_MandatoryMessage, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_MandatoryMessage, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x7a7cc341, L"vAlign", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -1086,7 +1086,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Relevant, XFA_ScriptType::Basic}, {0x964fb42e, L"formatMessage", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_FormatMessage, + (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, @@ -1113,7 +1113,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::AccessKey, XFA_ScriptType::Basic}, {0xcabfa3d0, L"validationMessage", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_ValidationMessage, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_ValidationMessage, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xdcecd663, L"editValue", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_EditValue, @@ -1311,7 +1311,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_BorderColor, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x79b67434, L"mandatoryMessage", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_MandatoryMessage, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_MandatoryMessage, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x7a7cc341, L"vAlign", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -1359,7 +1359,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::AccessKey, XFA_ScriptType::Basic}, {0xcabfa3d0, L"validationMessage", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_ValidationMessage, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_ValidationMessage, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xf65e34be, L"borderWidth", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_BorderWidth, @@ -1580,7 +1580,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::AnchorType, XFA_ScriptType::Basic}, {0xcabfa3d0, L"validationMessage", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_ValidationMessage, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_ValidationMessage, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xe4c3a5e5, L"restoreState", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, |