From 6a5b1c96e23bd684d9fec2c59e0d4bc5d883650c Mon Sep 17 00:00:00 2001 From: dan sinclair Date: Mon, 19 Feb 2018 18:10:34 +0000 Subject: Merge FormCalc to JavaScript methods This CL merges the ToJavaScript and the ToImpliedJS methods in the FormCalc expressions. The type of return is passed as a paramter to ToJavaScript. Change-Id: Idff83677bc70b964d95aa6ff6b0e2c1bf8c603ea Reviewed-on: https://pdfium-review.googlesource.com/27210 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- fxjs/cfxjse_formcalc_context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fxjs') diff --git a/fxjs/cfxjse_formcalc_context.cpp b/fxjs/cfxjse_formcalc_context.cpp index 787e60a91f..82884265cf 100644 --- a/fxjs/cfxjse_formcalc_context.cpp +++ b/fxjs/cfxjse_formcalc_context.cpp @@ -6180,7 +6180,7 @@ bool CFXJSE_FormCalcContext::Translate(const WideStringView& wsFormcalc, return false; CXFA_FMToJavaScriptDepth::Reset(); - if (!func->ToJavaScript(*wsJavascript)) + if (!func->ToJavaScript(*wsJavascript, ReturnType::kInfered)) return false; wsJavascript->AppendChar(0); -- cgit v1.2.3