diff options
| author | Bo Xu <bo_xu@foxitsoftware.com> | 2014-11-14 17:03:50 -0800 |
|---|---|---|
| committer | Bo Xu <bo_xu@foxitsoftware.com> | 2014-11-14 17:28:31 -0800 |
| commit | f13c1f3d21b1fad7a3ac70c14387379f6e146a1a (patch) | |
| tree | 9a3faa4513f451b24a6dd9999ea0f1ecca92a800 /fpdfsdk/src/javascript/Consts.cpp | |
| parent | 0c32f02cf5dabd80c03f3af34874b5f84535b1ef (diff) | |
| download | pdfium-f13c1f3d21b1fad7a3ac70c14387379f6e146a1a.tar.xz | |
Merge to XFA: Patch from CL 726143002
BUG=https://code.google.com/p/pdfium/issues/detail?id=78
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/726143002
Diffstat (limited to 'fpdfsdk/src/javascript/Consts.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/Consts.cpp | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/fpdfsdk/src/javascript/Consts.cpp b/fpdfsdk/src/javascript/Consts.cpp index 278cd7eab8..1b1c8babcb 100644 --- a/fpdfsdk/src/javascript/Consts.cpp +++ b/fpdfsdk/src/javascript/Consts.cpp @@ -151,94 +151,94 @@ int CJS_GlobalConsts::Init(IJS_Runtime* pRuntime) int CJS_GlobalArrays::Init(IJS_Runtime* pRuntime) { { - FX_LPCWSTR ArrayName = (FX_LPCWSTR)L"RE_NUMBER_ENTRY_DOT_SEP"; - FX_LPCWSTR ArrayContent[] = {(FX_LPCWSTR)L"[+-]?\\d*\\.?\\d*"}; + FX_LPCWSTR ArrayName = L"RE_NUMBER_ENTRY_DOT_SEP"; + FX_LPCWSTR ArrayContent[] = {L"[+-]?\\d*\\.?\\d*"}; DEFINE_GLOBAL_ARRAY(pRuntime); } { - FX_LPCWSTR ArrayName = (FX_LPCWSTR)L"RE_NUMBER_COMMIT_DOT_SEP"; - FX_LPCWSTR ArrayContent[] = {(FX_LPCWSTR)L"[+-]?\\d+(\\.\\d+)?", /* -1.0 or -1 */ - (FX_LPCWSTR)L"[+-]?\\.\\d+", /* -.1 */ - (FX_LPCWSTR)L"[+-]?\\d+\\." /* -1. */ - }; + FX_LPCWSTR ArrayName = L"RE_NUMBER_COMMIT_DOT_SEP"; + FX_LPCWSTR ArrayContent[] = { L"[+-]?\\d+(\\.\\d+)?", /* -1.0 or -1 */ + L"[+-]?\\.\\d+", /* -.1 */ + L"[+-]?\\d+\\." /* -1. */ + }; DEFINE_GLOBAL_ARRAY(pRuntime); } { - FX_LPCWSTR ArrayName = (FX_LPCWSTR)L"RE_NUMBER_ENTRY_COMMA_SEP"; - FX_LPCWSTR ArrayContent[] = {(FX_LPCWSTR)L"[+-]?\\d*,?\\d*"}; + FX_LPCWSTR ArrayName = L"RE_NUMBER_ENTRY_COMMA_SEP"; + FX_LPCWSTR ArrayContent[] = {L"[+-]?\\d*,?\\d*"}; DEFINE_GLOBAL_ARRAY(pRuntime); } { - FX_LPCWSTR ArrayName = (FX_LPCWSTR)L"RE_NUMBER_COMMIT_COMMA_SEP"; - FX_LPCWSTR ArrayContent[] = {(FX_LPCWSTR)L"[+-]?\\d+([.,]\\d+)?", /* -1,0 or -1 */ - (FX_LPCWSTR)L"[+-]?[.,]\\d+", /* -,1 */ - (FX_LPCWSTR)L"[+-]?\\d+[.,]" /* -1, */ - }; + FX_LPCWSTR ArrayName = L"RE_NUMBER_COMMIT_COMMA_SEP"; + FX_LPCWSTR ArrayContent[] = { L"[+-]?\\d+([.,]\\d+)?", /* -1,0 or -1 */ + L"[+-]?[.,]\\d+", /* -,1 */ + L"[+-]?\\d+[.,]" /* -1, */ + }; DEFINE_GLOBAL_ARRAY(pRuntime); } { - FX_LPCWSTR ArrayName = (FX_LPCWSTR)L"RE_ZIP_ENTRY"; - FX_LPCWSTR ArrayContent[] = {(FX_LPCWSTR)L"\\d{0,5}"}; + FX_LPCWSTR ArrayName = L"RE_ZIP_ENTRY"; + FX_LPCWSTR ArrayContent[] = {L"\\d{0,5}"}; DEFINE_GLOBAL_ARRAY(pRuntime); } { - FX_LPCWSTR ArrayName = (FX_LPCWSTR)L"RE_ZIP_COMMIT"; - FX_LPCWSTR ArrayContent[] = {(FX_LPCWSTR)L"\\d{5}"}; + FX_LPCWSTR ArrayName = L"RE_ZIP_COMMIT"; + FX_LPCWSTR ArrayContent[] = {L"\\d{5}"}; DEFINE_GLOBAL_ARRAY(pRuntime); } { - FX_LPCWSTR ArrayName = (FX_LPCWSTR)L"RE_ZIP4_ENTRY"; - FX_LPCWSTR ArrayContent[] = {(FX_LPCWSTR)L"\\d{0,5}(\\.|[- ])?\\d{0,4}"}; + FX_LPCWSTR ArrayName = L"RE_ZIP4_ENTRY"; + FX_LPCWSTR ArrayContent[] = {L"\\d{0,5}(\\.|[- ])?\\d{0,4}"}; DEFINE_GLOBAL_ARRAY(pRuntime); } { - FX_LPCWSTR ArrayName = (FX_LPCWSTR)L"RE_ZIP4_COMMIT"; - FX_LPCWSTR ArrayContent[] = {(FX_LPCWSTR)L"\\d{5}(\\.|[- ])?\\d{4}"}; + FX_LPCWSTR ArrayName = L"RE_ZIP4_COMMIT"; + FX_LPCWSTR ArrayContent[] = {L"\\d{5}(\\.|[- ])?\\d{4}"}; DEFINE_GLOBAL_ARRAY(pRuntime); } { - FX_LPCWSTR ArrayName = (FX_LPCWSTR)L"RE_PHONE_ENTRY"; + FX_LPCWSTR ArrayName = L"RE_PHONE_ENTRY"; FX_LPCWSTR ArrayContent[] = { - (FX_LPCWSTR)L"\\d{0,3}(\\.|[- ])?\\d{0,3}(\\.|[- ])?\\d{0,4}", /* 555-1234 or 408 555-1234 */ - (FX_LPCWSTR)L"\\(\\d{0,3}", /* (408 */ - (FX_LPCWSTR)L"\\(\\d{0,3}\\)(\\.|[- ])?\\d{0,3}(\\.|[- ])?\\d{0,4}", /* (408) 555-1234 */ + L"\\d{0,3}(\\.|[- ])?\\d{0,3}(\\.|[- ])?\\d{0,4}", /* 555-1234 or 408 555-1234 */ + L"\\(\\d{0,3}", /* (408 */ + L"\\(\\d{0,3}\\)(\\.|[- ])?\\d{0,3}(\\.|[- ])?\\d{0,4}", /* (408) 555-1234 */ /* (allow the addition of parens as an afterthought) */ - (FX_LPCWSTR)L"\\(\\d{0,3}(\\.|[- ])?\\d{0,3}(\\.|[- ])?\\d{0,4}", /* (408 555-1234 */ - (FX_LPCWSTR)L"\\d{0,3}\\)(\\.|[- ])?\\d{0,3}(\\.|[- ])?\\d{0,4}", /* 408) 555-1234 */ - (FX_LPCWSTR)L"011(\\.|[- \\d])*" /* international */ + L"\\(\\d{0,3}(\\.|[- ])?\\d{0,3}(\\.|[- ])?\\d{0,4}", /* (408 555-1234 */ + L"\\d{0,3}\\)(\\.|[- ])?\\d{0,3}(\\.|[- ])?\\d{0,4}", /* 408) 555-1234 */ + L"011(\\.|[- \\d])*" /* international */ }; DEFINE_GLOBAL_ARRAY(pRuntime); } { - FX_LPCWSTR ArrayName = (FX_LPCWSTR)L"RE_PHONE_COMMIT"; + FX_LPCWSTR ArrayName = L"RE_PHONE_COMMIT"; FX_LPCWSTR ArrayContent[] = { - (FX_LPCWSTR)L"\\d{3}(\\.|[- ])?\\d{4}", /* 555-1234 */ - (FX_LPCWSTR)L"\\d{3}(\\.|[- ])?\\d{3}(\\.|[- ])?\\d{4}", /* 408 555-1234 */ - (FX_LPCWSTR)L"\\(\\d{3}\\)(\\.|[- ])?\\d{3}(\\.|[- ])?\\d{4}", /* (408) 555-1234 */ - (FX_LPCWSTR)L"011(\\.|[- \\d])*" /* international */ + L"\\d{3}(\\.|[- ])?\\d{4}", /* 555-1234 */ + L"\\d{3}(\\.|[- ])?\\d{3}(\\.|[- ])?\\d{4}", /* 408 555-1234 */ + L"\\(\\d{3}\\)(\\.|[- ])?\\d{3}(\\.|[- ])?\\d{4}", /* (408) 555-1234 */ + L"011(\\.|[- \\d])*" /* international */ }; DEFINE_GLOBAL_ARRAY(pRuntime); } { - FX_LPCWSTR ArrayName = (FX_LPCWSTR)L"RE_SSN_ENTRY"; - FX_LPCWSTR ArrayContent[] = {(FX_LPCWSTR)L"\\d{0,3}(\\.|[- ])?\\d{0,2}(\\.|[- ])?\\d{0,4}"}; + FX_LPCWSTR ArrayName = L"RE_SSN_ENTRY"; + FX_LPCWSTR ArrayContent[] = {L"\\d{0,3}(\\.|[- ])?\\d{0,2}(\\.|[- ])?\\d{0,4}"}; DEFINE_GLOBAL_ARRAY(pRuntime); } { - FX_LPCWSTR ArrayName = (FX_LPCWSTR)L"RE_SSN_COMMIT"; - FX_LPCWSTR ArrayContent[] = {(FX_LPCWSTR)L"\\d{3}(\\.|[- ])?\\d{2}(\\.|[- ])?\\d{4}"}; + FX_LPCWSTR ArrayName = L"RE_SSN_COMMIT"; + FX_LPCWSTR ArrayContent[] = {L"\\d{3}(\\.|[- ])?\\d{2}(\\.|[- ])?\\d{4}"}; DEFINE_GLOBAL_ARRAY(pRuntime); } |