Inflict PPDF_ENABLE_XFA ifdefs on XFA core/

core/include/fpdfdoc/fpdf_doc.h

Index: core/include/fpdfdoc/fpdf_doc.h
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h
index c270c78bcf322daeafa74716072b7aa7b813707e..3f05fc9be9aa7b7a578982a078ffa9e97b9f0ec1 100644
--- a/core/include/fpdfdoc/fpdf_doc.h
+++ b/core/include/fpdfdoc/fpdf_doc.h
@@ -825,12 +825,14 @@ class CPDF_FormField {
 
   FX_BOOL ClearSelectedOptions(FX_BOOL bNotify = FALSE);
 
+#ifdef PDF_ENABLE_XFA
   FX_BOOL ClearOptions(FX_BOOL bNotify = FALSE);
 
   int InsertOption(CFX_WideString csOptLabel,
                    int index = -1,
                    FX_BOOL bNotify = FALSE);
 
+#endif

[Lei Zhang, 2015/11/24 23:36:04]

Blank line below rather than above? Ditto in other files.

[Tom Sepez, 2015/11/25 18:51:45]

Yep, that's just a result of the way automated diff works. Will fix manually in
next CL.

   FX_FLOAT GetFontSize() { return m_FontSize; }
 
   CPDF_Font* GetFont() { return m_pFont; }