convert FLT_DATE_ constants to scoped enum

Change-Id: I92229f180ae00064c90ee45a23b688eeb749ae2f

include/svx/ctredlin.hxx

@@ -35,12 +35,10 @@
 #include <unotools/textsearch.hxx>
 #include <svx/svxdllapi.h>
 
-#define FLT_DATE_BEFORE     0
-#define FLT_DATE_SINCE      1
-#define FLT_DATE_EQUAL      2
-#define FLT_DATE_NOTEQUAL   3
-#define FLT_DATE_BETWEEN    4
-#define FLT_DATE_SAVE       5
+enum class SvxRedlinDateMode
+{
+    BEFORE, SINCE, EQUAL, NOTEQUAL, BETWEEN, SAVE
+};
 
 /// Struct for sorting data.
 class SVX_DLLPUBLIC SAL_WARN_UNUSED RedlinData
@@ -95,7 +93,7 @@ private:
     bool            bAuthor;
     bool            bDate;
     bool            bComment;
-    sal_uInt16      nDaTiMode;
+    SvxRedlinDateMode nDaTiMode;
     DateTime        aDaTiFirst;
     DateTime        aDaTiLast;
     DateTime        aDaTiFilterFirst;
@@ -120,7 +118,7 @@ public:
 
     // For FilterPage only {
     void            SetFilterDate(bool bFlag=true);
-    void            SetDateTimeMode(sal_uInt16 nMode);
+    void            SetDateTimeMode(SvxRedlinDateMode nMode);
     void            SetFirstDate(const Date&);
     void            SetLastDate(const Date&);
     void            SetFirstTime(const tools::Time&);
@@ -210,7 +208,7 @@ private:
 
 protected:
 
-    void            ShowDateFields(sal_uInt16 nKind);
+    void            ShowDateFields(SvxRedlinDateMode nKind);
     void            EnableDateLine1(bool bFlag);
     void            EnableDateLine2(bool bFlag);
 
@@ -233,7 +231,7 @@ public:
     void            SetLastTime(const tools::Time &aTime);
 
     void            SetDateMode(sal_uInt16 nMode);
-    sal_uInt16      GetDateMode();
+    SvxRedlinDateMode GetDateMode();
 
     void            ClearAuthors();
     void            InsertAuthor( const OUString& rString, sal_Int32  nPos = LISTBOX_APPEND );

svx/source/dialog/ctredlin.cxx

@@ -100,7 +100,7 @@ SvxRedlinTable::SvxRedlinTable(SvSimpleTableContainer& rParent, WinBits nBits)
     , bAuthor(false)
     , bDate(false)
     , bComment(false)
-    , nDaTiMode(0)
+    , nDaTiMode(SvxRedlinDateMode::BEFORE)
     , aDaTiFirst( DateTime::EMPTY )
     , aDaTiLast( DateTime::EMPTY )
     , aDaTiFilterFirst( DateTime::EMPTY )
@@ -190,28 +190,28 @@ void SvxRedlinTable::UpdateFilterTest()
 
     switch(nDaTiMode)
     {
-        case FLT_DATE_BEFORE:
+        case SvxRedlinDateMode::BEFORE:
                                 aDaTiFilterFirst=aDTMin;
                                 aDaTiFilterLast=aDaTiFirst;
                                 break;
-        case FLT_DATE_SAVE:
-        case FLT_DATE_SINCE:
+        case SvxRedlinDateMode::SAVE:
+        case SvxRedlinDateMode::SINCE:
                                 aDaTiFilterFirst=aDaTiFirst;
                                 aDaTiFilterLast=aDTMax;
                                 break;
-        case FLT_DATE_EQUAL:
+        case SvxRedlinDateMode::EQUAL:
                                 aDaTiFilterFirst=aDaTiFirst;
                                 aDaTiFilterLast=aDaTiFirst;
                                 aDaTiFilterFirst.SetTime(aTMin.GetTime());
                                 aDaTiFilterLast.SetTime(aTMax.GetTime());
                                 break;
-        case FLT_DATE_NOTEQUAL:
+        case SvxRedlinDateMode::NOTEQUAL:
                                 aDaTiFilterFirst=aDaTiFirst;
                                 aDaTiFilterLast=aDaTiFirst;
                                 aDaTiFilterFirst.SetTime(aTMin.GetTime());
                                 aDaTiFilterLast.SetTime(aTMax.GetTime());
                                 break;
-        case FLT_DATE_BETWEEN:
+        case SvxRedlinDateMode::BETWEEN:
                                 aDaTiFilterFirst=aDaTiFirst;
                                 aDaTiFilterLast=aDaTiLast;
                                 break;
@@ -223,7 +223,7 @@ void SvxRedlinTable::SetFilterDate(bool bFlag)
     bDate=bFlag;
 }
 
-void SvxRedlinTable::SetDateTimeMode(sal_uInt16 nMode)
+void SvxRedlinTable::SetDateTimeMode(SvxRedlinDateMode nMode)
 {
     nDaTiMode=nMode;
 }
@@ -289,7 +289,7 @@ bool SvxRedlinTable::IsValidEntry(const OUString &rAuthorStr, const DateTime &rD
         return true;
 
     const bool bRes = rDateTime.IsBetween(aDaTiFilterFirst, aDaTiFilterLast);
-    return nDaTiMode!=FLT_DATE_NOTEQUAL ? bRes : !bRes;
+    return nDaTiMode!=SvxRedlinDateMode::NOTEQUAL ? bRes : !bRes;
 }
 
 bool SvxRedlinTable::IsValidComment(const OUString &rCommentStr)
@@ -636,35 +636,35 @@ void SvxTPFilter::SetRedlinTable(SvxRedlinTable* pTable)
     pRedlinTable=pTable;
 }
 
-void SvxTPFilter::ShowDateFields(sal_uInt16 nKind)
+void SvxTPFilter::ShowDateFields(SvxRedlinDateMode nKind)
 {
     switch(nKind)
     {
-        case FLT_DATE_BEFORE:
+        case SvxRedlinDateMode::BEFORE:
                 EnableDateLine1(true);
                 EnableDateLine2(false);
                 break;
-        case FLT_DATE_SINCE:
+        case SvxRedlinDateMode::SINCE:
                 EnableDateLine1(true);
                 EnableDateLine2(false);
                 break;
-        case FLT_DATE_EQUAL:
+        case SvxRedlinDateMode::EQUAL:
                 EnableDateLine1(true);
                 m_pTfDate->Disable();
                 m_pTfDate->SetText(OUString());
                 EnableDateLine2(false);
                 break;
-        case FLT_DATE_NOTEQUAL:
+        case SvxRedlinDateMode::NOTEQUAL:
                 EnableDateLine1(true);
                 m_pTfDate->Disable();
                 m_pTfDate->SetText(OUString());
                 EnableDateLine2(false);
                 break;
-        case FLT_DATE_BETWEEN:
+        case SvxRedlinDateMode::BETWEEN:
                 EnableDateLine1(true);
                 EnableDateLine2(true);
                 break;
-        case FLT_DATE_SAVE:
+        case SvxRedlinDateMode::SAVE:
                 EnableDateLine1(false);
                 EnableDateLine2(false);
                 break;
@@ -753,9 +753,9 @@ void SvxTPFilter::SetDateMode(sal_uInt16 nMode)
     SelDateHdl(m_pLbDate);
 }
 
-sal_uInt16 SvxTPFilter::GetDateMode()
+SvxRedlinDateMode SvxTPFilter::GetDateMode()
 {
-    return (sal_uInt16) m_pLbDate->GetSelectEntryPos();
+    return static_cast<SvxRedlinDateMode>(m_pLbDate->GetSelectEntryPos());
 }
 void SvxTPFilter::ClearAuthors()
 {
@@ -903,7 +903,7 @@ void SvxTPFilter::ShowAction(bool bShow)
 
 IMPL_LINK( SvxTPFilter, SelDateHdl, ListBox*, pLb )
 {
-    ShowDateFields((sal_uInt16)m_pLbDate->GetSelectEntryPos());
+    ShowDateFields(static_cast<SvxRedlinDateMode>(m_pLbDate->GetSelectEntryPos()));
     ModifyHdl(pLb);
     return 0;
 }