commit f793e3abc4ecaea52b9f1e960df3505233e466d6
author Tom Sepez <tsepez@chromium.org> Thu Jan 09 01:56:03 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Jan 09 01:56:03 2020 +0000
tree 6667035067109c6dd635467e654a99c165412a7e
parent e0539ffdbb40e93279a9b50ca07a278a7c7bef9e

Remove FWL_STYLEEXT_DTP_LongDateFormat.

It's a bitflag, not a bitmask. Then remove dubious logic using it.

- Tidy defines in header while we're at it.

Change-Id: I9adc48fe4a698cbfe54acca882a27f5c7ce24590
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/64651
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

xfa/fwl/cfwl_datetimepicker.cpp

diff --git a/xfa/fwl/cfwl_datetimepicker.cpp b/xfa/fwl/cfwl_datetimepicker.cpp
index b711eba..75e71b1 100644
--- a/xfa/fwl/cfwl_datetimepicker.cpp
+++ b/xfa/fwl/cfwl_datetimepicker.cpp
@@ -217,17 +217,10 @@
 WideString CFWL_DateTimePicker::FormatDateString(int32_t iYear,
                                                  int32_t iMonth,
                                                  int32_t iDay) {
-  if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_DTP_ShortDateFormat) ==
-      FWL_STYLEEXT_DTP_ShortDateFormat) {
+  if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_DTP_ShortDateFormat)
     return WideString::Format(L"%d-%d-%d", iYear, iMonth, iDay);
-  }
 
-  if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_DTP_LongDateFormat) ==
-      FWL_STYLEEXT_DTP_LongDateFormat) {
-    return WideString::Format(L"%d Year %d Month %d Day", iYear, iMonth, iDay);
-  }
-
-  return WideString();
+  return WideString::Format(L"%d Year %d Month %d Day", iYear, iMonth, iDay);
 }
 
 void CFWL_DateTimePicker::ShowMonthCalendar(bool bActivate) {

xfa/fwl/cfwl_datetimepicker.h

diff --git a/xfa/fwl/cfwl_datetimepicker.h b/xfa/fwl/cfwl_datetimepicker.h
index 8e05dde..eccde82 100644
--- a/xfa/fwl/cfwl_datetimepicker.h
+++ b/xfa/fwl/cfwl_datetimepicker.h
@@ -16,17 +16,16 @@
 #include "xfa/fwl/cfwl_widget.h"
 #include "xfa/fwl/cfwl_widgetproperties.h"
 
-#define FWL_STYLEEXT_DTP_LongDateFormat 0
 #define FWL_STYLEEXT_DTP_ShortDateFormat (1L << 1)
-#define FWL_STYLEEXT_DTP_EditHNear 0
+#define FWL_STYLEEXT_DTP_EditHAlignMask (3L << 4)
+#define FWL_STYLEEXT_DTP_EditHNear (0L << 4)
 #define FWL_STYLEEXT_DTP_EditHCenter (1L << 4)
 #define FWL_STYLEEXT_DTP_EditHFar (2L << 4)
-#define FWL_STYLEEXT_DTP_EditVNear 0
+#define FWL_STYLEEXT_DTP_EditVAlignMask (3L << 6)
+#define FWL_STYLEEXT_DTP_EditVNear (0L << 6)
 #define FWL_STYLEEXT_DTP_EditVCenter (1L << 6)
 #define FWL_STYLEEXT_DTP_EditVFar (2L << 6)
 #define FWL_STYLEEXT_DTP_EditJustified (1L << 8)
-#define FWL_STYLEEXT_DTP_EditHAlignMask (3L << 4)
-#define FWL_STYLEEXT_DTP_EditVAlignMask (3L << 6)
 
 class CFWL_DateTimeEdit;