commit 1f3442ce5c035d22e2cc9fffc203892f2f749373
author Tom Sepez <tsepez@chromium.org> Thu Jul 23 16:07:32 2015 -0700
committer Tom Sepez <tsepez@chromium.org> Thu Jul 23 16:07:32 2015 -0700
tree 7c66063cf1e29cc48c81ca84e9d766a2e23f4b95
parent 2f2ffece124e4ed4b96d2846263015d4b5ad6c00

Merge to XFA: FX_BOOL combo patch.

Original Review URL: https://codereview.chromium.org/1257503002
Original Review URL: https://codereview.chromium.org/1253603002

Manual merge for:
  core/include/fxge/fx_font.h
  core/src/fxcodec/codec/codec_int.h
  fpdfsdk/src/javascript/PublicMethods.cpp

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1248153004 .

fpdfsdk/src/javascript/PublicMethods.cpp

diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/src/javascript/PublicMethods.cpp
index c5cc84c..abb95f0 100644
--- a/fpdfsdk/src/javascript/PublicMethods.cpp
+++ b/fpdfsdk/src/javascript/PublicMethods.cpp
@@ -1066,13 +1066,13 @@
 		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";
@@ -1125,9 +1125,9 @@
 		else
 			cSeperator = '.';
 
-		int iDecPositive,iDecNagative;
+		int iDecPositive,iDecNegative;
 		iDecPositive = iDec2;
-		iDecNagative = iDec2;
+		iDecNegative = iDec2;
 
 		for (iDecPositive = iDec2 -3; iDecPositive > 0;iDecPositive -= 3)
 		{
@@ -1151,7 +1151,7 @@
 
 	/////////////////////////////////////////////////////////////////////////
 	//for processing negative style
-	if (bNagative)
+	if (iNegative)
 	{
 		if (iNegStyle == 0)
 		{
@@ -1394,12 +1394,12 @@
 		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)
@@ -1446,9 +1446,9 @@
 		else
 			cSeperator = '.';
 
-		int iDecPositive,iDecNagative;
+		int iDecPositive,iDecNegative;
 		iDecPositive = iDec2;
-		iDecNagative = iDec2;
+		iDecNegative = iDec2;
 
 		for (iDecPositive = iDec2 -3; iDecPositive > 0; iDecPositive -= 3)
 		{
@@ -1457,8 +1457,8 @@
 		}
 	}
 	////////////////////////////////////////////////////////////////////
-	//nagative mark
-	if(bNagative)
+	//negative mark
+	if (iNegative)
 		strValue = "-" + strValue;
 	strValue += "%";
 	Value = CFX_WideString::FromLocal(strValue);