Revert "Cleanup CJS_PublicMethods::ParseNumber"

fpdfsdk/src/javascript/Field.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 "Field.h"
 
 #include "Document.h"
 #include "Icon.h"
@@ skipping 2723 matching lines @@
 
     CPDF_FormField* pFormField = FieldArray[0];
     switch (pFormField->GetFieldType()) {
       case FIELDTYPE_PUSHBUTTON:
         return FALSE;
       case FIELDTYPE_COMBOBOX:
       case FIELDTYPE_TEXTFIELD: {
         CFX_WideString swValue = pFormField->GetValue();
 
         double dRet;
-        if (CJS_PublicMethods::ConvertStringToNumber(swValue.c_str(), dRet)) {
-          vp << dRet;
+        FX_BOOL bDot;
+        if (CJS_PublicMethods::ConvertStringToNumber(swValue.c_str(), dRet,
+                                                     bDot)) {
+          if (bDot)
+            vp << dRet;
+          else
+            vp << dRet;
         } else {
           vp << swValue;
         }
       } break;
       case FIELDTYPE_LISTBOX: {
         if (pFormField->CountSelectedItems() > 1) {
           CJS_Array ValueArray(pRuntime);
           CJS_Value ElementValue(pRuntime);
           int iIndex;
           for (int i = 0, sz = pFormField->CountSelectedItems(); i < sz; i++) {
             iIndex = pFormField->GetSelectedIndex(i);
             ElementValue = pFormField->GetOptionValue(iIndex).c_str();
             if (FXSYS_wcslen(ElementValue.ToCFXWideString().c_str()) == 0)
               ElementValue = pFormField->GetOptionLabel(iIndex).c_str();
             ValueArray.SetElement(i, ElementValue);
           }
           vp << ValueArray;
         } else {
           CFX_WideString swValue = pFormField->GetValue();
 
           double dRet;
-          if (CJS_PublicMethods::ConvertStringToNumber(swValue.c_str(), dRet)) {
-            vp << dRet;
+          FX_BOOL bDot;
+          if (CJS_PublicMethods::ConvertStringToNumber(swValue.c_str(), dRet,
+                                                       bDot)) {
+            if (bDot)
+              vp << dRet;
+            else
+              vp << dRet;
           } else {
             vp << swValue;
           }
         }
       } break;
       case FIELDTYPE_CHECKBOX:
       case FIELDTYPE_RADIOBUTTON: {
         FX_BOOL bFind = FALSE;
         for (int i = 0, sz = pFormField->CountControls(); i < sz; i++) {
           if (!pFormField->GetControl(i)->IsChecked())
             continue;
 
           CFX_WideString swValue = pFormField->GetControl(i)->GetExportValue();
           double dRet;
-          if (CJS_PublicMethods::ConvertStringToNumber(swValue.c_str(), dRet)) {
+          FX_BOOL bDotDummy;
+          if (CJS_PublicMethods::ConvertStringToNumber(swValue.c_str(), dRet,
+                                                       bDotDummy)) {
             vp << dRet;
           } else {
             vp << swValue;
           }
 
           bFind = TRUE;
           break;
         }
         if (!bFind)
           vp << L"Off";
@@ skipping 814 matching lines @@
   }
 }
 
 void Field::AddField(CPDFSDK_Document* pDocument,
                      int nPageIndex,
                      int nFieldType,
                      const CFX_WideString& sName,
                      const CPDF_Rect& rcCoords) {
   // Not supported.
 }