Index: xfa/fxfa/app/xfa_ffwidgetacc.cpp |
diff --git a/xfa/fxfa/app/xfa_ffwidgetacc.cpp b/xfa/fxfa/app/xfa_ffwidgetacc.cpp |
index c44084894189b07c9bef4ae9eb63ead9b0f18632..b660b50c209ff376e8b2ba98a3263b8cccdcc117 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); |
Tom Sepez
2016/06/07 21:51:48
Can we make ToString() return a string rather than
dsinclair
2016/06/08 02:01:41
On my todo list.
|
pEventParam->m_wsResult = |
CFX_WideString::FromUTF8(bsString.AsStringC()); |
} |