Remove more ScriptAttributeString() wrappers, part 4 Change-Id: I1e5bec14241164fcb4694c3d7aec10667c4a1c68 Reviewed-on: https://pdfium-review.googlesource.com/c/46558 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/fxjs/xfa/cjx_execute.cpp b/fxjs/xfa/cjx_execute.cpp index 4b843b3..90aed53 100644 --- a/fxjs/xfa/cjx_execute.cpp +++ b/fxjs/xfa/cjx_execute.cpp
@@ -11,33 +11,3 @@ CJX_Execute::CJX_Execute(CXFA_Execute* node) : CJX_Node(node) {} CJX_Execute::~CJX_Execute() = default; - -void CJX_Execute::use(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute) { - ScriptAttributeString(pValue, bSetting, eAttribute); -} - -void CJX_Execute::connection(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute) { - ScriptAttributeString(pValue, bSetting, eAttribute); -} - -void CJX_Execute::runAt(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute) { - ScriptAttributeString(pValue, bSetting, eAttribute); -} - -void CJX_Execute::executeType(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute) { - ScriptAttributeString(pValue, bSetting, eAttribute); -} - -void CJX_Execute::usehref(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute) { - ScriptAttributeString(pValue, bSetting, eAttribute); -}
diff --git a/fxjs/xfa/cjx_execute.h b/fxjs/xfa/cjx_execute.h index 29e4480..3038a86 100644 --- a/fxjs/xfa/cjx_execute.h +++ b/fxjs/xfa/cjx_execute.h
@@ -16,12 +16,6 @@ public: explicit CJX_Execute(CXFA_Execute* node); ~CJX_Execute() override; - - JSE_PROP(connection); - JSE_PROP(executeType); - JSE_PROP(runAt); - JSE_PROP(use); - JSE_PROP(usehref); }; #endif // FXJS_XFA_CJX_EXECUTE_H_
diff --git a/fxjs/xfa/cjx_exobject.cpp b/fxjs/xfa/cjx_exobject.cpp index 47a7688..9daf72f 100644 --- a/fxjs/xfa/cjx_exobject.cpp +++ b/fxjs/xfa/cjx_exobject.cpp
@@ -11,39 +11,3 @@ CJX_ExObject::CJX_ExObject(CXFA_ExObject* node) : CJX_Node(node) {} CJX_ExObject::~CJX_ExObject() = default; - -void CJX_ExObject::use(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute) { - ScriptAttributeString(pValue, bSetting, eAttribute); -} - -void CJX_ExObject::codeType(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute) { - ScriptAttributeString(pValue, bSetting, eAttribute); -} - -void CJX_ExObject::archive(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute) { - ScriptAttributeString(pValue, bSetting, eAttribute); -} - -void CJX_ExObject::usehref(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute) { - ScriptAttributeString(pValue, bSetting, eAttribute); -} - -void CJX_ExObject::codeBase(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute) { - ScriptAttributeString(pValue, bSetting, eAttribute); -} - -void CJX_ExObject::classId(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute) { - ScriptAttributeString(pValue, bSetting, eAttribute); -}
diff --git a/fxjs/xfa/cjx_exobject.h b/fxjs/xfa/cjx_exobject.h index 2dc7e79..33b4e1c 100644 --- a/fxjs/xfa/cjx_exobject.h +++ b/fxjs/xfa/cjx_exobject.h
@@ -16,13 +16,6 @@ public: explicit CJX_ExObject(CXFA_ExObject* node); ~CJX_ExObject() override; - - JSE_PROP(archive); - JSE_PROP(classId); - JSE_PROP(codeBase); - JSE_PROP(codeType); - JSE_PROP(use); - JSE_PROP(usehref); }; #endif // FXJS_XFA_CJX_EXOBJECT_H_
diff --git a/fxjs/xfa/cjx_extras.cpp b/fxjs/xfa/cjx_extras.cpp index 227d909..e68c879 100644 --- a/fxjs/xfa/cjx_extras.cpp +++ b/fxjs/xfa/cjx_extras.cpp
@@ -12,18 +12,6 @@ CJX_Extras::~CJX_Extras() = default; -void CJX_Extras::use(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute) { - ScriptAttributeString(pValue, bSetting, eAttribute); -} - void CJX_Extras::type(CFXJSE_Value* pValue, bool bSetting, XFA_Attribute eAttribute) {} - -void CJX_Extras::usehref(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute) { - ScriptAttributeString(pValue, bSetting, eAttribute); -}
diff --git a/fxjs/xfa/cjx_extras.h b/fxjs/xfa/cjx_extras.h index b236536..fa907ea 100644 --- a/fxjs/xfa/cjx_extras.h +++ b/fxjs/xfa/cjx_extras.h
@@ -18,8 +18,6 @@ ~CJX_Extras() override; JSE_PROP(type); - JSE_PROP(use); - JSE_PROP(usehref); }; #endif // FXJS_XFA_CJX_EXTRAS_H_
diff --git a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp index b3d51d6..beaec5f 100644 --- a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp +++ b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp
@@ -2855,27 +2855,27 @@ /* execute */ {ATTR(0xc0811ed, "use", - &CJX_Execute::use, + &CJX_Object::ScriptAttributeString, XFA_Attribute::Use, XFA_ScriptType::Basic)}, {ATTR(0x47d03490, "connection", - &CJX_Execute::connection, + &CJX_Object::ScriptAttributeString, XFA_Attribute::Connection, XFA_ScriptType::Basic)}, {ATTR(0x6cfa828a, "runAt", - &CJX_Execute::runAt, + &CJX_Object::ScriptAttributeString, XFA_Attribute::RunAt, XFA_ScriptType::Basic)}, {ATTR(0xa1b0d2f5, "executeType", - &CJX_Execute::executeType, + &CJX_Object::ScriptAttributeString, XFA_Attribute::ExecuteType, XFA_ScriptType::Basic)}, {ATTR(0xbc254332, "usehref", - &CJX_Execute::usehref, + &CJX_Object::ScriptAttributeString, XFA_Attribute::Usehref, XFA_ScriptType::Basic)}, @@ -5630,32 +5630,32 @@ /* exObject */ {ATTR(0xc0811ed, "use", - &CJX_ExObject::use, + &CJX_Object::ScriptAttributeString, XFA_Attribute::Use, XFA_ScriptType::Basic)}, {ATTR(0x60a61edd, "codeType", - &CJX_ExObject::codeType, + &CJX_Object::ScriptAttributeString, XFA_Attribute::CodeType, XFA_ScriptType::Basic)}, {ATTR(0xb373a862, "archive", - &CJX_ExObject::archive, + &CJX_Object::ScriptAttributeString, XFA_Attribute::Archive, XFA_ScriptType::Basic)}, {ATTR(0xbc254332, "usehref", - &CJX_ExObject::usehref, + &CJX_Object::ScriptAttributeString, XFA_Attribute::Usehref, XFA_ScriptType::Basic)}, {ATTR(0xe1a26b56, "codeBase", - &CJX_ExObject::codeBase, + &CJX_Object::ScriptAttributeString, XFA_Attribute::CodeBase, XFA_ScriptType::Basic)}, {ATTR(0xeb091003, "classId", - &CJX_ExObject::classId, + &CJX_Object::ScriptAttributeString, XFA_Attribute::ClassId, XFA_ScriptType::Basic)}, @@ -5742,7 +5742,7 @@ /* extras */ {ATTR(0xc0811ed, "use", - &CJX_Extras::use, + &CJX_Object::ScriptAttributeString, XFA_Attribute::Use, XFA_ScriptType::Basic)}, {ATTR(0x2f16a382, @@ -5752,7 +5752,7 @@ XFA_ScriptType::Basic)}, {ATTR(0xbc254332, "usehref", - &CJX_Extras::usehref, + &CJX_Object::ScriptAttributeString, XFA_Attribute::Usehref, XFA_ScriptType::Basic)},