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

fpdfsdk/src/fpdfdoc.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/fpdfdoc.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_page.h"
@@ skipping 81 matching lines @@
         if (!action)
                 return NULL;
         return action.GetDest(pDoc);
 }
 
 DLLEXPORT FPDF_ACTION STDCALL FPDFBookmark_GetAction(FPDF_BOOKMARK pDict)
 {
         if (!pDict)
                 return NULL;
         CPDF_Bookmark bookmark((CPDF_Dictionary*)pDict);
-        return bookmark.GetAction();
+        return bookmark.GetAction().GetDict();
 }
 
 DLLEXPORT unsigned long STDCALL FPDFAction_GetType(FPDF_ACTION pDict)
 {
         if (!pDict)
                 return 0;
-        CPDF_Action action = (CPDF_Dictionary*)pDict;
+        CPDF_Action action((CPDF_Dictionary*)pDict);
         CPDF_Action::ActionType type = action.GetType();
         switch (type) {
                 case CPDF_Action::GoTo:
                         return PDFACTION_GOTO;
                 case CPDF_Action::GoToR:
                         return PDFACTION_REMOTEGOTO;
                 case CPDF_Action::URI:
                         return PDFACTION_URI;
                 case CPDF_Action::Launch:
                         return PDFACTION_LAUNCH;
                 default:
                         return PDFACTION_UNSUPPORTED;
         }
         return PDFACTION_UNSUPPORTED;
 }
 
 DLLEXPORT FPDF_DEST STDCALL FPDFAction_GetDest(FPDF_DOCUMENT document, FPDF_ACTION pDict)
 {
         if (!document)
                 return NULL;
         if (!pDict)
                 return NULL;
         CPDF_Document* pDoc = ((CPDFXFA_Document*)document)->GetPDFDoc();
-        CPDF_Action action = (CPDF_Dictionary*)pDict;
+        CPDF_Action action((CPDF_Dictionary*)pDict);
         return action.GetDest(pDoc);
 }
 
 DLLEXPORT unsigned long STDCALL FPDFAction_GetURIPath(FPDF_DOCUMENT document, FPDF_ACTION pDict,
                                                                                           void* buffer, unsigned long buflen)
 {
         if (!document)
                 return 0;
         if (!pDict)
                 return 0;
         CPDF_Document* pDoc = ((CPDFXFA_Document*)document)->GetPDFDoc();
-        CPDF_Action action = (CPDF_Dictionary*)pDict;
+        CPDF_Action action((CPDF_Dictionary*)pDict);
         CFX_ByteString path = action.GetURI(pDoc);
         unsigned long len = path.GetLength() + 1;
         if (buffer != NULL && buflen >= len)
                 FXSYS_memcpy(buffer, path.c_str(), len);
         return len;
 }
 
 DLLEXPORT unsigned long STDCALL FPDFDest_GetPageIndex(FPDF_DOCUMENT document, FPDF_DEST pDict)
 {
         if (!document)
@@ skipping 44 matching lines @@
         if (!action)
                 return NULL;
         return action.GetDest(pDoc);
 }
 
 DLLEXPORT FPDF_ACTION STDCALL FPDFLink_GetAction(FPDF_LINK pDict)
 {
         if (!pDict)
                 return NULL;
         CPDF_Link link = (CPDF_Dictionary*)pDict;
-        return link.GetAction();
+        return link.GetAction().GetDict();
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FPDFLink_Enumerate(FPDF_PAGE page, int* startPos, FPDF_LINK* linkAnnot)
 {
         if(!page || !startPos || !linkAnnot)
                 return FALSE;
     CPDF_Page* pPage = ((CPDFXFA_Page*)page)->GetPDFPage();
         if(!pPage->m_pFormDict)
                 return FALSE;
         CPDF_Array* pAnnots = pPage->m_pFormDict->GetArray("Annots");
@@ skipping 71 matching lines @@
                 return 0;
         CFX_WideString text = pInfo->GetUnicodeText(tag);
         // Use UTF-16LE encoding
         CFX_ByteString encodedText = text.UTF16LE_Encode();
         unsigned long len = encodedText.GetLength();
         if (buffer && buflen >= len) {
                 FXSYS_memcpy(buffer, encodedText.c_str(), len);
         }
         return len;
 }