Merge to XFA: Make conversion between CPDF_Action and its dictionary explicit.

core/src/fpdfdoc/doc_formcontrol.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/fpdfdoc/fpdf_doc.h"
 CPDF_FormControl::CPDF_FormControl(CPDF_FormField* pField, CPDF_Dictionary* pWidgetDict)
 {
     m_pField = pField;
@@ skipping 230 matching lines @@
     CPDF_ApSettings mk = GetMK(FALSE);
     return mk.GetIconFit();
 }
 int CPDF_FormControl::GetTextPosition()
 {
     CPDF_ApSettings mk = GetMK(FALSE);
     return mk.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()
 {
     if (m_pWidgetDict == NULL) {
         return NULL;
     }
     if (m_pWidgetDict->KeyExist("AA")) {
         return m_pWidgetDict->GetDict("AA");
     } else {
         return m_pField->GetAdditionalAction();
@@ skipping 179 matching lines @@
     }
     return m_pDict->GetDict(FX_BSTRC("IF"));
 }
 int CPDF_ApSettings::GetTextPosition()
 {
     if (m_pDict == NULL) {
         return TEXTPOS_CAPTION;
     }
     return m_pDict->GetInteger(FX_BSTRC("TP"), TEXTPOS_CAPTION);
 }