coverity#1296292 merge these two enum types

Change-Id: I4f82ca5f7a6b392322225c0b871dbaffeba44377

include/svx/ctredlin.hxx

@@ -38,7 +38,7 @@
 
 enum class SvxRedlinDateMode
 {
-    BEFORE, SINCE, EQUAL, NOTEQUAL, BETWEEN, SAVE
+    BEFORE, SINCE, EQUAL, NOTEQUAL, BETWEEN, SAVE, NONE
 };
 
 /// Struct for sorting data.

sc/inc/chgviset.hxx

@@ -20,13 +20,10 @@
 #define INCLUDED_SC_INC_CHGVISET_HXX
 
 #include <tools/datetime.hxx>
+#include <svx/ctredlin.hxx>
 #include "rangelst.hxx"
 #include "scdllapi.h"
 
-enum ScChgsDateMode{    SCDM_DATE_BEFORE=0,SCDM_DATE_SINCE=1,SCDM_DATE_EQUAL=2,
-                        SCDM_DATE_NOTEQUAL=3,SCDM_DATE_BETWEEN=4, SCDM_DATE_SAVE=5,
-                        SCDM_NO_DATEMODE=6};
-
 namespace utl {
     class TextSearch;
 }
@@ -43,7 +40,7 @@ private:
     OUString            aAuthorToShow;
     OUString            aComment;
     ScRangeList         aRangeList;
-    ScChgsDateMode      eDateMode;
+    SvxRedlinDateMode   eDateMode;
     bool                bShowIt;
     bool                bIsDate;
     bool                bIsAuthor;
@@ -62,7 +59,7 @@ public:
         : pCommentSearcher(NULL)
         , aFirstDateTime(DateTime::EMPTY)
         , aLastDateTime(DateTime::EMPTY)
-        , eDateMode(SCDM_DATE_BEFORE)
+        , eDateMode(SvxRedlinDateMode::BEFORE)
         , bShowIt(false)
         , bIsDate(false)
         , bIsAuthor(false)
@@ -87,8 +84,8 @@ public:
     bool                HasDate() const {return bIsDate;}
     void                SetHasDate(bool nFlag) {bIsDate=nFlag;}
 
-    void                SetTheDateMode(ScChgsDateMode eDatMod){ eDateMode=eDatMod; }
-    ScChgsDateMode      GetTheDateMode() const { return eDateMode; }
+    void                SetTheDateMode(SvxRedlinDateMode eDatMod){ eDateMode=eDatMod; }
+    SvxRedlinDateMode   GetTheDateMode() const { return eDateMode; }
 
     void                SetTheFirstDateTime(const DateTime& aDateTime) {aFirstDateTime=aDateTime;}
     const DateTime&     GetTheFirstDateTime()const {return aFirstDateTime;}

sc/source/core/tool/chgviset.cxx

@@ -115,13 +115,13 @@ void ScChangeViewSettings::AdjustDateMode( const ScDocument& rDoc )
 {
     switch ( eDateMode )
     {   // corresponds with ScViewUtil::IsActionShown
-        case SCDM_DATE_EQUAL :
-        case SCDM_DATE_NOTEQUAL :
+        case SvxRedlinDateMode::EQUAL :
+        case SvxRedlinDateMode::NOTEQUAL :
             aFirstDateTime.SetTime( 0 );
             aLastDateTime = aFirstDateTime;
             aLastDateTime.SetTime( 23595999 );
             break;
-        case SCDM_DATE_SAVE:
+        case SvxRedlinDateMode::SAVE:
         {
             const ScChangeAction* pLast = 0;
             ScChangeTrack* pTrack = rDoc.GetChangeTrack();

sc/source/filter/xml/xmlimprt.cxx

@@ -2476,7 +2476,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque
                 else if (sName == "ShowChangesByDatetimeMode")
                 {
                     if (rChangeProps[i].Value >>= nTemp16)
-                        pViewSettings->SetTheDateMode(ScChgsDateMode(nTemp16));
+                        pViewSettings->SetTheDateMode(static_cast<SvxRedlinDateMode>(nTemp16));
                 }
                 else if (sName == "ShowChangesByDatetimeFirstDatetime")
                 {

sc/source/ui/miscdlgs/highred.cxx

@@ -223,7 +223,7 @@ IMPL_LINK( ScHighlightChgDlg, OKBtnHdl, PushButton*, pOKBtn )
     {
         aChangeViewSet.SetShowChanges(m_pHighlightBox->IsChecked());
         aChangeViewSet.SetHasDate(m_pFilterCtr->IsDate());
-        ScChgsDateMode eMode = (ScChgsDateMode) m_pFilterCtr->GetDateMode();
+        SvxRedlinDateMode eMode = m_pFilterCtr->GetDateMode();
         aChangeViewSet.SetTheDateMode( eMode );
         Date aFirstDate( m_pFilterCtr->GetFirstDate() );
         tools::Time aFirstTime( m_pFilterCtr->GetFirstTime() );

sc/source/ui/view/viewutil.cxx

@@ -178,35 +178,35 @@ bool ScViewUtil::IsActionShown( const ScChangeAction& rAction,
         if ( !rSettings.GetTheRangeList().Intersects( rAction.GetBigRange().MakeRange() ) )
             return false;
 
-    if ( rSettings.HasDate() && rSettings.GetTheDateMode() != SCDM_NO_DATEMODE )
+    if (rSettings.HasDate() && rSettings.GetTheDateMode() != SvxRedlinDateMode::NONE)
     {
         DateTime aDateTime = rAction.GetDateTime();
         const DateTime& rFirst = rSettings.GetTheFirstDateTime();
         const DateTime& rLast  = rSettings.GetTheLastDateTime();
         switch ( rSettings.GetTheDateMode() )
         {   // corresponds with ScHighlightChgDlg::OKBtnHdl
-            case SCDM_DATE_BEFORE:
+            case SvxRedlinDateMode::BEFORE:
                 if ( aDateTime > rFirst )
                     return false;
                 break;
 
-            case SCDM_DATE_SINCE:
+            case SvxRedlinDateMode::SINCE:
                 if ( aDateTime < rFirst )
                     return false;
                 break;
 
-            case SCDM_DATE_EQUAL:
-            case SCDM_DATE_BETWEEN:
+            case SvxRedlinDateMode::EQUAL:
+            case SvxRedlinDateMode::BETWEEN:
                 if ( aDateTime < rFirst || aDateTime > rLast )
                     return false;
                 break;
 
-            case SCDM_DATE_NOTEQUAL:
+            case SvxRedlinDateMode::NOTEQUAL:
                 if ( aDateTime >= rFirst && aDateTime <= rLast )
                     return false;
                 break;
 
-            case SCDM_DATE_SAVE:
+            case SvxRedlinDateMode::SAVE:
                 {
                 ScChangeTrack* pTrack = rDocument.GetChangeTrack();
                 if ( !pTrack || pTrack->GetLastSavedActionNumber() >=

svx/source/dialog/ctredlin.cxx

@@ -215,6 +215,8 @@ void SvxRedlinTable::UpdateFilterTest()
                                 aDaTiFilterFirst=aDaTiFirst;
                                 aDaTiFilterLast=aDaTiLast;
                                 break;
+        case SvxRedlinDateMode::NONE:
+                                break;
     }
 }
 
@@ -668,6 +670,8 @@ void SvxTPFilter::ShowDateFields(SvxRedlinDateMode nKind)
                 EnableDateLine1(false);
                 EnableDateLine2(false);
                 break;
+        case SvxRedlinDateMode::NONE:
+                break;
     }
 }