convert CursorType to scoped enum

and drop unused CURSOR_INVALID constant

Change-Id: I190908a03317f93d247c0a9c806c70bb286b8ecb
Reviewed-on: https://gerrit.libreoffice.org/33964
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

3 files changed, 15 insertions, 16 deletions

diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index bb2cb2aeaab6..d8263b51b496 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.hxx
@@ -39,21 +39,20 @@ typedef ::cppu::WeakImplHelper
 >
 SwSimpleEnumeration_Base;
 
-enum CursorType
+enum class CursorType
 {
-    CURSOR_INVALID,
-    CURSOR_BODY,
-    CURSOR_FRAME,
-    CURSOR_TBLTEXT,
-    CURSOR_FOOTNOTE,
-    CURSOR_HEADER,
-    CURSOR_FOOTER,
-    CURSOR_REDLINE,
-    CURSOR_ALL,         // for Search&Replace
-    CURSOR_SELECTION,   // create a paragraph enumeration from
+    Body,
+    Frame,
+    TableText,
+    Footnote,
+    Header,
+    Footer,
+    Redline,
+    All,         // for Search&Replace
+    Selection,   // create a paragraph enumeration from
                         // a text range or cursor
-    CURSOR_SELECTION_IN_TABLE,
-    CURSOR_META,         // meta/meta-field
+    SelectionInTable,
+    Meta,         // meta/meta-field
 };
 
 /*
diff --git a/sw/inc/unotext.hxx b/sw/inc/unotext.hxx
index 6bb0681a3695..65a1ecc94d36 100644
--- a/sw/inc/unotext.hxx
+++ b/sw/inc/unotext.hxx
@@ -81,7 +81,7 @@ public: /*not protected because C++ is retarded*/
 
 public:
 
-    SwXText(SwDoc *const pDoc, const enum CursorType eType);
+    SwXText(SwDoc *const pDoc, const CursorType eType);
 
     const SwDoc*    GetDoc() const;
           SwDoc*    GetDoc();
diff --git a/sw/inc/unotextcursor.hxx b/sw/inc/unotextcursor.hxx
index 7f457fe506ef..1bb2f9a119d8 100644
--- a/sw/inc/unotextcursor.hxx
+++ b/sw/inc/unotextcursor.hxx
@@ -81,13 +81,13 @@ public:
     SwXTextCursor(
             SwDoc & rDoc,
             css::uno::Reference< css::text::XText > const& xParent,
-            const enum CursorType eType,
+            const CursorType eType,
             SwPosition const& rPos,
             SwPosition const*const pMark = nullptr);
     SwXTextCursor(
             css::uno::Reference< css::text::XText > const& xParent,
             SwPaM const& rSourceCursor,
-            const enum CursorType eType = CURSOR_ALL);
+            const CursorType eType = CursorType::All);
 
     SwUnoCursor& GetCursor();
     bool IsAtEndOfMeta() const;