From d43ebdd78a854ebdaa7de301321ef8e698541bd6 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 27 Oct 2015 15:37:54 -0400 Subject: Merge to XFA: Use static_cast for various CPDF_Object conversions. This Cl converts a bunch of c-style casts to static_cast(). BUG=pdfium:201 TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1428583003 . (cherry picked from commit 74b147b5747cf65a8936d201b3ed5b32454365cc) Review URL: https://codereview.chromium.org/1417583007 . --- fpdfsdk/src/fsdk_baseform.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp index 112149370b..467e9429c1 100644 --- a/fpdfsdk/src/fsdk_baseform.cpp +++ b/fpdfsdk/src/fsdk_baseform.cpp @@ -2878,14 +2878,14 @@ void CPDFSDK_InterForm::GetFieldFromObjects(const CFX_PtrArray& objects, int iCount = objects.GetSize(); for (int i = 0; i < iCount; i++) { - CPDF_Object* pObject = (CPDF_Object*)objects[i]; - if (pObject == NULL) + CPDF_Object* pObject = static_cast(objects[i]); + if (!pObject) continue; if (pObject->IsString()) { CFX_WideString csName = pObject->GetUnicodeText(); CPDF_FormField* pField = m_pInterForm->GetField(0, csName); - if (pField != NULL) + if (pField) fields.Add(pField); } else if (pObject->IsDictionary()) { if (m_pInterForm->IsValidFormField(pObject)) -- cgit v1.2.3