commit 3ff0d04e9a4cffcd336ac60e036bf22834a09b07
author Tom Sepez <tsepez@chromium.org> Fri Jan 10 23:09:29 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Jan 10 23:09:29 2020 +0000
tree 2a77ae855da95c4077cb0a5e14c4ebf1ed1c7afd
parent 1b39d72bc34b8edc519c1fa981848749d0aca31a

Conditionalize more code on PDF_XFA_ELEMENT_SUBMIT_ENABLED.

Several methods are uncalled otherwise.

Change-Id: Id269656b0952f7783242ec250d3d9bc304b5caee
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/64971
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp

diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
index 1e4c836..11d1e49 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
@@ -628,7 +628,6 @@
   NotifySubmit(false);
   return ret;
 }
-#endif  // PDF_XFA_ELEMENT_SUBMIT_ENABLED
 
 bool CPDFXFA_DocEnvironment::MailToInfo(WideString& csURL,
                                         WideString& csToAddress,
@@ -808,7 +807,6 @@
   }
 }
 
-#ifdef PDF_XFA_ELEMENT_SUBMIT_ENABLED
 bool CPDFXFA_DocEnvironment::OnBeforeNotifySubmit() {
   if (!m_pContext->ContainsXFAForm())
     return true;

fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h

diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h
index 100e664..ebb86c4 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h
@@ -64,6 +64,7 @@
 #endif  // PDF_XFA_ELEMENT_SUBMIT_ENABLED
 
  private:
+#ifdef PDF_XFA_ELEMENT_SUBMIT_ENABLED
   bool MailToInfo(WideString& csURL,
                   WideString& csToAddress,
                   WideString& csCCAddress,
@@ -75,8 +76,6 @@
                         FPDF_DWORD encodeType,
                         FPDF_DWORD flag);
   void ToXFAContentFlags(WideString csSrcContent, FPDF_DWORD& flag);
-
-#ifdef PDF_XFA_ELEMENT_SUBMIT_ENABLED
   bool OnBeforeNotifySubmit();
   void OnAfterNotifySubmit();
   bool NotifySubmit(bool bPrevOrPost);