From 5c4c193fd4b6dd0657abf5e74125f9887f91d720 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 25 Nov 2015 12:15:38 -0800 Subject: Inflict PPDF_ENABLE_XFA ifdefs on XFA core/ R=thestig@chromium.org Review URL: https://codereview.chromium.org/1471323004 . --- core/include/fxcrt/fx_ucd.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'core/include/fxcrt/fx_ucd.h') diff --git a/core/include/fxcrt/fx_ucd.h b/core/include/fxcrt/fx_ucd.h index d4a43bd096..852a893843 100644 --- a/core/include/fxcrt/fx_ucd.h +++ b/core/include/fxcrt/fx_ucd.h @@ -7,8 +7,13 @@ #ifndef CORE_INCLUDE_FXCRT_FX_UCD_H_ #define CORE_INCLUDE_FXCRT_FX_UCD_H_ +#ifndef PDF_ENABLE_XFA +#include "fx_system.h" +#else #include "fx_basic.h" +#endif +#ifdef PDF_ENABLE_XFA enum FX_CHARBREAKPROP { FX_CBP_OP = 0, FX_CBP_CL = 1, @@ -50,6 +55,7 @@ enum FX_CHARBREAKPROP { FX_CBP_TB = 37, FX_CBP_NONE = 36, }; +#endif #define FX_BIDICLASSBITS 6 #define FX_BIDICLASSBITSMASK (31 << FX_BIDICLASSBITS) enum FX_BIDICLASS { @@ -84,6 +90,7 @@ extern const size_t kFXTextLayoutVerticalMirrorSize; extern const FX_WCHAR kFXTextLayoutBidiMirror[]; extern const size_t kFXTextLayoutBidiMirrorSize; +#ifdef PDF_ENABLE_XFA #define FX_CHARTYPEBITS 11 #define FX_CHARTYPEBITSMASK (15 << FX_CHARTYPEBITS) enum FX_CHARTYPE { @@ -102,9 +109,13 @@ enum FX_CHARTYPE { FX_CHARTYPE_Arabic = (12 << FX_CHARTYPEBITS), }; +#endif FX_DWORD FX_GetUnicodeProperties(FX_WCHAR wch); +#ifdef PDF_ENABLE_XFA FX_BOOL FX_IsCtrlCode(FX_WCHAR ch); +#endif FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_BOOL bRTL, FX_BOOL bVertical); +#ifdef PDF_ENABLE_XFA FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_DWORD dwProps, FX_BOOL bRTL, @@ -183,5 +194,6 @@ class CFX_RTFChar : public CFX_Char { IFX_Unknown* m_pUserData; }; typedef CFX_ArrayTemplate CFX_RTFCharArray; +#endif #endif // CORE_INCLUDE_FXCRT_FX_UCD_H_ -- cgit v1.2.3