summaryrefslogtreecommitdiff
path: root/xfa/fxfa
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-12-12 18:54:48 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-12-12 18:54:48 +0000
commitebcbb85ea364605baf8e382ad66793bf1b4db029 (patch)
tree2c546368c63f65d7786a1ab9c818cb07b80d599c /xfa/fxfa
parent4b004930490e416a2a404deee5de4b97e649a1c1 (diff)
downloadpdfium-ebcbb85ea364605baf8e382ad66793bf1b4db029.tar.xz
Move Script_Som_Border{Width|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_Border{Width|Color} from CJX_Node to CJX_Object. Change-Id: I07ba9ef2af675993c9f4d14cb74f48252a907569 Reviewed-on: https://pdfium-review.googlesource.com/20990 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.cpp12
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 e9814d8af0..071612ee34 100644
--- a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp
+++ b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp
@@ -1053,7 +1053,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = {
(XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String,
XFA_Attribute::Presence, XFA_ScriptType::Basic},
{0x5a3b375d, L"borderColor",
- (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_BorderColor,
+ (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,
@@ -1122,7 +1122,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = {
(XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_SelectedIndex,
XFA_Attribute::Unknown, XFA_ScriptType::Basic},
{0xf65e34be, L"borderWidth",
- (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_BorderWidth,
+ (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_BorderWidth,
XFA_Attribute::Unknown, XFA_ScriptType::Basic},
{0x31b19c1, L"name",
(XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String,
@@ -1308,7 +1308,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = {
(XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String,
XFA_Attribute::Presence, XFA_ScriptType::Basic},
{0x5a3b375d, L"borderColor",
- (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_BorderColor,
+ (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,
@@ -1362,7 +1362,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = {
(XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_ValidationMessage,
XFA_Attribute::Unknown, XFA_ScriptType::Basic},
{0xf65e34be, L"borderWidth",
- (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_BorderWidth,
+ (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_BorderWidth,
XFA_Attribute::Unknown, XFA_ScriptType::Basic},
{0xc0811ed, L"use",
(XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String,
@@ -1538,7 +1538,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = {
(XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String,
XFA_Attribute::Presence, XFA_ScriptType::Basic},
{0x5a3b375d, L"borderColor",
- (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_BorderColor,
+ (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_BorderColor,
XFA_Attribute::Unknown, XFA_ScriptType::Basic},
{0x7a7cc341, L"vAlign",
(XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String,
@@ -1589,7 +1589,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = {
(XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String,
XFA_Attribute::Scope, XFA_ScriptType::Basic},
{0xf65e34be, L"borderWidth",
- (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_BorderWidth,
+ (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_BorderWidth,
XFA_Attribute::Unknown, XFA_ScriptType::Basic},
{0xc0811ed, L"use",
(XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String,