| Index: fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp
|
| diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp
|
| index 63f4bb9faf355ab85070e04890421c4934337dd2..503765ee695f3353830144c29187d48811bd6cdd 100644
|
| --- a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp
|
| +++ b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp
|
| @@ -13,8 +13,8 @@
|
| #include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h"
|
| #include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h"
|
| #include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h"
|
| -#include "fpdfsdk/include/cpdfdoc_environment.h"
|
| #include "fpdfsdk/include/cpdfsdk_document.h"
|
| +#include "fpdfsdk/include/cpdfsdk_environment.h"
|
| #include "fpdfsdk/include/cpdfsdk_interform.h"
|
| #include "fpdfsdk/include/cpdfsdk_pageview.h"
|
| #include "fpdfsdk/include/fsdk_define.h"
|
| @@ -213,7 +213,7 @@ void CPDFXFA_Document::RemovePage(CPDFXFA_Page* page) {
|
| }
|
|
|
| CPDFSDK_Document* CPDFXFA_Document::GetSDKDocument(
|
| - CPDFDoc_Environment* pFormFillEnv) {
|
| + CPDFSDK_Environment* pFormFillEnv) {
|
| if (!m_pSDKDoc && pFormFillEnv)
|
| m_pSDKDoc.reset(new CPDFSDK_Document(this, pFormFillEnv));
|
| return m_pSDKDoc.get();
|
| @@ -249,7 +249,7 @@ void CPDFXFA_Document::InvalidateRect(CXFA_FFPageView* pPageView,
|
| if (!pPage)
|
| return;
|
|
|
| - CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| + CPDFSDK_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| if (!pEnv)
|
| return;
|
|
|
| @@ -281,7 +281,7 @@ void CPDFXFA_Document::DisplayCaret(CXFA_FFWidget* hWidget,
|
| CFX_FloatRect rcCaret;
|
| FXRect2PDFRect(*pRtAnchor, rcCaret);
|
|
|
| - CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| + CPDFSDK_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| if (!pEnv)
|
| return;
|
|
|
| @@ -307,7 +307,7 @@ FX_BOOL CPDFXFA_Document::GetPopupPos(CXFA_FFWidget* hWidget,
|
|
|
| CXFA_WidgetAcc* pWidgetAcc = hWidget->GetDataAcc();
|
| int nRotate = pWidgetAcc->GetRotate();
|
| - CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| + CPDFSDK_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| if (!pEnv)
|
| return FALSE;
|
| FS_RECTF pageViewRect = {0.0f, 0.0f, 0.0f, 0.0f};
|
| @@ -444,14 +444,14 @@ FX_BOOL CPDFXFA_Document::PopupMenu(CXFA_FFWidget* hWidget,
|
| if (hWidget->CanSelectAll())
|
| menuFlag |= FXFA_MEMU_SELECTALL;
|
|
|
| - CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| + CPDFSDK_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| return pEnv &&
|
| pEnv->FFI_PopupMenu(pPage, hWidget, menuFlag, ptPopup, nullptr);
|
| }
|
|
|
| void CPDFXFA_Document::PageViewEvent(CXFA_FFPageView* pPageView,
|
| uint32_t dwFlags) {
|
| - CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| + CPDFSDK_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| if (!pEnv)
|
| return;
|
|
|
| @@ -536,7 +536,7 @@ int32_t CPDFXFA_Document::GetCurrentPage(CXFA_FFDoc* hDoc) {
|
| if (m_iDocType != DOCTYPE_DYNAMIC_XFA)
|
| return -1;
|
|
|
| - CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| + CPDFSDK_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| if (!pEnv)
|
| return -1;
|
|
|
| @@ -549,7 +549,7 @@ void CPDFXFA_Document::SetCurrentPage(CXFA_FFDoc* hDoc, int32_t iCurPage) {
|
| iCurPage >= m_pSDKDoc->GetPageCount()) {
|
| return;
|
| }
|
| - CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| + CPDFSDK_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| if (!pEnv)
|
| return;
|
| pEnv->FFI_SetCurrentPage(this, iCurPage);
|
| @@ -601,7 +601,7 @@ void CPDFXFA_Document::ExportData(CXFA_FFDoc* hDoc,
|
| if (m_iDocType != DOCTYPE_DYNAMIC_XFA && m_iDocType != DOCTYPE_STATIC_XFA)
|
| return;
|
|
|
| - CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| + CPDFSDK_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| if (!pEnv)
|
| return;
|
|
|
| @@ -694,7 +694,7 @@ void CPDFXFA_Document::GotoURL(CXFA_FFDoc* hDoc,
|
| if (m_iDocType != DOCTYPE_DYNAMIC_XFA)
|
| return;
|
|
|
| - CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| + CPDFSDK_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| if (!pEnv)
|
| return;
|
|
|
| @@ -747,7 +747,7 @@ void CPDFXFA_Document::Print(CXFA_FFDoc* hDoc,
|
| if (hDoc != m_pXFADoc.get())
|
| return;
|
|
|
| - CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| + CPDFSDK_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| if (!pEnv || !pEnv->GetFormFillInfo() ||
|
| !pEnv->GetFormFillInfo()->m_pJsPlatform ||
|
| !pEnv->GetFormFillInfo()->m_pJsPlatform->Doc_print) {
|
| @@ -809,7 +809,7 @@ void CPDFXFA_Document::GetURL(CXFA_FFDoc* hDoc, CFX_WideString& wsDocURL) {
|
| if (hDoc != m_pXFADoc.get())
|
| return;
|
|
|
| - CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| + CPDFSDK_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| if (!pEnv)
|
| return;
|
|
|
| @@ -865,7 +865,7 @@ FX_BOOL CPDFXFA_Document::_OnBeforeNotifySumbit() {
|
| while (pWidgetAcc) {
|
| int fRet = pWidgetAcc->ProcessValidate(-1);
|
| if (fRet == XFA_EVENTERROR_Error) {
|
| - CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| + CPDFSDK_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| if (!pEnv)
|
| return FALSE;
|
| CFX_WideString ws;
|
| @@ -935,7 +935,7 @@ FX_BOOL CPDFXFA_Document::GetSuggestWords(
|
|
|
| IFX_FileRead* CPDFXFA_Document::OpenLinkedFile(CXFA_FFDoc* hDoc,
|
| const CFX_WideString& wsLink) {
|
| - CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| + CPDFSDK_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| if (!pEnv)
|
| return FALSE;
|
| CFX_ByteString bs = wsLink.UTF16LE_Encode();
|
| @@ -956,7 +956,7 @@ FX_BOOL CPDFXFA_Document::_ExportSubmitFile(FPDF_FILEHANDLER* pFileHandler,
|
| return FALSE;
|
|
|
| CFX_ByteString content;
|
| - CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| + CPDFSDK_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| if (!pEnv)
|
| return FALSE;
|
|
|
| @@ -1131,7 +1131,7 @@ FX_BOOL CPDFXFA_Document::_MailToInfo(CFX_WideString& csURL,
|
| }
|
|
|
| FX_BOOL CPDFXFA_Document::_SubmitData(CXFA_FFDoc* hDoc, CXFA_Submit submit) {
|
| - CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| + CPDFSDK_Environment* pEnv = m_pSDKDoc->GetEnv();
|
| if (!pEnv)
|
| return FALSE;
|
| CFX_WideStringC csURLC;
|
|
|