pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #317 from ONLYOFFICE/release/v6.0.0

Browse Source 
Release/v6.0.0
This commit is contained in:
Oleg Korshul
2020-09-09 16:21:36 +03:00
committed by GitHub
parent c716298121 0d45d9843c
commit 1d8fc10f2f
3 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
DesktopEditor/doctrenderer/doctrenderer.cpp
View File

@ -550,6 +550,20 @@ namespace NSDoctRenderer
if (js_func_calculate->IsFunction())
{
v8::Handle<v8::Function> func_calculate = v8::Handle<v8::Function>::Cast(js_func_calculate);
if (pParams->m_sJsonParams.empty())
args[0] = v8::Undefined(isolate);
else
{
std::string sTmp = U_TO_UTF8((pParams->m_sJsonParams));
#ifndef V8_OS_XP
args[0] = v8::JSON::Parse(context, v8::String::NewFromUtf8(isolate, (char*)sTmp.c_str())).FromMaybe(v8::Local<v8::Value>());
#else
args[0] = v8::JSON::Parse(v8::String::NewFromUtf8(isolate, (char*)sTmp.c_str()));
#endif
}
func_calculate->Call(js_objectApi, 1, args);
if (try_catch.HasCaught())