convert EVAnchorMode enum to scoped enum

change values to match position in definition to their meaning

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

6 files changed, 12 insertions, 12 deletions

diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx
index b50cff44c4e3..00e8a2d65ac0 100644
--- a/include/editeng/editdata.hxx
+++ b/include/editeng/editdata.hxx
@@ -37,10 +37,10 @@ enum EESelectionMode    { EE_SELMODE_STD, EE_SELMODE_TXTONLY, EE_SELMODE_HIDDEN
     // EE_SELMODE_HIDDEN can be used to completely hide the selection. This is useful e.g. when you want show the selection
     // only as long as your window (which the edit view works on) has the focus
 enum class EESpellState  { Ok, LanguageNotInstalled, NoSpeller, ErrorFound };
-enum EVAnchorMode       {
-            ANCHOR_TOP_LEFT,    ANCHOR_VCENTER_LEFT,    ANCHOR_BOTTOM_LEFT,
-            ANCHOR_TOP_HCENTER, ANCHOR_VCENTER_HCENTER, ANCHOR_BOTTOM_HCENTER,
-            ANCHOR_TOP_RIGHT,   ANCHOR_VCENTER_RIGHT,   ANCHOR_BOTTOM_RIGHT };
+enum class EEAnchorMode {
+            TopLeft,     TopHCenter,     TopRight,
+            VCenterLeft, VCenterHCenter, VCenterRight,
+            BottomLeft,  BottomHCenter,  BottomRight };
 
 #define EE_PARA_NOT_FOUND       SAL_MAX_INT32
 #define EE_PARA_APPEND          SAL_MAX_INT32
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 55b2620c9e87..3ff03cc7097b 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -214,8 +214,8 @@ public:
     const SfxStyleSheet* GetStyleSheet() const;
     SfxStyleSheet* GetStyleSheet();
 
-    void            SetAnchorMode( EVAnchorMode eMode );
-    EVAnchorMode    GetAnchorMode() const;
+    void            SetAnchorMode( EEAnchorMode eMode );
+    EEAnchorMode    GetAnchorMode() const;
 
     void            CompleteAutoCorrect( vcl::Window* pFrameWin = nullptr );
 
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index ed4eebbdc26a..06b21e38ec21 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -287,8 +287,8 @@ public:
     void            SetControlWord( EVControlBits nWord );
     EVControlBits   GetControlWord() const;
 
-    void            SetAnchorMode( EVAnchorMode eMode );
-    EVAnchorMode    GetAnchorMode() const;
+    void            SetAnchorMode( EEAnchorMode eMode );
+    EEAnchorMode    GetAnchorMode() const;
 
     Pointer     GetPointer( const Point& rPosPixel );
     void        Command( const CommandEvent& rCEvt );
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index c9c9091c3d93..be2ce849890b 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -139,7 +139,7 @@ public:
         tools::Rectangle* pAnchorRect, bool bLineWidth = true ) const override;
     virtual void TakeTextAnchorRect(tools::Rectangle& rAnchorRect) const override;
     virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const override;
-    virtual sal_uInt16 GetOutlinerViewAnchorMode() const override;
+    virtual EEAnchorMode GetOutlinerViewAnchorMode() const override;
     virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) override;
     virtual OutlinerParaObject* GetOutlinerParaObject() const override;
 
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 1a0d57bcda7f..905b4aa2ea98 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -229,7 +229,7 @@ public:
     virtual void EndTextEdit(SdrOutliner& rOutl) override;
     virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const override;
     void TakeTextEditArea(const sdr::table::CellPos& rPos, Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const;
-    virtual sal_uInt16 GetOutlinerViewAnchorMode() const override;
+    virtual EEAnchorMode GetOutlinerViewAnchorMode() const override;
 
     virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) override;
 
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 98d83b1e4651..9f6f383b5344 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -48,7 +48,7 @@ class ImpSdrObjTextLink;
 class EditStatus;
 class TextChain;
 class TextChainFlow;
-
+enum class EEAnchorMode;
 
 namespace sdr { namespace properties {
     class TextProperties;
@@ -487,7 +487,7 @@ public:
     virtual bool BegTextEdit(SdrOutliner& rOutl) override;
     virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const;
     virtual void EndTextEdit(SdrOutliner& rOutl) override;
-    virtual sal_uInt16 GetOutlinerViewAnchorMode() const;
+    virtual EEAnchorMode GetOutlinerViewAnchorMode() const;
 
     virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) override;
     void NbcSetOutlinerParaObjectForText( OutlinerParaObject* pTextObject, SdrText* pText );