commit ca02733961f84abd562d59e4b6a83018ef41b143
author Tom Sepez <tsepez@chromium.org> Fri May 25 23:37:50 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri May 25 23:37:50 2018 +0000
tree a5f2cb28353fc82aab57f99d6605f5b817a04cce
parent df93cd35530e7b8dd67abde8d199c36c3fae76be

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 <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

fpdfsdk/cpdfsdk_widget.h

diff --git a/fpdfsdk/cpdfsdk_widget.h b/fpdfsdk/cpdfsdk_widget.h
index db03262..43482ea 100644
--- a/fpdfsdk/cpdfsdk_widget.h
+++ b/fpdfsdk/cpdfsdk_widget.h
@@ -70,10 +70,10 @@
   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;