| Index: xfa/fxfa/parser/xfa_object_imp.cpp
|
| diff --git a/xfa/fxfa/parser/xfa_object_imp.cpp b/xfa/fxfa/parser/xfa_object_imp.cpp
|
| index 6f0cff319635f75215a9b7dfda212a235ea489bb..cad02e0d85f2765fb3ca8c8b39fad8d42990e881 100644
|
| --- a/xfa/fxfa/parser/xfa_object_imp.cpp
|
| +++ b/xfa/fxfa/parser/xfa_object_imp.cpp
|
| @@ -61,10 +61,10 @@ void CXFA_Object::Script_ObjectClass_ClassName(CFXJSE_Value* pValue,
|
| pValue,
|
| FX_UTF8Encode(className.c_str(), className.GetLength()).AsStringC());
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| }
|
| }
|
| -void CXFA_Object::ThrowScriptErrorMessage(int32_t iStringID, ...) {
|
| +void CXFA_Object::Throw(int32_t iStringID, ...) {
|
| IXFA_AppProvider* pAppProvider = m_pDocument->GetNotify()->GetAppProvider();
|
| ASSERT(pAppProvider);
|
| CFX_WideString wsFormat;
|
| @@ -631,7 +631,7 @@ void CXFA_Node::SetDataDescriptionNode(CXFA_Node* pDataDescriptionNode) {
|
| void CXFA_Node::Script_TreeClass_ResolveNode(CFXJSE_Arguments* pArguments) {
|
| int32_t iLength = pArguments->GetLength();
|
| if (iLength != 1) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"resolveNode");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"resolveNode");
|
| return;
|
| }
|
| CFX_WideString wsExpression =
|
| @@ -674,8 +674,7 @@ void CXFA_Node::Script_TreeClass_ResolveNode(CFXJSE_Arguments* pArguments) {
|
| void CXFA_Node::Script_TreeClass_ResolveNodes(CFXJSE_Arguments* pArguments) {
|
| int32_t iLength = pArguments->GetLength();
|
| if (iLength != 1) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"resolveNodes");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"resolveNodes");
|
| return;
|
| }
|
| CFX_WideString wsExpression =
|
| @@ -731,7 +730,7 @@ void CXFA_Node::Script_TreeClass_All(CFXJSE_Value* pValue,
|
| FX_BOOL bSetting,
|
| XFA_ATTRIBUTE eAttribute) {
|
| if (bSetting) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| } else {
|
| uint32_t dwFlag = XFA_RESOLVENODE_Siblings | XFA_RESOLVENODE_ALL;
|
| CFX_WideString wsName;
|
| @@ -765,7 +764,7 @@ void CXFA_Node::Script_TreeClass_ClassAll(CFXJSE_Value* pValue,
|
| FX_BOOL bSetting,
|
| XFA_ATTRIBUTE eAttribute) {
|
| if (bSetting) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| } else {
|
| uint32_t dwFlag = XFA_RESOLVENODE_Siblings | XFA_RESOLVENODE_ALL;
|
| CFX_WideStringC wsName;
|
| @@ -778,7 +777,7 @@ void CXFA_Node::Script_TreeClass_Parent(CFXJSE_Value* pValue,
|
| FX_BOOL bSetting,
|
| XFA_ATTRIBUTE eAttribute) {
|
| if (bSetting) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| } else {
|
| CXFA_Node* pParent = GetNodeItem(XFA_NODEITEM_Parent);
|
| if (pParent) {
|
| @@ -793,7 +792,7 @@ void CXFA_Node::Script_TreeClass_Index(CFXJSE_Value* pValue,
|
| FX_BOOL bSetting,
|
| XFA_ATTRIBUTE eAttribute) {
|
| if (bSetting) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| } else {
|
| FXJSE_Value_SetInteger(pValue, GetNodeSameNameIndex());
|
| }
|
| @@ -802,7 +801,7 @@ void CXFA_Node::Script_TreeClass_ClassIndex(CFXJSE_Value* pValue,
|
| FX_BOOL bSetting,
|
| XFA_ATTRIBUTE eAttribute) {
|
| if (bSetting) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| } else {
|
| FXJSE_Value_SetInteger(pValue, GetNodeSameClassIndex());
|
| }
|
| @@ -811,7 +810,7 @@ void CXFA_Node::Script_TreeClass_SomExpression(CFXJSE_Value* pValue,
|
| FX_BOOL bSetting,
|
| XFA_ATTRIBUTE eAttribute) {
|
| if (bSetting) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| } else {
|
| CFX_WideString wsSOMExpression;
|
| GetSOMExpression(wsSOMExpression);
|
| @@ -822,7 +821,7 @@ void CXFA_Node::Script_TreeClass_SomExpression(CFXJSE_Value* pValue,
|
| void CXFA_Node::Script_NodeClass_ApplyXSL(CFXJSE_Arguments* pArguments) {
|
| int32_t iLength = pArguments->GetLength();
|
| if (iLength != 1) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"applyXSL");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"applyXSL");
|
| return;
|
| }
|
| CFX_WideString wsExpression =
|
| @@ -835,7 +834,7 @@ void CXFA_Node::Script_NodeClass_ApplyXSL(CFXJSE_Arguments* pArguments) {
|
| void CXFA_Node::Script_NodeClass_AssignNode(CFXJSE_Arguments* pArguments) {
|
| int32_t iLength = pArguments->GetLength();
|
| if (iLength < 1 || iLength > 3) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"assignNode");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"assignNode");
|
| return;
|
| }
|
| CFX_WideString wsExpression;
|
| @@ -861,7 +860,7 @@ void CXFA_Node::Script_NodeClass_AssignNode(CFXJSE_Arguments* pArguments) {
|
| void CXFA_Node::Script_NodeClass_Clone(CFXJSE_Arguments* pArguments) {
|
| int32_t iLength = pArguments->GetLength();
|
| if (iLength != 1) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"clone");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"clone");
|
| return;
|
| }
|
| FX_BOOL bClone = TRUE;
|
| @@ -874,8 +873,7 @@ void CXFA_Node::Script_NodeClass_Clone(CFXJSE_Arguments* pArguments) {
|
| void CXFA_Node::Script_NodeClass_GetAttribute(CFXJSE_Arguments* pArguments) {
|
| int32_t iLength = pArguments->GetLength();
|
| if (iLength != 1) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"getAttribute");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"getAttribute");
|
| return;
|
| }
|
| CFX_WideString wsExpression =
|
| @@ -890,7 +888,7 @@ void CXFA_Node::Script_NodeClass_GetAttribute(CFXJSE_Arguments* pArguments) {
|
| void CXFA_Node::Script_NodeClass_GetElement(CFXJSE_Arguments* pArguments) {
|
| int32_t iLength = pArguments->GetLength();
|
| if (iLength < 1 || iLength > 2) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"getElement");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"getElement");
|
| return;
|
| }
|
| CFX_WideString wsExpression;
|
| @@ -913,8 +911,7 @@ void CXFA_Node::Script_NodeClass_IsPropertySpecified(
|
| CFXJSE_Arguments* pArguments) {
|
| int32_t iLength = pArguments->GetLength();
|
| if (iLength < 1 || iLength > 3) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"isPropertySpecified");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"isPropertySpecified");
|
| return;
|
| }
|
| CFX_WideString wsExpression;
|
| @@ -953,7 +950,7 @@ void CXFA_Node::Script_NodeClass_IsPropertySpecified(
|
| void CXFA_Node::Script_NodeClass_LoadXML(CFXJSE_Arguments* pArguments) {
|
| int32_t iLength = pArguments->GetLength();
|
| if (iLength < 1 || iLength > 3) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"loadXML");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"loadXML");
|
| return;
|
| }
|
| CFX_WideString wsExpression;
|
| @@ -1083,13 +1080,13 @@ void CXFA_Node::Script_NodeClass_SaveFilteredXML(CFXJSE_Arguments* pArguments) {
|
| void CXFA_Node::Script_NodeClass_SaveXML(CFXJSE_Arguments* pArguments) {
|
| int32_t iLength = pArguments->GetLength();
|
| if (iLength < 0 || iLength > 1) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"saveXML");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"saveXML");
|
| return;
|
| }
|
| FX_BOOL bPrettyMode = FALSE;
|
| if (iLength == 1) {
|
| if (pArguments->GetUTF8String(0) != "pretty") {
|
| - ThrowScriptErrorMessage(XFA_IDS_ARGUMENT_MISMATCH);
|
| + Throw(XFA_IDS_ARGUMENT_MISMATCH);
|
| return;
|
| }
|
| bPrettyMode = TRUE;
|
| @@ -1135,8 +1132,7 @@ void CXFA_Node::Script_NodeClass_SaveXML(CFXJSE_Arguments* pArguments) {
|
| void CXFA_Node::Script_NodeClass_SetAttribute(CFXJSE_Arguments* pArguments) {
|
| int32_t iLength = pArguments->GetLength();
|
| if (iLength != 2) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"setAttribute");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"setAttribute");
|
| return;
|
| }
|
| CFX_WideString wsAttributeValue =
|
| @@ -1149,7 +1145,7 @@ void CXFA_Node::Script_NodeClass_SetAttribute(CFXJSE_Arguments* pArguments) {
|
| void CXFA_Node::Script_NodeClass_SetElement(CFXJSE_Arguments* pArguments) {
|
| int32_t iLength = pArguments->GetLength();
|
| if (iLength != 1 && iLength != 2) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"setElement");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"setElement");
|
| return;
|
| }
|
| CXFA_Node* pNode = nullptr;
|
| @@ -1169,7 +1165,7 @@ void CXFA_Node::Script_NodeClass_Ns(CFXJSE_Value* pValue,
|
| FX_BOOL bSetting,
|
| XFA_ATTRIBUTE eAttribute) {
|
| if (bSetting) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| } else {
|
| CFX_WideString wsNameSpace;
|
| TryNamespace(wsNameSpace);
|
| @@ -1180,7 +1176,7 @@ void CXFA_Node::Script_NodeClass_Model(CFXJSE_Value* pValue,
|
| FX_BOOL bSetting,
|
| XFA_ATTRIBUTE eAttribute) {
|
| if (bSetting) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| } else {
|
| FXJSE_Value_Set(pValue, m_pDocument->GetScriptContext()->GetJSValueFromMap(
|
| GetModelNode()));
|
| @@ -1190,7 +1186,7 @@ void CXFA_Node::Script_NodeClass_IsContainer(CFXJSE_Value* pValue,
|
| FX_BOOL bSetting,
|
| XFA_ATTRIBUTE eAttribute) {
|
| if (bSetting) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| } else {
|
| FXJSE_Value_SetBoolean(pValue, IsContainerNode());
|
| }
|
| @@ -1199,7 +1195,7 @@ void CXFA_Node::Script_NodeClass_IsNull(CFXJSE_Value* pValue,
|
| FX_BOOL bSetting,
|
| XFA_ATTRIBUTE eAttribute) {
|
| if (bSetting) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| } else {
|
| if (GetClassID() == XFA_ELEMENT_Subform) {
|
| FXJSE_Value_SetBoolean(pValue, FALSE);
|
| @@ -1213,7 +1209,7 @@ void CXFA_Node::Script_NodeClass_OneOfChild(CFXJSE_Value* pValue,
|
| FX_BOOL bSetting,
|
| XFA_ATTRIBUTE eAttribute) {
|
| if (bSetting) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| } else {
|
| CXFA_NodeArray properts;
|
| int32_t iSize = GetNodeList(properts, XFA_NODEFILTER_OneOfProperty);
|
| @@ -1238,8 +1234,7 @@ void CXFA_Node::Script_ModelClass_CreateNode(CFXJSE_Arguments* pArguments) {
|
| void CXFA_Node::Script_ModelClass_IsCompatibleNS(CFXJSE_Arguments* pArguments) {
|
| int32_t iLength = pArguments->GetLength();
|
| if (iLength < 1) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"isCompatibleNS");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"isCompatibleNS");
|
| return;
|
| }
|
| CFX_WideString wsNameSpace;
|
| @@ -1275,7 +1270,7 @@ void CXFA_Node::Script_Attribute_IntegerRead(CFXJSE_Value* pValue,
|
| if (!bSetting) {
|
| FXJSE_Value_SetInteger(pValue, GetInteger(eAttribute));
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| }
|
| }
|
| void CXFA_Node::Script_Attribute_BOOL(CFXJSE_Value* pValue,
|
| @@ -1293,7 +1288,7 @@ void CXFA_Node::Script_Attribute_BOOLRead(CFXJSE_Value* pValue,
|
| if (!bSetting) {
|
| FXJSE_Value_SetUTF8String(pValue, GetBoolean(eAttribute) ? "1" : "0");
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| }
|
| }
|
|
|
| @@ -1527,7 +1522,7 @@ void CXFA_Node::Script_Attribute_StringRead(CFXJSE_Value* pValue,
|
| pValue,
|
| FX_UTF8Encode(wsValue.c_str(), wsValue.GetLength()).AsStringC());
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| }
|
| }
|
| void CXFA_Node::Script_WsdlConnection_Execute(CFXJSE_Arguments* pArguments) {
|
| @@ -1535,14 +1530,14 @@ void CXFA_Node::Script_WsdlConnection_Execute(CFXJSE_Arguments* pArguments) {
|
| if ((argc == 0) || (argc == 1)) {
|
| FXJSE_Value_SetBoolean(pArguments->GetReturnValue(), FALSE);
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execute");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execute");
|
| }
|
| }
|
| void CXFA_Node::Script_Delta_Restore(CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if (argc == 0) {
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"restore");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"restore");
|
| }
|
| }
|
| void CXFA_Node::Script_Delta_CurrentValue(CFXJSE_Value* pValue,
|
| @@ -1620,7 +1615,7 @@ void CXFA_Node::Script_Field_Length(CFXJSE_Value* pValue,
|
| FX_BOOL bSetting,
|
| XFA_ATTRIBUTE eAttribute) {
|
| if (bSetting) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| } else {
|
| CXFA_WidgetData* pWidgetData = GetWidgetData();
|
| if (!pWidgetData) {
|
| @@ -1699,7 +1694,7 @@ void CXFA_Node::Script_Som_DefaultValue_Read(CFXJSE_Value* pValue,
|
| FX_BOOL bSetting,
|
| XFA_ATTRIBUTE eAttribute) {
|
| if (bSetting) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| return;
|
| }
|
| CFX_WideString content = GetScriptContent(TRUE);
|
| @@ -1918,7 +1913,7 @@ void CXFA_Node::Script_Som_DataNode(CFXJSE_Value* pValue,
|
| FXJSE_Value_SetNull(pValue);
|
| }
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| }
|
| }
|
| void CXFA_Node::Script_Draw_DefaultValue(CFXJSE_Value* pValue,
|
| @@ -2123,7 +2118,7 @@ void CXFA_Node::Script_Field_ParentSubform(CFXJSE_Value* pValue,
|
| FX_BOOL bSetting,
|
| XFA_ATTRIBUTE eAttribute) {
|
| if (bSetting) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| } else {
|
| FXJSE_Value_SetNull(pValue);
|
| }
|
| @@ -2165,7 +2160,7 @@ void CXFA_Node::Script_Field_ExecEvent(CFXJSE_Arguments* pArguments) {
|
| ((iRet == XFA_EVENTERROR_Error) ? FALSE : TRUE));
|
| }
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execEvent");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execEvent");
|
| }
|
| }
|
| void CXFA_Node::Script_Field_ExecInitialize(CFXJSE_Arguments* pArguments) {
|
| @@ -2177,14 +2172,13 @@ void CXFA_Node::Script_Field_ExecInitialize(CFXJSE_Arguments* pArguments) {
|
| }
|
| pNotify->ExecEventByDeepFirst(this, XFA_EVENT_Initialize, FALSE, FALSE);
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"execInitialize");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execInitialize");
|
| }
|
| }
|
| void CXFA_Node::Script_Field_DeleteItem(CFXJSE_Arguments* pArguments) {
|
| int32_t iLength = pArguments->GetLength();
|
| if (iLength != 1) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"deleteItem");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"deleteItem");
|
| return;
|
| }
|
| CXFA_WidgetData* pWidgetData = GetWidgetData();
|
| @@ -2201,7 +2195,7 @@ void CXFA_Node::Script_Field_DeleteItem(CFXJSE_Arguments* pArguments) {
|
| void CXFA_Node::Script_Field_GetSaveItem(CFXJSE_Arguments* pArguments) {
|
| int32_t iLength = pArguments->GetLength();
|
| if (iLength != 1) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"getSaveItem");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"getSaveItem");
|
| return;
|
| }
|
| int32_t iIndex = pArguments->GetInt32(0);
|
| @@ -2227,7 +2221,7 @@ void CXFA_Node::Script_Field_GetSaveItem(CFXJSE_Arguments* pArguments) {
|
| void CXFA_Node::Script_Field_BoundItem(CFXJSE_Arguments* pArguments) {
|
| int32_t iLength = pArguments->GetLength();
|
| if (iLength != 1) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"boundItem");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"boundItem");
|
| return;
|
| }
|
| CXFA_WidgetData* pWidgetData = GetWidgetData();
|
| @@ -2246,8 +2240,7 @@ void CXFA_Node::Script_Field_BoundItem(CFXJSE_Arguments* pArguments) {
|
| void CXFA_Node::Script_Field_GetItemState(CFXJSE_Arguments* pArguments) {
|
| int32_t iLength = pArguments->GetLength();
|
| if (iLength != 1) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"getItemState");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"getItemState");
|
| return;
|
| }
|
| CXFA_WidgetData* pWidgetData = GetWidgetData();
|
| @@ -2270,16 +2263,14 @@ void CXFA_Node::Script_Field_ExecCalculate(CFXJSE_Arguments* pArguments) {
|
| }
|
| pNotify->ExecEventByDeepFirst(this, XFA_EVENT_Calculate, FALSE, FALSE);
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"execCalculate");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execCalculate");
|
| }
|
| }
|
| void CXFA_Node::Script_Field_SetItems(CFXJSE_Arguments* pArguments) {}
|
| void CXFA_Node::Script_Field_GetDisplayItem(CFXJSE_Arguments* pArguments) {
|
| int32_t iLength = pArguments->GetLength();
|
| if (iLength != 1) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"getDisplayItem");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"getDisplayItem");
|
| return;
|
| }
|
| int32_t iIndex = pArguments->GetInt32(0);
|
| @@ -2305,8 +2296,7 @@ void CXFA_Node::Script_Field_GetDisplayItem(CFXJSE_Arguments* pArguments) {
|
| void CXFA_Node::Script_Field_SetItemState(CFXJSE_Arguments* pArguments) {
|
| int32_t iLength = pArguments->GetLength();
|
| if (iLength != 2) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"setItemState");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"setItemState");
|
| return;
|
| }
|
| CXFA_WidgetData* pWidgetData = GetWidgetData();
|
| @@ -2324,7 +2314,7 @@ void CXFA_Node::Script_Field_SetItemState(CFXJSE_Arguments* pArguments) {
|
| void CXFA_Node::Script_Field_AddItem(CFXJSE_Arguments* pArguments) {
|
| int32_t iLength = pArguments->GetLength();
|
| if (iLength < 1 || iLength > 2) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"addItem");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"addItem");
|
| return;
|
| }
|
| CXFA_WidgetData* pWidgetData = GetWidgetData();
|
| @@ -2356,8 +2346,7 @@ void CXFA_Node::Script_Field_ExecValidate(CFXJSE_Arguments* pArguments) {
|
| ((iRet == XFA_EVENTERROR_Error) ? FALSE : TRUE));
|
| }
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"execValidate");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execValidate");
|
| }
|
| }
|
| void CXFA_Node::Script_ExclGroup_ErrorText(CFXJSE_Value* pValue,
|
| @@ -2365,7 +2354,7 @@ void CXFA_Node::Script_ExclGroup_ErrorText(CFXJSE_Value* pValue,
|
| XFA_ATTRIBUTE eAttribute) {
|
| if (!bSetting) {
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| }
|
| }
|
| void CXFA_Node::Script_ExclGroup_DefaultAndRawValue(CFXJSE_Value* pValue,
|
| @@ -2402,15 +2391,14 @@ void CXFA_Node::Script_ExclGroup_ExecEvent(CFXJSE_Arguments* pArguments) {
|
| CFX_WideString::FromUTF8(eventString.AsStringC()).AsStringC(),
|
| XFA_ELEMENT_ExclGroup);
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execEvent");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execEvent");
|
| }
|
| }
|
|
|
| void CXFA_Node::Script_ExclGroup_SelectedMember(CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if (argc < 0 || argc > 1) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"selectedMember");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"selectedMember");
|
| return;
|
| }
|
|
|
| @@ -2447,8 +2435,7 @@ void CXFA_Node::Script_ExclGroup_ExecInitialize(CFXJSE_Arguments* pArguments) {
|
| }
|
| pNotify->ExecEventByDeepFirst(this, XFA_EVENT_Initialize);
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"execInitialize");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execInitialize");
|
| }
|
| }
|
| void CXFA_Node::Script_ExclGroup_ExecCalculate(CFXJSE_Arguments* pArguments) {
|
| @@ -2460,8 +2447,7 @@ void CXFA_Node::Script_ExclGroup_ExecCalculate(CFXJSE_Arguments* pArguments) {
|
| }
|
| pNotify->ExecEventByDeepFirst(this, XFA_EVENT_Calculate);
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"execCalculate");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execCalculate");
|
| }
|
| }
|
| void CXFA_Node::Script_ExclGroup_ExecValidate(CFXJSE_Arguments* pArguments) {
|
| @@ -2476,8 +2462,7 @@ void CXFA_Node::Script_ExclGroup_ExecValidate(CFXJSE_Arguments* pArguments) {
|
| ((iRet == XFA_EVENTERROR_Error) ? FALSE : TRUE));
|
| }
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"execValidate");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execValidate");
|
| }
|
| }
|
| static CXFA_Node* XFA_ScriptInstanceManager_GetItem(CXFA_Node* pInstMgrNode,
|
| @@ -2574,7 +2559,7 @@ void CXFA_Node::Script_Subform_InstanceManager(CFXJSE_Value* pValue,
|
| FXJSE_Value_SetNull(pValue);
|
| }
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| }
|
| }
|
| void CXFA_Node::Script_Subform_Locale(CFXJSE_Value* pValue,
|
| @@ -2601,7 +2586,7 @@ void CXFA_Node::Script_Subform_ExecEvent(CFXJSE_Arguments* pArguments) {
|
| CFX_WideString::FromUTF8(eventString.AsStringC()).AsStringC(),
|
| XFA_ELEMENT_Subform);
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execEvent");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execEvent");
|
| }
|
| }
|
| void CXFA_Node::Script_Subform_ExecInitialize(CFXJSE_Arguments* pArguments) {
|
| @@ -2613,8 +2598,7 @@ void CXFA_Node::Script_Subform_ExecInitialize(CFXJSE_Arguments* pArguments) {
|
| }
|
| pNotify->ExecEventByDeepFirst(this, XFA_EVENT_Initialize);
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"execInitialize");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execInitialize");
|
| }
|
| }
|
| void CXFA_Node::Script_Subform_ExecCalculate(CFXJSE_Arguments* pArguments) {
|
| @@ -2626,8 +2610,7 @@ void CXFA_Node::Script_Subform_ExecCalculate(CFXJSE_Arguments* pArguments) {
|
| }
|
| pNotify->ExecEventByDeepFirst(this, XFA_EVENT_Calculate);
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"execCalculate");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execCalculate");
|
| }
|
| }
|
| void CXFA_Node::Script_Subform_ExecValidate(CFXJSE_Arguments* pArguments) {
|
| @@ -2642,16 +2625,14 @@ void CXFA_Node::Script_Subform_ExecValidate(CFXJSE_Arguments* pArguments) {
|
| ((iRet == XFA_EVENTERROR_Error) ? FALSE : TRUE));
|
| }
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"execValidate");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execValidate");
|
| }
|
| }
|
| void CXFA_Node::Script_Subform_GetInvalidObjects(CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if (argc == 0) {
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"getInvalidObjects");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"getInvalidObjects");
|
| }
|
| }
|
| int32_t CXFA_Node::Subform_and_SubformSet_InstanceIndex() {
|
| @@ -2672,7 +2653,7 @@ void CXFA_Node::Script_Template_FormNodes(CFXJSE_Arguments* pArguments) {
|
| if (argc == 1) {
|
| FXJSE_Value_SetBoolean(pArguments->GetReturnValue(), TRUE);
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"formNodes");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"formNodes");
|
| }
|
| }
|
| void CXFA_Node::Script_Template_Remerge(CFXJSE_Arguments* pArguments) {
|
| @@ -2680,7 +2661,7 @@ void CXFA_Node::Script_Template_Remerge(CFXJSE_Arguments* pArguments) {
|
| if (argc == 0) {
|
| m_pDocument->DoDataRemerge(TRUE);
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"remerge");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"remerge");
|
| }
|
| }
|
| void CXFA_Node::Script_Template_ExecInitialize(CFXJSE_Arguments* pArguments) {
|
| @@ -2693,8 +2674,7 @@ void CXFA_Node::Script_Template_ExecInitialize(CFXJSE_Arguments* pArguments) {
|
| FXJSE_Value_SetBoolean(pArguments->GetReturnValue(), TRUE);
|
| }
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"execInitialize");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execInitialize");
|
| }
|
| }
|
| void CXFA_Node::Script_Template_CreateNode(CFXJSE_Arguments* pArguments) {
|
| @@ -2730,8 +2710,7 @@ void CXFA_Node::Script_Template_CreateNode(CFXJSE_Arguments* pArguments) {
|
| pArguments->GetReturnValue(),
|
| m_pDocument->GetScriptContext()->GetJSValueFromMap(pNewNode));
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_NOT_HAVE_PROPERTY, strTagName.c_str(),
|
| - L"name");
|
| + Throw(XFA_IDS_NOT_HAVE_PROPERTY, strTagName.c_str(), L"name");
|
| }
|
| } else {
|
| FXJSE_Value_Set(
|
| @@ -2740,14 +2719,14 @@ void CXFA_Node::Script_Template_CreateNode(CFXJSE_Arguments* pArguments) {
|
| }
|
| }
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"createNode");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"createNode");
|
| }
|
| }
|
| void CXFA_Node::Script_Template_Recalculate(CFXJSE_Arguments* pArguments) {
|
| if (pArguments->GetLength() == 1) {
|
| FXJSE_Value_SetBoolean(pArguments->GetReturnValue(), TRUE);
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"recalculate");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"recalculate");
|
| }
|
| }
|
| void CXFA_Node::Script_Template_ExecCalculate(CFXJSE_Arguments* pArguments) {
|
| @@ -2760,8 +2739,7 @@ void CXFA_Node::Script_Template_ExecCalculate(CFXJSE_Arguments* pArguments) {
|
| FXJSE_Value_SetBoolean(pArguments->GetReturnValue(), TRUE);
|
| }
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"execCalculate");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execCalculate");
|
| }
|
| }
|
| void CXFA_Node::Script_Template_ExecValidate(CFXJSE_Arguments* pArguments) {
|
| @@ -2774,8 +2752,7 @@ void CXFA_Node::Script_Template_ExecValidate(CFXJSE_Arguments* pArguments) {
|
| FXJSE_Value_SetBoolean(pArguments->GetReturnValue(), TRUE);
|
| }
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"execValidate");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execValidate");
|
| }
|
| }
|
| void CXFA_Node::Script_Manifest_Evaluate(CFXJSE_Arguments* pArguments) {
|
| @@ -2788,14 +2765,14 @@ void CXFA_Node::Script_Manifest_Evaluate(CFXJSE_Arguments* pArguments) {
|
| FXJSE_Value_SetBoolean(pArguments->GetReturnValue(), TRUE);
|
| }
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"evaluate");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"evaluate");
|
| }
|
| }
|
| void CXFA_Node::Script_InstanceManager_Max(CFXJSE_Value* pValue,
|
| FX_BOOL bSetting,
|
| XFA_ATTRIBUTE eAttribute) {
|
| if (bSetting) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| return;
|
| }
|
| CXFA_Occur nodeOccur(GetOccurNode());
|
| @@ -2805,7 +2782,7 @@ void CXFA_Node::Script_InstanceManager_Min(CFXJSE_Value* pValue,
|
| FX_BOOL bSetting,
|
| XFA_ATTRIBUTE eAttribute) {
|
| if (bSetting) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| return;
|
| }
|
| CXFA_Occur nodeOccur(GetOccurNode());
|
| @@ -3127,13 +3104,13 @@ void CXFA_Node::Script_InstanceManager_RemoveInstance(
|
| int32_t iIndex = pArguments->GetInt32(0);
|
| int32_t iCount = XFA_ScriptInstanceManager_GetCount(this);
|
| if (iIndex < 0 || iIndex >= iCount) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INDEX_OUT_OF_BOUNDS);
|
| + Throw(XFA_IDS_INDEX_OUT_OF_BOUNDS);
|
| return;
|
| }
|
| CXFA_Occur nodeOccur(GetOccurNode());
|
| int32_t iMin = nodeOccur.GetMin();
|
| if (iCount - 1 < iMin) {
|
| - ThrowScriptErrorMessage(XFA_IDS_VIOLATE_BOUNDARY, L"min");
|
| + Throw(XFA_IDS_VIOLATE_BOUNDARY, L"min");
|
| return;
|
| }
|
| CXFA_Node* pRemoveInstance = XFA_ScriptInstanceManager_GetItem(this, iIndex);
|
| @@ -3169,7 +3146,7 @@ void CXFA_Node::Script_InstanceManager_AddInstance(
|
| CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if ((argc != 0) && (argc != 1)) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"addInstance");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"addInstance");
|
| return;
|
| }
|
| FX_BOOL fFlags = TRUE;
|
| @@ -3180,7 +3157,7 @@ void CXFA_Node::Script_InstanceManager_AddInstance(
|
| CXFA_Occur nodeOccur(GetOccurNode());
|
| int32_t iMax = nodeOccur.GetMax();
|
| if (iMax >= 0 && iCount >= iMax) {
|
| - ThrowScriptErrorMessage(XFA_IDS_VIOLATE_BOUNDARY, L"max");
|
| + Throw(XFA_IDS_VIOLATE_BOUNDARY, L"max");
|
| return;
|
| }
|
| CXFA_Node* pNewInstance =
|
| @@ -3206,8 +3183,7 @@ void CXFA_Node::Script_InstanceManager_InsertInstance(
|
| CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if ((argc != 1) && (argc != 2)) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"insertInstance");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"insertInstance");
|
| return;
|
| }
|
| int32_t iIndex = pArguments->GetInt32(0);
|
| @@ -3218,12 +3194,12 @@ void CXFA_Node::Script_InstanceManager_InsertInstance(
|
| CXFA_Occur nodeOccur(GetOccurNode());
|
| int32_t iCount = XFA_ScriptInstanceManager_GetCount(this);
|
| if (iIndex < 0 || iIndex > iCount) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INDEX_OUT_OF_BOUNDS);
|
| + Throw(XFA_IDS_INDEX_OUT_OF_BOUNDS);
|
| return;
|
| }
|
| int32_t iMax = nodeOccur.GetMax();
|
| if (iMax >= 0 && iCount >= iMax) {
|
| - ThrowScriptErrorMessage(XFA_IDS_VIOLATE_BOUNDARY, L"max");
|
| + Throw(XFA_IDS_VIOLATE_BOUNDARY, L"max");
|
| return;
|
| }
|
| CXFA_Node* pNewInstance =
|
| @@ -3250,11 +3226,11 @@ int32_t CXFA_Node::InstanceManager_SetInstances(int32_t iDesired) {
|
| int32_t iMax = nodeOccur.GetMax();
|
| int32_t iMin = nodeOccur.GetMin();
|
| if (iDesired < iMin) {
|
| - ThrowScriptErrorMessage(XFA_IDS_VIOLATE_BOUNDARY, L"min");
|
| + Throw(XFA_IDS_VIOLATE_BOUNDARY, L"min");
|
| return 1;
|
| }
|
| if ((iMax >= 0) && (iDesired > iMax)) {
|
| - ThrowScriptErrorMessage(XFA_IDS_VIOLATE_BOUNDARY, L"max");
|
| + Throw(XFA_IDS_VIOLATE_BOUNDARY, L"max");
|
| return 2;
|
| }
|
| int32_t iCount = XFA_ScriptInstanceManager_GetCount(this);
|
| @@ -3311,7 +3287,7 @@ int32_t CXFA_Node::InstanceManager_SetInstances(int32_t iDesired) {
|
| int32_t CXFA_Node::InstanceManager_MoveInstance(int32_t iTo, int32_t iFrom) {
|
| int32_t iCount = XFA_ScriptInstanceManager_GetCount(this);
|
| if (iFrom > iCount || iTo > iCount - 1) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INDEX_OUT_OF_BOUNDS);
|
| + Throw(XFA_IDS_INDEX_OUT_OF_BOUNDS);
|
| return 1;
|
| }
|
| if (iFrom < 0 || iTo < 0 || iFrom == iTo) {
|
| @@ -3355,7 +3331,7 @@ void CXFA_Node::Script_Desc_Metadata(CFXJSE_Arguments* pArguments) {
|
| if ((argc == 0) || (argc == 1)) {
|
| FXJSE_Value_SetUTF8String(pArguments->GetReturnValue(), "");
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"metadata");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"metadata");
|
| }
|
| }
|
| void CXFA_Node::Script_Form_FormNodes(CFXJSE_Arguments* pArguments) {
|
| @@ -3370,10 +3346,10 @@ void CXFA_Node::Script_Form_FormNodes(CFXJSE_Arguments* pArguments) {
|
| pArguments->GetReturnValue(), (CXFA_Object*)pFormNodes,
|
| m_pDocument->GetScriptContext()->GetJseNormalClass());
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_ARGUMENT_MISMATCH);
|
| + Throw(XFA_IDS_ARGUMENT_MISMATCH);
|
| }
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"formNodes");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"formNodes");
|
| }
|
| }
|
| void CXFA_Node::Script_Form_Remerge(CFXJSE_Arguments* pArguments) {
|
| @@ -3381,7 +3357,7 @@ void CXFA_Node::Script_Form_Remerge(CFXJSE_Arguments* pArguments) {
|
| if (argc == 0) {
|
| m_pDocument->DoDataRemerge(TRUE);
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"remerge");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"remerge");
|
| }
|
| }
|
| void CXFA_Node::Script_Form_ExecInitialize(CFXJSE_Arguments* pArguments) {
|
| @@ -3393,8 +3369,7 @@ void CXFA_Node::Script_Form_ExecInitialize(CFXJSE_Arguments* pArguments) {
|
| }
|
| pNotify->ExecEventByDeepFirst(this, XFA_EVENT_Initialize);
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"execInitialize");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execInitialize");
|
| }
|
| }
|
| void CXFA_Node::Script_Form_Recalculate(CFXJSE_Arguments* pArguments) {
|
| @@ -3418,7 +3393,7 @@ void CXFA_Node::Script_Form_Recalculate(CFXJSE_Arguments* pArguments) {
|
| } else {
|
| }
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"recalculate");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"recalculate");
|
| }
|
| }
|
| void CXFA_Node::Script_Form_ExecCalculate(CFXJSE_Arguments* pArguments) {
|
| @@ -3430,8 +3405,7 @@ void CXFA_Node::Script_Form_ExecCalculate(CFXJSE_Arguments* pArguments) {
|
| }
|
| pNotify->ExecEventByDeepFirst(this, XFA_EVENT_Calculate);
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"execCalculate");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execCalculate");
|
| }
|
| }
|
| void CXFA_Node::Script_Form_ExecValidate(CFXJSE_Arguments* pArguments) {
|
| @@ -3446,8 +3420,7 @@ void CXFA_Node::Script_Form_ExecValidate(CFXJSE_Arguments* pArguments) {
|
| ((iRet == XFA_EVENTERROR_Error) ? FALSE : TRUE));
|
| }
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"execValidate");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"execValidate");
|
| }
|
| }
|
| void CXFA_Node::Script_Form_Checksum(CFXJSE_Value* pValue,
|
| @@ -3482,8 +3455,7 @@ void CXFA_Node::Script_Packet_GetAttribute(CFXJSE_Arguments* pArguments) {
|
| FX_UTF8Encode(wsAttributeValue.c_str(), wsAttributeValue.GetLength())
|
| .AsStringC());
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"getAttribute");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"getAttribute");
|
| }
|
| }
|
| void CXFA_Node::Script_Packet_SetAttribute(CFXJSE_Arguments* pArguments) {
|
| @@ -3499,8 +3471,7 @@ void CXFA_Node::Script_Packet_SetAttribute(CFXJSE_Arguments* pArguments) {
|
| }
|
| FXJSE_Value_SetNull(pArguments->GetReturnValue());
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"setAttribute");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"setAttribute");
|
| }
|
| }
|
| void CXFA_Node::Script_Packet_RemoveAttribute(CFXJSE_Arguments* pArguments) {
|
| @@ -3517,8 +3488,7 @@ void CXFA_Node::Script_Packet_RemoveAttribute(CFXJSE_Arguments* pArguments) {
|
| }
|
| FXJSE_Value_SetNull(pArguments->GetReturnValue());
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"removeAttribute");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"removeAttribute");
|
| }
|
| }
|
| void CXFA_Node::Script_Packet_Content(CFXJSE_Value* pValue,
|
| @@ -3549,120 +3519,119 @@ void CXFA_Node::Script_Source_Next(CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if (argc == 0) {
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"next");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"next");
|
| }
|
| }
|
| void CXFA_Node::Script_Source_CancelBatch(CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if (argc == 0) {
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"cancelBatch");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"cancelBatch");
|
| }
|
| }
|
| void CXFA_Node::Script_Source_First(CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if (argc == 0) {
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"first");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"first");
|
| }
|
| }
|
| void CXFA_Node::Script_Source_UpdateBatch(CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if (argc == 0) {
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"updateBatch");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"updateBatch");
|
| }
|
| }
|
| void CXFA_Node::Script_Source_Previous(CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if (argc == 0) {
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"previous");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"previous");
|
| }
|
| }
|
| void CXFA_Node::Script_Source_IsBOF(CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if (argc == 0) {
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"isBOF");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"isBOF");
|
| }
|
| }
|
| void CXFA_Node::Script_Source_IsEOF(CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if (argc == 0) {
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"isEOF");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"isEOF");
|
| }
|
| }
|
| void CXFA_Node::Script_Source_Cancel(CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if (argc == 0) {
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"cancel");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"cancel");
|
| }
|
| }
|
| void CXFA_Node::Script_Source_Update(CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if (argc == 0) {
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"update");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"update");
|
| }
|
| }
|
| void CXFA_Node::Script_Source_Open(CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if (argc == 0) {
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"open");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"open");
|
| }
|
| }
|
| void CXFA_Node::Script_Source_Delete(CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if (argc == 0) {
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"delete");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"delete");
|
| }
|
| }
|
| void CXFA_Node::Script_Source_AddNew(CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if (argc == 0) {
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"addNew");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"addNew");
|
| }
|
| }
|
| void CXFA_Node::Script_Source_Requery(CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if (argc == 0) {
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"requery");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"requery");
|
| }
|
| }
|
| void CXFA_Node::Script_Source_Resync(CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if (argc == 0) {
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"resync");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"resync");
|
| }
|
| }
|
| void CXFA_Node::Script_Source_Close(CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if (argc == 0) {
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"close");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"close");
|
| }
|
| }
|
| void CXFA_Node::Script_Source_Last(CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if (argc == 0) {
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"last");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"last");
|
| }
|
| }
|
| void CXFA_Node::Script_Source_HasDataChanged(CFXJSE_Arguments* pArguments) {
|
| int32_t argc = pArguments->GetLength();
|
| if (argc == 0) {
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
|
| - L"hasDataChanged");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"hasDataChanged");
|
| }
|
| }
|
| void CXFA_Node::Script_Source_Db(CFXJSE_Value* pValue,
|
| @@ -3691,7 +3660,7 @@ void CXFA_Node::Script_Script_Stateless(CFXJSE_Value* pValue,
|
| FX_BOOL bSetting,
|
| XFA_ATTRIBUTE eAttribute) {
|
| if (bSetting) {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| return;
|
| }
|
| FXJSE_Value_SetUTF8String(pValue, FX_UTF8Encode(FX_WSTRC(L"0")).AsStringC());
|
| @@ -5220,10 +5189,10 @@ void CXFA_NodeList::Script_ListClass_Append(CFXJSE_Arguments* pArguments) {
|
| if (pNode) {
|
| Append(pNode);
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_ARGUMENT_MISMATCH);
|
| + Throw(XFA_IDS_ARGUMENT_MISMATCH);
|
| }
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"append");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"append");
|
| }
|
| }
|
| void CXFA_NodeList::Script_ListClass_Insert(CFXJSE_Arguments* pArguments) {
|
| @@ -5234,10 +5203,10 @@ void CXFA_NodeList::Script_ListClass_Insert(CFXJSE_Arguments* pArguments) {
|
| if (pNewNode) {
|
| Insert(pNewNode, pBeforeNode);
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_ARGUMENT_MISMATCH);
|
| + Throw(XFA_IDS_ARGUMENT_MISMATCH);
|
| }
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"insert");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"insert");
|
| }
|
| }
|
| void CXFA_NodeList::Script_ListClass_Remove(CFXJSE_Arguments* pArguments) {
|
| @@ -5247,10 +5216,10 @@ void CXFA_NodeList::Script_ListClass_Remove(CFXJSE_Arguments* pArguments) {
|
| if (pNode) {
|
| Remove(pNode);
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_ARGUMENT_MISMATCH);
|
| + Throw(XFA_IDS_ARGUMENT_MISMATCH);
|
| }
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"remove");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"remove");
|
| }
|
| }
|
| void CXFA_NodeList::Script_ListClass_Item(CFXJSE_Arguments* pArguments) {
|
| @@ -5262,10 +5231,10 @@ void CXFA_NodeList::Script_ListClass_Item(CFXJSE_Arguments* pArguments) {
|
| pArguments->GetReturnValue(),
|
| m_pDocument->GetScriptContext()->GetJSValueFromMap(Item(iIndex)));
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INDEX_OUT_OF_BOUNDS);
|
| + Throw(XFA_IDS_INDEX_OUT_OF_BOUNDS);
|
| }
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"item");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"item");
|
| }
|
| }
|
| void CXFA_NodeList::Script_TreelistClass_NamedItem(
|
| @@ -5281,7 +5250,7 @@ void CXFA_NodeList::Script_TreelistClass_NamedItem(
|
| FXJSE_Value_Set(pArguments->GetReturnValue(),
|
| m_pDocument->GetScriptContext()->GetJSValueFromMap(pNode));
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"namedItem");
|
| + Throw(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"namedItem");
|
| }
|
| }
|
| void CXFA_NodeList::Script_ListClass_Length(CFXJSE_Value* pValue,
|
| @@ -5290,7 +5259,7 @@ void CXFA_NodeList::Script_ListClass_Length(CFXJSE_Value* pValue,
|
| if (!bSetting) {
|
| FXJSE_Value_SetInteger(pValue, GetLength());
|
| } else {
|
| - ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
|
| + Throw(XFA_IDS_INVAlID_PROP_SET);
|
| }
|
| }
|
| CXFA_ArrayNodeList::CXFA_ArrayNodeList(CXFA_Document* pDocument)
|
|
|