Merge to XFA: FX_BOOL combo patch.

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 "../../include/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
@@ skipping 1048 matching lines @@
 
 
         //////////////////////////////////////////////////////
         //for processing decimal places
         strValue.Replace(",", ".");
         double dValue = atof(strValue);
         if (iDec > 0)
                 dValue += DOUBLE_CORRECT;//
 
         int iDec2;
-        FX_BOOL bNagative = FALSE;
+        int iNegative = 0;
 
-        strValue = fcvt(dValue,iDec,&iDec2,&bNagative);
+        strValue = fcvt(dValue, iDec, &iDec2, &iNegative);
         if (strValue.IsEmpty())
         {
                 dValue = 0;
-                strValue = fcvt(dValue,iDec,&iDec2,&bNagative);
+                strValue = fcvt(dValue, iDec, &iDec2, &iNegative);
                 if (strValue.IsEmpty())
                 {
                         strValue = "0";
                         iDec2 = 1;
                 }
 
         }
 
         if (iDec2 < 0)
         {
@@ skipping 32 matching lines @@
                         strValue.Insert(iDec2, '0');
         }
         if (iSepStyle == 0 || iSepStyle == 2)
         {
                 char cSeperator;
                 if (iSepStyle == 0)
                         cSeperator = ',';
                 else
                         cSeperator = '.';
 
-                int iDecPositive,iDecNagative;
+                int iDecPositive,iDecNegative;
                 iDecPositive = iDec2;
-                iDecNagative = iDec2;
+                iDecNegative = iDec2;
 
                 for (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();
 
         if (bCurrencyPrepend)
                 strValue2 = wstrCurrency + strValue2;
         else
                 strValue2 = strValue2 + wstrCurrency;
 
 
 
         /////////////////////////////////////////////////////////////////////////
         //for processing negative style
-        if (bNagative)
+        if (iNegative)
         {
                 if (iNegStyle == 0)
                 {
                         strValue2.insert(0,L"-");
                 }
                 if (iNegStyle == 2 || iNegStyle == 3)
                 {
                         strValue2.insert(0,L"(");
                         strValue2.insert(strValue2.length(),L")");
                 }
@@ skipping 222 matching lines @@
                 iSepStyle = 0;
 
         //////////////////////////////////////////////////////
         //for processing decimal places
         double dValue = atof(strValue);
         dValue *= 100;
         if (iDec > 0)
                 dValue += DOUBLE_CORRECT;//УÕý
 
         int iDec2;
-        FX_BOOL bNagative = FALSE;
-        strValue = fcvt(dValue,iDec,&iDec2,&bNagative);
+        int iNegative = 0;
+        strValue = fcvt(dValue, iDec, &iDec2, &iNegative);
     if (strValue.IsEmpty())
         {
                 dValue = 0;
-                strValue = fcvt(dValue,iDec,&iDec2,&bNagative);
+                strValue = fcvt(dValue, iDec, &iDec2, &iNegative);
         }
 
         if (iDec2 < 0)
         {
                 for (int iNum = 0; iNum < abs(iDec2); iNum++)
                 {
                         strValue = "0" + strValue;
                 }
                 iDec2 = 0;
 
@@ skipping 26 matching lines @@
                         strValue.Insert(iDec2, '0');
         }
         if (iSepStyle == 0 || iSepStyle == 2)
         {
                 char cSeperator;
                 if (iSepStyle == 0)
                         cSeperator = ',';
                 else
                         cSeperator = '.';
 
-                int iDecPositive,iDecNagative;
+                int iDecPositive,iDecNegative;
                 iDecPositive = iDec2;
-                iDecNagative = iDec2;
+                iDecNegative = iDec2;
 
                 for (iDecPositive = iDec2 -3; iDecPositive > 0; iDecPositive -= 3)
                 {
                         strValue.Insert(iDecPositive,cSeperator);
                         iMax++;
                 }
         }
         ////////////////////////////////////////////////////////////////////
-        //nagative mark
-        if(bNagative)
+        //negative mark
+        if (iNegative)
                 strValue = "-" + strValue;
         strValue += "%";
         Value = CFX_WideString::FromLocal(strValue);
 #endif
     return TRUE;
 }
 //AFPercent_Keystroke(nDec, sepStyle)
 FX_BOOL CJS_PublicMethods::AFPercent_Keystroke(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
     return AFNumber_Keystroke(cc,params,vRet,sError);
@@ skipping 794 matching lines @@
         nums.SetElement(nIndex,CJS_Value(isolate,sPart.c_str()));
     }
 
     if (nums.GetLength() > 0)
         vRet = nums;
     else
         vRet.SetNull();
 
     return TRUE;
 }