diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-03-02 15:35:26 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-03-02 15:35:26 -0800 |
| commit | 2f3dfefd2b34fc560c725c255495cc82a2b4044f (patch) | |
| tree | f808beb51dded7618b0706e87e6290b87cd21a73 /fpdfsdk/src/javascript/util.cpp | |
| parent | 3a83266acee37e99832adaf1337c6b3ab7559f50 (diff) | |
| download | pdfium-2f3dfefd2b34fc560c725c255495cc82a2b4044f.tar.xz | |
Merge to XFA: Kill off JS_ErrorString type.
Orignal Review URL: https://codereview.chromium.org/971033002
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/969203002
Diffstat (limited to 'fpdfsdk/src/javascript/util.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/util.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/fpdfsdk/src/javascript/util.cpp b/fpdfsdk/src/javascript/util.cpp index a53bb17507..0ac98ddbac 100644 --- a/fpdfsdk/src/javascript/util.cpp +++ b/fpdfsdk/src/javascript/util.cpp @@ -137,7 +137,7 @@ int util::ParstDataType(std::wstring* sFormat) return -1; } -FX_BOOL util::printf(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) +FX_BOOL util::printf(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError) { int iSize = params.size(); if (iSize < 1) @@ -202,7 +202,7 @@ FX_BOOL util::printf(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& return TRUE; } -FX_BOOL util::printd(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) +FX_BOOL util::printd(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError) { v8::Isolate* isolate = GetIsolate(cc); @@ -455,16 +455,14 @@ void util::printd(const std::wstring &cFormat2, CJS_Date jsDate, bool bXFAPictur } } - CFX_WideString strFormat; -// strFormat.Format(L"%d,%d,%d,%d,%d,%d",iYear, iMonth, iDay, iHour, iMin, iSec); -// CString strFormat = cppTm.Format(cFormat.c_str()); - wchar_t buf[64] = {0}; - strFormat = wcsftime(buf, 64, cFormat.c_str(), &time); - cFormat = buf; - cPurpose = cFormat; + CFX_WideString strFormat; + wchar_t buf[64] = {0}; + strFormat = wcsftime(buf, 64, cFormat.c_str(), &time); + cFormat = buf; + cPurpose = cFormat; } -FX_BOOL util::printx(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) +FX_BOOL util::printx(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError) { int iSize = params.size(); if (iSize<2) @@ -578,7 +576,7 @@ void util::printx(const std::string &cFormat,const std::string &cSource2,std::st } } -FX_BOOL util::scand(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) +FX_BOOL util::scand(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError) { v8::Isolate* isolate = GetIsolate(cc); int iSize = params.size(); @@ -635,7 +633,7 @@ FX_INT64 FX_atoi64(const char *nptr) return total; /* return result, negated if necessary */ } -FX_BOOL util::byteToChar(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) +FX_BOOL util::byteToChar(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError) { int iSize = params.size(); if (iSize == 0) |