Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Side by Side Diff: xfa/fxfa/fm2js/xfa_fm2jscontext.cpp

Issue 1886263003: Rename CFX_ByteTextBuf::GetByteString() to AsStringC(). (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "xfa/fxfa/fm2js/xfa_fm2jscontext.h" 7 #include "xfa/fxfa/fm2js/xfa_fm2jscontext.h"
8 8
9 #include <time.h> 9 #include <time.h>
10 10
(...skipping 3230 matching lines...) Expand 10 before | Expand all | Expand 10 after
3241 FXJSE_Value_SetNull(args.GetReturnValue()); 3241 FXJSE_Value_SetNull(args.GetReturnValue());
3242 } else { 3242 } else {
3243 CFX_WideTextBuf wsJavaScriptBuf; 3243 CFX_WideTextBuf wsJavaScriptBuf;
3244 CFX_WideString javaScript; 3244 CFX_WideString javaScript;
3245 CFX_WideString wsError; 3245 CFX_WideString wsError;
3246 XFA_FM2JS_Translate( 3246 XFA_FM2JS_Translate(
3247 CFX_WideString::FromUTF8(utf8ScriptString.AsStringC()).AsStringC(), 3247 CFX_WideString::FromUTF8(utf8ScriptString.AsStringC()).AsStringC(),
3248 wsJavaScriptBuf, wsError); 3248 wsJavaScriptBuf, wsError);
3249 FXJSE_HCONTEXT hContext = FXJSE_Context_Create(hruntime); 3249 FXJSE_HCONTEXT hContext = FXJSE_Context_Create(hruntime);
3250 FXJSE_HVALUE returnValue = FXJSE_Value_Create(hruntime); 3250 FXJSE_HVALUE returnValue = FXJSE_Value_Create(hruntime);
3251 javaScript = wsJavaScriptBuf.GetWideString(); 3251 javaScript = wsJavaScriptBuf.AsStringC();
3252 FXJSE_ExecuteScript( 3252 FXJSE_ExecuteScript(
3253 hContext, 3253 hContext,
3254 FX_UTF8Encode(javaScript.c_str(), javaScript.GetLength()).c_str(), 3254 FX_UTF8Encode(javaScript.c_str(), javaScript.GetLength()).c_str(),
3255 returnValue); 3255 returnValue);
3256 FXJSE_Value_Set(args.GetReturnValue(), returnValue); 3256 FXJSE_Value_Set(args.GetReturnValue(), returnValue);
3257 FXJSE_Value_Release(returnValue); 3257 FXJSE_Value_Release(returnValue);
3258 FXJSE_Context_Release(hContext); 3258 FXJSE_Context_Release(hContext);
3259 } 3259 }
3260 FXJSE_Value_Release(scriptValue); 3260 FXJSE_Value_Release(scriptValue);
3261 } else { 3261 } else {
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
3686 int32_t argc = args.GetLength(); 3686 int32_t argc = args.GetLength();
3687 if (argc == 1) { 3687 if (argc == 1) {
3688 FXJSE_HVALUE argOne = GetSimpleHValue(hThis, args, 0); 3688 FXJSE_HVALUE argOne = GetSimpleHValue(hThis, args, 0);
3689 if (HValueIsNull(hThis, argOne)) { 3689 if (HValueIsNull(hThis, argOne)) {
3690 FXJSE_Value_SetNull(args.GetReturnValue()); 3690 FXJSE_Value_SetNull(args.GetReturnValue());
3691 } else { 3691 } else {
3692 CFX_ByteString toDecodeString; 3692 CFX_ByteString toDecodeString;
3693 HValueToUTF8String(argOne, toDecodeString); 3693 HValueToUTF8String(argOne, toDecodeString);
3694 CFX_ByteTextBuf resultBuf; 3694 CFX_ByteTextBuf resultBuf;
3695 DecodeURL(toDecodeString.AsStringC(), resultBuf); 3695 DecodeURL(toDecodeString.AsStringC(), resultBuf);
3696 FXJSE_Value_SetUTF8String(args.GetReturnValue(), 3696 FXJSE_Value_SetUTF8String(args.GetReturnValue(), resultBuf.AsStringC());
3697 resultBuf.GetByteString());
3698 } 3697 }
3699 FXJSE_Value_Release(argOne); 3698 FXJSE_Value_Release(argOne);
3700 } else if (argc == 2) { 3699 } else if (argc == 2) {
3701 FXJSE_HVALUE argOne = GetSimpleHValue(hThis, args, 0); 3700 FXJSE_HVALUE argOne = GetSimpleHValue(hThis, args, 0);
3702 FXJSE_HVALUE argTwo = GetSimpleHValue(hThis, args, 1); 3701 FXJSE_HVALUE argTwo = GetSimpleHValue(hThis, args, 1);
3703 if (HValueIsNull(hThis, argOne) || HValueIsNull(hThis, argTwo)) { 3702 if (HValueIsNull(hThis, argOne) || HValueIsNull(hThis, argTwo)) {
3704 FXJSE_Value_SetNull(args.GetReturnValue()); 3703 FXJSE_Value_SetNull(args.GetReturnValue());
3705 } else { 3704 } else {
3706 CFX_ByteString toDecodeString; 3705 CFX_ByteString toDecodeString;
3707 HValueToUTF8String(argOne, toDecodeString); 3706 HValueToUTF8String(argOne, toDecodeString);
3708 CFX_ByteString identifyString; 3707 CFX_ByteString identifyString;
3709 HValueToUTF8String(argTwo, identifyString); 3708 HValueToUTF8String(argTwo, identifyString);
3710 CFX_ByteTextBuf resultBuf; 3709 CFX_ByteTextBuf resultBuf;
3711 if (identifyString.EqualNoCase("html")) { 3710 if (identifyString.EqualNoCase("html")) {
3712 DecodeHTML(toDecodeString.AsStringC(), resultBuf); 3711 DecodeHTML(toDecodeString.AsStringC(), resultBuf);
3713 } else if (identifyString.EqualNoCase("xml")) { 3712 } else if (identifyString.EqualNoCase("xml")) {
3714 DecodeXML(toDecodeString.AsStringC(), resultBuf); 3713 DecodeXML(toDecodeString.AsStringC(), resultBuf);
3715 } else { 3714 } else {
3716 DecodeURL(toDecodeString.AsStringC(), resultBuf); 3715 DecodeURL(toDecodeString.AsStringC(), resultBuf);
3717 } 3716 }
3718 FXJSE_Value_SetUTF8String(args.GetReturnValue(), 3717 FXJSE_Value_SetUTF8String(args.GetReturnValue(), resultBuf.AsStringC());
3719 resultBuf.GetByteString());
3720 } 3718 }
3721 FXJSE_Value_Release(argOne); 3719 FXJSE_Value_Release(argOne);
3722 FXJSE_Value_Release(argTwo); 3720 FXJSE_Value_Release(argTwo);
3723 } else { 3721 } else {
3724 pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, 3722 pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
3725 L"Decode"); 3723 L"Decode");
3726 } 3724 }
3727 } 3725 }
3728 void CXFA_FM2JSContext::DecodeURL(const CFX_ByteStringC& szURLString, 3726 void CXFA_FM2JSContext::DecodeURL(const CFX_ByteStringC& szURLString,
3729 CFX_ByteTextBuf& szResultString) { 3727 CFX_ByteTextBuf& szResultString) {
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
3959 int32_t argc = args.GetLength(); 3957 int32_t argc = args.GetLength();
3960 if (argc == 1) { 3958 if (argc == 1) {
3961 FXJSE_HVALUE argOne = GetSimpleHValue(hThis, args, 0); 3959 FXJSE_HVALUE argOne = GetSimpleHValue(hThis, args, 0);
3962 if (HValueIsNull(hThis, argOne)) { 3960 if (HValueIsNull(hThis, argOne)) {
3963 FXJSE_Value_SetNull(args.GetReturnValue()); 3961 FXJSE_Value_SetNull(args.GetReturnValue());
3964 } else { 3962 } else {
3965 CFX_ByteString toEncodeString; 3963 CFX_ByteString toEncodeString;
3966 HValueToUTF8String(argOne, toEncodeString); 3964 HValueToUTF8String(argOne, toEncodeString);
3967 CFX_ByteTextBuf resultBuf; 3965 CFX_ByteTextBuf resultBuf;
3968 EncodeURL(toEncodeString.AsStringC(), resultBuf); 3966 EncodeURL(toEncodeString.AsStringC(), resultBuf);
3969 FXJSE_Value_SetUTF8String(args.GetReturnValue(), 3967 FXJSE_Value_SetUTF8String(args.GetReturnValue(), resultBuf.AsStringC());
3970 resultBuf.GetByteString());
3971 } 3968 }
3972 FXJSE_Value_Release(argOne); 3969 FXJSE_Value_Release(argOne);
3973 } else if (argc == 2) { 3970 } else if (argc == 2) {
3974 FXJSE_HVALUE argOne = GetSimpleHValue(hThis, args, 0); 3971 FXJSE_HVALUE argOne = GetSimpleHValue(hThis, args, 0);
3975 FXJSE_HVALUE argTwo = GetSimpleHValue(hThis, args, 1); 3972 FXJSE_HVALUE argTwo = GetSimpleHValue(hThis, args, 1);
3976 if (HValueIsNull(hThis, argOne) || HValueIsNull(hThis, argTwo)) { 3973 if (HValueIsNull(hThis, argOne) || HValueIsNull(hThis, argTwo)) {
3977 FXJSE_Value_SetNull(args.GetReturnValue()); 3974 FXJSE_Value_SetNull(args.GetReturnValue());
3978 } else { 3975 } else {
3979 CFX_ByteString toEncodeString; 3976 CFX_ByteString toEncodeString;
3980 HValueToUTF8String(argOne, toEncodeString); 3977 HValueToUTF8String(argOne, toEncodeString);
3981 CFX_ByteString identifyString; 3978 CFX_ByteString identifyString;
3982 HValueToUTF8String(argTwo, identifyString); 3979 HValueToUTF8String(argTwo, identifyString);
3983 CFX_ByteTextBuf resultBuf; 3980 CFX_ByteTextBuf resultBuf;
3984 if (identifyString.EqualNoCase("html")) { 3981 if (identifyString.EqualNoCase("html")) {
3985 EncodeHTML(toEncodeString.AsStringC(), resultBuf); 3982 EncodeHTML(toEncodeString.AsStringC(), resultBuf);
3986 } else if (identifyString.EqualNoCase("xml")) { 3983 } else if (identifyString.EqualNoCase("xml")) {
3987 EncodeXML(toEncodeString.AsStringC(), resultBuf); 3984 EncodeXML(toEncodeString.AsStringC(), resultBuf);
3988 } else { 3985 } else {
3989 EncodeURL(toEncodeString.AsStringC(), resultBuf); 3986 EncodeURL(toEncodeString.AsStringC(), resultBuf);
3990 } 3987 }
3991 FXJSE_Value_SetUTF8String(args.GetReturnValue(), 3988 FXJSE_Value_SetUTF8String(args.GetReturnValue(), resultBuf.AsStringC());
3992 resultBuf.GetByteString());
3993 } 3989 }
3994 FXJSE_Value_Release(argOne); 3990 FXJSE_Value_Release(argOne);
3995 FXJSE_Value_Release(argTwo); 3991 FXJSE_Value_Release(argTwo);
3996 } else { 3992 } else {
3997 pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, 3993 pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
3998 L"Encode"); 3994 L"Encode");
3999 } 3995 }
4000 } 3996 }
4001 void CXFA_FM2JSContext::EncodeURL(const CFX_ByteStringC& szURLString, 3997 void CXFA_FM2JSContext::EncodeURL(const CFX_ByteStringC& szURLString,
4002 CFX_ByteTextBuf& szResultBuf) { 3998 CFX_ByteTextBuf& szResultBuf) {
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after
4766 u += iFindLen - 1; 4762 u += iFindLen - 1;
4767 iFindIndex = 0; 4763 iFindIndex = 0;
4768 } else { 4764 } else {
4769 resultString.AppendChar(ch); 4765 resultString.AppendChar(ch);
4770 } 4766 }
4771 } else { 4767 } else {
4772 resultString.AppendChar(ch); 4768 resultString.AppendChar(ch);
4773 } 4769 }
4774 } 4770 }
4775 resultString.AppendChar(0); 4771 resultString.AppendChar(0);
4776 FXJSE_Value_SetUTF8String(args.GetReturnValue(), 4772 FXJSE_Value_SetUTF8String(args.GetReturnValue(), resultString.AsStringC());
4777 resultString.GetByteString());
4778 FXJSE_Value_Release(argOne); 4773 FXJSE_Value_Release(argOne);
4779 FXJSE_Value_Release(argTwo); 4774 FXJSE_Value_Release(argTwo);
4780 if (argc == 3) { 4775 if (argc == 3) {
4781 FXJSE_Value_Release(argThree); 4776 FXJSE_Value_Release(argThree);
4782 } 4777 }
4783 } else { 4778 } else {
4784 CXFA_FM2JSContext* pContext = 4779 CXFA_FM2JSContext* pContext =
4785 (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL); 4780 (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
4786 pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, 4781 pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
4787 L"Replace"); 4782 L"Replace");
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
4853 int32_t count = 0; 4848 int32_t count = 0;
4854 count = HValueToInteger(hThis, argOne); 4849 count = HValueToInteger(hThis, argOne);
4855 count = (count < 0) ? 0 : count; 4850 count = (count < 0) ? 0 : count;
4856 CFX_ByteTextBuf spaceString; 4851 CFX_ByteTextBuf spaceString;
4857 int32_t index = 0; 4852 int32_t index = 0;
4858 while (index < count) { 4853 while (index < count) {
4859 spaceString.AppendByte(' '); 4854 spaceString.AppendByte(' ');
4860 index++; 4855 index++;
4861 } 4856 }
4862 spaceString.AppendByte(0); 4857 spaceString.AppendByte(0);
4863 FXJSE_Value_SetUTF8String(args.GetReturnValue(), 4858 FXJSE_Value_SetUTF8String(args.GetReturnValue(), spaceString.AsStringC());
4864 spaceString.GetByteString());
4865 } 4859 }
4866 FXJSE_Value_Release(argOne); 4860 FXJSE_Value_Release(argOne);
4867 } else { 4861 } else {
4868 pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, 4862 pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
4869 L"Space"); 4863 L"Space");
4870 } 4864 }
4871 } 4865 }
4872 void CXFA_FM2JSContext::Str(FXJSE_HOBJECT hThis, 4866 void CXFA_FM2JSContext::Str(FXJSE_HOBJECT hThis,
4873 const CFX_ByteStringC& szFuncName, 4867 const CFX_ByteStringC& szFuncName,
4874 CFXJSE_Arguments& args) { 4868 CFXJSE_Arguments& args) {
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
4970 ++i; 4964 ++i;
4971 ++u; 4965 ++u;
4972 } 4966 }
4973 while (i < iPrecision) { 4967 while (i < iPrecision) {
4974 resultBuf.AppendChar('0'); 4968 resultBuf.AppendChar('0');
4975 ++i; 4969 ++i;
4976 } 4970 }
4977 resultBuf.AppendChar(0); 4971 resultBuf.AppendChar(0);
4978 } 4972 }
4979 } 4973 }
4980 FXJSE_Value_SetUTF8String(args.GetReturnValue(), 4974 FXJSE_Value_SetUTF8String(args.GetReturnValue(), resultBuf.AsStringC());
4981 resultBuf.GetByteString());
4982 } else { 4975 } else {
4983 FXJSE_Value_SetNull(args.GetReturnValue()); 4976 FXJSE_Value_SetNull(args.GetReturnValue());
4984 } 4977 }
4985 FXJSE_Value_Release(numberValue); 4978 FXJSE_Value_Release(numberValue);
4986 if (argc > 1) { 4979 if (argc > 1) {
4987 FXJSE_Value_Release(widthValue); 4980 FXJSE_Value_Release(widthValue);
4988 if (argc == 3) { 4981 if (argc == 3) {
4989 FXJSE_Value_Release(precisionValue); 4982 FXJSE_Value_Release(precisionValue);
4990 } 4983 }
4991 } 4984 }
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
5037 resultString.AppendChar(sourceString.GetAt(i)); 5030 resultString.AppendChar(sourceString.GetAt(i));
5038 ++i; 5031 ++i;
5039 } 5032 }
5040 resultString << insertString.AsStringC(); 5033 resultString << insertString.AsStringC();
5041 i = iStart + iDelete; 5034 i = iStart + iDelete;
5042 while (i < iLength) { 5035 while (i < iLength) {
5043 resultString.AppendChar(sourceString.GetAt(i)); 5036 resultString.AppendChar(sourceString.GetAt(i));
5044 ++i; 5037 ++i;
5045 } 5038 }
5046 resultString.AppendChar(0); 5039 resultString.AppendChar(0);
5047 FXJSE_Value_SetUTF8String(args.GetReturnValue(), 5040 FXJSE_Value_SetUTF8String(args.GetReturnValue(), resultString.AsStringC());
5048 resultString.GetByteString());
5049 FXJSE_Value_Release(sourceValue); 5041 FXJSE_Value_Release(sourceValue);
5050 FXJSE_Value_Release(startValue); 5042 FXJSE_Value_Release(startValue);
5051 FXJSE_Value_Release(deleteValue); 5043 FXJSE_Value_Release(deleteValue);
5052 if (argc == 4) { 5044 if (argc == 4) {
5053 FXJSE_Value_Release(insertValue); 5045 FXJSE_Value_Release(insertValue);
5054 } 5046 }
5055 } else { 5047 } else {
5056 CXFA_FM2JSContext* pContext = 5048 CXFA_FM2JSContext* pContext =
5057 (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL); 5049 (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
5058 pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, 5050 pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
5216 } 5208 }
5217 } 5209 }
5218 if (!bFlags) { 5210 if (!bFlags) {
5219 if ((fNumber < 0) || (fNumber > 922337203685477550)) { 5211 if ((fNumber < 0) || (fNumber > 922337203685477550)) {
5220 FXJSE_Value_SetUTF8String(args.GetReturnValue(), "*"); 5212 FXJSE_Value_SetUTF8String(args.GetReturnValue(), "*");
5221 } else { 5213 } else {
5222 CFX_ByteTextBuf resultBuf; 5214 CFX_ByteTextBuf resultBuf;
5223 CFX_ByteString numberString; 5215 CFX_ByteString numberString;
5224 numberString.Format("%.2f", fNumber); 5216 numberString.Format("%.2f", fNumber);
5225 WordUS(numberString.AsStringC(), iIdentifier, resultBuf); 5217 WordUS(numberString.AsStringC(), iIdentifier, resultBuf);
5226 FXJSE_Value_SetUTF8String(args.GetReturnValue(), 5218 FXJSE_Value_SetUTF8String(args.GetReturnValue(), resultBuf.AsStringC());
5227 resultBuf.GetByteString());
5228 } 5219 }
5229 } else { 5220 } else {
5230 FXJSE_Value_SetNull(args.GetReturnValue()); 5221 FXJSE_Value_SetNull(args.GetReturnValue());
5231 } 5222 }
5232 FXJSE_Value_Release(numberValue); 5223 FXJSE_Value_Release(numberValue);
5233 if (argc > 1) { 5224 if (argc > 1) {
5234 FXJSE_Value_Release(identifierValue); 5225 FXJSE_Value_Release(identifierValue);
5235 if (argc == 3) { 5226 if (argc == 3) {
5236 FXJSE_Value_Release(localeValue); 5227 FXJSE_Value_Release(localeValue);
5237 } 5228 }
(...skipping 1143 matching lines...) Expand 10 before | Expand all | Expand 10 after
6381 HValueToUTF8String(argOne, argString); 6372 HValueToUTF8String(argOne, argString);
6382 if (argString.IsEmpty()) { 6373 if (argString.IsEmpty()) {
6383 pContext->ThrowScriptErrorMessage(XFA_IDS_ARGUMENT_MISMATCH); 6374 pContext->ThrowScriptErrorMessage(XFA_IDS_ARGUMENT_MISMATCH);
6384 } else { 6375 } else {
6385 CFX_WideString scriptString = 6376 CFX_WideString scriptString =
6386 CFX_WideString::FromUTF8(argString.AsStringC()); 6377 CFX_WideString::FromUTF8(argString.AsStringC());
6387 CFX_WideTextBuf wsJavaScriptBuf; 6378 CFX_WideTextBuf wsJavaScriptBuf;
6388 CFX_WideString wsError; 6379 CFX_WideString wsError;
6389 XFA_FM2JS_Translate(scriptString.AsStringC(), wsJavaScriptBuf, wsError); 6380 XFA_FM2JS_Translate(scriptString.AsStringC(), wsJavaScriptBuf, wsError);
6390 if (wsError.IsEmpty()) { 6381 if (wsError.IsEmpty()) {
6391 CFX_WideString javaScript = wsJavaScriptBuf.GetWideString(); 6382 CFX_WideString javaScript = wsJavaScriptBuf.AsStringC();
6392 FXJSE_Value_SetUTF8String( 6383 FXJSE_Value_SetUTF8String(
6393 args.GetReturnValue(), 6384 args.GetReturnValue(),
6394 FX_UTF8Encode(javaScript.c_str(), javaScript.GetLength()) 6385 FX_UTF8Encode(javaScript.c_str(), javaScript.GetLength())
6395 .AsStringC()); 6386 .AsStringC());
6396 } else { 6387 } else {
6397 pContext->ThrowScriptErrorMessage(XFA_IDS_COMPILER_ERROR); 6388 pContext->ThrowScriptErrorMessage(XFA_IDS_COMPILER_ERROR);
6398 } 6389 }
6399 } 6390 }
6400 FXJSE_Value_Release(argOne); 6391 FXJSE_Value_Release(argOne);
6401 } else { 6392 } else {
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after
7230 CFX_WideString wsFormat; 7221 CFX_WideString wsFormat;
7231 pAppProvider->LoadString(iStringID, wsFormat); 7222 pAppProvider->LoadString(iStringID, wsFormat);
7232 CFX_WideString wsMessage; 7223 CFX_WideString wsMessage;
7233 va_list arg_ptr; 7224 va_list arg_ptr;
7234 va_start(arg_ptr, iStringID); 7225 va_start(arg_ptr, iStringID);
7235 wsMessage.FormatV(wsFormat.c_str(), arg_ptr); 7226 wsMessage.FormatV(wsFormat.c_str(), arg_ptr);
7236 va_end(arg_ptr); 7227 va_end(arg_ptr);
7237 FXJSE_ThrowMessage( 7228 FXJSE_ThrowMessage(
7238 "", FX_UTF8Encode(wsMessage.c_str(), wsMessage.GetLength()).AsStringC()); 7229 "", FX_UTF8Encode(wsMessage.c_str(), wsMessage.GetLength()).AsStringC());
7239 } 7230 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698