From ca02733961f84abd562d59e4b6a83018ef41b143 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 25 May 2018 23:37:50 +0000 Subject: Replace some #ifdefs PDF_ENABLE_XFA, part 2. Tidy some code encountered along the way in cpdfsdk_helpers.cpp Remove one ifdef from xfa-only file. Restore some option flag processing (probably wrong to remove). Flip some #ifndef to #ifdef (#ifndef PDF_ENABLE_XFA is an anti-pattern and should be treated with suspicion since XFA should always be "additive"). Change-Id: I564a28401e20e6269c85ea610da8c96f8c8dd737 Reviewed-on: https://pdfium-review.googlesource.com/32834 Commit-Queue: Tom Sepez Reviewed-by: Lei Zhang --- fpdfsdk/cpdfsdk_widget.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/cpdfsdk_widget.h') diff --git a/fpdfsdk/cpdfsdk_widget.h b/fpdfsdk/cpdfsdk_widget.h index db03262aa9..43482ea7d5 100644 --- a/fpdfsdk/cpdfsdk_widget.h +++ b/fpdfsdk/cpdfsdk_widget.h @@ -70,10 +70,10 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot { float GetFontSize() const; int GetSelectedIndex(int nIndex) const; -#ifndef PDF_ENABLE_XFA - WideString GetValue() const; -#else +#ifdef PDF_ENABLE_XFA WideString GetValue(bool bDisplay = true) const; +#else + WideString GetValue() const; #endif // PDF_ENABLE_XFA WideString GetDefaultValue() const; WideString GetOptionLabel(int nIndex) const; -- cgit v1.2.3