Inflict PDF_ENABLE_XFA ifdefs on XFA fpdfsdk/

fpdfsdk/src/formfiller/FFL_FormFiller.cpp

Index: fpdfsdk/src/formfiller/FFL_FormFiller.cpp
diff --git a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp
index 048ebafa12bac8c8eeb574976c1ae859f060843b..7696ebefa120e955e94858c5e95dba54a5aef2b8 100644
--- a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp
+++ b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp
@@ -243,7 +243,11 @@ FX_BOOL CFFL_FormFiller::OnChar(CPDFSDK_Annot* pAnnot,
 
 void CFFL_FormFiller::SetFocusForAnnot(CPDFSDK_Annot* pAnnot, FX_UINT nFlag) {
   CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
+#ifndef PDF_ENABLE_XFA
+  CPDF_Page* pPage = pWidget->GetPDFPage();

[Lei Zhang, 2015/11/25 00:12:02]

GetUnderlyingPage?

[Tom Sepez, 2015/11/25 21:45:29]

I'm going to cobble up a pair of CLs to fix this now.

+#else
   CPDFXFA_Page* pPage = pWidget->GetPDFXFAPage();
+#endif
   CPDFSDK_Document* pDoc = m_pApp->GetSDKDocument();
   CPDFSDK_PageView* pPageView = pDoc->GetPageView(pPage);
   if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, TRUE))
@@ -461,7 +465,11 @@ CPDF_Rect CFFL_FormFiller::GetPDFWindowRect() const {
 }
 
 CPDFSDK_PageView* CFFL_FormFiller::GetCurPageView() {
+#ifndef PDF_ENABLE_XFA
+  CPDF_Page* pPage = m_pAnnot->GetPDFPage();

[Lei Zhang, 2015/11/25 00:12:02]

GetUnderlyingPage?

[Tom Sepez, 2015/11/25 21:45:29]

Ditto

+#else
   CPDFXFA_Page* pPage = m_pAnnot->GetPDFXFAPage();
+#endif
   CPDFSDK_Document* pSDKDoc = m_pApp->GetSDKDocument();
   return pSDKDoc ? pSDKDoc->GetPageView(pPage) : nullptr;
 }
@@ -562,10 +570,12 @@ FX_BOOL CFFL_FormFiller::IsDataChanged(CPDFSDK_PageView* pPageView) {
 
 void CFFL_FormFiller::SaveData(CPDFSDK_PageView* pPageView) {}
 
+#ifdef PDF_ENABLE_XFA
 FX_BOOL CFFL_FormFiller::IsFieldFull(CPDFSDK_PageView* pPageView) {
   return FALSE;
 }
 
+#endif
 void CFFL_FormFiller::SetChangeMark() {
   m_pApp->FFI_OnChange();
 }
@@ -616,7 +626,11 @@ void CFFL_FormFiller::InvalidateRect(double left,
                                      double top,
                                      double right,
                                      double bottom) {
+#ifndef PDF_ENABLE_XFA
+  CPDF_Page* pPage = m_pWidget->GetPDFPage();

[Lei Zhang, 2015/11/25 00:12:02]

GetUnderlyingPage?

[Tom Sepez, 2015/11/25 21:45:29]

Ditto

+#else
   CPDFXFA_Page* pPage = m_pWidget->GetPDFXFAPage();
+#endif
   m_pApp->FFI_Invalidate(pPage, left, top, right, bottom);
 }