Index: xfa/fxfa/fm2js/xfa_fm2jscontext.cpp |
diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp |
index 3acae67bc3c4911904b011aef5095affd5ec9511..9bea47ebfb5e08ceb28f32c241043c0289d533f4 100644 |
--- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp |
+++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp |
@@ -3539,65 +3539,62 @@ void CXFA_FM2JSContext::UnitValue(FXJSE_HOBJECT hThis, |
strUnit = strFirstUnit; |
} |
FX_DOUBLE dResult = 0; |
- if (strFirstUnit.Equal("in") || strFirstUnit.Equal("inches")) { |
- if (strUnit.Equal("mm") || strUnit.Equal("millimeters")) { |
+ if (strFirstUnit == "in" || strFirstUnit == "inches") { |
+ if (strUnit == "mm" || strUnit == "millimeters") { |
dResult = dFirstNumber * 25.4; |
- } else if (strUnit.Equal("cm") || strUnit.Equal("centimeters")) { |
+ } else if (strUnit == "cm" || strUnit == "centimeters") { |
dResult = dFirstNumber * 2.54; |
- } else if (strUnit.Equal("pt") || strUnit.Equal("points")) { |
+ } else if (strUnit == "pt" || strUnit == "points") { |
dResult = dFirstNumber / 72; |
- } else if (strUnit.Equal("mp") || strUnit.Equal("millipoints")) { |
+ } else if (strUnit == "mp" || strUnit == "millipoints") { |
dResult = dFirstNumber / 72000; |
} else { |
dResult = dFirstNumber; |
} |
- } else if (strFirstUnit.Equal("mm") || |
- strFirstUnit.Equal("millimeters")) { |
- if (strUnit.Equal("mm") || strUnit.Equal("millimeters")) { |
+ } else if (strFirstUnit == "mm" || strFirstUnit == "millimeters") { |
+ if (strUnit == "mm" || strUnit == "millimeters") { |
dResult = dFirstNumber; |
- } else if (strUnit.Equal("cm") || strUnit.Equal("centimeters")) { |
+ } else if (strUnit == "cm" || strUnit == "centimeters") { |
dResult = dFirstNumber / 10; |
- } else if (strUnit.Equal("pt") || strUnit.Equal("points")) { |
+ } else if (strUnit == "pt" || strUnit == "points") { |
dResult = dFirstNumber / 25.4 / 72; |
- } else if (strUnit.Equal("mp") || strUnit.Equal("millipoints")) { |
+ } else if (strUnit == "mp" || strUnit == "millipoints") { |
dResult = dFirstNumber / 25.4 / 72000; |
} else { |
dResult = dFirstNumber / 25.4; |
} |
- } else if (strFirstUnit.Equal("cm") || |
- strFirstUnit.Equal("centimeters")) { |
- if (strUnit.Equal("mm") || strUnit.Equal("millimeters")) { |
+ } else if (strFirstUnit == "cm" || strFirstUnit == "centimeters") { |
+ if (strUnit == "mm" || strUnit == "millimeters") { |
dResult = dFirstNumber * 10; |
- } else if (strUnit.Equal("cm") || strUnit.Equal("centimeters")) { |
+ } else if (strUnit == "cm" || strUnit == "centimeters") { |
dResult = dFirstNumber; |
- } else if (strUnit.Equal("pt") || strUnit.Equal("points")) { |
+ } else if (strUnit == "pt" || strUnit == "points") { |
dResult = dFirstNumber / 2.54 / 72; |
- } else if (strUnit.Equal("mp") || strUnit.Equal("millipoints")) { |
+ } else if (strUnit == "mp" || strUnit == "millipoints") { |
dResult = dFirstNumber / 2.54 / 72000; |
} else { |
dResult = dFirstNumber / 2.54; |
} |
- } else if (strFirstUnit.Equal("pt") || strFirstUnit.Equal("points")) { |
- if (strUnit.Equal("mm") || strUnit.Equal("millimeters")) { |
+ } else if (strFirstUnit == "pt" || strFirstUnit == "points") { |
+ if (strUnit == "mm" || strUnit == "millimeters") { |
dResult = dFirstNumber / 72 * 25.4; |
- } else if (strUnit.Equal("cm") || strUnit.Equal("centimeters")) { |
+ } else if (strUnit == "cm" || strUnit == "centimeters") { |
dResult = dFirstNumber / 72 * 2.54; |
- } else if (strUnit.Equal("pt") || strUnit.Equal("points")) { |
+ } else if (strUnit == "pt" || strUnit == "points") { |
dResult = dFirstNumber; |
- } else if (strUnit.Equal("mp") || strUnit.Equal("millipoints")) { |
+ } else if (strUnit == "mp" || strUnit == "millipoints") { |
dResult = dFirstNumber * 1000; |
} else { |
dResult = dFirstNumber / 72; |
} |
- } else if (strFirstUnit.Equal("mp") || |
- strFirstUnit.Equal("millipoints")) { |
- if (strUnit.Equal("mm") || strUnit.Equal("millimeters")) { |
+ } else if (strFirstUnit == "mp" || strFirstUnit == "millipoints") { |
+ if (strUnit == "mm" || strUnit == "millimeters") { |
dResult = dFirstNumber / 72000 * 25.4; |
- } else if (strUnit.Equal("cm") || strUnit.Equal("centimeters")) { |
+ } else if (strUnit == "cm" || strUnit == "centimeters") { |
dResult = dFirstNumber / 72000 * 2.54; |
- } else if (strUnit.Equal("pt") || strUnit.Equal("points")) { |
+ } else if (strUnit == "pt" || strUnit == "points") { |
dResult = dFirstNumber / 1000; |
- } else if (strUnit.Equal("mp") || strUnit.Equal("millipoints")) { |
+ } else if (strUnit == "mp" || strUnit == "millipoints") { |
dResult = dFirstNumber; |
} else { |
dResult = dFirstNumber / 72000; |
@@ -5707,7 +5704,7 @@ void CXFA_FM2JSContext::equality_operator(FXJSE_HOBJECT hThis, |
FXJSE_Value_ToUTF8String(argFirst, firstOutput); |
FXJSE_Value_ToUTF8String(argSecond, secondOutput); |
FXJSE_Value_SetInteger(args.GetReturnValue(), |
- firstOutput.Equal(secondOutput) ? 1 : 0); |
+ firstOutput == secondOutput); |
} else { |
FX_DOUBLE first = HValueToDouble(hThis, argFirst); |
FX_DOUBLE second = HValueToDouble(hThis, argSecond); |
@@ -5745,7 +5742,7 @@ void CXFA_FM2JSContext::notequality_operator(FXJSE_HOBJECT hThis, |
FXJSE_Value_ToUTF8String(argFirst, firstOutput); |
FXJSE_Value_ToUTF8String(argSecond, secondOutput); |
FXJSE_Value_SetInteger(args.GetReturnValue(), |
- firstOutput.Equal(secondOutput) ? 0 : 1); |
+ firstOutput == secondOutput ? 0 : 1); |
Lei Zhang
2016/04/01 01:02:36
!=
Tom Sepez
2016/04/01 17:06:12
Done.
|
} else { |
FX_DOUBLE first = HValueToDouble(hThis, argFirst); |
FX_DOUBLE second = HValueToDouble(hThis, argSecond); |
@@ -6691,7 +6688,7 @@ FX_BOOL CXFA_FM2JSContext::simpleValueCompare(FXJSE_HOBJECT hThis, |
CFX_ByteString firstString, secondString; |
HValueToUTF8String(firstValue, firstString); |
HValueToUTF8String(secondValue, secondString); |
- bReturn = firstString.Equal(secondString); |
+ bReturn = firstString == secondString; |
} else if (FXJSE_Value_IsNumber(firstValue)) { |
FX_FLOAT first = HValueToFloat(hThis, firstValue); |
FX_FLOAT second = HValueToFloat(hThis, secondValue); |