diff options
Diffstat (limited to 'fpdfsdk')
-rw-r--r-- | fpdfsdk/fpdfxfa/cpdfxfa_app.cpp | 23 | ||||
-rw-r--r-- | fpdfsdk/fpdfxfa/cpdfxfa_app.h | 6 | ||||
-rw-r--r-- | fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h | 5 | ||||
-rw-r--r-- | fpdfsdk/javascript/app.cpp | 4 |
4 files changed, 4 insertions, 34 deletions
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_app.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_app.cpp index 626a07eb29..61694d0a28 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_app.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_app.cpp @@ -35,9 +35,7 @@ void CPDFXFA_App::ReleaseInstance() { } CPDFXFA_App::CPDFXFA_App() - : m_bJavaScriptInitialized(FALSE), - m_pIsolate(nullptr), - m_csAppType(JS_STR_VIEWERTYPE_STANDARD) { + : m_bJavaScriptInitialized(FALSE), m_pIsolate(nullptr) { m_pFormFillEnvList.RemoveAll(); } @@ -86,20 +84,12 @@ FX_BOOL CPDFXFA_App::RemoveFormFillEnv( return FALSE; } -void CPDFXFA_App::GetAppType(CFX_WideString& wsAppType) { - wsAppType = m_csAppType; -} - void CPDFXFA_App::GetAppName(CFX_WideString& wsName) { CPDFSDK_FormFillEnvironment* pFormFillEnv = m_pFormFillEnvList.GetAt(0); if (pFormFillEnv) wsName = pFormFillEnv->FFI_GetAppName(); } -void CPDFXFA_App::SetAppType(const CFX_WideStringC& wsAppType) { - m_csAppType = wsAppType; -} - void CPDFXFA_App::GetLanguage(CFX_WideString& wsLanguage) { CPDFSDK_FormFillEnvironment* pFormFillEnv = m_pFormFillEnvList.GetAt(0); if (pFormFillEnv) @@ -113,19 +103,10 @@ void CPDFXFA_App::GetPlatform(CFX_WideString& wsPlatform) { } } -void CPDFXFA_App::GetVariation(CFX_WideString& wsVariation) { - wsVariation = JS_STR_VIEWERVARIATION; -} - -void CPDFXFA_App::GetVersion(CFX_WideString& wsVersion) { - wsVersion = JS_STR_VIEWERVERSION_XFA; -} - void CPDFXFA_App::Beep(uint32_t dwType) { CPDFSDK_FormFillEnvironment* pFormFillEnv = m_pFormFillEnvList.GetAt(0); - if (pFormFillEnv) { + if (pFormFillEnv) pFormFillEnv->JS_appBeep(dwType); - } } int32_t CPDFXFA_App::MsgBox(const CFX_WideString& wsMessage, diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_app.h b/fpdfsdk/fpdfxfa/cpdfxfa_app.h index 6deaeacff0..78184d1434 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_app.h +++ b/fpdfsdk/fpdfxfa/cpdfxfa_app.h @@ -34,13 +34,8 @@ class CPDFXFA_App : public IXFA_AppProvider { v8::Isolate* GetJSERuntime() const { return m_pIsolate; } // IFXA_AppProvider: - void GetAppType(CFX_WideString& wsAppType) override; - void SetAppType(const CFX_WideStringC& wsAppType) override; - void GetLanguage(CFX_WideString& wsLanguage) override; void GetPlatform(CFX_WideString& wsPlatform) override; - void GetVariation(CFX_WideString& wsVariation) override; - void GetVersion(CFX_WideString& wsVersion) override; void GetAppName(CFX_WideString& wsName) override; void Beep(uint32_t dwType) override; @@ -73,7 +68,6 @@ class CPDFXFA_App : public IXFA_AppProvider { FX_BOOL m_bJavaScriptInitialized; std::unique_ptr<CXFA_FFApp> m_pXFAApp; v8::Isolate* m_pIsolate; - CFX_WideString m_csAppType; }; #endif // FPDFSDK_FPDFXFA_CPDFXFA_APP_H_ diff --git a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h index 5f5017b5d8..3fc56ee0e7 100644 --- a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h +++ b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h @@ -12,11 +12,6 @@ #include "fpdfsdk/fpdfxfa/cpdfxfa_document.h" #include "xfa/fwl/core/ifwl_adaptertimermgr.h" -#define JS_STR_VIEWERTYPE_STANDARD L"Exchange" -#define JS_STR_LANGUANGE L"ENU" -#define JS_STR_VIEWERVARIATION L"Full" -#define JS_STR_VIEWERVERSION_XFA L"11" - struct CFWL_TimerInfo; class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr { diff --git a/fpdfsdk/javascript/app.cpp b/fpdfsdk/javascript/app.cpp index 325a84b1f8..394f49e143 100644 --- a/fpdfsdk/javascript/app.cpp +++ b/fpdfsdk/javascript/app.cpp @@ -152,7 +152,7 @@ void TimerObj::SetTimer(GlobalTimer* pTimer) { #define JS_STR_VIEWERTYPE L"pdfium" #define JS_STR_VIEWERVARIATION L"Full" #define JS_STR_PLATFORM L"WIN" -#define JS_STR_LANGUANGE L"ENU" +#define JS_STR_LANGUAGE L"ENU" #define JS_NUM_VIEWERVERSION 8 #ifdef PDF_ENABLE_XFA #define JS_NUM_VIEWERVERSION_XFA 11 @@ -338,7 +338,7 @@ FX_BOOL app::language(IJS_Context* cc, return TRUE; } #endif - vp << JS_STR_LANGUANGE; + vp << JS_STR_LANGUAGE; return TRUE; } |