From beb56d69a7a57317d521bab927a651fb260f5404 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 18 Jul 2018 04:52:18 +0000 Subject: Avoid writing const/non-const versions of the same function. Use const_cast for the non-const version to call the const version. Change-Id: Ibdf5fe53255ee6e983555080336f5d63e683afd1 Reviewed-on: https://pdfium-review.googlesource.com/37490 Reviewed-by: Henrique Nakashima Commit-Queue: Lei Zhang --- core/fpdfdoc/cpdf_formfield.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'core/fpdfdoc/cpdf_formfield.cpp') diff --git a/core/fpdfdoc/cpdf_formfield.cpp b/core/fpdfdoc/cpdf_formfield.cpp index 2f05ad8732..c88513d50f 100644 --- a/core/fpdfdoc/cpdf_formfield.cpp +++ b/core/fpdfdoc/cpdf_formfield.cpp @@ -37,8 +37,6 @@ const int kFormTextPassword = 0x200; const int kFormTextNoScroll = 0x400; const int kFormTextComb = 0x800; -constexpr int kGetFieldMaxRecursion = 32; - bool IsUnison(CPDF_FormField* pField) { if (pField->GetType() == CPDF_FormField::CheckBox) return true; @@ -58,6 +56,7 @@ Optional IntToFormFieldType(int value) { const CPDF_Object* FPDF_GetFieldAttr(const CPDF_Dictionary* pFieldDict, const char* name, int nLevel) { + static constexpr int kGetFieldMaxRecursion = 32; if (!pFieldDict || nLevel > kGetFieldMaxRecursion) return nullptr; @@ -72,15 +71,8 @@ const CPDF_Object* FPDF_GetFieldAttr(const CPDF_Dictionary* pFieldDict, CPDF_Object* FPDF_GetFieldAttr(CPDF_Dictionary* pFieldDict, const char* name, int nLevel) { - if (!pFieldDict || nLevel > kGetFieldMaxRecursion) - return nullptr; - - CPDF_Object* pAttr = pFieldDict->GetDirectObjectFor(name); - if (pAttr) - return pAttr; - - CPDF_Dictionary* pParent = pFieldDict->GetDictFor("Parent"); - return pParent ? FPDF_GetFieldAttr(pParent, name, nLevel + 1) : nullptr; + return const_cast(FPDF_GetFieldAttr( + static_cast(pFieldDict), name, nLevel)); } WideString FPDF_GetFullName(CPDF_Dictionary* pFieldDict) { -- cgit v1.2.3