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

fpdfsdk/src/fsdk_mgr.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_page.h"
 #include "../include/fpdfxfa/fpdfxfa_util.h"
@@ skipping 409 matching lines @@
                 CFX_ByteString csJSName;
                 CPDF_Action jsAction = docJS.GetJSAction(i, csJSName);
                 if(m_pEnv->GetActionHander())
                         m_pEnv->GetActionHander()->DoAction_JavaScript(jsAction,CFX_WideString::FromLocal(csJSName),this);
         }
         
 }
 
 FX_BOOL CPDFSDK_Document::ProcOpenAction()
 {
-        if(!m_pDoc) return FALSE;
-        
-        CPDF_Dictionary* pRoot = m_pDoc->GetPDFDoc()->GetRoot();        
-        if (!pRoot)     return FALSE;
-        CPDF_Object* pOpenAction = pRoot->GetDict("OpenAction");//
-        if(!pOpenAction) pOpenAction = pRoot->GetArray("OpenAction");//
-        if(!pOpenAction) return FALSE;
-        
+        if(!m_pDoc)
+                return FALSE;
+
+        CPDF_Dictionary* pRoot = m_pDoc->GetPDFDoc()->GetRoot();
+        if (!pRoot)
+                return FALSE;
+
+        CPDF_Object* pOpenAction = pRoot->GetDict("OpenAction");
+        if(!pOpenAction)
+                pOpenAction = pRoot->GetArray("OpenAction");
+
+        if(!pOpenAction)
+                return FALSE;
+
         if(pOpenAction->GetType()==PDFOBJ_ARRAY)
-        {       
+                return TRUE;
+
+        if(pOpenAction->GetType()==PDFOBJ_DICTIONARY)
+        {
+                CPDF_Dictionary * pDict=(CPDF_Dictionary*)pOpenAction;
+                CPDF_Action action(pDict);
+                if(m_pEnv->GetActionHander())
+                        m_pEnv->GetActionHander()->DoAction_DocOpen(action, this);
+                return TRUE;
         }
-        else if(pOpenAction->GetType()==PDFOBJ_DICTIONARY)
-        {       
-                CPDF_Dictionary * pDict=(CPDF_Dictionary*)pOpenAction;  
-                CPDF_Action Action = pDict;
-                
-                if(m_pEnv->GetActionHander())
-                        m_pEnv->GetActionHander()->DoAction_DocOpen(Action,this);               
-        }       
-        else
-        {
-                return FALSE;                   
-        }       
-        return TRUE;
+        return FALSE;
 }
 
 CPDF_OCContext* CPDFSDK_Document::GetOCContext()
 {
         if(!m_pOccontent)
                 m_pOccontent = new CPDF_OCContext(m_pDoc->GetPDFDoc());
         return m_pOccontent;
 }
 
 void CPDFSDK_Document::ReMovePageView(CPDFXFA_Page* pPDFXFAPage)
@@ skipping 785 matching lines @@
         
         for(int i=0; i<m_fxAnnotArray.GetSize(); i++)
         {
                 CPDFSDK_Annot* pAnnot = (CPDFSDK_Annot*)m_fxAnnotArray.GetAt(i);
                 if(pAnnot == pFocusAnnot)
                         return pAnnot;
         }
         return NULL;
 }