From c8fd3318a8deca3e1eabd6f7a9449ae4a0fa964d Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 2 Jan 2017 17:17:02 -0500 Subject: Cleaning out params in CPDFXFA_Context This CL cleans up some of the out params in CPDFXFA_Context. In the process several of the strings returned by ::LoadString() are inlined in their call sites and the defines removed. BUG=pdfium:549 Change-Id: I41a7ceeba3962299eecd0cb714ddb03d28dbb0ea Reviewed-on: https://pdfium-review.googlesource.com/2134 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- xfa/fwl/theme/cfwl_monthcalendartp.cpp | 80 ---------------------------------- xfa/fwl/theme/cfwl_widgettp.h | 22 ---------- 2 files changed, 102 deletions(-) (limited to 'xfa/fwl/theme') diff --git a/xfa/fwl/theme/cfwl_monthcalendartp.cpp b/xfa/fwl/theme/cfwl_monthcalendartp.cpp index 13fabb34e5..a76d959cca 100644 --- a/xfa/fwl/theme/cfwl_monthcalendartp.cpp +++ b/xfa/fwl/theme/cfwl_monthcalendartp.cpp @@ -248,86 +248,6 @@ void* CFWL_MonthCalendarTP::GetCapacity(CFWL_ThemePart* pThemePart, m_fValue = kHeight; break; } - case CFWL_WidgetCapacity::Sun: { - wsResource = L"Sun"; - return &wsResource; - } - case CFWL_WidgetCapacity::Mon: { - wsResource = L"Mon"; - return &wsResource; - } - case CFWL_WidgetCapacity::Tue: { - wsResource = L"Tue"; - return &wsResource; - } - case CFWL_WidgetCapacity::Wed: { - wsResource = L"Wed"; - return &wsResource; - } - case CFWL_WidgetCapacity::Thu: { - wsResource = L"Thu"; - return &wsResource; - } - case CFWL_WidgetCapacity::Fri: { - wsResource = L"Fri"; - return &wsResource; - } - case CFWL_WidgetCapacity::Sat: { - wsResource = L"Sat"; - return &wsResource; - } - case CFWL_WidgetCapacity::January: { - wsResource = L"January"; - return &wsResource; - } - case CFWL_WidgetCapacity::February: { - wsResource = L"February"; - return &wsResource; - } - case CFWL_WidgetCapacity::March: { - wsResource = L"March"; - return &wsResource; - } - case CFWL_WidgetCapacity::April: { - wsResource = L"April"; - return &wsResource; - } - case CFWL_WidgetCapacity::May: { - wsResource = L"May"; - return &wsResource; - } - case CFWL_WidgetCapacity::June: { - wsResource = L"June"; - return &wsResource; - } - case CFWL_WidgetCapacity::July: { - wsResource = L"July"; - return &wsResource; - } - case CFWL_WidgetCapacity::August: { - wsResource = L"August"; - return &wsResource; - } - case CFWL_WidgetCapacity::September: { - wsResource = L"September"; - return &wsResource; - } - case CFWL_WidgetCapacity::October: { - wsResource = L"October"; - return &wsResource; - } - case CFWL_WidgetCapacity::November: { - wsResource = L"November"; - return &wsResource; - } - case CFWL_WidgetCapacity::December: { - wsResource = L"December"; - return &wsResource; - } - case CFWL_WidgetCapacity::Today: { - wsResource = L"Today"; - return &wsResource; - } default: bDefPro = true; break; diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h index 90d697379c..11135121c0 100644 --- a/xfa/fwl/theme/cfwl_widgettp.h +++ b/xfa/fwl/theme/cfwl_widgettp.h @@ -19,28 +19,6 @@ enum class CFWL_WidgetCapacity { None = 0, - Today, - Sun, - Mon, - Tue, - Wed, - Thu, - Fri, - Sat, - - January, - February, - March, - April, - May, - June, - July, - August, - September, - October, - November, - December, - BigIcon, ComboFormHandler, CXBorder, -- cgit v1.2.3