diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-11-30 12:39:54 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-11-30 12:39:54 -0800 |
| commit | 40e9ff30b7f22b37c071dc9751f489d4cc22b0ee (patch) | |
| tree | 33f50b65518fcb32bc197adc94bb0073244113e1 /fpdfsdk/include/formfiller | |
| parent | d029d934e1a23aadc07cc99753a55b308f20ef2b (diff) | |
| download | pdfium-40e9ff30b7f22b37c071dc9751f489d4cc22b0ee.tar.xz | |
Tidy PDF_ENABLE_XFA #ifdefs in fpdfsdk.
-- label matching #endifs
-- prefer #ifdef over #ifndef
-- consolidate some blocks.
R=ochang@chromium.org
Review URL: https://codereview.chromium.org/1484843002 .
Diffstat (limited to 'fpdfsdk/include/formfiller')
| -rw-r--r-- | fpdfsdk/include/formfiller/FFL_ComboBox.h | 2 | ||||
| -rw-r--r-- | fpdfsdk/include/formfiller/FFL_FormFiller.h | 2 | ||||
| -rw-r--r-- | fpdfsdk/include/formfiller/FFL_IFormFiller.h | 9 | ||||
| -rw-r--r-- | fpdfsdk/include/formfiller/FFL_TextField.h | 2 |
4 files changed, 6 insertions, 9 deletions
diff --git a/fpdfsdk/include/formfiller/FFL_ComboBox.h b/fpdfsdk/include/formfiller/FFL_ComboBox.h index f8f5c3c191..5c36779df7 100644 --- a/fpdfsdk/include/formfiller/FFL_ComboBox.h +++ b/fpdfsdk/include/formfiller/FFL_ComboBox.h @@ -58,8 +58,8 @@ class CFFL_ComboBox : public CFFL_FormFiller, #ifdef PDF_ENABLE_XFA // CFFL_FormFiller: FX_BOOL IsFieldFull(CPDFSDK_PageView* pPageView) override; +#endif // PDF_ENABLE_XFA -#endif private: CFX_WideString GetSelectExportText(); diff --git a/fpdfsdk/include/formfiller/FFL_FormFiller.h b/fpdfsdk/include/formfiller/FFL_FormFiller.h index 83b9902aa5..989d17e00a 100644 --- a/fpdfsdk/include/formfiller/FFL_FormFiller.h +++ b/fpdfsdk/include/formfiller/FFL_FormFiller.h @@ -122,8 +122,8 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { #ifdef PDF_ENABLE_XFA virtual FX_BOOL IsFieldFull(CPDFSDK_PageView* pPageView); +#endif // PDF_ENABLE_XFA -#endif CPWL_Wnd* GetPDFWindow(CPDFSDK_PageView* pPageView, FX_BOOL bNew); void DestroyPDFWindow(CPDFSDK_PageView* pPageView); void EscapeFiller(CPDFSDK_PageView* pPageView, FX_BOOL bDestroyPDFWindow); diff --git a/fpdfsdk/include/formfiller/FFL_IFormFiller.h b/fpdfsdk/include/formfiller/FFL_IFormFiller.h index bfdce10f59..dbd8b868e7 100644 --- a/fpdfsdk/include/formfiller/FFL_IFormFiller.h +++ b/fpdfsdk/include/formfiller/FFL_IFormFiller.h @@ -133,7 +133,7 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify { FX_BOOL& bReset, FX_BOOL& bExit, FX_UINT nFlag); -#endif +#endif // PDF_ENABLE_XFA private: using CFFL_Widget2Filler = std::map<CPDFSDK_Annot*, CFFL_FormFiller*>; @@ -160,14 +160,11 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify { void OnPopupPostOpen(void* pPrivateData, FX_BOOL& bExit, FX_DWORD nFlag) override; -#endif - - void UnRegisterFormFiller(CPDFSDK_Annot* pAnnot); -#ifdef PDF_ENABLE_XFA void SetFocusAnnotTab(CPDFSDK_Annot* pWidget, FX_BOOL bSameField, FX_BOOL bNext); -#endif +#endif // PDF_ENABLE_XFA + void UnRegisterFormFiller(CPDFSDK_Annot* pAnnot); CPDFDoc_Environment* m_pApp; CFFL_Widget2Filler m_Maps; diff --git a/fpdfsdk/include/formfiller/FFL_TextField.h b/fpdfsdk/include/formfiller/FFL_TextField.h index a6065fe992..12ac15abb8 100644 --- a/fpdfsdk/include/formfiller/FFL_TextField.h +++ b/fpdfsdk/include/formfiller/FFL_TextField.h @@ -59,8 +59,8 @@ class CFFL_TextField : public CFFL_FormFiller, #ifdef PDF_ENABLE_XFA // CFFL_FormFiller: FX_BOOL IsFieldFull(CPDFSDK_PageView* pPageView) override; +#endif // PDF_ENABLE_XFA -#endif private: CBA_FontMap* m_pFontMap; FFL_TextFieldState m_State; |