CPDFSDK_InteractiveForm::m_XFAMap is useless.
It is inserted into, and removed from, but is never
retrieved from, nor does it persist its objects.
Change-Id: Ib2991edb058bd4b5bf329cc8fd652b66af040714
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/59611
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/fpdfsdk/cpdfsdk_interactiveform.cpp b/fpdfsdk/cpdfsdk_interactiveform.cpp
index ae43435..2f888b4 100644
--- a/fpdfsdk/cpdfsdk_interactiveform.cpp
+++ b/fpdfsdk/cpdfsdk_interactiveform.cpp
@@ -38,11 +38,6 @@
#include "fxjs/ijs_runtime.h"
#include "third_party/base/ptr_util.h"
-#ifdef PDF_ENABLE_XFA
-#include "fpdfsdk/fpdfxfa/cpdfxfa_widget.h"
-#include "xfa/fxfa/cxfa_ffwidget.h"
-#endif // PDF_ENABLE_XFA
-
namespace {
constexpr uint32_t kWhiteBGR = FXSYS_BGR(255, 255, 255);
@@ -125,12 +120,7 @@
RemoveAllHighLights();
}
-CPDFSDK_InteractiveForm::~CPDFSDK_InteractiveForm() {
- m_Map.clear();
-#ifdef PDF_ENABLE_XFA
- m_XFAMap.clear();
-#endif // PDF_ENABLE_XFA
-}
+CPDFSDK_InteractiveForm::~CPDFSDK_InteractiveForm() = default;
CPDFSDK_Widget* CPDFSDK_InteractiveForm::GetWidget(
CPDF_FormControl* pControl) const {
@@ -224,26 +214,10 @@
}
#ifdef PDF_ENABLE_XFA
-void CPDFSDK_InteractiveForm::AddXFAMap(CXFA_FFWidget* hWidget,
- CPDFXFA_Widget* pWidget) {
- ASSERT(hWidget);
- m_XFAMap[hWidget] = pWidget;
-}
-
-void CPDFSDK_InteractiveForm::RemoveXFAMap(CXFA_FFWidget* hWidget) {
- if (hWidget)
- m_XFAMap.erase(hWidget);
-}
-
-CPDFXFA_Widget* CPDFSDK_InteractiveForm::GetXFAWidget(CXFA_FFWidget* hWidget) {
- ASSERT(hWidget);
- auto it = m_XFAMap.find(hWidget);
- return it != m_XFAMap.end() ? it->second : nullptr;
-}
-
void CPDFSDK_InteractiveForm::XfaEnableCalculate(bool bEnabled) {
m_bXfaCalculate = bEnabled;
}
+
bool CPDFSDK_InteractiveForm::IsXfaCalculateEnabled() const {
return m_bXfaCalculate;
}
diff --git a/fpdfsdk/cpdfsdk_interactiveform.h b/fpdfsdk/cpdfsdk_interactiveform.h
index 17a350d..ec76bee 100644
--- a/fpdfsdk/cpdfsdk_interactiveform.h
+++ b/fpdfsdk/cpdfsdk_interactiveform.h
@@ -25,11 +25,6 @@
class CPDF_Object;
class CPDFSDK_FormFillEnvironment;
-#ifdef PDF_ENABLE_XFA
-class CPDFXFA_Widget;
-class CXFA_FFWidget;
-#endif // PDF_ENABLE_XFA
-
class CPDFSDK_InteractiveForm final : public IPDF_FormNotify {
public:
explicit CPDFSDK_InteractiveForm(CPDFSDK_FormFillEnvironment* pFormFillEnv);
@@ -55,9 +50,6 @@
bool IsCalculateEnabled() const;
#ifdef PDF_ENABLE_XFA
- void AddXFAMap(CXFA_FFWidget* hWidget, CPDFXFA_Widget* pWidget);
- void RemoveXFAMap(CXFA_FFWidget* hWidget);
- CPDFXFA_Widget* GetXFAWidget(CXFA_FFWidget* hWidget);
void XfaEnableCalculate(bool bEnabled);
bool IsXfaCalculateEnabled() const;
bool IsXfaValidationsEnabled();
@@ -116,13 +108,11 @@
std::unique_ptr<CPDF_InteractiveForm> const m_pInteractiveForm;
std::map<CPDF_FormControl*, CPDFSDK_Widget*> m_Map;
#ifdef PDF_ENABLE_XFA
- std::map<CXFA_FFWidget*, CPDFXFA_Widget*> m_XFAMap;
bool m_bXfaCalculate = true;
bool m_bXfaValidationsEnabled = true;
#endif // PDF_ENABLE_XFA
bool m_bCalculate = true;
bool m_bBusy = false;
-
uint8_t m_HighlightAlpha = 0;
FX_COLORREF m_HighlightColor[kFormFieldTypeCount];
bool m_NeedsHighlight[kFormFieldTypeCount];
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_widgethandler.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_widgethandler.cpp
index 4e6fa00..4638cd8 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_widgethandler.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_widgethandler.cpp
@@ -218,9 +218,7 @@
CPDFSDK_Annot* CPDFXFA_WidgetHandler::NewAnnotForXFA(CXFA_FFWidget* pAnnot,
CPDFSDK_PageView* pPage) {
CPDFSDK_InteractiveForm* pForm = m_pFormFillEnv->GetInteractiveForm();
- CPDFXFA_Widget* pWidget = new CPDFXFA_Widget(pAnnot, pPage, pForm);
- pForm->AddXFAMap(pAnnot, pWidget);
- return pWidget;
+ return new CPDFXFA_Widget(pAnnot, pPage, pForm);
}
void CPDFXFA_WidgetHandler::OnDraw(CPDFSDK_PageView* pPageView,
@@ -247,8 +245,6 @@
void CPDFXFA_WidgetHandler::ReleaseAnnot(
std::unique_ptr<CPDFSDK_Annot> pAnnot) {
- CPDFXFA_Widget* pWidget = ToXFAWidget(pAnnot.get());
- pWidget->GetInteractiveForm()->RemoveXFAMap(pWidget->GetXFAWidget());
}
CFX_FloatRect CPDFXFA_WidgetHandler::GetViewBBox(CPDFSDK_PageView* pPageView,
