Merge to master: Kill off some dodgy JS callbacks
[pdfium.git] / fpdfsdk / src / javascript / Consts.cpp
index 278cd7e..1b1c8ba 100644 (file)
@@ -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);
        }