summaryrefslogtreecommitdiff
path: root/fpdfsdk
diff options
context:
space:
mode:
Diffstat (limited to 'fpdfsdk')
-rw-r--r--fpdfsdk/src/fpdfdoc.cpp10
-rw-r--r--fpdfsdk/src/fsdk_actionhandler.cpp214
-rw-r--r--fpdfsdk/src/fsdk_baseannot.cpp42
-rw-r--r--fpdfsdk/src/fsdk_baseform.cpp33
-rw-r--r--fpdfsdk/src/fsdk_mgr.cpp46
5 files changed, 154 insertions, 191 deletions
diff --git a/fpdfsdk/src/fpdfdoc.cpp b/fpdfsdk/src/fpdfdoc.cpp
index 19b4581829..9e4267ffc7 100644
--- a/fpdfsdk/src/fpdfdoc.cpp
+++ b/fpdfsdk/src/fpdfdoc.cpp
@@ -99,14 +99,14 @@ 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:
@@ -130,7 +130,7 @@ DLLEXPORT FPDF_DEST STDCALL FPDFAction_GetDest(FPDF_DOCUMENT document, FPDF_ACTI
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);
}
@@ -142,7 +142,7 @@ DLLEXPORT unsigned long STDCALL FPDFAction_GetURIPath(FPDF_DOCUMENT document, FP
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)
@@ -207,7 +207,7 @@ 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)
diff --git a/fpdfsdk/src/fsdk_actionhandler.cpp b/fpdfsdk/src/fsdk_actionhandler.cpp
index 494b5298d3..5fd6c54209 100644
--- a/fpdfsdk/src/fsdk_actionhandler.cpp
+++ b/fpdfsdk/src/fsdk_actionhandler.cpp
@@ -1,7 +1,7 @@
// 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"
@@ -12,7 +12,7 @@
/* -------------------------- CBA_ActionHandler -------------------------- */
-CPDFSDK_ActionHandler::CPDFSDK_ActionHandler(CPDFDoc_Environment* pEvi) :
+CPDFSDK_ActionHandler::CPDFSDK_ActionHandler(CPDFDoc_Environment* pEvi) :
m_pFormActionHandler(NULL),
m_pMediaActionHandler(NULL)
{
@@ -48,16 +48,15 @@ void CPDFSDK_ActionHandler::Destroy()
}
//document open
-FX_BOOL CPDFSDK_ActionHandler::DoAction_DocOpen(const CPDF_Action& action, CPDFSDK_Document* pDocument
- /*CReader_Document* pDocument, CReader_DocView *pDocView*/)
+FX_BOOL CPDFSDK_ActionHandler::DoAction_DocOpen(const CPDF_Action& action, CPDFSDK_Document* pDocument)
{
CFX_PtrList list;
- return ExecuteDocumentOpenAction(action, pDocument, /*pDocView, */list);
+ return ExecuteDocumentOpenAction(action, pDocument, list);
}
//document open
FX_BOOL CPDFSDK_ActionHandler::DoAction_JavaScript(const CPDF_Action& JsAction,CFX_WideString csJSName,
- CPDFSDK_Document* pDocument/*, CReader_DocView *pDocView*/)
+ CPDFSDK_Document* pDocument)
{
if (JsAction.GetType() == CPDF_Action::JavaScript)
{
@@ -72,8 +71,8 @@ FX_BOOL CPDFSDK_ActionHandler::DoAction_JavaScript(const CPDF_Action& JsAction,C
return FALSE;
}
-FX_BOOL CPDFSDK_ActionHandler::DoAction_FieldJavaScript(const CPDF_Action& JsAction, CPDF_AAction::AActionType type,
- CPDFSDK_Document* pDocument, CPDF_FormField* pFormField,
+FX_BOOL CPDFSDK_ActionHandler::DoAction_FieldJavaScript(const CPDF_Action& JsAction, CPDF_AAction::AActionType type,
+ CPDFSDK_Document* pDocument, CPDF_FormField* pFormField,
PDFSDK_FieldAction& data)
{
CPDFDoc_Environment* pEnv = pDocument->GetEnv();
@@ -91,56 +90,56 @@ FX_BOOL CPDFSDK_ActionHandler::DoAction_FieldJavaScript(const CPDF_Action& JsAct
}
FX_BOOL CPDFSDK_ActionHandler::DoAction_Page(const CPDF_Action& action, enum CPDF_AAction::AActionType eType,
- CPDFSDK_Document* pDocument/*, CReader_DocView *pDocView*/)
+ CPDFSDK_Document* pDocument)
{
CFX_PtrList list;
- return ExecuteDocumentPageAction(action, eType, pDocument,/* pDocView,*/ list);
+ return ExecuteDocumentPageAction(action, eType, pDocument, list);
}
FX_BOOL CPDFSDK_ActionHandler::DoAction_Document(const CPDF_Action& action, enum CPDF_AAction::AActionType eType,
- CPDFSDK_Document* pDocument/*, CReader_DocView *pDocView*/)
+ CPDFSDK_Document* pDocument)
{
CFX_PtrList list;
- return ExecuteDocumentPageAction(action, eType, pDocument,/* pDocView,*/ list);
+ return ExecuteDocumentPageAction(action, eType, pDocument, list);
}
-FX_BOOL CPDFSDK_ActionHandler::DoAction_BookMark(CPDF_Bookmark *pBookMark, const CPDF_Action& action, CPDF_AAction::AActionType type,
- CPDFSDK_Document* pDocument/*, CReader_DocView *pDocView*/)
+FX_BOOL CPDFSDK_ActionHandler::DoAction_BookMark(CPDF_Bookmark *pBookMark, const CPDF_Action& action, CPDF_AAction::AActionType type,
+ CPDFSDK_Document* pDocument)
{
CFX_PtrList list;
- return this->ExecuteBookMark(action, pDocument,/* pDocView,*/ pBookMark, list);
+ return this->ExecuteBookMark(action, pDocument, pBookMark, list);
}
-FX_BOOL CPDFSDK_ActionHandler::DoAction_Screen(const CPDF_Action& action, CPDF_AAction::AActionType type,
- CPDFSDK_Document* pDocument,/* CReader_DocView *pDocView,*/ CPDFSDK_Annot* pScreen)
+FX_BOOL CPDFSDK_ActionHandler::DoAction_Screen(const CPDF_Action& action, CPDF_AAction::AActionType type,
+ CPDFSDK_Document* pDocument, CPDFSDK_Annot* pScreen)
{
CFX_PtrList list;
- return this->ExecuteScreenAction(action, type, pDocument,/* pDocView,*/ pScreen, list);
+ return this->ExecuteScreenAction(action, type, pDocument, pScreen, list);
}
-FX_BOOL CPDFSDK_ActionHandler::DoAction_Link(const CPDF_Action& action,
- CPDFSDK_Document* pDocument/*, CReader_DocView *pDocView*/)
+FX_BOOL CPDFSDK_ActionHandler::DoAction_Link(const CPDF_Action& action,
+ CPDFSDK_Document* pDocument)
{
CFX_PtrList list;
- return ExecuteLinkAction(action, pDocument,/* pDocView,*/ list);
+ return ExecuteLinkAction(action, pDocument, list);
}
-FX_BOOL CPDFSDK_ActionHandler::DoAction_Field(const CPDF_Action& action, CPDF_AAction::AActionType type,
- CPDFSDK_Document* pDocument,/* CReader_DocView *pDocView,*/
+FX_BOOL CPDFSDK_ActionHandler::DoAction_Field(const CPDF_Action& action, CPDF_AAction::AActionType type,
+ CPDFSDK_Document* pDocument,
CPDF_FormField* pFormField, PDFSDK_FieldAction& data)
{
CFX_PtrList list;
- return ExecuteFieldAction(action, type, pDocument,/* pDocView,*/ pFormField, data, list);
+ return ExecuteFieldAction(action, type, pDocument, pFormField, data, list);
}
FX_BOOL CPDFSDK_ActionHandler::ExecuteDocumentOpenAction(const CPDF_Action& action, CPDFSDK_Document* pDocument,
- /*CReader_DocView *pDocView,*/ CFX_PtrList& list)
+ CFX_PtrList& list)
{
- ASSERT(pDocument != NULL);
-
- if (list.Find((CPDF_Dictionary*)action))
+ CPDF_Dictionary* pDict = action.GetDict();
+ if (list.Find(pDict))
return FALSE;
- list.AddTail((CPDF_Dictionary*)action);
+
+ list.AddTail(pDict);
CPDFDoc_Environment* pEnv = pDocument->GetEnv();
ASSERT(pEnv);
@@ -157,29 +156,28 @@ FX_BOOL CPDFSDK_ActionHandler::ExecuteDocumentOpenAction(const CPDF_Action& acti
}
else
{
- DoAction_NoJs(action, pDocument/*, pDocView*/);
+ DoAction_NoJs(action, pDocument);
}
-// if (!IsValidDocView(pDocument, pDocView))
-// return FALSE;
-
for (FX_INT32 i=0,sz=action.GetSubActionsCount(); i<sz; i++)
{
CPDF_Action subaction = action.GetSubAction(i);
- if (!ExecuteDocumentOpenAction(subaction, pDocument,/* pDocView,*/ list)) return FALSE;
+ if (!ExecuteDocumentOpenAction(subaction, pDocument, list)) return FALSE;
}
return TRUE;
}
FX_BOOL CPDFSDK_ActionHandler::ExecuteLinkAction(const CPDF_Action& action, CPDFSDK_Document* pDocument,
- /*CReader_DocView* pDocView,*/ CFX_PtrList& list)
+ CFX_PtrList& list)
{
ASSERT(pDocument != NULL);
- if (list.Find((CPDF_Dictionary*)action))
+ CPDF_Dictionary* pDict = action.GetDict();
+ if (list.Find(pDict))
return FALSE;
- list.AddTail((CPDF_Dictionary*)action);
+
+ list.AddTail(pDict);
CPDFDoc_Environment* pEnv = pDocument->GetEnv();
ASSERT(pEnv);
@@ -204,7 +202,7 @@ FX_BOOL CPDFSDK_ActionHandler::ExecuteLinkAction(const CPDF_Action& action, CPDF
FX_BOOL bRet = pContext->RunScript(swJS, csInfo);
if (!bRet)
{
- //CBCL_FormNotify::MsgBoxJSError(pPageView->GetPageViewWnd(), csInfo);
+ // FIXME: return error.
}
pRuntime->ReleaseContext(pContext);
@@ -213,29 +211,28 @@ FX_BOOL CPDFSDK_ActionHandler::ExecuteLinkAction(const CPDF_Action& action, CPDF
}
else
{
- DoAction_NoJs(action, pDocument/*, pDocView*/);
+ DoAction_NoJs(action, pDocument);
}
-// if (!IsValidDocView(pDocument, pDocView))
-// return FALSE;
-
for (FX_INT32 i=0,sz=action.GetSubActionsCount(); i<sz; i++)
{
CPDF_Action subaction = action.GetSubAction(i);
- if (!ExecuteLinkAction(subaction, pDocument,/* pDocView,*/ list)) return FALSE;
+ if (!ExecuteLinkAction(subaction, pDocument, list)) return FALSE;
}
return TRUE;
}
FX_BOOL CPDFSDK_ActionHandler::ExecuteDocumentPageAction(const CPDF_Action& action, CPDF_AAction::AActionType type,
- CPDFSDK_Document* pDocument,/* CReader_DocView* pDocView,*/ CFX_PtrList& list)
+ CPDFSDK_Document* pDocument, CFX_PtrList& list)
{
ASSERT(pDocument != NULL);
- if (list.Find((CPDF_Dictionary*)action))
+ CPDF_Dictionary* pDict = action.GetDict();
+ if (list.Find(pDict))
return FALSE;
- list.AddTail((CPDF_Dictionary*)action);
+
+ list.AddTail(pDict);
CPDFDoc_Environment* pEnv = pDocument->GetEnv();
ASSERT(pEnv);
@@ -252,16 +249,16 @@ FX_BOOL CPDFSDK_ActionHandler::ExecuteDocumentPageAction(const CPDF_Action& acti
}
else
{
- DoAction_NoJs(action, pDocument/*, pDocView*/);
+ DoAction_NoJs(action, pDocument);
}
- if (!IsValidDocView(pDocument/*, pDocView*/))
+ if (!IsValidDocView(pDocument))
return FALSE;
for (FX_INT32 i=0,sz=action.GetSubActionsCount(); i<sz; i++)
{
CPDF_Action subaction = action.GetSubAction(i);
- if (!ExecuteDocumentPageAction(subaction, type, pDocument,/* pDocView,*/ list)) return FALSE;
+ if (!ExecuteDocumentPageAction(subaction, type, pDocument, list)) return FALSE;
}
return TRUE;
@@ -281,15 +278,17 @@ FX_BOOL CPDFSDK_ActionHandler::IsValidField(CPDFSDK_Document* pDocument, CPDF_Di
return pPDFInterForm->GetFieldByDict(pFieldDict) != NULL;
}
-FX_BOOL CPDFSDK_ActionHandler::ExecuteFieldAction(const CPDF_Action& action, CPDF_AAction::AActionType type,
- CPDFSDK_Document* pDocument,/* CReader_DocView* pDocView,*/ CPDF_FormField* pFormField,
+FX_BOOL CPDFSDK_ActionHandler::ExecuteFieldAction(const CPDF_Action& action, CPDF_AAction::AActionType type,
+ CPDFSDK_Document* pDocument, CPDF_FormField* pFormField,
PDFSDK_FieldAction& data, CFX_PtrList& list)
{
ASSERT(pDocument != NULL);
- if (list.Find((CPDF_Dictionary*)action))
+ CPDF_Dictionary* pDict = action.GetDict();
+ if (list.Find(pDict))
return FALSE;
- list.AddTail((CPDF_Dictionary*)action);
+
+ list.AddTail(pDict);
CPDFDoc_Environment* pEnv = pDocument->GetEnv();
ASSERT(pEnv);
@@ -308,28 +307,28 @@ FX_BOOL CPDFSDK_ActionHandler::ExecuteFieldAction(const CPDF_Action& action, CPD
}
else
{
- DoAction_NoJs(action, pDocument/*, pDocView*/);
-// if (!IsValidDocView(pDocument, pDocView))
-// return FALSE;
+ DoAction_NoJs(action, pDocument);
}
for (FX_INT32 i=0,sz=action.GetSubActionsCount(); i<sz; i++)
{
CPDF_Action subaction = action.GetSubAction(i);
- if (!ExecuteFieldAction(subaction, type, pDocument,/* pDocView,*/ pFormField, data, list)) return FALSE;
+ if (!ExecuteFieldAction(subaction, type, pDocument, pFormField, data, list)) return FALSE;
}
return TRUE;
}
-FX_BOOL CPDFSDK_ActionHandler::ExecuteScreenAction(const CPDF_Action& action, CPDF_AAction::AActionType type,
- CPDFSDK_Document* pDocument,/* CReader_DocView* pDocView,*/ CPDFSDK_Annot* pScreen, CFX_PtrList& list)
+FX_BOOL CPDFSDK_ActionHandler::ExecuteScreenAction(const CPDF_Action& action, CPDF_AAction::AActionType type,
+ CPDFSDK_Document* pDocument, CPDFSDK_Annot* pScreen, CFX_PtrList& list)
{
ASSERT(pDocument != NULL);
- if (list.Find((CPDF_Dictionary*)action))
+ CPDF_Dictionary* pDict = action.GetDict();
+ if (list.Find(pDict))
return FALSE;
- list.AddTail((CPDF_Dictionary*)action);
+
+ list.AddTail(pDict);
CPDFDoc_Environment* pEnv = pDocument->GetEnv();
ASSERT(pEnv);
@@ -398,29 +397,28 @@ FX_BOOL CPDFSDK_ActionHandler::ExecuteScreenAction(const CPDF_Action& action, CP
}
else
{
- DoAction_NoJs(action, pDocument/*, pDocView*/);
+ DoAction_NoJs(action, pDocument);
}
-// if (!IsValidDocView(pDocument, pDocView))
-// return FALSE;
-
for (FX_INT32 i=0,sz=action.GetSubActionsCount(); i<sz; i++)
{
CPDF_Action subaction = action.GetSubAction(i);
- if (!ExecuteScreenAction(subaction, type, pDocument,/* pDocView,*/ pScreen, list)) return FALSE;
+ if (!ExecuteScreenAction(subaction, type, pDocument, pScreen, list)) return FALSE;
}
return TRUE;
}
-FX_BOOL CPDFSDK_ActionHandler::ExecuteBookMark(const CPDF_Action& action, CPDFSDK_Document* pDocument,
- /*CReader_DocView* pDocView,*/ CPDF_Bookmark* pBookmark, CFX_PtrList& list)
+FX_BOOL CPDFSDK_ActionHandler::ExecuteBookMark(const CPDF_Action& action, CPDFSDK_Document* pDocument,
+ CPDF_Bookmark* pBookmark, CFX_PtrList& list)
{
ASSERT(pDocument != NULL);
- if (list.Find((CPDF_Dictionary*)action))
+ CPDF_Dictionary* pDict = action.GetDict();
+ if (list.Find(pDict))
return FALSE;
- list.AddTail((CPDF_Dictionary*)action);
+
+ list.AddTail(pDict);
CPDFDoc_Environment* pEnv = pDocument->GetEnv();
ASSERT(pEnv);
@@ -454,29 +452,26 @@ FX_BOOL CPDFSDK_ActionHandler::ExecuteBookMark(const CPDF_Action& action, CPDFSD
}
else
{
- DoAction_NoJs(action, pDocument/*, pDocView*/);
+ DoAction_NoJs(action, pDocument);
}
-// if (!IsValidDocView(pDocument, pDocView))
-// return FALSE;
-
for (FX_INT32 i=0,sz=action.GetSubActionsCount(); i<sz; i++)
{
CPDF_Action subaction = action.GetSubAction(i);
- if (!ExecuteBookMark(subaction, pDocument,/* pDocView,*/ pBookmark, list)) return FALSE;
+ if (!ExecuteBookMark(subaction, pDocument, pBookmark, list)) return FALSE;
}
return TRUE;
}
-void CPDFSDK_ActionHandler::DoAction_NoJs(const CPDF_Action& action, CPDFSDK_Document* pDocument/*, CReader_DocView* pDocView*/)
+void CPDFSDK_ActionHandler::DoAction_NoJs(const CPDF_Action& action, CPDFSDK_Document* pDocument)
{
ASSERT(pDocument != NULL);
switch (action.GetType())
{
case CPDF_Action::GoTo:
- DoAction_GoTo(pDocument,/* pDocView,*/ action);
+ DoAction_GoTo(pDocument, action);
break;
case CPDF_Action::GoToR:
DoAction_GoToR(pDocument, action);
@@ -494,13 +489,13 @@ void CPDFSDK_ActionHandler::DoAction_NoJs(const CPDF_Action& action, CPDFSDK_Doc
case CPDF_Action::Sound:
if (m_pMediaActionHandler)
{
- m_pMediaActionHandler->DoAction_Sound(action, pDocument/*, pDocView*/);
+ m_pMediaActionHandler->DoAction_Sound(action, pDocument);
}
break;
case CPDF_Action::Movie:
if (m_pMediaActionHandler)
{
- m_pMediaActionHandler->DoAction_Movie(action, pDocument/*, pDocView*/);
+ m_pMediaActionHandler->DoAction_Movie(action, pDocument);
}
break;
case CPDF_Action::Hide:
@@ -515,7 +510,7 @@ void CPDFSDK_ActionHandler::DoAction_NoJs(const CPDF_Action& action, CPDFSDK_Doc
case CPDF_Action::SubmitForm:
if (m_pFormActionHandler)
{
- m_pFormActionHandler->DoAction_SubmitForm(action, pDocument/*, pDocView*/);
+ m_pFormActionHandler->DoAction_SubmitForm(action, pDocument);
}
break;
case CPDF_Action::ResetForm:
@@ -527,19 +522,19 @@ void CPDFSDK_ActionHandler::DoAction_NoJs(const CPDF_Action& action, CPDFSDK_Doc
case CPDF_Action::ImportData:
if (m_pFormActionHandler)
{
- m_pFormActionHandler->DoAction_ImportData(action, pDocument/*, pDocView*/);
+ m_pFormActionHandler->DoAction_ImportData(action, pDocument);
}
break;
case CPDF_Action::JavaScript:
ASSERT(FALSE);
break;
case CPDF_Action::SetOCGState:
- DoAction_SetOCGState(pDocument, /*pDocView,*/ action);
+ DoAction_SetOCGState(pDocument, action);
break;
case CPDF_Action::Rendition:
if (m_pMediaActionHandler)
{
- m_pMediaActionHandler->DoAction_Rendition(action, pDocument/*, pDocView*/);
+ m_pMediaActionHandler->DoAction_Rendition(action, pDocument);
}
break;
case CPDF_Action::Trans:
@@ -551,21 +546,16 @@ void CPDFSDK_ActionHandler::DoAction_NoJs(const CPDF_Action& action, CPDFSDK_Doc
}
}
-FX_BOOL CPDFSDK_ActionHandler::IsValidDocView(CPDFSDK_Document* pDocument/*, CReader_DocView* pDocView*/)
+FX_BOOL CPDFSDK_ActionHandler::IsValidDocView(CPDFSDK_Document* pDocument)
{
ASSERT(pDocument != NULL);
- //ASSERT(pDocView != NULL);
-
- //return pDocument->IsValidDocView(pDocView);
return TRUE;
}
-void CPDFSDK_ActionHandler::DoAction_GoTo(CPDFSDK_Document* pDocument, /*CReader_DocView* pDocView,*/
+void CPDFSDK_ActionHandler::DoAction_GoTo(CPDFSDK_Document* pDocument,
const CPDF_Action& action)
{
- ASSERT(pDocument != NULL);
-// ASSERT(pDocView != NULL);
- ASSERT(action != NULL);
+ ASSERT(action);
CPDF_Document* pPDFDocument = pDocument->GetDocument()->GetPDFDoc();
ASSERT(pPDFDocument != NULL);
@@ -605,27 +595,24 @@ void CPDFSDK_ActionHandler::DoAction_Launch(CPDFSDK_Document* pDocument, const C
void CPDFSDK_ActionHandler::DoAction_URI(CPDFSDK_Document* pDocument, const CPDF_Action& action)
{
- ASSERT(pDocument != NULL);
- ASSERT(action != NULL);
+ ASSERT(action);
CPDFDoc_Environment* pApp = pDocument->GetEnv();
ASSERT(pApp != NULL);
-
CFX_ByteString sURI = action.GetURI(pDocument->GetDocument()->GetPDFDoc());
pApp->FFI_DoURIAction(FX_LPCSTR(sURI));
}
void CPDFSDK_ActionHandler::DoAction_Named(CPDFSDK_Document* pDocument, const CPDF_Action& action)
{
- ASSERT(pDocument != NULL);
- ASSERT(action != NULL);
-
+ ASSERT(action);
+
CFX_ByteString csName = action.GetNamedAction();
pDocument->GetEnv()->FFI_ExecuteNamedAction(csName);
}
-void CPDFSDK_ActionHandler::DoAction_SetOCGState(CPDFSDK_Document* pDocument,/* CReader_DocView* pDocView,*/ const CPDF_Action& action)
+void CPDFSDK_ActionHandler::DoAction_SetOCGState(CPDFSDK_Document* pDocument, const CPDF_Action& action)
{
}
@@ -666,7 +653,7 @@ void CPDFSDK_ActionHandler::RunFieldJavaScript(CPDFSDK_Document* pDocument, CPDF
pContext->OnField_Blur(data.bModifier, data.bShift, pFormField, data.sValue);
break;
case CPDF_AAction::KeyStroke:
- pContext->OnField_Keystroke(data.nCommitKey, data.sChange, data.sChangeEx, data.bKeyDown,
+ pContext->OnField_Keystroke(data.nCommitKey, data.sChange, data.sChangeEx, data.bKeyDown,
data.bModifier, data.nSelEnd, data.nSelStart, data.bShift, pFormField, data.sValue,
data.bWillCommit, data.bFieldFull, data.bRC);
break;
@@ -726,7 +713,7 @@ void CPDFSDK_ActionHandler::RunDocumentPageJavaScript(CPDFSDK_Document* pDocumen
ASSERT(pContext != NULL);
switch (type)
- {
+ {
case CPDF_AAction::OpenPage:
pContext->OnPage_Open(pDocument);
break;
@@ -773,57 +760,57 @@ void CPDFSDK_ActionHandler::RunDocumentPageJavaScript(CPDFSDK_Document* pDocumen
FX_BOOL CPDFSDK_FormActionHandler::DoAction_Hide(const CPDF_Action& action, CPDFSDK_Document* pDocument)
{
ASSERT(pDocument != NULL);
-
+
CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)pDocument->GetInterForm();
ASSERT(pInterForm != NULL);
-
+
if (pInterForm->DoAction_Hide(action))
{
pDocument->SetChangeMark();
return TRUE;
}
-
+
return FALSE;
}
FX_BOOL CPDFSDK_FormActionHandler::DoAction_SubmitForm(const CPDF_Action& action, CPDFSDK_Document* pDocument)
{
ASSERT(pDocument != NULL);
-
+
CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)pDocument->GetInterForm();
ASSERT(pInterForm != NULL);
-
+
return pInterForm->DoAction_SubmitForm(action);
}
FX_BOOL CPDFSDK_FormActionHandler::DoAction_ResetForm(const CPDF_Action& action, CPDFSDK_Document* pDocument)
{
ASSERT(pDocument != NULL);
-
+
CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)pDocument->GetInterForm();
ASSERT(pInterForm != NULL);
-
+
if (pInterForm->DoAction_ResetForm(action))
- {
+ {
return TRUE;
}
-
+
return FALSE;
}
FX_BOOL CPDFSDK_FormActionHandler::DoAction_ImportData(const CPDF_Action& action, CPDFSDK_Document* pDocument)
{
ASSERT(pDocument != NULL);
-
+
CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)pDocument->GetInterForm();
ASSERT(pInterForm != NULL);
-
+
if (pInterForm->DoAction_ImportData(action))
{
- pDocument->SetChangeMark();
+ pDocument->SetChangeMark();
return TRUE;
}
-
+
return FALSE;
}
@@ -841,4 +828,3 @@ FX_BOOL CPDFSDK_MediaActionHandler::DoAction_Movie(const CPDF_Action& action, CP
{
return FALSE;
}
-
diff --git a/fpdfsdk/src/fsdk_baseannot.cpp b/fpdfsdk/src/fsdk_baseannot.cpp
index 9b669e9f4a..e57eb674cc 100644
--- a/fpdfsdk/src/fsdk_baseannot.cpp
+++ b/fpdfsdk/src/fsdk_baseannot.cpp
@@ -1086,43 +1086,30 @@ FX_BOOL CPDFSDK_BAAnnot::IsVisible() const
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");
}
@@ -1147,17 +1134,14 @@ void CPDFSDK_BAAnnot::RemoveAAction()
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()
diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp
index f2873b51fd..86c43f1aa4 100644
--- a/fpdfsdk/src/fsdk_baseform.cpp
+++ b/fpdfsdk/src/fsdk_baseform.cpp
@@ -2310,24 +2310,22 @@ CPDF_Action CPDFSDK_Widget::GetAAction(CPDF_AAction::AActionType eAAT)
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();
}
@@ -2930,7 +2928,7 @@ void CPDFSDK_InterForm::OnValidate(CPDF_FormField* pFormField, CFX_WideString& c
FX_BOOL CPDFSDK_InterForm::DoAction_Hide(const CPDF_Action& action)
{
- ASSERT(action != NULL);
+ ASSERT(action);
CPDF_ActionFields af = action.GetWidgets();
CFX_PtrArray fieldObjects;
@@ -2986,13 +2984,13 @@ FX_BOOL CPDFSDK_InterForm::DoAction_Hide(const CPDF_Action& action)
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();
@@ -3238,29 +3236,22 @@ FX_BOOL CPDFSDK_InterForm::ExportFormToFDFTextBuf(CFX_ByteTextBuf& textBuf)
FX_BOOL CPDFSDK_InterForm::DoAction_ResetForm(const CPDF_Action& action)
{
- ASSERT(action != NULL);
-
- CPDF_Dictionary* pActionDict = action;
+ ASSERT(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)
diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp
index f134b790a9..7b071a9b55 100644
--- a/fpdfsdk/src/fsdk_mgr.cpp
+++ b/fpdfsdk/src/fsdk_mgr.cpp
@@ -427,30 +427,32 @@ void CPDFSDK_Document:: ProcJavascriptFun()
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)
- {
- }
- 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 TRUE;
+
+ if(pOpenAction->GetType()==PDFOBJ_DICTIONARY)
{
- return FALSE;
- }
- return TRUE;
+ CPDF_Dictionary * pDict=(CPDF_Dictionary*)pOpenAction;
+ CPDF_Action action(pDict);
+ if(m_pEnv->GetActionHander())
+ m_pEnv->GetActionHander()->DoAction_DocOpen(action, this);
+ return TRUE;
+ }
+ return FALSE;
}
CPDF_OCContext* CPDFSDK_Document::GetOCContext()
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 04:54:54 +0000