diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-03-05 16:44:22 -0800 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-03-05 16:44:22 -0800 |
commit | 7b5bc26e8267fec38bef9f95cd04d2bd731faff3 (patch) | |
tree | 9203aa0ff0d4a34616a5161b2ded34ce7e9ada24 /core/src/fpdfdoc/doc_formcontrol.cpp | |
parent | 827a1722f70e7092270b5e0fdfba1e9c0b1ac50f (diff) | |
download | pdfium-7b5bc26e8267fec38bef9f95cd04d2bd731faff3.tar.xz |
Merge to XFA: Make conversion between CPDF_Action and its dictionary explicit.
Original Review URL: https://codereview.chromium.org/984773002
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/984783002
Diffstat (limited to 'core/src/fpdfdoc/doc_formcontrol.cpp')
-rw-r--r-- | core/src/fpdfdoc/doc_formcontrol.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/core/src/fpdfdoc/doc_formcontrol.cpp b/core/src/fpdfdoc/doc_formcontrol.cpp index 61cd980754..1ab63234d6 100644 --- a/core/src/fpdfdoc/doc_formcontrol.cpp +++ b/core/src/fpdfdoc/doc_formcontrol.cpp @@ -248,18 +248,17 @@ int CPDF_FormControl::GetTextPosition() } CPDF_Action CPDF_FormControl::GetAction() { - if (m_pWidgetDict == NULL) { - return NULL; + if (!m_pWidgetDict) { + return CPDF_Action(); } if (m_pWidgetDict->KeyExist("A")) { - return m_pWidgetDict->GetDict("A"); - } else { - CPDF_Object* pObj = FPDF_GetFieldAttr(m_pField->m_pDict, "A"); - if (pObj == NULL) { - return NULL; - } - return pObj->GetDict(); + return CPDF_Action(m_pWidgetDict->GetDict("A")); + } + CPDF_Object* pObj = FPDF_GetFieldAttr(m_pField->m_pDict, "A"); + if (!pObj) { + return CPDF_Action(); } + return CPDF_Action(pObj->GetDict()); } CPDF_AAction CPDF_FormControl::GetAdditionalAction() { |