| Index: xfa/fxfa/app/xfa_ffwidgetacc.cpp
|
| diff --git a/xfa/fxfa/app/xfa_ffwidgetacc.cpp b/xfa/fxfa/app/xfa_ffwidgetacc.cpp
|
| index 950c3f694e0649aeb391615ea13c1f5e3b4fa654..ce378df22297bc85df45ba374404f394116a00df 100644
|
| --- a/xfa/fxfa/app/xfa_ffwidgetacc.cpp
|
| +++ b/xfa/fxfa/app/xfa_ffwidgetacc.cpp
|
| @@ -370,7 +370,7 @@ void CXFA_WidgetAcc::ProcessScriptTestValidate(CXFA_Validate validate,
|
| CFXJSE_Value* pRetValue,
|
| FX_BOOL bVersionFlag) {
|
| if (iRet == XFA_EVENTERROR_Success && pRetValue) {
|
| - if (FXJSE_Value_IsBoolean(pRetValue) && !pRetValue->ToBoolean()) {
|
| + if (pRetValue->IsBoolean() && !pRetValue->ToBoolean()) {
|
| IXFA_AppProvider* pAppProvider = GetAppProvider();
|
| if (!pAppProvider) {
|
| return;
|
| @@ -657,8 +657,8 @@ int32_t CXFA_WidgetAcc::ExecuteScript(CXFA_Script script,
|
| iRet = XFA_EVENTERROR_Success;
|
| if (pEventParam->m_eType == XFA_EVENT_Calculate ||
|
| pEventParam->m_eType == XFA_EVENT_InitCalculate) {
|
| - if (!FXJSE_Value_IsUndefined(pTmpRetValue.get())) {
|
| - if (!FXJSE_Value_IsNull(pTmpRetValue.get())) {
|
| + if (!pTmpRetValue->IsUndefined()) {
|
| + if (!pTmpRetValue->IsNull()) {
|
| CFX_ByteString bsString;
|
| pTmpRetValue->ToString(bsString);
|
| pEventParam->m_wsResult =
|
|
|