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

fpdfsdk/src/fsdk_baseannot.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/fsdk_mgr.h"
 #include "../include/fsdk_baseannot.h"
@@ skipping 1068 matching lines @@
         return TRUE;
 }
 FX_BOOL CPDFSDK_BAAnnot::IsVisible() const
 {
         int nFlags = GetFlags();
         return !((nFlags & ANNOTFLAG_INVISIBLE) || (nFlags & ANNOTFLAG_HIDDEN) || (nFlags & ANNOTFLAG_NOVIEW));
 }
 
 CPDF_Action CPDFSDK_BAAnnot::GetAction() const
 {
-        ASSERT(m_pAnnot != NULL);
-        ASSERT(m_pAnnot->m_pAnnotDict != NULL);
-        
-        return m_pAnnot->m_pAnnotDict->GetDict("A");
+        return CPDF_Action(m_pAnnot->m_pAnnotDict->GetDict("A"));
 }
 
 void CPDFSDK_BAAnnot::SetAction(const CPDF_Action& action)
 {
-        ASSERT(m_pAnnot != NULL);
-        ASSERT(m_pAnnot->m_pAnnotDict != NULL);
-        
-        ASSERT(action != NULL);
-        
-        if ((CPDF_Action&)action != m_pAnnot->m_pAnnotDict->GetDict("A"))
+        ASSERT(action);
+        if ((CPDF_Action&)action != CPDF_Action(m_pAnnot->m_pAnnotDict->GetDict("A")))
         {
                 CPDF_Document* pDoc = m_pPageView->GetPDFDocument();
-                ASSERT(pDoc != NULL);
-                
-                if (action.m_pDict && (action.m_pDict->GetObjNum() == 0))
-                        pDoc->AddIndirectObject(action.m_pDict); 
-                m_pAnnot->m_pAnnotDict->SetAtReference("A", pDoc, action.m_pDict->GetObjNum());
+                CPDF_Dictionary* pDict = action.GetDict();
+                if (pDict && pDict->GetObjNum() == 0) {
+                        pDoc->AddIndirectObject(pDict);
+                }
+                m_pAnnot->m_pAnnotDict->SetAtReference("A", pDoc, pDict->GetObjNum());
         }
 }
 
 void CPDFSDK_BAAnnot::RemoveAction()
 {
-        ASSERT(m_pAnnot != NULL);
-        ASSERT(m_pAnnot->m_pAnnotDict != NULL);
-        
         m_pAnnot->m_pAnnotDict->RemoveAt("A");
 }
 
 CPDF_AAction CPDFSDK_BAAnnot::GetAAction() const
 {
-        ASSERT(m_pAnnot != NULL);
-        ASSERT(m_pAnnot->m_pAnnotDict != NULL);
-        
         return m_pAnnot->m_pAnnotDict->GetDict("AA");
 }
 
 void CPDFSDK_BAAnnot::SetAAction(const CPDF_AAction& aa)
 {
         ASSERT(m_pAnnot != NULL);
         ASSERT(m_pAnnot->m_pAnnotDict != NULL);
         ASSERT(aa != NULL);
         
         if ((CPDF_AAction&)aa != m_pAnnot->m_pAnnotDict->GetDict("AA"))
                 m_pAnnot->m_pAnnotDict->SetAt("AA", (CPDF_AAction&)aa);
 }
 
 void CPDFSDK_BAAnnot::RemoveAAction()
 {
         ASSERT(m_pAnnot != NULL);
         ASSERT(m_pAnnot->m_pAnnotDict != NULL);
         
         m_pAnnot->m_pAnnotDict->RemoveAt("AA");
 }
 
 CPDF_Action     CPDFSDK_BAAnnot::GetAAction(CPDF_AAction::AActionType eAAT)
 {
         CPDF_AAction AAction = GetAAction();
-        
+
         if (AAction.ActionExist(eAAT))
-        {
                 return AAction.GetAction(eAAT);
-        }
-        else if (eAAT == CPDF_AAction::ButtonUp)
-        {
+
+        if (eAAT == CPDF_AAction::ButtonUp)
                 return GetAction();
-        }
-        
-        return NULL;
+
+        return CPDF_Action();
 }
 
 FX_BOOL CPDFSDK_BAAnnot::IsXFAField()
 {
         return FALSE;
 }
 
 void  CPDFSDK_BAAnnot::Annot_OnDraw(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device, CPDF_RenderOptions* pOptions)
 {
         
@@ skipping 10 matching lines @@
         return NULL;
 }
 
 CPDFXFA_Page* CPDFSDK_Annot::GetPDFXFAPage()
 {
         if (m_pPageView)
                 return m_pPageView->GetPDFXFAPage();
         return NULL;
 }