Next round of XFA changes to match master

fpdfsdk/src/javascript/PublicMethods.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "PublicMethods.h"
 
 #include "../../include/fsdk_mgr.h"  // For CPDFDoc_Environment.
 #include "../../include/javascript/IJavaScript.h"
@@ skipping 30 matching lines @@
 JS_STATIC_GLOBAL_FUN_ENTRY(AFMakeNumber)
 JS_STATIC_GLOBAL_FUN_ENTRY(AFSimple_Calculate)
 JS_STATIC_GLOBAL_FUN_ENTRY(AFRange_Validate)
 JS_STATIC_GLOBAL_FUN_ENTRY(AFMergeChange)
 JS_STATIC_GLOBAL_FUN_ENTRY(AFParseDateEx)
 JS_STATIC_GLOBAL_FUN_ENTRY(AFExtractNums)
 END_JS_STATIC_GLOBAL_FUN()
 
 IMPLEMENT_JS_STATIC_GLOBAL_FUN(CJS_PublicMethods)
 
-static const FX_WCHAR* months[] = {L"Jan", L"Feb", L"Mar", L"Apr",
-                                   L"May", L"Jun", L"Jul", L"Aug",
-                                   L"Sep", L"Oct", L"Nov", L"Dec"};
+static const FX_WCHAR* const months[] = {L"Jan",
+                                         L"Feb",
+                                         L"Mar",
+                                         L"Apr",
+                                         L"May",
+                                         L"Jun",
+                                         L"Jul",
+                                         L"Aug",
+                                         L"Sep",
+                                         L"Oct",
+                                         L"Nov",
+                                         L"Dec"};
 
 static const FX_WCHAR* const fullmonths[] = {
     L"January",   L"February", L"March",    L"April",
     L"May",       L"June",     L"July",     L"August",
     L"September", L"October",  L"November", L"December"};
 
 FX_BOOL CJS_PublicMethods::IsNumber(const FX_WCHAR* string) {
   CFX_WideString sTrim = StrTrim(string);
   const FX_WCHAR* pTrim = sTrim.c_str();
   const FX_WCHAR* p = pTrim;
@@ skipping 864 matching lines @@
     iSepStyle = 0;
 
   if (iNegStyle < 0 || iNegStyle > 3)
     iNegStyle = 0;
 
   //////////////////////////////////////////////////////
   // for processing decimal places
   strValue.Replace(",", ".");
   double dValue = atof(strValue);
   if (iDec > 0)
-    dValue += DOUBLE_CORRECT;  //
+    dValue += DOUBLE_CORRECT;
 
   int iDec2;
   int iNegative = 0;
 
   strValue = fcvt(dValue, iDec, &iDec2, &iNegative);
   if (strValue.IsEmpty()) {
     dValue = 0;
     strValue = fcvt(dValue, iDec, &iDec2, &iNegative);
     if (strValue.IsEmpty()) {
       strValue = "0";
@@ skipping 28 matching lines @@
     if (iDec2 == 0)
       strValue.Insert(iDec2, '0');
   }
   if (iSepStyle == 0 || iSepStyle == 2) {
     char cSeperator;
     if (iSepStyle == 0)
       cSeperator = ',';
     else
       cSeperator = '.';
 
-    int iDecPositive, iDecNegative;
-    iDecPositive = iDec2;
-    iDecNegative = iDec2;
-
-    for (iDecPositive = iDec2 - 3; iDecPositive > 0; iDecPositive -= 3) {
+    for (int iDecPositive = iDec2 - 3; iDecPositive > 0; iDecPositive -= 3) {
       strValue.Insert(iDecPositive, cSeperator);
       iMax++;
     }
   }
 
   //////////////////////////////////////////////////////////////////////
   // for processing currency string
 
   Value = CFX_WideString::FromLocal(strValue);
   std::wstring strValue2 = Value.c_str();
@@ skipping 265 matching lines @@
     if (iDec2 == 0)
       strValue.Insert(iDec2, '0');
   }
   if (iSepStyle == 0 || iSepStyle == 2) {
     char cSeperator;
     if (iSepStyle == 0)
       cSeperator = ',';
     else
       cSeperator = '.';
 
-    int iDecPositive, iDecNegative;
-    iDecPositive = iDec2;
-    iDecNegative = iDec2;
-
-    for (iDecPositive = iDec2 - 3; iDecPositive > 0; iDecPositive -= 3) {
+    for (int iDecPositive = iDec2 - 3; iDecPositive > 0; iDecPositive -= 3) {
       strValue.Insert(iDecPositive, cSeperator);
       iMax++;
     }
   }
   ////////////////////////////////////////////////////////////////////
   // negative mark
   if (iNegative)
     strValue = "-" + strValue;
   strValue += "%";
   Value = CFX_WideString::FromLocal(strValue);
@@ skipping 776 matching lines @@
     nums.SetElement(nIndex, CJS_Value(pRuntime, sPart.c_str()));
   }
 
   if (nums.GetLength() > 0)
     vRet = nums;
   else
     vRet.SetNull();
 
   return TRUE;
 }