| Index: xfa/fxfa/parser/xfa_script_imp.cpp
|
| diff --git a/xfa/fxfa/parser/xfa_script_imp.cpp b/xfa/fxfa/parser/xfa_script_imp.cpp
|
| index fe3a3e0a945adf91c8593c38f4a8fea206960c5a..50810305e46e21238b57b8d4466f0ab7407824aa 100644
|
| --- a/xfa/fxfa/parser/xfa_script_imp.cpp
|
| +++ b/xfa/fxfa/parser/xfa_script_imp.cpp
|
| @@ -101,7 +101,8 @@
|
| void CXFA_ScriptContext::GlobalPropertySetter(FXJSE_HOBJECT hObject,
|
| const CFX_ByteStringC& szPropName,
|
| FXJSE_HVALUE hValue) {
|
| - CXFA_Object* lpOrginalNode = (CXFA_Object*)FXJSE_Value_ToObject(hObject);
|
| + CXFA_Object* lpOrginalNode =
|
| + (CXFA_Object*)FXJSE_Value_ToObject(hObject, NULL);
|
| CXFA_Document* pDoc = lpOrginalNode->GetDocument();
|
| CXFA_ScriptContext* lpScriptContext =
|
| (CXFA_ScriptContext*)pDoc->GetScriptContext();
|
| @@ -158,7 +159,8 @@
|
| void CXFA_ScriptContext::GlobalPropertyGetter(FXJSE_HOBJECT hObject,
|
| const CFX_ByteStringC& szPropName,
|
| FXJSE_HVALUE hValue) {
|
| - CXFA_Object* pOrginalObject = (CXFA_Object*)FXJSE_Value_ToObject(hObject);
|
| + CXFA_Object* pOrginalObject =
|
| + (CXFA_Object*)FXJSE_Value_ToObject(hObject, NULL);
|
| CXFA_Document* pDoc = pOrginalObject->GetDocument();
|
| CXFA_ScriptContext* lpScriptContext =
|
| (CXFA_ScriptContext*)pDoc->GetScriptContext();
|
| @@ -212,7 +214,8 @@
|
| void CXFA_ScriptContext::NormalPropertyGetter(FXJSE_HOBJECT hObject,
|
| const CFX_ByteStringC& szPropName,
|
| FXJSE_HVALUE hValue) {
|
| - CXFA_Object* pOrginalObject = (CXFA_Object*)FXJSE_Value_ToObject(hObject);
|
| + CXFA_Object* pOrginalObject =
|
| + (CXFA_Object*)FXJSE_Value_ToObject(hObject, NULL);
|
| if (pOrginalObject == NULL) {
|
| FXJSE_Value_SetUndefined(hValue);
|
| return;
|
| @@ -257,7 +260,8 @@
|
| void CXFA_ScriptContext::NormalPropertySetter(FXJSE_HOBJECT hObject,
|
| const CFX_ByteStringC& szPropName,
|
| FXJSE_HVALUE hValue) {
|
| - CXFA_Object* pOrginalObject = (CXFA_Object*)FXJSE_Value_ToObject(hObject);
|
| + CXFA_Object* pOrginalObject =
|
| + (CXFA_Object*)FXJSE_Value_ToObject(hObject, NULL);
|
| if (pOrginalObject == NULL) {
|
| return;
|
| }
|
| @@ -308,7 +312,7 @@
|
| FXJSE_HOBJECT hObject,
|
| const CFX_ByteStringC& szPropName,
|
| FX_BOOL bQueryIn) {
|
| - CXFA_Object* pObject = (CXFA_Object*)FXJSE_Value_ToObject(hObject);
|
| + CXFA_Object* pObject = (CXFA_Object*)FXJSE_Value_ToObject(hObject, NULL);
|
| if (pObject == NULL) {
|
| return FXJSE_ClassPropType_None;
|
| }
|
| @@ -330,7 +334,7 @@
|
| FXJSE_HOBJECT hObject,
|
| const CFX_ByteStringC& szPropName,
|
| FX_BOOL bQueryIn) {
|
| - CXFA_Object* pObject = (CXFA_Object*)FXJSE_Value_ToObject(hObject);
|
| + CXFA_Object* pObject = (CXFA_Object*)FXJSE_Value_ToObject(hObject, NULL);
|
| if (pObject == NULL) {
|
| return FXJSE_ClassPropType_None;
|
| }
|
| @@ -347,7 +351,7 @@
|
| void CXFA_ScriptContext::NormalMethodCall(FXJSE_HOBJECT hThis,
|
| const CFX_ByteStringC& szFuncName,
|
| CFXJSE_Arguments& args) {
|
| - CXFA_Object* pObject = (CXFA_Object*)FXJSE_Value_ToObject(hThis);
|
| + CXFA_Object* pObject = (CXFA_Object*)FXJSE_Value_ToObject(hThis, NULL);
|
| if (pObject == NULL) {
|
| return;
|
| }
|
| @@ -509,7 +513,7 @@
|
| FXJSE_HCONTEXT hVariableContext = nullptr;
|
| m_mapVariableToHValue.GetNextAssoc(ps, pScriptNode, hVariableContext);
|
| FXJSE_HVALUE hObject = FXJSE_Context_GetGlobalObject(hVariableContext);
|
| - delete static_cast<CXFA_ThisProxy*>(FXJSE_Value_ToObject(hObject));
|
| + delete static_cast<CXFA_ThisProxy*>(FXJSE_Value_ToObject(hObject, nullptr));
|
| FXJSE_Value_Release(hObject);
|
| FXJSE_Context_Release(hVariableContext);
|
| }
|
| @@ -643,7 +647,8 @@
|
| (rndFind.m_Nodes[0]->*(rndFind.m_pScriptAttribute->lpfnCallback))(
|
| hValue, FALSE,
|
| (XFA_ATTRIBUTE)rndFind.m_pScriptAttribute->eAttribute);
|
| - rndFind.m_Nodes.SetAt(0, (CXFA_Object*)FXJSE_Value_ToObject(hValue));
|
| + rndFind.m_Nodes.SetAt(0,
|
| + (CXFA_Object*)FXJSE_Value_ToObject(hValue, NULL));
|
| FXJSE_Value_Release(hValue);
|
| }
|
| int32_t iSize = m_upObjectArray.GetSize();
|
|
|