diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-04 18:04:03 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-04 18:04:03 -0800 |
| commit | ff5adbc0dfa71270a9979f0c3e1d27923c16218a (patch) | |
| tree | c68169974c3d747d30f925c1ace74d7bc9fb774c /fpdfsdk/src/fsdk_baseform.cpp | |
| parent | 4544797e8998a31e7bc3f5439a5982f7f66dff26 (diff) | |
| download | pdfium-ff5adbc0dfa71270a9979f0c3e1d27923c16218a.tar.xz | |
Cleanup: Remove some NULL checks in fpdfsdk.
And simplify code.
R=ochang@chromium.org
Review URL: https://codereview.chromium.org/1411663013 .
Diffstat (limited to 'fpdfsdk/src/fsdk_baseform.cpp')
| -rw-r--r-- | fpdfsdk/src/fsdk_baseform.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp index 9a20e48e84..bc2d137d70 100644 --- a/fpdfsdk/src/fsdk_baseform.cpp +++ b/fpdfsdk/src/fsdk_baseform.cpp @@ -1806,7 +1806,7 @@ CFX_WideString CPDFSDK_InterForm::OnFormat(CPDF_FormField* pFormField, bFormated = FALSE; CPDF_AAction aAction = pFormField->GetAdditionalAction(); - if (aAction != NULL && aAction.ActionExist(CPDF_AAction::Format)) { + if (aAction && aAction.ActionExist(CPDF_AAction::Format)) { CPDF_Action action = aAction.GetAction(CPDF_AAction::Format); if (action) { CFX_WideString script = action.GetJavaScript(); @@ -1876,7 +1876,7 @@ void CPDFSDK_InterForm::OnKeyStrokeCommit(CPDF_FormField* pFormField, ASSERT(pFormField != NULL); CPDF_AAction aAction = pFormField->GetAdditionalAction(); - if (aAction != NULL && aAction.ActionExist(CPDF_AAction::KeyStroke)) { + if (aAction && aAction.ActionExist(CPDF_AAction::KeyStroke)) { CPDF_Action action = aAction.GetAction(CPDF_AAction::KeyStroke); if (action) { ASSERT(m_pDocument != NULL); @@ -1904,7 +1904,7 @@ void CPDFSDK_InterForm::OnValidate(CPDF_FormField* pFormField, ASSERT(pFormField != NULL); CPDF_AAction aAction = pFormField->GetAdditionalAction(); - if (aAction != NULL && aAction.ActionExist(CPDF_AAction::Validate)) { + if (aAction && aAction.ActionExist(CPDF_AAction::Validate)) { CPDF_Action action = aAction.GetAction(CPDF_AAction::Validate); if (action) { ASSERT(m_pDocument != NULL); @@ -2038,19 +2038,19 @@ FX_BOOL CPDFSDK_InterForm::FDFToURLEncodedData(uint8_t*& pBuf, CFDF_Document* pFDF = CFDF_Document::ParseMemory(pBuf, nBufSize); if (pFDF) { CPDF_Dictionary* pMainDict = pFDF->GetRoot()->GetDict("FDF"); - if (pMainDict == NULL) + if (!pMainDict) return FALSE; // Get fields CPDF_Array* pFields = pMainDict->GetArray("Fields"); - if (pFields == NULL) + if (!pFields) return FALSE; CFX_ByteTextBuf fdfEncodedData; for (FX_DWORD i = 0; i < pFields->GetCount(); i++) { CPDF_Dictionary* pField = pFields->GetDict(i); - if (pField == NULL) + if (!pField) continue; CFX_WideString name; name = pField->GetUnicodeText("T"); @@ -2106,14 +2106,14 @@ FX_BOOL CPDFSDK_InterForm::SubmitForm(const CFX_WideString& sDestination, CPDFDoc_Environment* pEnv = m_pDocument->GetEnv(); ASSERT(pEnv != NULL); - if (NULL == m_pDocument) + if (!m_pDocument) return FALSE; CFX_WideString wsPDFFilePath = m_pDocument->GetPath(); - if (NULL == m_pInterForm) + if (!m_pInterForm) return FALSE; CFDF_Document* pFDFDoc = m_pInterForm->ExportToFDF(wsPDFFilePath); - if (NULL == pFDFDoc) + if (!pFDFDoc) return FALSE; CFX_ByteTextBuf FdfBuffer; |