diff options
Diffstat (limited to 'xfa/fxfa/app')
| -rw-r--r-- | xfa/fxfa/app/xfa_ffnotify.cpp | 2 | ||||
| -rw-r--r-- | xfa/fxfa/app/xfa_ffwidgetacc.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fxfa/app/xfa_ffnotify.cpp b/xfa/fxfa/app/xfa_ffnotify.cpp index 9524a25b1a..c801bb45e5 100644 --- a/xfa/fxfa/app/xfa_ffnotify.cpp +++ b/xfa/fxfa/app/xfa_ffnotify.cpp @@ -206,7 +206,7 @@ FX_BOOL CXFA_FFNotify::RunScript(CXFA_Node* pScript, CXFA_Node* pFormItem) { int32_t iRet = pWidgetAcc->ExecuteScript(CXFA_Script(pScript), &EventParam, &pRetValue); if (iRet == XFA_EVENTERROR_Success && pRetValue) { - bRet = FXJSE_Value_ToBoolean(pRetValue); + bRet = pRetValue->ToBoolean(); delete pRetValue; } return bRet; diff --git a/xfa/fxfa/app/xfa_ffwidgetacc.cpp b/xfa/fxfa/app/xfa_ffwidgetacc.cpp index 1a579e222e..950c3f694e 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) && !FXJSE_Value_ToBoolean(pRetValue)) { + if (FXJSE_Value_IsBoolean(pRetValue) && !pRetValue->ToBoolean()) { IXFA_AppProvider* pAppProvider = GetAppProvider(); if (!pAppProvider) { return; @@ -660,7 +660,7 @@ int32_t CXFA_WidgetAcc::ExecuteScript(CXFA_Script script, if (!FXJSE_Value_IsUndefined(pTmpRetValue.get())) { if (!FXJSE_Value_IsNull(pTmpRetValue.get())) { CFX_ByteString bsString; - FXJSE_Value_ToUTF8String(pTmpRetValue.get(), bsString); + pTmpRetValue->ToString(bsString); pEventParam->m_wsResult = CFX_WideString::FromUTF8(bsString.AsStringC()); } |