From 468652f17a480f2d62fd8fb5cf51aa41511dcc97 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 16 May 2018 19:17:44 +0000 Subject: Remove some more unused #defines Bug: pdfium:1085 Change-Id: I62c526ae865f0cadfddd2e75a616bce73de0f88d Reviewed-on: https://pdfium-review.googlesource.com/32632 Reviewed-by: dsinclair Commit-Queue: Tom Sepez --- core/fpdftext/cpdf_textpage.h | 1 - core/fxcodec/codec/fx_codec_jpeg.cpp | 3 --- core/fxcodec/gif/cfx_gif.h | 1 - xfa/fwl/cfwl_monthcalendar.cpp | 1 - xfa/fwl/cfwl_widget.cpp | 1 - xfa/fwl/fwl_widgetdef.h | 3 --- xfa/fwl/theme/cfwl_checkboxtp.cpp | 5 ----- 7 files changed, 15 deletions(-) diff --git a/core/fpdftext/cpdf_textpage.h b/core/fpdftext/cpdf_textpage.h index 43a03123ca..36d01854f5 100644 --- a/core/fpdftext/cpdf_textpage.h +++ b/core/fpdftext/cpdf_textpage.h @@ -36,7 +36,6 @@ class CPDF_TextObject; #define TEXT_LINEFEED_CHAR L'\n' #define TEXT_RETURN_CHAR L'\r' #define TEXT_HYPHEN_CHAR L'-' -#define TEXT_EMPTY L"" #define TEXT_HYPHEN L"-" #define TEXT_CHARRATIO_GAPDELTA 0.070 diff --git a/core/fxcodec/codec/fx_codec_jpeg.cpp b/core/fxcodec/codec/fx_codec_jpeg.cpp index 71a2f8889e..7a73f4e55e 100644 --- a/core/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/fxcodec/codec/fx_codec_jpeg.cpp @@ -99,9 +99,6 @@ static boolean _dest_empty(j_compress_ptr cinfo) { #endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ } // extern "C" -#define JPEG_MARKER_ICC (JPEG_APP0 + 2) -#define JPEG_MARKER_MAXSIZE 0xFFFF - #ifdef PDF_ENABLE_XFA static void JpegLoadAttribute(struct jpeg_decompress_struct* pInfo, CFX_DIBAttribute* pAttribute) { diff --git a/core/fxcodec/gif/cfx_gif.h b/core/fxcodec/gif/cfx_gif.h index bba2d9c911..dd0d719bcf 100644 --- a/core/fxcodec/gif/cfx_gif.h +++ b/core/fxcodec/gif/cfx_gif.h @@ -24,7 +24,6 @@ extern const char kGifSignature89[]; #define GIF_BLOCK_TERMINAL 0x00 #define GIF_MAX_LZW_EXP 12 #define GIF_MAX_LZW_CODE 4096 -#define GIF_DATA_BLOCK 255 #define GIF_D_STATUS_SIG 0x01 #define GIF_D_STATUS_TAIL 0x02 #define GIF_D_STATUS_EXT 0x03 diff --git a/xfa/fwl/cfwl_monthcalendar.cpp b/xfa/fwl/cfwl_monthcalendar.cpp index c254bca253..f3a34b0250 100644 --- a/xfa/fwl/cfwl_monthcalendar.cpp +++ b/xfa/fwl/cfwl_monthcalendar.cpp @@ -21,7 +21,6 @@ #include "xfa/fwl/ifwl_themeprovider.h" #define MONTHCAL_HSEP_HEIGHT 1 -#define MONTHCAL_VSEP_WIDTH 1 #define MONTHCAL_HMARGIN 3 #define MONTHCAL_VMARGIN 2 #define MONTHCAL_ROWS 9 diff --git a/xfa/fwl/cfwl_widget.cpp b/xfa/fwl/cfwl_widget.cpp index af46cd3d93..4ebce30818 100644 --- a/xfa/fwl/cfwl_widget.cpp +++ b/xfa/fwl/cfwl_widget.cpp @@ -30,7 +30,6 @@ #include "xfa/fwl/ifwl_themeprovider.h" #include "xfa/fxfa/cxfa_ffapp.h" -#define FWL_STYLEEXT_MNU_Vert (1L << 0) #define FWL_WGT_CalcHeight 2048 #define FWL_WGT_CalcWidth 2048 #define FWL_WGT_CalcMultiLineDefWidth 120.0f diff --git a/xfa/fwl/fwl_widgetdef.h b/xfa/fwl/fwl_widgetdef.h index a85ba1562a..e8e8b9202e 100644 --- a/xfa/fwl/fwl_widgetdef.h +++ b/xfa/fwl/fwl_widgetdef.h @@ -21,9 +21,6 @@ #define FWL_WGTSTATE_Invisible (1L << 5) #define FWL_WGTSTATE_MAX (6) -#define FWL_VKEY_LButton 0x01 -#define FWL_VKEY_RButton 0x02 -#define FWL_VKEY_MButton 0x04 #define FWL_VKEY_Back 0x08 #define FWL_VKEY_Tab 0x09 #define FWL_VKEY_NewLine 0x0A diff --git a/xfa/fwl/theme/cfwl_checkboxtp.cpp b/xfa/fwl/theme/cfwl_checkboxtp.cpp index 82fdc1a18a..a4e474b4f1 100644 --- a/xfa/fwl/theme/cfwl_checkboxtp.cpp +++ b/xfa/fwl/theme/cfwl_checkboxtp.cpp @@ -29,11 +29,6 @@ CFX_PointF ScaleBezierPoint(const CFX_PointF& point) { } // namespace -#define CHECKBOX_COLOR_BOXLT1 (ArgbEncode(255, 172, 168, 153)) -#define CHECKBOX_COLOR_BOXLT2 (ArgbEncode(255, 113, 111, 100)) -#define CHECKBOX_COLOR_BOXRB1 (ArgbEncode(255, 241, 239, 226)) -#define CHECKBOX_COLOR_BOXRB2 (ArgbEncode(255, 255, 255, 255)) - CFWL_CheckBoxTP::CFWL_CheckBoxTP() : m_pThemeData(new CKBThemeData) { SetThemeData(); } -- cgit v1.2.3