summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fpdfsdk/cpdfsdk_formfillenvironment.cpp47
-rw-r--r--fpdfsdk/cpdfsdk_formfillenvironment.h17
-rw-r--r--fpdfsdk/fpdf_formfill.cpp4
-rw-r--r--fpdfsdk/fpdfxfa/cpdfxfa_context.cpp2
-rw-r--r--fxjs/cjs_document.cpp4
5 files changed, 37 insertions, 37 deletions
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
index 4338f984e0..6007ac9443 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
@@ -33,10 +33,10 @@ FPDF_WIDESTRING AsFPDFWideString(ByteString* bsUTF16LE) {
}
CPDFSDK_FormFillEnvironment::CPDFSDK_FormFillEnvironment(
- UnderlyingDocumentType* pDoc,
+ CPDF_Document* pDoc,
FPDF_FORMFILLINFO* pFFinfo)
: m_pInfo(pFFinfo),
- m_pUnderlyingDoc(pDoc),
+ m_pCPDFDoc(pDoc),
m_pSysHandler(pdfium::MakeUnique<CFX_SystemHandler>(this)),
m_bChangeMask(false),
m_bBeingDestroyed(false) {}
@@ -288,8 +288,10 @@ void CPDFSDK_FormFillEnvironment::OnChange() {
}
FPDF_PAGE CPDFSDK_FormFillEnvironment::GetCurrentPage() const {
- if (m_pInfo && m_pInfo->FFI_GetCurrentPage)
- return m_pInfo->FFI_GetCurrentPage(m_pInfo, m_pUnderlyingDoc.Get());
+ if (m_pInfo && m_pInfo->FFI_GetCurrentPage) {
+ return m_pInfo->FFI_GetCurrentPage(
+ m_pInfo, FPDFDocumentFromCPDFDocument(m_pCPDFDoc.Get()));
+ }
return nullptr;
}
@@ -337,12 +339,15 @@ void CPDFSDK_FormFillEnvironment::DisplayCaret(CPDFXFA_Page* page,
int CPDFSDK_FormFillEnvironment::GetCurrentPageIndex() const {
if (!m_pInfo || !m_pInfo->FFI_GetCurrentPageIndex)
return -1;
- return m_pInfo->FFI_GetCurrentPageIndex(m_pInfo, m_pUnderlyingDoc.Get());
+ return m_pInfo->FFI_GetCurrentPageIndex(
+ m_pInfo, FPDFDocumentFromCPDFDocument(m_pCPDFDoc.Get()));
}
void CPDFSDK_FormFillEnvironment::SetCurrentPage(int iCurPage) {
- if (m_pInfo && m_pInfo->FFI_SetCurrentPage)
- m_pInfo->FFI_SetCurrentPage(m_pInfo, m_pUnderlyingDoc.Get(), iCurPage);
+ if (!m_pInfo || !m_pInfo->FFI_SetCurrentPage)
+ return;
+ m_pInfo->FFI_SetCurrentPage(
+ m_pInfo, FPDFDocumentFromCPDFDocument(m_pCPDFDoc.Get()), iCurPage);
}
WideString CPDFSDK_FormFillEnvironment::GetPlatform() {
@@ -368,7 +373,7 @@ void CPDFSDK_FormFillEnvironment::GotoURL(const WideString& wsURL) {
return;
ByteString bsTo = wsURL.UTF16LE_Encode();
- m_pInfo->FFI_GotoURL(m_pInfo, m_pUnderlyingDoc.Get(),
+ m_pInfo->FFI_GotoURL(m_pInfo, FPDFDocumentFromCPDFDocument(m_pCPDFDoc.Get()),
AsFPDFWideString(&bsTo));
}
@@ -556,8 +561,7 @@ CPDFSDK_PageView* CPDFSDK_FormFillEnvironment::GetPageView(int nIndex) {
}
void CPDFSDK_FormFillEnvironment::ProcJavascriptFun() {
- CPDF_Document* pPDFDoc = GetPDFDocument();
- CPDF_DocJSActions docJS(pPDFDoc);
+ CPDF_DocJSActions docJS(m_pCPDFDoc.Get());
int iCount = docJS.CountJSActions();
for (int i = 0; i < iCount; i++) {
WideString csJSName;
@@ -567,10 +571,10 @@ void CPDFSDK_FormFillEnvironment::ProcJavascriptFun() {
}
bool CPDFSDK_FormFillEnvironment::ProcOpenAction() {
- if (!m_pUnderlyingDoc)
+ if (!m_pCPDFDoc)
return false;
- const CPDF_Dictionary* pRoot = GetPDFDocument()->GetRoot();
+ const CPDF_Dictionary* pRoot = m_pCPDFDoc->GetRoot();
if (!pRoot)
return false;
@@ -622,8 +626,8 @@ void CPDFSDK_FormFillEnvironment::RemovePageView(
UnderlyingPageType* CPDFSDK_FormFillEnvironment::GetPage(int nIndex) {
if (!m_pInfo || !m_pInfo->FFI_GetPage)
return nullptr;
- return UnderlyingFromFPDFPage(
- m_pInfo->FFI_GetPage(m_pInfo, m_pUnderlyingDoc.Get(), nIndex));
+ return UnderlyingFromFPDFPage(m_pInfo->FFI_GetPage(
+ m_pInfo, FPDFDocumentFromCPDFDocument(m_pCPDFDoc.Get()), nIndex));
}
CPDFSDK_InterForm* CPDFSDK_FormFillEnvironment::GetInterForm() {
@@ -703,17 +707,22 @@ bool CPDFSDK_FormFillEnvironment::KillFocusAnnot(uint32_t nFlag) {
}
return !m_pFocusAnnot;
}
-
#ifdef PDF_ENABLE_XFA
-CPDF_Document* CPDFSDK_FormFillEnvironment::GetPDFDocument() const {
- return m_pUnderlyingDoc ? m_pUnderlyingDoc->GetPDFDoc() : nullptr;
+CPDFXFA_Context* CPDFSDK_FormFillEnvironment::GetXFAContext() const {
+ if (!m_pCPDFDoc)
+ return nullptr;
+ return static_cast<CPDFXFA_Context*>(m_pCPDFDoc->GetExtension());
}
#endif // PDF_ENABLE_XFA
int CPDFSDK_FormFillEnvironment::GetPageCount() const {
- return m_pUnderlyingDoc->GetPageCount();
+#ifdef PDF_ENABLE_XFA
+ return GetXFAContext()->GetPageCount();
+#else
+ return m_pCPDFDoc->GetPageCount();
+#endif
}
bool CPDFSDK_FormFillEnvironment::GetPermissions(int nFlag) const {
- return !!(GetPDFDocument()->GetUserPermissions() & nFlag);
+ return !!(m_pCPDFDoc->GetUserPermissions() & nFlag);
}
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.h b/fpdfsdk/cpdfsdk_formfillenvironment.h
index aba3f39c69..8baa5848fd 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.h
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.h
@@ -47,8 +47,7 @@ FPDF_WIDESTRING AsFPDFWideString(ByteString* bsUTF16LE);
class CPDFSDK_FormFillEnvironment
: public Observable<CPDFSDK_FormFillEnvironment> {
public:
- CPDFSDK_FormFillEnvironment(UnderlyingDocumentType* pDoc,
- FPDF_FORMFILLINFO* pFFinfo);
+ CPDFSDK_FormFillEnvironment(CPDF_Document* pDoc, FPDF_FORMFILLINFO* pFFinfo);
~CPDFSDK_FormFillEnvironment();
static bool IsSHIFTKeyDown(uint32_t nFlag) {
@@ -112,16 +111,10 @@ class CPDFSDK_FormFillEnvironment
float* fPosArray,
int sizeOfArray);
- UnderlyingDocumentType* GetUnderlyingDocument() const {
- return m_pUnderlyingDoc.Get();
- }
+ CPDF_Document* GetPDFDocument() const { return m_pCPDFDoc.Get(); }
#ifdef PDF_ENABLE_XFA
- CPDF_Document* GetPDFDocument() const;
-
- CPDFXFA_Context* GetXFAContext() const { return m_pUnderlyingDoc.Get(); }
- void ResetXFADocument() { m_pUnderlyingDoc = nullptr; }
-
+ CPDFXFA_Context* GetXFAContext() const;
int GetPageViewCount() const { return m_PageMap.size(); }
void DisplayCaret(CPDFXFA_Page* page,
@@ -169,8 +162,6 @@ class CPDFSDK_FormFillEnvironment
WideString GetLanguage();
void PageEvent(int iPageCount, uint32_t dwEventType) const;
-#else // PDF_ENABLE_XFA
- CPDF_Document* GetPDFDocument() const { return m_pUnderlyingDoc.Get(); }
#endif // PDF_ENABLE_XFA
int JS_appAlert(const WideString& Msg,
@@ -228,7 +219,7 @@ class CPDFSDK_FormFillEnvironment
std::map<UnderlyingPageType*, std::unique_ptr<CPDFSDK_PageView>> m_PageMap;
std::unique_ptr<CPDFSDK_InterForm> m_pInterForm;
CPDFSDK_Annot::ObservedPtr m_pFocusAnnot;
- UnownedPtr<UnderlyingDocumentType> m_pUnderlyingDoc;
+ UnownedPtr<CPDF_Document> const m_pCPDFDoc;
std::unique_ptr<CFFL_InteractiveFormFiller> m_pFormFiller;
std::unique_ptr<CFX_SystemHandler> m_pSysHandler;
bool m_bChangeMask;
diff --git a/fpdfsdk/fpdf_formfill.cpp b/fpdfsdk/fpdf_formfill.cpp
index b70bd9da50..5d762ee1f0 100644
--- a/fpdfsdk/fpdf_formfill.cpp
+++ b/fpdfsdk/fpdf_formfill.cpp
@@ -299,8 +299,8 @@ FPDFDOC_InitFormFillEnvironment(FPDF_DOCUMENT document,
return pDocument->GetFormFillEnv();
#endif
- auto pFormFillEnv =
- pdfium::MakeUnique<CPDFSDK_FormFillEnvironment>(pDocument, formInfo);
+ auto pFormFillEnv = pdfium::MakeUnique<CPDFSDK_FormFillEnvironment>(
+ CPDFDocumentFromFPDFDocument(document), formInfo);
#ifdef PDF_ENABLE_XFA
pDocument->SetFormFillEnv(pFormFillEnv.get());
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp
index 7d1b28be70..97288c67f0 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp
@@ -52,7 +52,7 @@ CPDFXFA_Context::~CPDFXFA_Context() {
m_pFormFillEnv->ClearAllFocusedAnnots();
// Once we're deleted the FormFillEnvironment will point at a bad underlying
// doc so we need to reset it ...
- m_pFormFillEnv->ResetXFADocument();
+ m_pFormFillEnv->GetPDFDocument()->SetExtension(nullptr);
m_pFormFillEnv.Reset();
}
diff --git a/fxjs/cjs_document.cpp b/fxjs/cjs_document.cpp
index 9cfcad313e..07701902ea 100644
--- a/fxjs/cjs_document.cpp
+++ b/fxjs/cjs_document.cpp
@@ -829,14 +829,14 @@ CJS_Return CJS_Document::set_subject(CJS_Runtime* pRuntime,
}
CJS_Return CJS_Document::get_title(CJS_Runtime* pRuntime) {
- if (!m_pFormFillEnv || !m_pFormFillEnv->GetUnderlyingDocument())
+ if (!m_pFormFillEnv || !m_pFormFillEnv->GetPDFDocument())
return CJS_Return(JSGetStringFromID(JSMessage::kBadObjectError));
return getPropertyInternal(pRuntime, "Title");
}
CJS_Return CJS_Document::set_title(CJS_Runtime* pRuntime,
v8::Local<v8::Value> vp) {
- if (!m_pFormFillEnv || !m_pFormFillEnv->GetUnderlyingDocument())
+ if (!m_pFormFillEnv || !m_pFormFillEnv->GetPDFDocument())
return CJS_Return(JSGetStringFromID(JSMessage::kBadObjectError));
return setPropertyInternal(pRuntime, vp, "Title");
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 17:28:34 +0000