convert DELMODE to scoped enum

Change-Id: Idd3f45adb43930358420dba464dbdb88fe27b91d
(cherry picked from commit 84e3e6ee04c2be0f8fa3a43c8c55bad6b6504f65)
(cherry picked from commit 6841451d6d80fdd3bfe9f8cb430bca6b671c6cbf)

4 files changed, 21 insertions, 20 deletions

diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index bb647933fab5..e7e1be701ccd 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -338,9 +338,9 @@ enum class PortionKind
     HYPHENATOR  = 4
 };
 
-#define DELMODE_SIMPLE          0
-#define DELMODE_RESTOFWORD      1
-#define DELMODE_RESTOFCONTENT   2
+enum class DeleteMode {
+    Simple, RestOfWord, RestOfContent
+};
 
 #define CHAR_NORMAL            0x00
 #define CHAR_KANA              0x01
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 6b41b3105800..4c75a7e2930d 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1145,30 +1145,31 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, v
                             break;
                     }
 
-                    sal_uInt8 nDel = 0, nMode = 0;
+                    sal_uInt8 nDel = 0;
+                    DeleteMode nMode = DeleteMode::Simple;
                     switch( nCode )
                     {
                     case css::awt::Key::DELETE_WORD_BACKWARD:
-                        nMode = DELMODE_RESTOFWORD;
+                        nMode = DeleteMode::RestOfWord;
                         nDel = DEL_LEFT;
                         break;
                     case css::awt::Key::DELETE_WORD_FORWARD:
-                        nMode = DELMODE_RESTOFWORD;
+                        nMode = DeleteMode::RestOfWord;
                         nDel = DEL_RIGHT;
                         break;
                     case css::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH:
-                        nMode = DELMODE_RESTOFCONTENT;
+                        nMode = DeleteMode::RestOfContent;
                         nDel = DEL_LEFT;
                         break;
                     case css::awt::Key::DELETE_TO_END_OF_PARAGRAPH:
-                        nMode = DELMODE_RESTOFCONTENT;
+                        nMode = DeleteMode::RestOfContent;
                         nDel = DEL_RIGHT;
                         break;
                     default:
                         nDel = ( nCode == KEY_DELETE ) ? DEL_RIGHT : DEL_LEFT;
-                        nMode = rKeyEvent.GetKeyCode().IsMod1() ? DELMODE_RESTOFWORD : DELMODE_SIMPLE;
-                        if ( ( nMode == DELMODE_RESTOFWORD ) && rKeyEvent.GetKeyCode().IsShift() )
-                            nMode = DELMODE_RESTOFCONTENT;
+                        nMode = rKeyEvent.GetKeyCode().IsMod1() ? DeleteMode::RestOfWord : DeleteMode::Simple;
+                        if ( ( nMode == DeleteMode::RestOfWord ) && rKeyEvent.GetKeyCode().IsShift() )
+                            nMode = DeleteMode::RestOfContent;
                         break;
                     }
 
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index ac6dd36da9f5..b0658e0897b6 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -801,7 +801,7 @@ public:
     EditPaM         InsertTextUserInput( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite );
     EditPaM         InsertText(const EditSelection& aCurEditSelection, const OUString& rStr);
     EditPaM         AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, vcl::Window* pFrameWin = nullptr );
-    EditPaM         DeleteLeftOrRight( const EditSelection& rEditSelection, sal_uInt8 nMode, sal_uInt8 nDelMode );
+    EditPaM         DeleteLeftOrRight( const EditSelection& rEditSelection, sal_uInt8 nMode, DeleteMode nDelMode );
     EditPaM         InsertParaBreak(const EditSelection& rEditSelection);
     EditPaM         InsertLineBreak(const EditSelection& aEditSelection);
     EditPaM         InsertTab(const EditSelection& rEditSelection);
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index c862c9896440..3e40ef38d473 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2263,7 +2263,7 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR
     return aPaM;
 }
 
-EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, sal_uInt8 nMode, sal_uInt8 nDelMode )
+EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, sal_uInt8 nMode, DeleteMode nDelMode )
 {
     OSL_ENSURE( !EditSelection( rSel ).DbgIsBuggy( aEditDoc ), "Index out of range in DeleteLeftOrRight" );
 
@@ -2275,11 +2275,11 @@ EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, sal_uInt8 n
     EditPaM aDelEnd( aCurPos );
     if ( nMode == DEL_LEFT )
     {
-        if ( nDelMode == DELMODE_SIMPLE )
+        if ( nDelMode == DeleteMode::Simple )
         {
             aDelStart = CursorLeft( aCurPos, i18n::CharacterIteratorMode::SKIPCHARACTER );
         }
-        else if ( nDelMode == DELMODE_RESTOFWORD )
+        else if ( nDelMode == DeleteMode::RestOfWord )
         {
             aDelStart = StartOfWord( aCurPos );
             if ( aDelStart.GetIndex() == aCurPos.GetIndex() )
@@ -2299,11 +2299,11 @@ EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, sal_uInt8 n
     }
     else
     {
-        if ( nDelMode == DELMODE_SIMPLE )
+        if ( nDelMode == DeleteMode::Simple )
         {
             aDelEnd = CursorRight( aCurPos );
         }
-        else if ( nDelMode == DELMODE_RESTOFWORD )
+        else if ( nDelMode == DeleteMode::RestOfWord )
         {
             aDelEnd = EndOfWord( aCurPos );
 
@@ -2351,12 +2351,12 @@ EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, sal_uInt8 n
     }
 
     // ConnectParagraphs not enough for different Nodes when
-    // DELMODE_RESTOFCONTENT.
-    if ( ( nDelMode == DELMODE_RESTOFCONTENT ) || ( aDelStart.GetNode() == aDelEnd.GetNode() ) )
+    // DeleteMode::RestOfContent.
+    if ( ( nDelMode == DeleteMode::RestOfContent ) || ( aDelStart.GetNode() == aDelEnd.GetNode() ) )
         return ImpDeleteSelection( EditSelection( aDelStart, aDelEnd ) );
 
     // Decide now if to delete selection (RESTOFCONTENTS)
-    bool bSpecialBackward = ( nMode == DEL_LEFT ) && ( nDelMode == DELMODE_SIMPLE );
+    bool bSpecialBackward = ( nMode == DEL_LEFT ) && ( nDelMode == DeleteMode::Simple );
     if ( aStatus.IsAnyOutliner() )
         bSpecialBackward = false;