Remove useless |kFormFieldTypes| constant.
Replace it with a loop using |kFormFieldTypeCount|.
Bug: pdfium:1428
Change-Id: Idf0a35748d3dab61122875322ee5d4768508c9a9
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/63735
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfdoc/cpdf_formfield.h b/core/fpdfdoc/cpdf_formfield.h
index 4c59591..a269af8 100644
--- a/core/fpdfdoc/cpdf_formfield.h
+++ b/core/fpdfdoc/cpdf_formfield.h
@@ -56,27 +56,6 @@
constexpr size_t kFormFieldTypeCount = 8;
#endif // PDF_ENABLE_XFA
-constexpr FormFieldType kFormFieldTypes[kFormFieldTypeCount] = {
- FormFieldType::kUnknown,
- FormFieldType::kPushButton,
- FormFieldType::kCheckBox,
- FormFieldType::kRadioButton,
- FormFieldType::kComboBox,
- FormFieldType::kListBox,
- FormFieldType::kTextField,
- FormFieldType::kSignature,
-#ifdef PDF_ENABLE_XFA
- FormFieldType::kXFA,
- FormFieldType::kXFA_CheckBox,
- FormFieldType::kXFA_ComboBox,
- FormFieldType::kXFA_ImageField,
- FormFieldType::kXFA_ListBox,
- FormFieldType::kXFA_PushButton,
- FormFieldType::kXFA_Signature,
- FormFieldType::kXFA_TextField
-#endif // PDF_ENABLE_XFA
-};
-
const CPDF_Object* FPDF_GetFieldAttr(const CPDF_Dictionary* pFieldDict,
const char* name);
CPDF_Object* FPDF_GetFieldAttr(CPDF_Dictionary* pFieldDict, const char* name);
diff --git a/fpdfsdk/cpdfsdk_interactiveform.cpp b/fpdfsdk/cpdfsdk_interactiveform.cpp
index 4b10400..54ec8b4 100644
--- a/fpdfsdk/cpdfsdk_interactiveform.cpp
+++ b/fpdfsdk/cpdfsdk_interactiveform.cpp
@@ -612,9 +612,9 @@
}
void CPDFSDK_InteractiveForm::SetAllHighlightColors(FX_COLORREF clr) {
- for (auto type : kFormFieldTypes) {
- m_HighlightColor[static_cast<size_t>(type)] = clr;
- m_NeedsHighlight[static_cast<size_t>(type)] = true;
+ for (size_t i = 0; i < kFormFieldTypeCount; ++i) {
+ m_HighlightColor[i] = clr;
+ m_NeedsHighlight[i] = true;
}
}