commit 8c9ca1bd3bc1684e40696fb06bf44c81a3d18222
author Tom Sepez <tsepez@chromium.org> Fri May 21 23:04:55 2021 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri May 21 23:04:55 2021 +0000
tree a8a3d9ef477c9a09f94948d6acb24387fda742de
parent 21a993f259f4fa06a080a826dbef647000fed599

Avoid some else-ifs in cfxjse_formcalc_context.cpp

Change-Id: I0600443b3288f875b477fc3859bcbb477f9cb35f
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/80830
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

fxjs/xfa/cfxjse_formcalc_context.cpp

diff --git a/fxjs/xfa/cfxjse_formcalc_context.cpp b/fxjs/xfa/cfxjse_formcalc_context.cpp
index e6e080a..3acf137 100644
--- a/fxjs/xfa/cfxjse_formcalc_context.cpp
+++ b/fxjs/xfa/cfxjse_formcalc_context.cpp
@@ -335,30 +335,24 @@
     return {true, CXFA_LocaleValue::ValueType::kDateTime};
   if (L"date" == wsPattern.First(4)) {
     auto pos = wsPattern.Find(L"time");
-    CXFA_LocaleValue::ValueType type =
-        pos.has_value() && pos.value() != 0
-            ? CXFA_LocaleValue::ValueType::kDateTime
-            : CXFA_LocaleValue::ValueType::kDate;
-    return {true, type};
+    if (pos.has_value() && pos.value() != 0)
+      return {true, CXFA_LocaleValue::ValueType::kDateTime};
+    return {true, CXFA_LocaleValue::ValueType::kDate};
   }
   if (L"time" == wsPattern.First(4))
     return {true, CXFA_LocaleValue::ValueType::kTime};
   if (L"text" == wsPattern.First(4))
     return {true, CXFA_LocaleValue::ValueType::kText};
   if (L"num" == wsPattern.First(3)) {
-    CXFA_LocaleValue::ValueType type;
-    if (L"integer" == wsPattern.Substr(4, 7)) {
-      type = CXFA_LocaleValue::ValueType::kInteger;
-    } else if (L"decimal" == wsPattern.Substr(4, 7)) {
-      type = CXFA_LocaleValue::ValueType::kDecimal;
-    } else if (L"currency" == wsPattern.Substr(4, 8)) {
-      type = CXFA_LocaleValue::ValueType::kFloat;
-    } else if (L"percent" == wsPattern.Substr(4, 7)) {
-      type = CXFA_LocaleValue::ValueType::kFloat;
-    } else {
-      type = CXFA_LocaleValue::ValueType::kFloat;
-    }
-    return {true, type};
+    if (L"integer" == wsPattern.Substr(4, 7))
+      return {true, CXFA_LocaleValue::ValueType::kInteger};
+    if (L"decimal" == wsPattern.Substr(4, 7))
+      return {true, CXFA_LocaleValue::ValueType::kDecimal};
+    if (L"currency" == wsPattern.Substr(4, 8))
+      return {true, CXFA_LocaleValue::ValueType::kFloat};
+    if (L"percent" == wsPattern.Substr(4, 7))
+      return {true, CXFA_LocaleValue::ValueType::kFloat};
+    return {true, CXFA_LocaleValue::ValueType::kFloat};
   }
 
   CXFA_LocaleValue::ValueType type = CXFA_LocaleValue::ValueType::kNull;