diff options
Diffstat (limited to 'fxjs/xfa')
| -rw-r--r-- | fxjs/xfa/cjx_exclgroup.cpp | 9 | ||||
| -rw-r--r-- | fxjs/xfa/cjx_form.cpp | 16 | ||||
| -rw-r--r-- | fxjs/xfa/cjx_hostpseudomodel.cpp | 7 | ||||
| -rw-r--r-- | fxjs/xfa/cjx_subform.cpp | 10 |
4 files changed, 24 insertions, 18 deletions
diff --git a/fxjs/xfa/cjx_exclgroup.cpp b/fxjs/xfa/cjx_exclgroup.cpp index 4facdcae47..6d9f5407de 100644 --- a/fxjs/xfa/cjx_exclgroup.cpp +++ b/fxjs/xfa/cjx_exclgroup.cpp @@ -50,7 +50,8 @@ CJS_Return CJX_ExclGroup::execInitialize( CXFA_FFNotify* pNotify = GetDocument()->GetNotify(); if (pNotify) - pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Initialize); + pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Initialize, false, + true); return CJS_Return(true); } @@ -62,7 +63,8 @@ CJS_Return CJX_ExclGroup::execCalculate( CXFA_FFNotify* pNotify = GetDocument()->GetNotify(); if (pNotify) - pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Calculate); + pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Calculate, false, + true); return CJS_Return(true); } @@ -76,7 +78,8 @@ CJS_Return CJX_ExclGroup::execValidate( if (!notify) return CJS_Return(runtime->NewBoolean(false)); - int32_t iRet = notify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Validate); + int32_t iRet = notify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Validate, + false, true); return CJS_Return(runtime->NewBoolean(iRet != XFA_EVENTERROR_Error)); } diff --git a/fxjs/xfa/cjx_form.cpp b/fxjs/xfa/cjx_form.cpp index 54f06fe966..6576df88d2 100644 --- a/fxjs/xfa/cjx_form.cpp +++ b/fxjs/xfa/cjx_form.cpp @@ -69,7 +69,8 @@ CJS_Return CJX_Form::execInitialize( CXFA_FFNotify* pNotify = GetDocument()->GetNotify(); if (pNotify) - pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Initialize); + pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Initialize, false, + true); return CJS_Return(true); } @@ -89,9 +90,9 @@ CJS_Return CJX_Form::recalculate( if (!pNotify || runtime->ToInt32(params[0]) != 0) return CJS_Return(true); - pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Calculate); - pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Validate); - pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Ready, true); + pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Calculate, false, true); + pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Validate, false, true); + pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Ready, true, true); return CJS_Return(true); } @@ -103,7 +104,8 @@ CJS_Return CJX_Form::execCalculate( CXFA_FFNotify* pNotify = GetDocument()->GetNotify(); if (pNotify) - pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Calculate); + pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Calculate, false, + true); return CJS_Return(true); } @@ -117,7 +119,7 @@ CJS_Return CJX_Form::execValidate( if (!pNotify) return CJS_Return(runtime->NewBoolean(false)); - int32_t iRet = - pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Validate); + int32_t iRet = pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Validate, + false, true); return CJS_Return(runtime->NewBoolean(iRet != XFA_EVENTERROR_Error)); } diff --git a/fxjs/xfa/cjx_hostpseudomodel.cpp b/fxjs/xfa/cjx_hostpseudomodel.cpp index c607325a90..319761d19a 100644 --- a/fxjs/xfa/cjx_hostpseudomodel.cpp +++ b/fxjs/xfa/cjx_hostpseudomodel.cpp @@ -367,7 +367,7 @@ CJS_Return CJX_HostPseudoModel::resetData( expression = runtime->ToWideString(params[0]); if (expression.IsEmpty()) { - pNotify->ResetData(); + pNotify->ResetData(nullptr); return CJS_Return(true); } @@ -394,11 +394,10 @@ CJS_Return CJX_HostPseudoModel::resetData( continue; pNode = resolveNodeRS.objects.front()->AsNode(); - pNotify->ResetData(pNode->IsWidgetReady() ? pNode->GetWidgetAcc() - : nullptr); + pNotify->ResetData(pNode->IsWidgetReady() ? pNode : nullptr); } if (!pNode) - pNotify->ResetData(); + pNotify->ResetData(nullptr); return CJS_Return(true); } diff --git a/fxjs/xfa/cjx_subform.cpp b/fxjs/xfa/cjx_subform.cpp index 947d66db1d..f153fa2ba0 100644 --- a/fxjs/xfa/cjx_subform.cpp +++ b/fxjs/xfa/cjx_subform.cpp @@ -47,7 +47,8 @@ CJS_Return CJX_Subform::execInitialize( CXFA_FFNotify* pNotify = GetDocument()->GetNotify(); if (pNotify) - pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Initialize); + pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Initialize, false, + true); return CJS_Return(true); } @@ -59,7 +60,8 @@ CJS_Return CJX_Subform::execCalculate( CXFA_FFNotify* pNotify = GetDocument()->GetNotify(); if (pNotify) - pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Calculate); + pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Calculate, false, + true); return CJS_Return(true); } @@ -73,8 +75,8 @@ CJS_Return CJX_Subform::execValidate( if (!pNotify) return CJS_Return(runtime->NewBoolean(false)); - int32_t iRet = - pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Validate); + int32_t iRet = pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Validate, + false, true); return CJS_Return(runtime->NewBoolean(iRet != XFA_EVENTERROR_Error)); } |