summaryrefslogtreecommitdiff
path: root/fpdfsdk
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2015-10-27 15:37:54 -0400
committerDan Sinclair <dsinclair@chromium.org>2015-10-27 15:37:54 -0400
commitd43ebdd78a854ebdaa7de301321ef8e698541bd6 (patch)
tree74328acd508c0507d5bf3e46fcef29b7c4519ac9 /fpdfsdk
parentc5fd3e95fbc42f41479f803e4f2f0b4a7c4fc612 (diff)
downloadpdfium-d43ebdd78a854ebdaa7de301321ef8e698541bd6.tar.xz
Merge to XFA: Use static_cast for various CPDF_Object conversions.
This Cl converts a bunch of c-style casts to static_cast<CPDF_Object*>(). 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 .
Diffstat (limited to 'fpdfsdk')
-rw-r--r--fpdfsdk/src/fsdk_baseform.cpp6
1 files changed, 3 insertions, 3 deletions
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<CPDF_Object*>(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))