From c8fd3318a8deca3e1eabd6f7a9449ae4a0fa964d Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 2 Jan 2017 17:17:02 -0500 Subject: Cleaning out params in CPDFXFA_Context This CL cleans up some of the out params in CPDFXFA_Context. In the process several of the strings returned by ::LoadString() are inlined in their call sites and the defines removed. BUG=pdfium:549 Change-Id: I41a7ceeba3962299eecd0cb714ddb03d28dbb0ea Reviewed-on: https://pdfium-review.googlesource.com/2134 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- xfa/fxfa/fm2js/xfa_fm2jscontext.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'xfa/fxfa/fm2js/xfa_fm2jscontext.cpp') diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp index 01328f2374..862571e0af 100644 --- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp +++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp @@ -6512,12 +6512,11 @@ void CXFA_FM2JSContext::GlobalPropertyGetter(CFXJSE_Value* pValue) { void CXFA_FM2JSContext::ThrowException(int32_t iStringID, ...) { IXFA_AppProvider* pAppProvider = m_pDocument->GetNotify()->GetAppProvider(); ASSERT(pAppProvider); - CFX_WideString wsFormat; - pAppProvider->LoadString(iStringID, wsFormat); + CFX_WideString wsMessage; va_list arg_ptr; va_start(arg_ptr, iStringID); - wsMessage.FormatV(wsFormat.c_str(), arg_ptr); + wsMessage.FormatV(pAppProvider->LoadString(iStringID).c_str(), arg_ptr); va_end(arg_ptr); FXJSE_ThrowMessage( FX_UTF8Encode(wsMessage.c_str(), wsMessage.GetLength()).AsStringC()); -- cgit v1.2.3