| Index: xfa/fxfa/app/xfa_ffwidgetacc.cpp
|
| diff --git a/xfa/fxfa/app/xfa_ffwidgetacc.cpp b/xfa/fxfa/app/xfa_ffwidgetacc.cpp
|
| index ce378df22297bc85df45ba374404f394116a00df..920b78129f8320f00aa786eca59a599d7c78599a 100644
|
| --- a/xfa/fxfa/app/xfa_ffwidgetacc.cpp
|
| +++ b/xfa/fxfa/app/xfa_ffwidgetacc.cpp
|
| @@ -658,12 +658,9 @@ int32_t CXFA_WidgetAcc::ExecuteScript(CXFA_Script script,
|
| if (pEventParam->m_eType == XFA_EVENT_Calculate ||
|
| pEventParam->m_eType == XFA_EVENT_InitCalculate) {
|
| if (!pTmpRetValue->IsUndefined()) {
|
| - if (!pTmpRetValue->IsNull()) {
|
| - CFX_ByteString bsString;
|
| - pTmpRetValue->ToString(bsString);
|
| - pEventParam->m_wsResult =
|
| - CFX_WideString::FromUTF8(bsString.AsStringC());
|
| - }
|
| + if (!pTmpRetValue->IsNull())
|
| + pEventParam->m_wsResult = pTmpRetValue->ToWideString();
|
| +
|
| iRet = XFA_EVENTERROR_Success;
|
| } else {
|
| iRet = XFA_EVENTERROR_Error;
|
|
|