| Index: fpdfsdk/fpdfxfa/cpdfxfa_app.cpp
|
| diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_app.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_app.cpp
|
| index 14450a10ab320163c6de3493ae8b19e3c99b7bff..70dd29f0a01f1dc4fd2ee2ecd188947468b771a5 100644
|
| --- a/fpdfsdk/fpdfxfa/cpdfxfa_app.cpp
|
| +++ b/fpdfsdk/fpdfxfa/cpdfxfa_app.cpp
|
| @@ -8,7 +8,7 @@
|
|
|
| #include <memory>
|
|
|
| -#include "fpdfsdk/cpdfsdk_environment.h"
|
| +#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
|
| #include "fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h"
|
| #include "fpdfsdk/fsdk_define.h"
|
| #include "third_party/base/ptr_util.h"
|
| @@ -64,7 +64,7 @@ FX_BOOL CPDFXFA_App::Initialize(v8::Isolate* pIsolate) {
|
| return TRUE;
|
| }
|
|
|
| -FX_BOOL CPDFXFA_App::AddFormFillEnv(CPDFSDK_Environment* pEnv) {
|
| +FX_BOOL CPDFXFA_App::AddFormFillEnv(CPDFSDK_FormfillEnvironment* pEnv) {
|
| if (!pEnv)
|
| return FALSE;
|
|
|
| @@ -72,7 +72,7 @@ FX_BOOL CPDFXFA_App::AddFormFillEnv(CPDFSDK_Environment* pEnv) {
|
| return TRUE;
|
| }
|
|
|
| -FX_BOOL CPDFXFA_App::RemoveFormFillEnv(CPDFSDK_Environment* pEnv) {
|
| +FX_BOOL CPDFXFA_App::RemoveFormFillEnv(CPDFSDK_FormfillEnvironment* pEnv) {
|
| if (!pEnv)
|
| return FALSE;
|
|
|
| @@ -90,7 +90,7 @@ void CPDFXFA_App::GetAppType(CFX_WideString& wsAppType) {
|
| }
|
|
|
| void CPDFXFA_App::GetAppName(CFX_WideString& wsName) {
|
| - CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
|
| + CPDFSDK_FormfillEnvironment* pEnv = m_pEnvList.GetAt(0);
|
| if (pEnv) {
|
| wsName = pEnv->FFI_GetAppName();
|
| }
|
| @@ -101,13 +101,13 @@ void CPDFXFA_App::SetAppType(const CFX_WideStringC& wsAppType) {
|
| }
|
|
|
| void CPDFXFA_App::GetLanguage(CFX_WideString& wsLanguage) {
|
| - CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
|
| + CPDFSDK_FormfillEnvironment* pEnv = m_pEnvList.GetAt(0);
|
| if (pEnv)
|
| wsLanguage = pEnv->GetLanguage();
|
| }
|
|
|
| void CPDFXFA_App::GetPlatform(CFX_WideString& wsPlatform) {
|
| - CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
|
| + CPDFSDK_FormfillEnvironment* pEnv = m_pEnvList.GetAt(0);
|
| if (pEnv) {
|
| wsPlatform = pEnv->GetPlatform();
|
| }
|
| @@ -122,7 +122,7 @@ void CPDFXFA_App::GetVersion(CFX_WideString& wsVersion) {
|
| }
|
|
|
| void CPDFXFA_App::Beep(uint32_t dwType) {
|
| - CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
|
| + CPDFSDK_FormfillEnvironment* pEnv = m_pEnvList.GetAt(0);
|
| if (pEnv) {
|
| pEnv->JS_appBeep(dwType);
|
| }
|
| @@ -132,7 +132,7 @@ int32_t CPDFXFA_App::MsgBox(const CFX_WideString& wsMessage,
|
| const CFX_WideString& wsTitle,
|
| uint32_t dwIconType,
|
| uint32_t dwButtonType) {
|
| - CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
|
| + CPDFSDK_FormfillEnvironment* pEnv = m_pEnvList.GetAt(0);
|
| if (!pEnv)
|
| return -1;
|
|
|
| @@ -186,7 +186,7 @@ CFX_WideString CPDFXFA_App::Response(const CFX_WideString& wsQuestion,
|
| const CFX_WideString& wsDefaultAnswer,
|
| FX_BOOL bMark) {
|
| CFX_WideString wsAnswer;
|
| - CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
|
| + CPDFSDK_FormfillEnvironment* pEnv = m_pEnvList.GetAt(0);
|
| if (pEnv) {
|
| int nLength = 2048;
|
| char* pBuff = new char[nLength];
|
| @@ -207,7 +207,7 @@ CFX_WideString CPDFXFA_App::Response(const CFX_WideString& wsQuestion,
|
| }
|
|
|
| IFX_FileRead* CPDFXFA_App::DownloadURL(const CFX_WideString& wsURL) {
|
| - CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
|
| + CPDFSDK_FormfillEnvironment* pEnv = m_pEnvList.GetAt(0);
|
| return pEnv ? pEnv->DownloadFromURL(wsURL.c_str()) : nullptr;
|
| }
|
|
|
| @@ -217,7 +217,7 @@ FX_BOOL CPDFXFA_App::PostRequestURL(const CFX_WideString& wsURL,
|
| const CFX_WideString& wsEncode,
|
| const CFX_WideString& wsHeader,
|
| CFX_WideString& wsResponse) {
|
| - CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
|
| + CPDFSDK_FormfillEnvironment* pEnv = m_pEnvList.GetAt(0);
|
| if (!pEnv)
|
| return FALSE;
|
|
|
| @@ -230,7 +230,7 @@ FX_BOOL CPDFXFA_App::PostRequestURL(const CFX_WideString& wsURL,
|
| FX_BOOL CPDFXFA_App::PutRequestURL(const CFX_WideString& wsURL,
|
| const CFX_WideString& wsData,
|
| const CFX_WideString& wsEncode) {
|
| - CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
|
| + CPDFSDK_FormfillEnvironment* pEnv = m_pEnvList.GetAt(0);
|
| return pEnv &&
|
| pEnv->PutRequestURL(wsURL.c_str(), wsData.c_str(), wsEncode.c_str());
|
| }
|
| @@ -334,7 +334,7 @@ void CPDFXFA_App::LoadString(int32_t iStringID, CFX_WideString& wsString) {
|
|
|
| IFWL_AdapterTimerMgr* CPDFXFA_App::GetTimerMgr() {
|
| CXFA_FWLAdapterTimerMgr* pAdapter = nullptr;
|
| - CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
|
| + CPDFSDK_FormfillEnvironment* pEnv = m_pEnvList.GetAt(0);
|
| if (pEnv)
|
| pAdapter = new CXFA_FWLAdapterTimerMgr(pEnv);
|
| return pAdapter;
|
|
|