diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-12-12 18:39:28 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-12-12 18:39:28 +0000 |
commit | 84435fca8fb06feae5794eb9c8a1ac797708d069 (patch) | |
tree | b852aa1e771d9f82e4ff420dfa9da25fa78b6c91 /xfa/fxfa | |
parent | 97c0aed963a0ebdce39fa59502be5ae127407dd0 (diff) | |
download | pdfium-84435fca8fb06feae5794eb9c8a1ac797708d069.tar.xz |
Move Script_Attribute_Integer 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_Attribute_Integer from CJX_Node to CJX_Object.
Change-Id: Iec9d38440756827fa52561cb5938af4041738ad5
Reviewed-on: https://pdfium-review.googlesource.com/20951
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa')
-rw-r--r-- | xfa/fxfa/parser/xfa_basic_data_element_script.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp index 73ce2bf859..e9814d8af0 100644 --- a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp +++ b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp @@ -844,7 +844,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Use, XFA_ScriptType::Basic}, {0x1059ec18, L"level", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_Integer, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_Integer, XFA_Attribute::Level, XFA_ScriptType::Basic}, {0x8e1c2921, L"relevant", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -988,7 +988,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Use, XFA_ScriptType::Basic}, {0x78bff531, L"numberOfCells", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_Integer, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_Integer, XFA_Attribute::NumberOfCells, XFA_ScriptType::Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, |