From 92cb5e580cecf0412b74d51e8863ed557e2bd47a Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 16 May 2016 11:38:28 -0700 Subject: Convert border style defines to an enum class. There were two defines, BBS_ and PBS_ for the various border styles in the system. They were the same, except PBS_ had an extra SHADOW define which was never used. This CL combines both of those into a single BorderStyle enum class and updates the code as needed. Also, removes ADDBIT, GETBIT unused defines. Updates barcode code to use the util.h defines instead of redefinition. fsdk_baseannot names starting with _ were cleaned up and some #defines moved to constants. Review-Url: https://codereview.chromium.org/1980973002 --- fpdfsdk/javascript/Field.cpp | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'fpdfsdk/javascript/Field.cpp') diff --git a/fpdfsdk/javascript/Field.cpp b/fpdfsdk/javascript/Field.cpp index 158d4d6a7f..c1838332ba 100644 --- a/fpdfsdk/javascript/Field.cpp +++ b/fpdfsdk/javascript/Field.cpp @@ -395,22 +395,20 @@ FX_BOOL Field::borderStyle(IJS_Context* cc, if (!pWidget) return FALSE; - int nBorderstyle = pWidget->GetBorderStyle(); - - switch (nBorderstyle) { - case BBS_SOLID: + switch (pWidget->GetBorderStyle()) { + case BorderStyle::SOLID: vp << L"solid"; break; - case BBS_DASH: + case BorderStyle::DASH: vp << L"dashed"; break; - case BBS_BEVELED: + case BorderStyle::BEVELED: vp << L"beveled"; break; - case BBS_INSET: + case BorderStyle::INSET: vp << L"inset"; break; - case BBS_UNDERLINE: + case BorderStyle::UNDERLINE: vp << L"underline"; break; default: @@ -428,18 +426,17 @@ void Field::SetBorderStyle(CPDFSDK_Document* pDocument, const CFX_ByteString& string) { ASSERT(pDocument); - int nBorderStyle = 0; - + BorderStyle nBorderStyle = BorderStyle::SOLID; if (string == "solid") - nBorderStyle = BBS_SOLID; + nBorderStyle = BorderStyle::SOLID; else if (string == "beveled") - nBorderStyle = BBS_BEVELED; + nBorderStyle = BorderStyle::BEVELED; else if (string == "dashed") - nBorderStyle = BBS_DASH; + nBorderStyle = BorderStyle::DASH; else if (string == "inset") - nBorderStyle = BBS_INSET; + nBorderStyle = BorderStyle::INSET; else if (string == "underline") - nBorderStyle = BBS_UNDERLINE; + nBorderStyle = BorderStyle::UNDERLINE; else return; -- cgit v1.2.3