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

fpdfsdk/src/fsdk_baseform.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/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_util.h"
 #include "../include/fsdk_mgr.h"
@@ skipping 2292 matching lines @@
         case CPDF_AAction::CursorExit:
         case CPDF_AAction::ButtonDown:
         case CPDF_AAction::ButtonUp:
         case CPDF_AAction::GetFocus:
         case CPDF_AAction::LoseFocus:
         case CPDF_AAction::PageOpen:
         case CPDF_AAction::PageClose:
         case CPDF_AAction::PageVisible:
         case CPDF_AAction::PageInvisible:
                 return CPDFSDK_BAAnnot::GetAAction(eAAT);
+
         case CPDF_AAction::KeyStroke:
         case CPDF_AAction::Format:
         case CPDF_AAction::Validate:
         case CPDF_AAction::Calculate:
                 {
                         CPDF_FormField* pField = this->GetFormField();
-                        ASSERT(pField != NULL);
-
                         if (CPDF_AAction aa = pField->GetAdditionalAction())
                                 return aa.GetAction(eAAT);
-                        else 
-                                return CPDFSDK_BAAnnot::GetAAction(eAAT);
+                        return CPDFSDK_BAAnnot::GetAAction(eAAT);
                 }
         default:
-                return NULL;
+                break;
         }
 
-        return NULL;
+        return CPDF_Action();
 }
 
 
 CFX_WideString CPDFSDK_Widget::GetAlternateName() const
 {
         CPDF_FormField* pFormField = GetFormField();
         ASSERT(pFormField != NULL);
 
         return pFormField->GetAlternateName();
 }
@@ skipping 582 matching lines @@
                         bRC = fa.bRC;
          
                 }
         }
 }
 
 /* ----------------------------- action ----------------------------- */
 
 FX_BOOL CPDFSDK_InterForm::DoAction_Hide(const CPDF_Action& action)
 {
-        ASSERT(action != NULL);
+        ASSERT(action);
 
         CPDF_ActionFields af = action.GetWidgets();
         CFX_PtrArray fieldObjects;
         af.GetAllFields(fieldObjects);
         CFX_PtrArray widgetArray;
         CFX_PtrArray fields;
         GetFieldFromObjects(fieldObjects, fields);
 
         FX_BOOL bHide = action.GetHideStatus();
 
@@ skipping 35 matching lines @@
                                 bChanged = TRUE;
                         }
                 }
         }
 
         return bChanged;
 }
 
 FX_BOOL CPDFSDK_InterForm::DoAction_SubmitForm(const CPDF_Action& action)
 {
-        ASSERT(action != NULL);
+        ASSERT(action);
         ASSERT(m_pInterForm != NULL);
 
         CFX_WideString sDestination = action.GetFilePath();
         if (sDestination.IsEmpty()) return FALSE;
 
-        CPDF_Dictionary* pActionDict = action;
+        CPDF_Dictionary* pActionDict = action.GetDict();
         if (pActionDict->KeyExist("Fields"))
         {
                 CPDF_ActionFields af = action.GetWidgets();
                 FX_DWORD dwFlags = action.GetFlags();
                 
                 CFX_PtrArray fieldObjects;
                 af.GetAllFields(fieldObjects);
                 CFX_PtrArray fields;
                 GetFieldFromObjects(fieldObjects, fields);
                 
@@ skipping 225 matching lines @@
         
         FX_BOOL bRet = pFDF->WriteBuf(textBuf);
         delete pFDF;
         
         return bRet;
 }
 
 
 FX_BOOL CPDFSDK_InterForm::DoAction_ResetForm(const CPDF_Action& action)
 {
-        ASSERT(action != NULL);
+        ASSERT(action);
 
-        CPDF_Dictionary* pActionDict = action;
-
+        CPDF_Dictionary* pActionDict = action.GetDict();
         if (pActionDict->KeyExist("Fields"))
         {
                 CPDF_ActionFields af = action.GetWidgets();
                 FX_DWORD dwFlags = action.GetFlags();
-                
+
                 CFX_PtrArray fieldObjects;
                 af.GetAllFields(fieldObjects);
                 CFX_PtrArray fields;
                 GetFieldFromObjects(fieldObjects, fields);
-                
-                ASSERT(m_pInterForm != NULL);
-
                 return m_pInterForm->ResetForm(fields, !(dwFlags & 0x01), TRUE);
         }
-        else
-        {
-                ASSERT(m_pInterForm != NULL);
-                return m_pInterForm->ResetForm(TRUE);
-        }
+
+        return m_pInterForm->ResetForm(TRUE);
 }
 
 FX_BOOL CPDFSDK_InterForm::DoAction_ImportData(const CPDF_Action& action)
 {
         return FALSE;
 }
 
 void CPDFSDK_InterForm::GetFieldFromObjects(const CFX_PtrArray& objects, CFX_PtrArray& fields)
 {
         ASSERT(m_pInterForm != NULL);
@@ skipping 531 matching lines @@
 
         CPDF_Annot* pPDFAnnot = pAnnot->GetPDFAnnot();
         ASSERT(pPDFAnnot != NULL);
 
         CPDF_Rect rcAnnot;
         pPDFAnnot->GetRect(rcAnnot);
 
         return rcAnnot;
 }