diff options
| -rw-r--r-- | fxjs/xfa/cjx_node.cpp | 10 | ||||
| -rw-r--r-- | fxjs/xfa/cjx_node.h | 3 | ||||
| -rw-r--r-- | fxjs/xfa/cjx_object.cpp | 10 | ||||
| -rw-r--r-- | fxjs/xfa/cjx_object.h | 3 | ||||
| -rw-r--r-- | xfa/fxfa/parser/xfa_basic_data_element_script.cpp | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/fxjs/xfa/cjx_node.cpp b/fxjs/xfa/cjx_node.cpp index d342604c11..8234fa6be7 100644 --- a/fxjs/xfa/cjx_node.cpp +++ b/fxjs/xfa/cjx_node.cpp @@ -595,16 +595,6 @@ void CJX_Node::Script_ModelClass_AliasNode(CFXJSE_Value* pValue, bool bSetting, XFA_Attribute eAttribute) {} -void CJX_Node::Script_Attribute_Integer(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute) { - if (bSetting) { - SetInteger(eAttribute, pValue->ToInteger(), true); - return; - } - pValue->SetInteger(GetInteger(eAttribute)); -} - void CJX_Node::Script_Delta_CurrentValue(CFXJSE_Value* pValue, bool bSetting, XFA_Attribute eAttribute) {} diff --git a/fxjs/xfa/cjx_node.h b/fxjs/xfa/cjx_node.h index 0b2a0b6f20..2cf41a0735 100644 --- a/fxjs/xfa/cjx_node.h +++ b/fxjs/xfa/cjx_node.h @@ -108,9 +108,6 @@ class CJX_Node : public CJX_Tree { void Script_Delta_Target(CFXJSE_Value* pValue, bool bSetting, XFA_Attribute eAttribute); - void Script_Attribute_Integer(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute); void Script_Som_ValidationMessage(CFXJSE_Value* pValue, bool bSetting, XFA_Attribute eAttribute); diff --git a/fxjs/xfa/cjx_object.cpp b/fxjs/xfa/cjx_object.cpp index 10c6078f17..4ba1d39394 100644 --- a/fxjs/xfa/cjx_object.cpp +++ b/fxjs/xfa/cjx_object.cpp @@ -883,3 +883,13 @@ void CJX_Object::Script_Attribute_BOOL(CFXJSE_Value* pValue, } pValue->SetString(GetBoolean(eAttribute) ? "1" : "0"); } + +void CJX_Object::Script_Attribute_Integer(CFXJSE_Value* pValue, + bool bSetting, + XFA_Attribute eAttribute) { + if (bSetting) { + SetInteger(eAttribute, pValue->ToInteger(), true); + return; + } + pValue->SetInteger(GetInteger(eAttribute)); +} diff --git a/fxjs/xfa/cjx_object.h b/fxjs/xfa/cjx_object.h index c16424fa3c..c191dcfd43 100644 --- a/fxjs/xfa/cjx_object.h +++ b/fxjs/xfa/cjx_object.h @@ -81,6 +81,9 @@ class CJX_Object { void Script_Attribute_BOOL(CFXJSE_Value* pValue, bool bSetting, XFA_Attribute eAttribute); + void Script_Attribute_Integer(CFXJSE_Value* pValue, + bool bSetting, + XFA_Attribute eAttribute); pdfium::Optional<int32_t> TryInteger(XFA_Attribute eAttr, bool bUseDefault); bool SetInteger(XFA_Attribute eAttr, int32_t iValue, bool bNotify); 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, |