| Index: fpdfsdk/cpdfsdk_widget.cpp
|
| diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp
|
| index 13b412c5e59bbe17689462ab1d1713768724c8e4..94555b70c5d6fe304071b06cf1570d9231d21fed 100644
|
| --- a/fpdfsdk/cpdfsdk_widget.cpp
|
| +++ b/fpdfsdk/cpdfsdk_widget.cpp
|
| @@ -20,7 +20,7 @@
|
| #include "core/fxge/cfx_pathdata.h"
|
| #include "core/fxge/cfx_renderdevice.h"
|
| #include "fpdfsdk/cpdfsdk_document.h"
|
| -#include "fpdfsdk/cpdfsdk_environment.h"
|
| +#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
|
| #include "fpdfsdk/cpdfsdk_interform.h"
|
| #include "fpdfsdk/cpdfsdk_pageview.h"
|
| #include "fpdfsdk/formfiller/cba_fontmap.h"
|
| @@ -853,7 +853,7 @@ void CPDFSDK_Widget::DrawShadow(CFX_RenderDevice* pDevice,
|
|
|
| CFX_FloatRect rcDevice;
|
| ASSERT(m_pInterForm->GetDocument());
|
| - CPDFSDK_Environment* pEnv = m_pInterForm->GetDocument()->GetEnv();
|
| + CPDFSDK_FormFillEnvironment* pEnv = m_pInterForm->GetDocument()->GetEnv();
|
| if (!pEnv)
|
| return;
|
| CFX_Matrix page2device;
|
| @@ -1000,7 +1000,7 @@ void CPDFSDK_Widget::ResetAppearance_PushButton() {
|
| CPDF_IconFit iconFit = pControl->GetIconFit();
|
|
|
| CPDFSDK_Document* pDoc = m_pInterForm->GetDocument();
|
| - CPDFSDK_Environment* pEnv = pDoc->GetEnv();
|
| + CPDFSDK_FormFillEnvironment* pEnv = pDoc->GetEnv();
|
|
|
| CBA_FontMap font_map(this, pEnv->GetSysHandler());
|
| font_map.SetAPType("N");
|
| @@ -1378,7 +1378,7 @@ void CPDFSDK_Widget::ResetAppearance_ComboBox(const CFX_WideString* sValue) {
|
| pEdit->EnableRefresh(FALSE);
|
|
|
| CPDFSDK_Document* pDoc = m_pInterForm->GetDocument();
|
| - CPDFSDK_Environment* pEnv = pDoc->GetEnv();
|
| + CPDFSDK_FormFillEnvironment* pEnv = pDoc->GetEnv();
|
| CBA_FontMap font_map(this, pEnv->GetSysHandler());
|
| pEdit->SetFontMap(&font_map);
|
|
|
| @@ -1444,7 +1444,7 @@ void CPDFSDK_Widget::ResetAppearance_ListBox() {
|
| pEdit->EnableRefresh(FALSE);
|
|
|
| CPDFSDK_Document* pDoc = m_pInterForm->GetDocument();
|
| - CPDFSDK_Environment* pEnv = pDoc->GetEnv();
|
| + CPDFSDK_FormFillEnvironment* pEnv = pDoc->GetEnv();
|
|
|
| CBA_FontMap font_map(this, pEnv->GetSysHandler());
|
| pEdit->SetFontMap(&font_map);
|
| @@ -1531,7 +1531,7 @@ void CPDFSDK_Widget::ResetAppearance_TextField(const CFX_WideString* sValue) {
|
| pEdit->EnableRefresh(FALSE);
|
|
|
| CPDFSDK_Document* pDoc = m_pInterForm->GetDocument();
|
| - CPDFSDK_Environment* pEnv = pDoc->GetEnv();
|
| + CPDFSDK_FormFillEnvironment* pEnv = pDoc->GetEnv();
|
|
|
| CBA_FontMap font_map(this, pEnv->GetSysHandler());
|
| pEdit->SetFontMap(&font_map);
|
| @@ -1847,7 +1847,7 @@ FX_BOOL CPDFSDK_Widget::OnAAction(CPDF_AAction::AActionType type,
|
| PDFSDK_FieldAction& data,
|
| CPDFSDK_PageView* pPageView) {
|
| CPDFSDK_Document* pDocument = pPageView->GetSDKDocument();
|
| - CPDFSDK_Environment* pEnv = pDocument->GetEnv();
|
| + CPDFSDK_FormFillEnvironment* pEnv = pDocument->GetEnv();
|
|
|
| #ifdef PDF_ENABLE_XFA
|
| CPDFXFA_Document* pDoc = pDocument->GetXFADocument();
|
|
|