From 62d8ebeee58c5da29102e61d25b28967a1b2aa04 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 12 Jun 2018 20:49:55 +0000 Subject: Comment some more #else // PDF_ENABLE_XFA This is an anti-pattern when XFA can be configured at runtime. Make it easier to find some more remaining cases. Change-Id: I1ee8d95b2fd52be5e37ef4e859e3e9179ea25975 Reviewed-on: https://pdfium-review.googlesource.com/34990 Commit-Queue: Tom Sepez Reviewed-by: dsinclair --- core/fpdfdoc/cpdf_formfield.h | 2 +- fpdfsdk/cpdfsdk_widget.cpp | 2 +- fpdfsdk/cpdfsdk_widget.h | 2 +- fpdfsdk/fpdf_view_embeddertest.cpp | 4 ++-- public/fpdf_formfill.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/fpdfdoc/cpdf_formfield.h b/core/fpdfdoc/cpdf_formfield.h index 29ff7147c2..78ef1798cb 100644 --- a/core/fpdfdoc/cpdf_formfield.h +++ b/core/fpdfdoc/cpdf_formfield.h @@ -44,7 +44,7 @@ Optional IntToFormFieldType(int value); // If values are added to FormFieldType, these will need to be updated. #ifdef PDF_ENABLE_XFA constexpr size_t kFormFieldTypeCount = 16; -#else +#else // PDF_ENABLE_XFA constexpr size_t kFormFieldTypeCount = 8; #endif // PDF_ENABLE_XFA diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp index 40e04e8772..cd863bda2c 100644 --- a/fpdfsdk/cpdfsdk_widget.cpp +++ b/fpdfsdk/cpdfsdk_widget.cpp @@ -465,7 +465,7 @@ WideString CPDFSDK_Widget::GetValue(bool bDisplay) const { : XFA_VALUEPICTURE_Edit); } } -#else +#else // PDF_ENABLE_XFA WideString CPDFSDK_Widget::GetValue() const { #endif // PDF_ENABLE_XFA CPDF_FormField* pFormField = GetFormField(); diff --git a/fpdfsdk/cpdfsdk_widget.h b/fpdfsdk/cpdfsdk_widget.h index 43482ea7d5..4d85facb7d 100644 --- a/fpdfsdk/cpdfsdk_widget.h +++ b/fpdfsdk/cpdfsdk_widget.h @@ -72,7 +72,7 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot { int GetSelectedIndex(int nIndex) const; #ifdef PDF_ENABLE_XFA WideString GetValue(bool bDisplay = true) const; -#else +#else // PDF_ENABLE_XFA WideString GetValue() const; #endif // PDF_ENABLE_XFA WideString GetDefaultValue() const; diff --git a/fpdfsdk/fpdf_view_embeddertest.cpp b/fpdfsdk/fpdf_view_embeddertest.cpp index cef5e9a0d4..1eedda3d4b 100644 --- a/fpdfsdk/fpdf_view_embeddertest.cpp +++ b/fpdfsdk/fpdf_view_embeddertest.cpp @@ -79,9 +79,9 @@ TEST_F(FPDFViewEmbeddertest, EmptyDocument) { { #ifdef PDF_ENABLE_XFA const unsigned long kExpected = static_cast(-1); -#else +#else // PDF_ENABLE_XFA const unsigned long kExpected = 0; -#endif +#endif // PDF_ENABLE_XFA EXPECT_EQ(kExpected, FPDF_GetDocPermissions(document())); } diff --git a/public/fpdf_formfill.h b/public/fpdf_formfill.h index f372d84b95..dc7c54e5c0 100644 --- a/public/fpdf_formfill.h +++ b/public/fpdf_formfill.h @@ -1548,7 +1548,7 @@ FORM_ForceToKillFocus(FPDF_FORMHANDLE hHandle); #ifdef PDF_ENABLE_XFA #define FPDF_FORMFIELD_COUNT 16 -#else +#else // PDF_ENABLE_XFA #define FPDF_FORMFIELD_COUNT 8 #endif // PDF_ENABLE_XFA -- cgit v1.2.3