convert RECT_POINT to scoped enum

Change-Id: I3f0304d69d5d638230b64135c73497192dc00cb3

24 files changed, 255 insertions, 255 deletions

diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 1a8774ba9219..76f4698ce5c6 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -521,7 +521,7 @@ Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic, double
 
 void EmbossControl::MouseButtonDown( const MouseEvent& rEvt )
 {
-    const RECT_POINT eOldRP = GetActualRP();
+    const RectPoint eOldRP = GetActualRP();
 
     SvxRectCtl::MouseButtonDown( rEvt );
 
@@ -540,7 +540,7 @@ VCL_BUILDER_FACTORY(EmbossControl)
 
 
 GraphicFilterEmboss::GraphicFilterEmboss(vcl::Window* pParent,
-    const Graphic& rGraphic, RECT_POINT eLightSource)
+    const Graphic& rGraphic, RectPoint eLightSource)
     : GraphicFilterDialog (pParent, "EmbossDialog",
         "cui/ui/embossdialog.ui", rGraphic)
 {
@@ -573,15 +573,15 @@ Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, double
     {
         default:       OSL_FAIL("svx::GraphicFilterEmboss::GetFilteredGraphic(), unknown Reference Point!" );
                        SAL_FALLTHROUGH;
-        case RP_LT: nAzim = 4500;    nElev = 4500; break;
-        case RP_MT: nAzim = 9000;    nElev = 4500; break;
-        case RP_RT: nAzim = 13500;   nElev = 4500; break;
-        case RP_LM: nAzim = 0;       nElev = 4500; break;
-        case RP_MM: nAzim = 0;       nElev = 9000; break;
-        case RP_RM: nAzim = 18000;   nElev = 4500; break;
-        case RP_LB: nAzim = 31500;   nElev = 4500; break;
-        case RP_MB: nAzim = 27000;   nElev = 4500; break;
-        case RP_RB: nAzim = 22500;   nElev = 4500; break;
+        case RectPoint::LT: nAzim = 4500;    nElev = 4500; break;
+        case RectPoint::MT: nAzim = 9000;    nElev = 4500; break;
+        case RectPoint::RT: nAzim = 13500;   nElev = 4500; break;
+        case RectPoint::LM: nAzim = 0;       nElev = 4500; break;
+        case RectPoint::MM: nAzim = 0;       nElev = 9000; break;
+        case RectPoint::RM: nAzim = 18000;   nElev = 4500; break;
+        case RectPoint::LB: nAzim = 31500;   nElev = 4500; break;
+        case RectPoint::MB: nAzim = 27000;   nElev = 4500; break;
+        case RectPoint::RB: nAzim = 22500;   nElev = 4500; break;
     }
 
     BmpFilterParam aParam( nAzim, nElev );
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index f45c32eeddc3..7010cfc0af19 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1223,7 +1223,7 @@ AbstractFmSearchDialog*  AbstractDialogFactory_Impl::CreateFmSearchDialog(vcl::W
 
 AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmboss (vcl::Window* pParent,
                                             const Graphic& rGraphic,
-                                            RECT_POINT eLightSource)
+                                            RectPoint eLightSource)
 {
     VclPtrInstance<GraphicFilterEmboss> pDlg( pParent, rGraphic, eLightSource );
     return new AbstractGraphicFilterDialog_Impl( pDlg );
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 57355f660a95..a1441f6a326d 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -571,7 +571,7 @@ public:
                                                         sal_Int16 nInitialContext,
                                                         const Link<FmSearchContext&,sal_uInt32>& lnkContextSupplier) override;
     virtual AbstractGraphicFilterDialog *   CreateGraphicFilterEmboss(vcl::Window* pParent,
-                                                const Graphic& rGraphic, RECT_POINT eLightSource) override;
+                                                const Graphic& rGraphic, RectPoint eLightSource) override;
     virtual AbstractGraphicFilterDialog *   CreateGraphicFilterPoster(vcl::Window* pParent,
                                                 const Graphic& rGraphic, sal_uInt16 nCount) override;
     virtual AbstractGraphicFilterDialog *   CreateGraphicFilterSepia (vcl::Window* pParent,
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index c668a12e9e4b..8ba8411af948 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -55,7 +55,7 @@ public:
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
     virtual void        Reset( const SfxItemSet* rSet ) override;
     virtual void        FillUserData() override;
-    virtual void        PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override;
+    virtual void        PointChanged( vcl::Window* pWindow, RectPoint eRP ) override;
 
     /// Shift-ListBox activation
     void                ShowSelector();
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index db4b0a384eec..57b73e3473fe 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -199,7 +199,7 @@ private:
     VclPtr<EmbossControl>  mpCtlLight;
 public:
     GraphicFilterEmboss( vcl::Window* pParent, const Graphic& rGraphic,
-                         RECT_POINT eLightSource );
+                         RectPoint eLightSource );
     virtual ~GraphicFilterEmboss();
     virtual void dispose() override;
 
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index ed510c092f99..d3cefc5bf62a 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -133,7 +133,7 @@ class SvxTransparenceTabPage : public SvxTabPage
     static const sal_uInt16 pTransparenceRanges[];
 
     const SfxItemSet&   rOutAttrs;
-    RECT_POINT          eRP;
+    RectPoint          eRP;
 
     PageType               nPageType;
     sal_uInt16             nDlgType;
@@ -195,7 +195,7 @@ public:
     virtual void ChangesApplied() override;
     virtual void ActivatePage(const SfxItemSet& rSet) override;
     virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
-    virtual void PointChanged(vcl::Window* pWindow, RECT_POINT eRP) override;
+    virtual void PointChanged(vcl::Window* pWindow, RectPoint eRP) override;
 
     void SetPageType(PageType nInType) { nPageType = nInType; }
     void SetDlgType(sal_uInt16 nInType) { nDlgType = nInType; }
@@ -221,7 +221,7 @@ private:
     VclPtr<SvxXRectPreview>    m_pCtlXRectPreview;
 
     const SfxItemSet&   m_rOutAttrs;
-    RECT_POINT          m_eRP;
+    RectPoint          m_eRP;
 
     XColorListRef         m_pColorList;
     XGradientListRef      m_pGradientList;
@@ -281,7 +281,7 @@ public:
     virtual void ChangesApplied() override;
     virtual void ActivatePage( const SfxItemSet& rSet ) override;
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
-    virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override;
+    virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override;
 
     void    SetColorList( XColorListRef const & pColorList ) { m_pColorList = pColorList; }
     void    SetGradientList( XGradientListRef const & pGrdLst)
@@ -318,7 +318,7 @@ private:
     VclPtr<SvxXShadowPreview>  m_pCtlXRectPreview;
 
     const SfxItemSet&   m_rOutAttrs;
-    RECT_POINT          m_eRP;
+    RectPoint          m_eRP;
 
     XColorListRef       m_pColorList;
     ChangeType*         m_pnColorListState;
@@ -347,7 +347,7 @@ public:
     virtual void Reset( const SfxItemSet * ) override;
     virtual void ActivatePage( const SfxItemSet& rSet ) override;
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
-    virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override;
+    virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override;
 
     void    SetColorList( XColorListRef const & pColorList ) { m_pColorList = pColorList; }
     void    SetPageType( PageType nInType ) { m_nPageType = nInType; }
@@ -511,7 +511,7 @@ public:
     virtual void ActivatePage( const SfxItemSet& rSet ) override;
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
 
-    virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override;
+    virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override;
 
     void    SetColorList( XColorListRef const & pColorList ) { m_pColorList = pColorList; }
     void    SetHatchingList( XHatchListRef const & pHtchLst)
@@ -608,7 +608,7 @@ public:
     virtual void Reset( const SfxItemSet * ) override;
     virtual void ActivatePage( const SfxItemSet& rSet ) override;
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
-    virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override;
+    virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override;
 
     void    SetBitmapList( const XBitmapListRef& pBmpLst) { m_pBitmapList = pBmpLst; }
 
@@ -679,7 +679,7 @@ public:
     virtual void ActivatePage( const SfxItemSet& rSet ) override;
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
 
-    virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override;
+    virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override;
 
     void    SetColorList( XColorListRef const & pColorList ) { m_pColorList = pColorList; }
     void    SetPatternList( XPatternListRef const & pPatternList) { m_pPatternList = pPatternList; }
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 639e5117598c..e95919925504 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -146,7 +146,7 @@ private:
     bool                m_bSymbols;
 
     const SfxItemSet&   m_rOutAttrs;
-    RECT_POINT          m_eRP;
+    RectPoint          m_eRP;
     bool                m_bObjSelected;
 
     XLineAttrSetItem    m_aXLineAttr;
@@ -217,7 +217,7 @@ public:
     virtual void ActivatePage( const SfxItemSet& rSet ) override;
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
 
-    virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override;
+    virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override;
 
     virtual void FillUserData() override;
 
diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx
index 9f478f6bf2f7..abe0e3fde48a 100644
--- a/cui/source/inc/dstribut.hxx
+++ b/cui/source/inc/dstribut.hxx
@@ -49,7 +49,7 @@ public:
 
     virtual bool FillItemSet(SfxItemSet*) override;
     virtual void Reset(const SfxItemSet*) override;
-    virtual void PointChanged(vcl::Window* pWindow, RECT_POINT eRP) override;
+    virtual void PointChanged(vcl::Window* pWindow, RectPoint eRP) override;
 
     SvxDistributeHorizontal GetDistributeHor() const { return m_eDistributeHor; }
     SvxDistributeVertical GetDistributeVer() const { return m_eDistributeVer; }
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index 184ad5cca81e..50418d3dc2e5 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -78,7 +78,7 @@ public:
     virtual bool        FillItemSet( SfxItemSet* ) override;
     virtual void        Reset( const SfxItemSet * ) override;
 
-    virtual void        PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override;
+    virtual void        PointChanged( vcl::Window* pWindow, RectPoint eRP ) override;
 
     void         Construct();
     void         SetView( const SdrView* pSdrView ) { pView = pSdrView; }
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index a826b2fedf96..931727bc8666 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -90,7 +90,7 @@ public:
     virtual bool        FillItemSet( SfxItemSet* ) override;
     virtual void        Reset( const SfxItemSet * ) override;
 
-    virtual void        PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override;
+    virtual void        PointChanged( vcl::Window* pWindow, RectPoint eRP ) override;
 
     void         Construct();
     void         SetObjKind(SdrObjKind eObjKind) { m_eObjKind = eObjKind; }
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 7e9077758e54..80a5ff14ee84 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -121,7 +121,7 @@ private:
     // #i75273#
     double              mfOldWidth;
     double              mfOldHeight;
-    RECT_POINT          meRP;
+    RectPoint          meRP;
 
 
     DECL_LINK_TYPED( ChangePosProtectHdl, Button*, void );
@@ -149,7 +149,7 @@ public:
     virtual void ActivatePage( const SfxItemSet& rSet ) override;
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
 
-    virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override;
+    virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override;
 
     void         Construct();
     void         SetView( const SdrView* pSdrView ) { mpView = pSdrView; }
@@ -207,7 +207,7 @@ public:
     virtual void ActivatePage( const SfxItemSet& rSet ) override;
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
 
-    virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override;
+    virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override;
 
     void         Construct();
     void         SetView( const SdrView* pSdrView ) { pView = pSdrView; }
@@ -260,7 +260,7 @@ public:
     virtual void ActivatePage( const SfxItemSet& rSet ) override;
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
 
-    virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override;
+    virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override;
 
     void         Construct();
     void         SetView( const SdrView* pSdrView ) { pView = pSdrView; }
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 906f1649d272..535074e71325 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -931,7 +931,7 @@ DeactivateRC SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet )
     return DeactivateRC::LeavePage;
 }
 
-void SvxBackgroundTabPage::PointChanged( vcl::Window* , RECT_POINT  )
+void SvxBackgroundTabPage::PointChanged( vcl::Window* , RectPoint  )
 {
     // has to be implemented so that position control can work
 }
@@ -1083,19 +1083,19 @@ void SvxBackgroundTabPage::SetGraphicPosition_Impl( SvxGraphicPosition ePos )
         {
             m_pBtnPosition->Check();
             m_pWndPosition->Enable();
-            RECT_POINT eNewPos = RP_MM;
+            RectPoint eNewPos = RectPoint::MM;
 
             switch ( ePos )
             {
                 case GPOS_MM:   break;
-                case GPOS_LT:   eNewPos = RP_LT; break;
-                case GPOS_MT:   eNewPos = RP_MT; break;
-                case GPOS_RT:   eNewPos = RP_RT; break;
-                case GPOS_LM:   eNewPos = RP_LM; break;
-                case GPOS_RM:   eNewPos = RP_RM; break;
-                case GPOS_LB:   eNewPos = RP_LB; break;
-                case GPOS_MB:   eNewPos = RP_MB; break;
-                case GPOS_RB:   eNewPos = RP_RB; break;
+                case GPOS_LT:   eNewPos = RectPoint::LT; break;
+                case GPOS_MT:   eNewPos = RectPoint::MT; break;
+                case GPOS_RT:   eNewPos = RectPoint::RT; break;
+                case GPOS_LM:   eNewPos = RectPoint::LM; break;
+                case GPOS_RM:   eNewPos = RectPoint::RM; break;
+                case GPOS_LB:   eNewPos = RectPoint::LB; break;
+                case GPOS_MB:   eNewPos = RectPoint::MB; break;
+                case GPOS_RB:   eNewPos = RectPoint::RB; break;
                 default: ;//prevent warning
             }
             m_pWndPosition->SetActualRP( eNewPos );
@@ -1115,15 +1115,15 @@ SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl()
     {
         switch ( m_pWndPosition->GetActualRP() )
         {
-            case RP_LT: return GPOS_LT;
-            case RP_MT: return GPOS_MT;
-            case RP_RT: return GPOS_RT;
-            case RP_LM: return GPOS_LM;
-            case RP_MM: return GPOS_MM;
-            case RP_RM: return GPOS_RM;
-            case RP_LB: return GPOS_LB;
-            case RP_MB: return GPOS_MB;
-            case RP_RB: return GPOS_RB;
+            case RectPoint::LT: return GPOS_LT;
+            case RectPoint::MT: return GPOS_MT;
+            case RectPoint::RT: return GPOS_RT;
+            case RectPoint::LM: return GPOS_LM;
+            case RectPoint::MM: return GPOS_MM;
+            case RectPoint::RM: return GPOS_RM;
+            case RectPoint::LB: return GPOS_LB;
+            case RectPoint::MB: return GPOS_MB;
+            case RectPoint::RB: return GPOS_RB;
         }
     }
     return GPOS_MM;
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index 574468a1e98c..d50a60f72c00 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -100,7 +100,7 @@ void SvxDistributePage::dispose()
 }
 
 
-void SvxDistributePage::PointChanged(vcl::Window* /*pWindow*/, RECT_POINT /*eRP*/)
+void SvxDistributePage::PointChanged(vcl::Window* /*pWindow*/, RectPoint /*eRP*/)
 {
 }
 
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 714a362af017..6da107c1c4ab 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -349,43 +349,43 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
 
                 SdrMeasureTextHPos eHPos = (SdrMeasureTextHPos)
                             static_cast<const SdrMeasureTextHPosItem&>( rAttrs->Get( SDRATTR_MEASURETEXTHPOS ) ).GetValue();
-                RECT_POINT eRP = RP_MM;
+                RectPoint eRP = RectPoint::MM;
                 switch( eVPos )
                 {
                 case SdrMeasureTextVPos::Above:
                     switch( eHPos )
                     {
-                    case SdrMeasureTextHPos::LeftOutside:    eRP = RP_LT; break;
-                    case SdrMeasureTextHPos::Inside:         eRP = RP_MT; break;
-                    case SdrMeasureTextHPos::RightOutside:   eRP = RP_RT; break;
-                    case SdrMeasureTextHPos::Auto:          eRP = RP_MT; break;
+                    case SdrMeasureTextHPos::LeftOutside:    eRP = RectPoint::LT; break;
+                    case SdrMeasureTextHPos::Inside:         eRP = RectPoint::MT; break;
+                    case SdrMeasureTextHPos::RightOutside:   eRP = RectPoint::RT; break;
+                    case SdrMeasureTextHPos::Auto:          eRP = RectPoint::MT; break;
                     }
                     break;
                 case SdrMeasureTextVPos::VerticalCentered:
                     switch( eHPos )
                     {
-                    case SdrMeasureTextHPos::LeftOutside:    eRP = RP_LM; break;
-                    case SdrMeasureTextHPos::Inside:         eRP = RP_MM; break;
-                    case SdrMeasureTextHPos::RightOutside:   eRP = RP_RM; break;
-                    case SdrMeasureTextHPos::Auto:          eRP = RP_MM; break;
+                    case SdrMeasureTextHPos::LeftOutside:    eRP = RectPoint::LM; break;
+                    case SdrMeasureTextHPos::Inside:         eRP = RectPoint::MM; break;
+                    case SdrMeasureTextHPos::RightOutside:   eRP = RectPoint::RM; break;
+                    case SdrMeasureTextHPos::Auto:          eRP = RectPoint::MM; break;
                     }
                     break;
                 case SdrMeasureTextVPos::Below:
                     switch( eHPos )
                     {
-                    case SdrMeasureTextHPos::LeftOutside:    eRP = RP_LB; break;
-                    case SdrMeasureTextHPos::Inside:         eRP = RP_MB; break;
-                    case SdrMeasureTextHPos::RightOutside:   eRP = RP_RB; break;
-                    case SdrMeasureTextHPos::Auto:          eRP = RP_MB; break;
+                    case SdrMeasureTextHPos::LeftOutside:    eRP = RectPoint::LB; break;
+                    case SdrMeasureTextHPos::Inside:         eRP = RectPoint::MB; break;
+                    case SdrMeasureTextHPos::RightOutside:   eRP = RectPoint::RB; break;
+                    case SdrMeasureTextHPos::Auto:          eRP = RectPoint::MB; break;
                     }
                     break;
                 case SdrMeasureTextVPos::Auto:
                     switch( eHPos )
                     {
-                    case SdrMeasureTextHPos::LeftOutside:    eRP = RP_LM; break;
-                    case SdrMeasureTextHPos::Inside:         eRP = RP_MM; break;
-                    case SdrMeasureTextHPos::RightOutside:   eRP = RP_RM; break;
-                    case SdrMeasureTextHPos::Auto:          eRP = RP_MM; break;
+                    case SdrMeasureTextHPos::LeftOutside:    eRP = RectPoint::LM; break;
+                    case SdrMeasureTextHPos::Inside:         eRP = RectPoint::MM; break;
+                    case SdrMeasureTextHPos::RightOutside:   eRP = RectPoint::RM; break;
+                    case SdrMeasureTextHPos::Auto:          eRP = RectPoint::MM; break;
                     }
                     break;
                  default: ;//prevent warning
@@ -521,27 +521,27 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet* rAttrs)
         SdrMeasureTextVPos eVPos, eOldVPos;
         SdrMeasureTextHPos eHPos, eOldHPos;
 
-        RECT_POINT eRP = m_pCtlPosition->GetActualRP();
+        RectPoint eRP = m_pCtlPosition->GetActualRP();
         switch( eRP )
         {
             default:
-            case RP_LT: eVPos = SdrMeasureTextVPos::Above;
+            case RectPoint::LT: eVPos = SdrMeasureTextVPos::Above;
                         eHPos = SdrMeasureTextHPos::LeftOutside; break;
-            case RP_LM: eVPos = SdrMeasureTextVPos::VerticalCentered;
+            case RectPoint::LM: eVPos = SdrMeasureTextVPos::VerticalCentered;
                         eHPos = SdrMeasureTextHPos::LeftOutside; break;
-            case RP_LB: eVPos = SdrMeasureTextVPos::Below;
+            case RectPoint::LB: eVPos = SdrMeasureTextVPos::Below;
                         eHPos = SdrMeasureTextHPos::LeftOutside; break;
-            case RP_MT: eVPos = SdrMeasureTextVPos::Above;
+            case RectPoint::MT: eVPos = SdrMeasureTextVPos::Above;
                         eHPos = SdrMeasureTextHPos::Inside; break;
-            case RP_MM: eVPos = SdrMeasureTextVPos::VerticalCentered;
+            case RectPoint::MM: eVPos = SdrMeasureTextVPos::VerticalCentered;
                         eHPos = SdrMeasureTextHPos::Inside; break;
-            case RP_MB: eVPos = SdrMeasureTextVPos::Below;
+            case RectPoint::MB: eVPos = SdrMeasureTextVPos::Below;
                         eHPos = SdrMeasureTextHPos::Inside; break;
-            case RP_RT: eVPos = SdrMeasureTextVPos::Above;
+            case RectPoint::RT: eVPos = SdrMeasureTextVPos::Above;
                         eHPos = SdrMeasureTextHPos::RightOutside; break;
-            case RP_RM: eVPos = SdrMeasureTextVPos::VerticalCentered;
+            case RectPoint::RM: eVPos = SdrMeasureTextVPos::VerticalCentered;
                         eHPos = SdrMeasureTextHPos::RightOutside; break;
-            case RP_RB: eVPos = SdrMeasureTextVPos::Below;
+            case RectPoint::RB: eVPos = SdrMeasureTextVPos::Below;
                         eHPos = SdrMeasureTextHPos::RightOutside; break;
         }
         if( m_pTsbAutoPosH->GetState() == TRISTATE_TRUE )
@@ -607,7 +607,7 @@ VclPtr<SfxTabPage> SvxMeasurePage::Create( vcl::Window* pWindow,
     return VclPtr<SvxMeasurePage>::Create( pWindow, *rAttrs );
 }
 
-void SvxMeasurePage::PointChanged( vcl::Window* pWindow, RECT_POINT /*eRP*/ )
+void SvxMeasurePage::PointChanged( vcl::Window* pWindow, RectPoint /*eRP*/ )
 {
     ChangeAttrHdl_Impl( pWindow );
 }
@@ -618,19 +618,19 @@ IMPL_LINK_TYPED( SvxMeasurePage, ClickAutoPosHdl_Impl, Button*, p, void )
     {
         switch( m_pCtlPosition->GetActualRP() )
         {
-            case RP_LT:
-            case RP_RT:
-                m_pCtlPosition->SetActualRP( RP_MT );
+            case RectPoint::LT:
+            case RectPoint::RT:
+                m_pCtlPosition->SetActualRP( RectPoint::MT );
             break;
 
-            case RP_LM:
-            case RP_RM:
-                m_pCtlPosition->SetActualRP( RP_MM );
+            case RectPoint::LM:
+            case RectPoint::RM:
+                m_pCtlPosition->SetActualRP( RectPoint::MM );
             break;
 
-            case RP_LB:
-            case RP_RB:
-                m_pCtlPosition->SetActualRP( RP_MB );
+            case RectPoint::LB:
+            case RectPoint::RB:
+                m_pCtlPosition->SetActualRP( RectPoint::MB );
             break;
             default: ;//prevent warning
         }
@@ -639,19 +639,19 @@ IMPL_LINK_TYPED( SvxMeasurePage, ClickAutoPosHdl_Impl, Button*, p, void )
     {
         switch( m_pCtlPosition->GetActualRP() )
         {
-            case RP_LT:
-            case RP_LB:
-                m_pCtlPosition->SetActualRP( RP_LM );
+            case RectPoint::LT:
+            case RectPoint::LB:
+                m_pCtlPosition->SetActualRP( RectPoint::LM );
             break;
 
-            case RP_MT:
-            case RP_MB:
-                m_pCtlPosition->SetActualRP( RP_MM );
+            case RectPoint::MT:
+            case RectPoint::MB:
+                m_pCtlPosition->SetActualRP( RectPoint::MM );
             break;
 
-            case RP_RT:
-            case RP_RB:
-                m_pCtlPosition->SetActualRP( RP_RM );
+            case RectPoint::RT:
+            case RectPoint::RB:
+                m_pCtlPosition->SetActualRP( RectPoint::RM );
             break;
             default: ;//prevent warning
         }
@@ -747,30 +747,30 @@ void SvxMeasurePage::ChangeAttrHdl_Impl( void* p )
         bPositionModified = true;
 
         // Position
-        RECT_POINT eRP = m_pCtlPosition->GetActualRP();
+        RectPoint eRP = m_pCtlPosition->GetActualRP();
         SdrMeasureTextVPos eVPos;
         SdrMeasureTextHPos eHPos;
 
         switch( eRP )
         {
             default:
-            case RP_LT: eVPos = SdrMeasureTextVPos::Above;
+            case RectPoint::LT: eVPos = SdrMeasureTextVPos::Above;
                         eHPos = SdrMeasureTextHPos::LeftOutside; break;
-            case RP_LM: eVPos = SdrMeasureTextVPos::VerticalCentered;
+            case RectPoint::LM: eVPos = SdrMeasureTextVPos::VerticalCentered;
                         eHPos = SdrMeasureTextHPos::LeftOutside; break;
-            case RP_LB: eVPos = SdrMeasureTextVPos::Below;
+            case RectPoint::LB: eVPos = SdrMeasureTextVPos::Below;
                         eHPos = SdrMeasureTextHPos::LeftOutside; break;
-            case RP_MT: eVPos = SdrMeasureTextVPos::Above;
+            case RectPoint::MT: eVPos = SdrMeasureTextVPos::Above;
                         eHPos = SdrMeasureTextHPos::Inside; break;
-            case RP_MM: eVPos = SdrMeasureTextVPos::VerticalCentered;
+            case RectPoint::MM: eVPos = SdrMeasureTextVPos::VerticalCentered;
                         eHPos = SdrMeasureTextHPos::Inside; break;
-            case RP_MB: eVPos = SdrMeasureTextVPos::Below;
+            case RectPoint::MB: eVPos = SdrMeasureTextVPos::Below;
                         eHPos = SdrMeasureTextHPos::Inside; break;
-            case RP_RT: eVPos = SdrMeasureTextVPos::Above;
+            case RectPoint::RT: eVPos = SdrMeasureTextVPos::Above;
                         eHPos = SdrMeasureTextHPos::RightOutside; break;
-            case RP_RM: eVPos = SdrMeasureTextVPos::VerticalCentered;
+            case RectPoint::RM: eVPos = SdrMeasureTextVPos::VerticalCentered;
                         eHPos = SdrMeasureTextHPos::RightOutside; break;
-            case RP_RB: eVPos = SdrMeasureTextVPos::Below;
+            case RectPoint::RB: eVPos = SdrMeasureTextVPos::Below;
                         eHPos = SdrMeasureTextHPos::RightOutside; break;
         }
 
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index fabedc8b0e32..7c03cf4a11b2 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -916,7 +916,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet)
         rSet->Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_HEIGHT ),
                         (sal_uInt32) nHeight ) );
         //this item is required by SdrEditView::SetGeoAttrToMarked()
-        rSet->Put( SfxAllEnumItem( GetWhich( SID_ATTR_TRANSFORM_SIZE_POINT ), RP_LT ) );
+        rSet->Put( SfxAllEnumItem( GetWhich( SID_ATTR_TRANSFORM_SIZE_POINT ), (sal_uInt16)RectPoint::LT ) );
 
         bModified = true;
     }
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 4da31e4b6158..a53b3695b12f 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -79,7 +79,7 @@ SvxTextAttrPage::SvxTextAttrPage(vcl::Window* pWindow, const SfxItemSet& rInAttr
     get(m_pMtrFldBottom,"MTR_FLD_BOTTOM");
     get(m_pFlPosition,"FL_POSITION");
     get(m_pCtlPosition,"CTL_POSITION");
-    m_pCtlPosition->SetControlSettings(RP_MM, 240, 100);
+    m_pCtlPosition->SetControlSettings(RectPoint::MM, 240, 100);
     get(m_pTsbFullWidth,"TSB_FULL_WIDTH");
 
 
@@ -238,7 +238,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
         // VertAdjust and HorAdjust are unequivocal, thus
         SdrTextVertAdjust eTVA = (SdrTextVertAdjust)static_cast<const SdrTextVertAdjustItem&>(rAttrs->Get(SDRATTR_TEXT_VERTADJUST)).GetValue();
         SdrTextHorzAdjust eTHA = (SdrTextHorzAdjust)static_cast<const SdrTextHorzAdjustItem&>(rAttrs->Get(SDRATTR_TEXT_HORZADJUST)).GetValue();
-        RECT_POINT eRP = RP_LB;
+        RectPoint eRP = RectPoint::LB;
 
         m_pTsbFullWidth->EnableTriState( false );
 
@@ -249,10 +249,10 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
             {
                 switch (eTHA)
                 {
-                    case SDRTEXTHORZADJUST_LEFT: eRP = RP_LT; break;
+                    case SDRTEXTHORZADJUST_LEFT: eRP = RectPoint::LT; break;
                     case SDRTEXTHORZADJUST_BLOCK:
-                    case SDRTEXTHORZADJUST_CENTER: eRP = RP_MT; break;
-                    case SDRTEXTHORZADJUST_RIGHT: eRP = RP_RT; break;
+                    case SDRTEXTHORZADJUST_CENTER: eRP = RectPoint::MT; break;
+                    case SDRTEXTHORZADJUST_RIGHT: eRP = RectPoint::RT; break;
                 }
                 break;
             }
@@ -261,10 +261,10 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
             {
                 switch (eTHA)
                 {
-                    case SDRTEXTHORZADJUST_LEFT: eRP = RP_LM; break;
+                    case SDRTEXTHORZADJUST_LEFT: eRP = RectPoint::LM; break;
                     case SDRTEXTHORZADJUST_BLOCK:
-                    case SDRTEXTHORZADJUST_CENTER: eRP = RP_MM; break;
-                    case SDRTEXTHORZADJUST_RIGHT: eRP = RP_RM; break;
+                    case SDRTEXTHORZADJUST_CENTER: eRP = RectPoint::MM; break;
+                    case SDRTEXTHORZADJUST_RIGHT: eRP = RectPoint::RM; break;
                 }
                 break;
             }
@@ -272,10 +272,10 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
             {
                 switch (eTHA)
                 {
-                    case SDRTEXTHORZADJUST_LEFT: eRP = RP_LB; break;
+                    case SDRTEXTHORZADJUST_LEFT: eRP = RectPoint::LB; break;
                     case SDRTEXTHORZADJUST_BLOCK:
-                    case SDRTEXTHORZADJUST_CENTER: eRP = RP_MB; break;
-                    case SDRTEXTHORZADJUST_RIGHT: eRP = RP_RB; break;
+                    case SDRTEXTHORZADJUST_CENTER: eRP = RectPoint::MB; break;
+                    case SDRTEXTHORZADJUST_RIGHT: eRP = RectPoint::RB; break;
                 }
                 break;
             }
@@ -417,30 +417,30 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet* rAttrs)
     }
 
     // centered
-    RECT_POINT eRP = m_pCtlPosition->GetActualRP();
+    RectPoint eRP = m_pCtlPosition->GetActualRP();
     SdrTextVertAdjust eTVA, eOldTVA;
     SdrTextHorzAdjust eTHA, eOldTHA;
 
     switch( eRP )
     {
         default:
-        case RP_LT: eTVA = SDRTEXTVERTADJUST_TOP;
+        case RectPoint::LT: eTVA = SDRTEXTVERTADJUST_TOP;
                     eTHA = SDRTEXTHORZADJUST_LEFT; break;
-        case RP_LM: eTVA = SDRTEXTVERTADJUST_CENTER;
+        case RectPoint::LM: eTVA = SDRTEXTVERTADJUST_CENTER;
                     eTHA = SDRTEXTHORZADJUST_LEFT; break;
-        case RP_LB: eTVA = SDRTEXTVERTADJUST_BOTTOM;
+        case RectPoint::LB: eTVA = SDRTEXTVERTADJUST_BOTTOM;
                     eTHA = SDRTEXTHORZADJUST_LEFT; break;
-        case RP_MT: eTVA = SDRTEXTVERTADJUST_TOP;
+        case RectPoint::MT: eTVA = SDRTEXTVERTADJUST_TOP;
                     eTHA = SDRTEXTHORZADJUST_CENTER; break;
-        case RP_MM: eTVA = SDRTEXTVERTADJUST_CENTER;
+        case RectPoint::MM: eTVA = SDRTEXTVERTADJUST_CENTER;
                     eTHA = SDRTEXTHORZADJUST_CENTER; break;
-        case RP_MB: eTVA = SDRTEXTVERTADJUST_BOTTOM;
+        case RectPoint::MB: eTVA = SDRTEXTVERTADJUST_BOTTOM;
                     eTHA = SDRTEXTHORZADJUST_CENTER; break;
-        case RP_RT: eTVA = SDRTEXTVERTADJUST_TOP;
+        case RectPoint::RT: eTVA = SDRTEXTVERTADJUST_TOP;
                     eTHA = SDRTEXTHORZADJUST_RIGHT; break;
-        case RP_RM: eTVA = SDRTEXTVERTADJUST_CENTER;
+        case RectPoint::RM: eTVA = SDRTEXTVERTADJUST_CENTER;
                     eTHA = SDRTEXTHORZADJUST_RIGHT; break;
-        case RP_RB: eTVA = SDRTEXTVERTADJUST_BOTTOM;
+        case RectPoint::RB: eTVA = SDRTEXTVERTADJUST_BOTTOM;
                     eTHA = SDRTEXTHORZADJUST_RIGHT; break;
     }
 
@@ -534,7 +534,7 @@ VclPtr<SfxTabPage> SvxTextAttrPage::Create( vcl::Window* pWindow,
 
 /** Check whether we have to uncheck the "Full width" check box.
 */
-void SvxTextAttrPage::PointChanged( vcl::Window*, RECT_POINT eRP )
+void SvxTextAttrPage::PointChanged( vcl::Window*, RectPoint eRP )
 {
     if (m_pTsbFullWidth->GetState() == TRISTATE_TRUE)
     {
@@ -543,12 +543,12 @@ void SvxTextAttrPage::PointChanged( vcl::Window*, RECT_POINT eRP )
         if (IsTextDirectionLeftToRight())
             switch( eRP )
             {
-                case RP_LT:
-                case RP_LM:
-                case RP_LB:
-                case RP_RT:
-                case RP_RM:
-                case RP_RB:
+                case RectPoint::LT:
+                case RectPoint::LM:
+                case RectPoint::LB:
+                case RectPoint::RT:
+                case RectPoint::RM:
+                case RectPoint::RB:
                     m_pTsbFullWidth->SetState( TRISTATE_FALSE );
                 break;
                 default: ;//prevent warning
@@ -556,12 +556,12 @@ void SvxTextAttrPage::PointChanged( vcl::Window*, RECT_POINT eRP )
         else
             switch (eRP)
             {
-                case RP_LT:
-                case RP_MT:
-                case RP_RT:
-                case RP_LB:
-                case RP_MB:
-                case RP_RB:
+                case RectPoint::LT:
+                case RectPoint::MT:
+                case RectPoint::RT:
+                case RectPoint::LB:
+                case RectPoint::MB:
+                case RectPoint::RB:
                     m_pTsbFullWidth->SetState( TRISTATE_FALSE );
                 break;
                 default: ;//prevent warning
@@ -588,19 +588,19 @@ IMPL_LINK_NOARG_TYPED(SvxTextAttrPage, ClickFullWidthHdl_Impl, Button*, void)
             // Move text anchor to horizontal middle axis.
             switch( m_pCtlPosition->GetActualRP() )
             {
-                case RP_LT:
-                case RP_RT:
-                    m_pCtlPosition->SetActualRP( RP_MT );
+                case RectPoint::LT:
+                case RectPoint::RT:
+                    m_pCtlPosition->SetActualRP( RectPoint::MT );
                     break;
 
-                case RP_LM:
-                case RP_RM:
-                    m_pCtlPosition->SetActualRP( RP_MM );
+                case RectPoint::LM:
+                case RectPoint::RM:
+                    m_pCtlPosition->SetActualRP( RectPoint::MM );
                     break;
 
-                case RP_LB:
-                case RP_RB:
-                    m_pCtlPosition->SetActualRP( RP_MB );
+                case RectPoint::LB:
+                case RectPoint::RB:
+                    m_pCtlPosition->SetActualRP( RectPoint::MB );
                     break;
                 default: ;//prevent warning
             }
@@ -610,19 +610,19 @@ IMPL_LINK_NOARG_TYPED(SvxTextAttrPage, ClickFullWidthHdl_Impl, Button*, void)
             // Move text anchor to vertical middle axis.
             switch( m_pCtlPosition->GetActualRP() )
             {
-                case RP_LT:
-                case RP_LB:
-                    m_pCtlPosition->SetActualRP( RP_LM );
+                case RectPoint::LT:
+                case RectPoint::LB:
+                    m_pCtlPosition->SetActualRP( RectPoint::LM );
                     break;
 
-                case RP_MT:
-                case RP_MB:
-                    m_pCtlPosition->SetActualRP( RP_MM );
+                case RectPoint::MT:
+                case RectPoint::MB:
+                    m_pCtlPosition->SetActualRP( RectPoint::MM );
                     break;
 
-                case RP_RT:
-                case RP_RB:
-                    m_pCtlPosition->SetActualRP( RP_RM );
+                case RectPoint::RT:
+                case RectPoint::RB:
+                    m_pCtlPosition->SetActualRP( RectPoint::RM );
                 break;
                 default: ;//prevent warning
             }
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 3f54e2263d74..ff8360f5674d 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -72,7 +72,7 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs
                 "cui/ui/areatabpage.ui",
                rInAttrs ),
     m_rOutAttrs (rInAttrs ),
-    m_eRP( RP_LT ),
+    m_eRP( RectPoint::LT ),
 
     m_pColorList( nullptr ),
     m_pGradientList( nullptr ),
@@ -880,7 +880,7 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyBitmapHdl_Impl, ListBox&, void)
     m_pCtlBitmapPreview->Invalidate();
 }
 
-void SvxAreaTabPage::PointChanged( vcl::Window* , RECT_POINT )
+void SvxAreaTabPage::PointChanged( vcl::Window* , RectPoint )
 {
 }
 
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 31e06172cf4d..f00310b00771 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -270,7 +270,7 @@ bool SvxBitmapTabPage::FillItemSet( SfxItemSet* rAttrs )
             }
 
             if(m_pPositionLB->IsEnabled())
-                rAttrs->Put( XFillBmpPosItem( static_cast<RECT_POINT>( m_pPositionLB->GetSelectEntryPos() ) ) );
+                rAttrs->Put( XFillBmpPosItem( static_cast<RectPoint>( m_pPositionLB->GetSelectEntryPos() ) ) );
             if(m_pPositionOffX->IsEnabled())
                 rAttrs->Put( XFillBmpPosOffsetXItem( m_pPositionOffX->GetValue() ) );
             if(m_pPositionOffY->IsEnabled())
@@ -410,7 +410,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
 
     if( rAttrs->GetItemState( XATTR_FILLBMP_POS ) != SfxItemState::DONTCARE )
     {
-        RECT_POINT eValue = static_cast<const XFillBmpPosItem&>( rAttrs->Get( XATTR_FILLBMP_POS ) ).GetValue();
+        RectPoint eValue = static_cast<const XFillBmpPosItem&>( rAttrs->Get( XATTR_FILLBMP_POS ) ).GetValue();
         m_pPositionLB->SelectEntryPos( static_cast< sal_Int32 >(eValue) );
     }
 
@@ -719,7 +719,7 @@ IMPL_LINK_NOARG_TYPED( SvxBitmapTabPage, ModifyBitmapStyleHdl, ListBox&, void )
 IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ModifyBitmapPositionHdl, ListBox&, void)
 {
     if(m_pPositionLB->IsEnabled())
-        m_rXFSet.Put( XFillBmpPosItem( static_cast< RECT_POINT >( m_pPositionLB->GetSelectEntryPos() ) ) );
+        m_rXFSet.Put( XFillBmpPosItem( static_cast< RectPoint >( m_pPositionLB->GetSelectEntryPos() ) ) );
 
     m_pCtlBitmapPreview->SetAttributes( m_aXFillAttr.GetItemSet() );
     m_pCtlBitmapPreview->Invalidate();
@@ -852,7 +852,7 @@ sal_Int32 SvxBitmapTabPage::SearchBitmapList(const OUString& rBitmapName)
     return nPos;
 }
 
-void SvxBitmapTabPage::PointChanged( vcl::Window* , RECT_POINT )
+void SvxBitmapTabPage::PointChanged( vcl::Window* , RectPoint )
 {
 }
 
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 32abc8ed0ad9..b9c9c384dcc5 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -642,7 +642,7 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, v
 
 }
 
-void SvxHatchTabPage::PointChanged( vcl::Window*, RECT_POINT )
+void SvxHatchTabPage::PointChanged( vcl::Window*, RectPoint )
 {
 }
 
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 85d02b3d4e04..fa2398fd3622 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -96,7 +96,7 @@ SvxLineTabPage::SvxLineTabPage
     m_bSymbols(false),
 
     m_rOutAttrs           ( rInAttrs ),
-    m_eRP( RP_LT ),
+    m_eRP( RectPoint::LT ),
     m_bObjSelected( false ),
 
     m_aXLineAttr          ( rInAttrs.GetPool() ),
@@ -1696,7 +1696,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineTabPage, ChangeTransparentHdl_Impl, Edit&, void)
 }
 
 
-void SvxLineTabPage::PointChanged( vcl::Window*, RECT_POINT eRcPt )
+void SvxLineTabPage::PointChanged( vcl::Window*, RectPoint eRcPt )
 {
     m_eRP = eRcPt;
 }
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index 1f0b9d841c94..de13c2089745 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -664,7 +664,7 @@ void SvxPatternTabPage::ChangeColor_Impl()
 }
 
 
-void SvxPatternTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT )
+void SvxPatternTabPage::PointChanged( vcl::Window* pWindow, RectPoint )
 {
     if( pWindow == m_pCtlPixel )
     {
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 01f99fc9313a..4073e715fe33 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -54,7 +54,7 @@ SvxShadowTabPage::SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInA
                           "cui/ui/shadowtabpage.ui",
                           rInAttrs ),
     m_rOutAttrs           ( rInAttrs ),
-    m_eRP                 ( RP_LT ),
+    m_eRP                 ( RectPoint::LT ),
     m_pnColorListState    ( nullptr ),
     m_nPageType           ( PageType::Area ),
     m_nDlgType            ( 0 ),
@@ -287,15 +287,15 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs )
 
     switch( m_pCtlPosition->GetActualRP() )
     {
-        case RP_LT: nX = nY = -nXY;      break;
-        case RP_MT: nY = -nXY;           break;
-        case RP_RT: nX = nXY; nY = -nXY; break;
-        case RP_LM: nX = -nXY;           break;
-        case RP_RM: nX = nXY;            break;
-        case RP_LB: nX = -nXY; nY = nXY; break;
-        case RP_MB: nY = nXY;            break;
-        case RP_RB: nX = nY = nXY;       break;
-        case RP_MM: break;
+        case RectPoint::LT: nX = nY = -nXY;      break;
+        case RectPoint::MT: nY = -nXY;           break;
+        case RectPoint::RT: nX = nXY; nY = -nXY; break;
+        case RectPoint::LM: nX = -nXY;           break;
+        case RectPoint::RM: nX = nXY;            break;
+        case RectPoint::LB: nX = -nXY; nY = nXY; break;
+        case RectPoint::MB: nY = nXY;            break;
+        case RectPoint::RB: nX = nY = nXY;       break;
+        case RectPoint::MM: break;
     }
 
     // If the values of the shadow distances==SfxItemState::DONTCARE and the displayed
@@ -402,16 +402,16 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs )
             SetMetricValue( *m_pMtrDistance, nY < 0L ? -nY : nY, m_ePoolUnit );
 
         // setting the shadow control
-        if     ( nX <  0L && nY <  0L ) m_pCtlPosition->SetActualRP( RP_LT );
-        else if( nX == 0L && nY <  0L ) m_pCtlPosition->SetActualRP( RP_MT );
-        else if( nX >  0L && nY <  0L ) m_pCtlPosition->SetActualRP( RP_RT );
-        else if( nX <  0L && nY == 0L ) m_pCtlPosition->SetActualRP( RP_LM );
+        if     ( nX <  0L && nY <  0L ) m_pCtlPosition->SetActualRP( RectPoint::LT );
+        else if( nX == 0L && nY <  0L ) m_pCtlPosition->SetActualRP( RectPoint::MT );
+        else if( nX >  0L && nY <  0L ) m_pCtlPosition->SetActualRP( RectPoint::RT );
+        else if( nX <  0L && nY == 0L ) m_pCtlPosition->SetActualRP( RectPoint::LM );
         // there's no center point anymore
-        else if( nX == 0L && nY == 0L ) m_pCtlPosition->SetActualRP( RP_RB );
-        else if( nX >  0L && nY == 0L ) m_pCtlPosition->SetActualRP( RP_RM );
-        else if( nX <  0L && nY >  0L ) m_pCtlPosition->SetActualRP( RP_LB );
-        else if( nX == 0L && nY >  0L ) m_pCtlPosition->SetActualRP( RP_MB );
-        else if( nX >  0L && nY >  0L ) m_pCtlPosition->SetActualRP( RP_RB );
+        else if( nX == 0L && nY == 0L ) m_pCtlPosition->SetActualRP( RectPoint::RB );
+        else if( nX >  0L && nY == 0L ) m_pCtlPosition->SetActualRP( RectPoint::RM );
+        else if( nX <  0L && nY >  0L ) m_pCtlPosition->SetActualRP( RectPoint::LB );
+        else if( nX == 0L && nY >  0L ) m_pCtlPosition->SetActualRP( RectPoint::MB );
+        else if( nX >  0L && nY >  0L ) m_pCtlPosition->SetActualRP( RectPoint::RB );
     }
     else
     {
@@ -433,7 +433,7 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs )
         // The text (which shall be displayed) of the MetricFields is set to "" and serves as an
         // identification in the method FillItemSet for the fact that the distance value was NOT changed !!!!
         m_pMtrDistance->SetText( "" );
-        m_pCtlPosition->SetActualRP( RP_MM );
+        m_pCtlPosition->SetActualRP( RectPoint::MM );
     }
 
     if( rAttrs->GetItemState( SDRATTR_SHADOWCOLOR ) != SfxItemState::DONTCARE )
@@ -514,15 +514,15 @@ IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, ModifyShadowHdl_Impl, Edit&, void)
     sal_Int32 nXY = GetCoreValue( *m_pMtrDistance, m_ePoolUnit );
     switch( m_pCtlPosition->GetActualRP() )
     {
-        case RP_LT: nX = nY = -nXY;      break;
-        case RP_MT: nY = -nXY;           break;
-        case RP_RT: nX = nXY; nY = -nXY; break;
-        case RP_LM: nX = -nXY;           break;
-        case RP_RM: nX = nXY;            break;
-        case RP_LB: nX = -nXY; nY = nXY; break;
-        case RP_MB: nY = nXY;            break;
-        case RP_RB: nX = nY = nXY;       break;
-        case RP_MM: break;
+        case RectPoint::LT: nX = nY = -nXY;      break;
+        case RectPoint::MT: nY = -nXY;           break;
+        case RectPoint::RT: nX = nXY; nY = -nXY; break;
+        case RectPoint::LM: nX = -nXY;           break;
+        case RectPoint::RM: nX = nXY;            break;
+        case RectPoint::LB: nX = -nXY; nY = nXY; break;
+        case RectPoint::MB: nY = nXY;            break;
+        case RectPoint::RB: nX = nY = nXY;       break;
+        case RectPoint::MM: break;
     }
 
     m_pCtlXRectPreview->SetShadowPosition(Point(nX, nY));
@@ -533,7 +533,7 @@ IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, ModifyShadowHdl_Impl, Edit&, void)
 }
 
 
-void SvxShadowTabPage::PointChanged( vcl::Window*, RECT_POINT eRcPt )
+void SvxShadowTabPage::PointChanged( vcl::Window*, RectPoint eRcPt )
 {
     m_eRP = eRcPt;
 
diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx
index 1809549fad36..cc718cc949a8 100644
--- a/cui/source/tabpages/tptrans.cxx
+++ b/cui/source/tabpages/tptrans.cxx
@@ -241,7 +241,7 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(vcl::Window* pParent, const SfxIt
                           "cui/ui/transparencytabpage.ui",
                           rInAttrs),
     rOutAttrs           ( rInAttrs ),
-    eRP                 ( RP_LT ),
+    eRP                 ( RectPoint::LT ),
     nPageType           ( PageType::Area ),
     nDlgType            (0),
     bBitmap             ( false ),
@@ -489,7 +489,7 @@ DeactivateRC SvxTransparenceTabPage::DeactivatePage(SfxItemSet* _pSet)
     return DeactivateRC::LeavePage;
 }
 
-void SvxTransparenceTabPage::PointChanged(vcl::Window* , RECT_POINT eRcPt)
+void SvxTransparenceTabPage::PointChanged(vcl::Window* , RectPoint eRcPt)
 {
     eRP = eRcPt;
 }
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 90cede794f54..10c3cae058f8 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -344,61 +344,61 @@ DeactivateRC SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet )
 }
 
 
-void SvxAngleTabPage::PointChanged(vcl::Window* pWindow, RECT_POINT eRP)
+void SvxAngleTabPage::PointChanged(vcl::Window* pWindow, RectPoint eRP)
 {
     if(pWindow == m_pCtlRect)
     {
         switch(eRP)
         {
-            case RP_LT:
+            case RectPoint::LT:
             {
                 m_pMtrPosX->SetUserValue( basegfx::fround64(maRange.getMinX()), FUNIT_NONE );
                 m_pMtrPosY->SetUserValue( basegfx::fround64(maRange.getMinY()), FUNIT_NONE );
                 break;
             }
-            case RP_MT:
+            case RectPoint::MT:
             {
                 m_pMtrPosX->SetUserValue( basegfx::fround64(maRange.getCenter().getX()), FUNIT_NONE );
                 m_pMtrPosY->SetUserValue( basegfx::fround64(maRange.getMinY()), FUNIT_NONE );
                 break;
             }
-            case RP_RT:
+            case RectPoint::RT:
             {
                 m_pMtrPosX->SetUserValue( basegfx::fround64(maRange.getMaxX()), FUNIT_NONE );
                 m_pMtrPosY->SetUserValue( basegfx::fround64(maRange.getMinY()), FUNIT_NONE );
                 break;
             }
-            case RP_LM:
+            case RectPoint::LM:
             {
                 m_pMtrPosX->SetUserValue( basegfx::fround64(maRange.getMinX()), FUNIT_NONE );
                 m_pMtrPosY->SetUserValue( basegfx::fround64(maRange.getCenter().getY()), FUNIT_NONE );
                 break;
             }
-            case RP_MM:
+            case RectPoint::MM:
             {
                 m_pMtrPosX->SetUserValue( basegfx::fround64(maRange.getCenter().getX()), FUNIT_NONE );
                 m_pMtrPosY->SetUserValue( basegfx::fround64(maRange.getCenter().getY()), FUNIT_NONE );
                 break;
             }
-            case RP_RM:
+            case RectPoint::RM:
             {
                 m_pMtrPosX->SetUserValue( basegfx::fround64(maRange.getMaxX()), FUNIT_NONE );
                 m_pMtrPosY->SetUserValue( basegfx::fround64(maRange.getCenter().getY()), FUNIT_NONE );
                 break;
             }
-            case RP_LB:
+            case RectPoint::LB:
             {
                 m_pMtrPosX->SetUserValue( basegfx::fround64(maRange.getMinX()), FUNIT_NONE );
                 m_pMtrPosY->SetUserValue( basegfx::fround64(maRange.getMaxY()), FUNIT_NONE );
                 break;
             }
-            case RP_MB:
+            case RectPoint::MB:
             {
                 m_pMtrPosX->SetUserValue( basegfx::fround64(maRange.getCenter().getX()), FUNIT_NONE );
                 m_pMtrPosY->SetUserValue( basegfx::fround64(maRange.getMaxY()), FUNIT_NONE );
                 break;
             }
-            case RP_RB:
+            case RectPoint::RB:
             {
                 m_pMtrPosX->SetUserValue( basegfx::fround64(maRange.getMaxX()), FUNIT_NONE );
                 m_pMtrPosY->SetUserValue( basegfx::fround64(maRange.getMaxY()), FUNIT_NONE );
@@ -714,7 +714,7 @@ DeactivateRC SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet )
 }
 
 
-void SvxSlantTabPage::PointChanged( vcl::Window* , RECT_POINT  )
+void SvxSlantTabPage::PointChanged( vcl::Window* , RectPoint  )
 {
 }
 
@@ -765,9 +765,9 @@ SvxPositionSizeTabPage::SvxPositionSizeTabPage(vcl::Window* pParent, const SfxIt
     DBG_ASSERT( pPool, "no pool (!)" );
     mePoolUnit = pPool->GetMetric( SID_ATTR_TRANSFORM_POS_X );
 
-    m_pCtlPos->SetActualRP(RP_LT);
-    m_pCtlSize->SetActualRP(RP_LT);
-    meRP = RP_LT; // see above
+    m_pCtlPos->SetActualRP(RectPoint::LT);
+    m_pCtlSize->SetActualRP(RectPoint::LT);
+    meRP = RectPoint::LT; // see above
 
     m_pMtrWidth->SetModifyHdl( LINK( this, SvxPositionSizeTabPage, ChangeWidthHdl ) );
     m_pMtrHeight->SetModifyHdl( LINK( this, SvxPositionSizeTabPage, ChangeHeightHdl ) );
@@ -1248,33 +1248,33 @@ void SvxPositionSizeTabPage::SetMinMaxPosition()
 
     switch ( m_pCtlPos->GetActualRP() )
     {
-        case RP_LT:
+        case RectPoint::LT:
         {
             fRight  -= maRange.getWidth();
             fBottom -= maRange.getHeight();
             break;
         }
-        case RP_MT:
+        case RectPoint::MT:
         {
             fLeft   += maRange.getWidth() / 2.0;
             fRight  -= maRange.getWidth() / 2.0;
             fBottom -= maRange.getHeight();
             break;
         }
-        case RP_RT:
+        case RectPoint::RT:
         {
             fLeft   += maRange.getWidth();
             fBottom -= maRange.getHeight();
             break;
         }
-        case RP_LM:
+        case RectPoint::LM:
         {
             fRight  -= maRange.getWidth();
             fTop    += maRange.getHeight() / 2.0;
             fBottom -= maRange.getHeight() / 2.0;
             break;
         }
-        case RP_MM:
+        case RectPoint::MM:
         {
             fLeft   += maRange.getWidth() / 2.0;
             fRight  -= maRange.getWidth() / 2.0;
@@ -1282,27 +1282,27 @@ void SvxPositionSizeTabPage::SetMinMaxPosition()
             fBottom -= maRange.getHeight() / 2.0;
             break;
         }
-        case RP_RM:
+        case RectPoint::RM:
         {
             fLeft   += maRange.getWidth();
             fTop    += maRange.getHeight() / 2.0;
             fBottom -= maRange.getHeight() / 2.0;
             break;
         }
-        case RP_LB:
+        case RectPoint::LB:
         {
             fRight  -= maRange.getWidth();
             fTop    += maRange.getHeight();
             break;
         }
-        case RP_MB:
+        case RectPoint::MB:
         {
             fLeft   += maRange.getWidth() / 2.0;
             fRight  -= maRange.getWidth() / 2.0;
             fTop    += maRange.getHeight();
             break;
         }
-        case RP_RB:
+        case RectPoint::RB:
         {
             fLeft   += maRange.getWidth();
             fTop    += maRange.getHeight();
@@ -1336,31 +1336,31 @@ void SvxPositionSizeTabPage::SetMinMaxPosition()
 
     switch ( m_pCtlSize->GetActualRP() )
     {
-        case RP_LT:
+        case RectPoint::LT:
         {
             fNewX = maWorkRange.getWidth() - ( maRange.getMinX() - fLeft );
             fNewY = maWorkRange.getHeight() - ( maRange.getMinY() - fTop );
             break;
         }
-        case RP_MT:
+        case RectPoint::MT:
         {
             fNewX = std::min( maRange.getCenter().getX() - fLeft, fRight - maRange.getCenter().getX() ) * 2.0;
             fNewY = maWorkRange.getHeight() - ( maRange.getMinY() - fTop );
             break;
         }
-        case RP_RT:
+        case RectPoint::RT:
         {
             fNewX = maWorkRange.getWidth() - ( fRight - maRange.getMaxX() );
             fNewY = maWorkRange.getHeight() - ( maRange.getMinY() - fTop );
             break;
         }
-        case RP_LM:
+        case RectPoint::LM:
         {
             fNewX = maWorkRange.getWidth() - ( maRange.getMinX() - fLeft );
             fNewY = std::min( maRange.getCenter().getY() - fTop, fBottom - maRange.getCenter().getY() ) * 2.0;
             break;
         }
-        case RP_MM:
+        case RectPoint::MM:
         {
             const double f1(maRange.getCenter().getX() - fLeft);
             const double f2(fRight - maRange.getCenter().getX());
@@ -1374,25 +1374,25 @@ void SvxPositionSizeTabPage::SetMinMaxPosition()
 
             break;
         }
-        case RP_RM:
+        case RectPoint::RM:
         {
             fNewX = maWorkRange.getWidth() - ( fRight - maRange.getMaxX() );
             fNewY = std::min( maRange.getCenter().getY() - fTop, fBottom - maRange.getCenter().getY() ) * 2.0;
             break;
         }
-        case RP_LB:
+        case RectPoint::LB:
         {
             fNewX = maWorkRange.getWidth() - ( maRange.getMinX() - fLeft );
             fNewY = maWorkRange.getHeight() - ( fBottom - maRange.getMaxY() );
             break;
         }
-        case RP_MB:
+        case RectPoint::MB:
         {
             fNewX = std::min( maRange.getCenter().getX() - fLeft, fRight - maRange.getCenter().getX() ) * 2.0;
             fNewY = maWorkRange.getHeight() - ( maRange.getMaxY() - fBottom );
             break;
         }
-        case RP_RB:
+        case RectPoint::RB:
         {
             fNewX = maWorkRange.getWidth() - ( fRight - maRange.getMaxX() );
             fNewY = maWorkRange.getHeight() - ( fBottom - maRange.getMaxY() );
@@ -1412,49 +1412,49 @@ void SvxPositionSizeTabPage::GetTopLeftPosition(double& rfX, double& rfY, const
 {
     switch (m_pCtlPos->GetActualRP())
     {
-        case RP_LT:
+        case RectPoint::LT:
         {
             break;
         }
-        case RP_MT:
+        case RectPoint::MT:
         {
             rfX -= rRange.getCenter().getX() - rRange.getMinX();
             break;
         }
-        case RP_RT:
+        case RectPoint::RT:
         {
             rfX -= rRange.getWidth();
             break;
         }
-        case RP_LM:
+        case RectPoint::LM:
         {
             rfY -= rRange.getCenter().getY() - rRange.getMinY();
             break;
         }
-        case RP_MM:
+        case RectPoint::MM:
         {
             rfX -= rRange.getCenter().getX() - rRange.getMinX();
             rfY -= rRange.getCenter().getY() - rRange.getMinY();
             break;
         }
-        case RP_RM:
+        case RectPoint::RM:
         {
             rfX -= rRange.getWidth();
             rfY -= rRange.getCenter().getY() - rRange.getMinY();
             break;
         }
-        case RP_LB:
+        case RectPoint::LB:
         {
             rfY -= rRange.getHeight();
             break;
         }
-        case RP_MB:
+        case RectPoint::MB:
         {
             rfX -= rRange.getCenter().getX() - rRange.getMinX();
             rfY -= rRange.getHeight();
             break;
         }
-        case RP_RB:
+        case RectPoint::RB:
         {
             rfX -= rRange.getWidth();
             rfY -= rRange.getHeight();
@@ -1464,62 +1464,62 @@ void SvxPositionSizeTabPage::GetTopLeftPosition(double& rfX, double& rfY, const
 }
 
 
-void SvxPositionSizeTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRP )
+void SvxPositionSizeTabPage::PointChanged( vcl::Window* pWindow, RectPoint eRP )
 {
     if( pWindow == m_pCtlPos )
     {
         SetMinMaxPosition();
         switch( eRP )
         {
-            case RP_LT:
+            case RectPoint::LT:
             {
                 m_pMtrPosX->SetValue( basegfx::fround64(maRange.getMinX()) );
                 m_pMtrPosY->SetValue( basegfx::fround64(maRange.getMinY()) );
                 break;
             }
-            case RP_MT:
+            case RectPoint::MT:
             {
                 m_pMtrPosX->SetValue( basegfx::fround64(maRange.getCenter().getX()) );
                 m_pMtrPosY->SetValue( basegfx::fround64(maRange.getMinY()) );
                 break;
             }
-            case RP_RT:
+            case RectPoint::RT:
             {
                 m_pMtrPosX->SetValue( basegfx::fround64(maRange.getMaxX()) );
                 m_pMtrPosY->SetValue( basegfx::fround64(maRange.getMinY()) );
                 break;
             }
-            case RP_LM:
+            case RectPoint::LM:
             {
                 m_pMtrPosX->SetValue( basegfx::fround64(maRange.getMinX()) );
                 m_pMtrPosY->SetValue( basegfx::fround64(maRange.getCenter().getY()) );
                 break;
             }
-            case RP_MM:
+            case RectPoint::MM:
             {
                 m_pMtrPosX->SetValue( basegfx::fround64(maRange.getCenter().getX()) );
                 m_pMtrPosY->SetValue( basegfx::fround64(maRange.getCenter().getY()) );
                 break;
             }
-            case RP_RM:
+            case RectPoint::RM:
             {
                 m_pMtrPosX->SetValue( basegfx::fround64(maRange.getMaxX()) );
                 m_pMtrPosY->SetValue( basegfx::fround64(maRange.getCenter().getY()) );
                 break;
             }
-            case RP_LB:
+            case RectPoint::LB:
             {
                 m_pMtrPosX->SetValue( basegfx::fround64(maRange.getMinX()) );
                 m_pMtrPosY->SetValue( basegfx::fround64(maRange.getMaxY()) );
                 break;
             }
-            case RP_MB:
+            case RectPoint::MB:
             {
                 m_pMtrPosX->SetValue( basegfx::fround64(maRange.getCenter().getX()) );
                 m_pMtrPosY->SetValue( basegfx::fround64(maRange.getMaxY()) );
                 break;
             }
-            case RP_RB:
+            case RectPoint::RB:
             {
                 m_pMtrPosX->SetValue( basegfx::fround64(maRange.getMaxX()) );
                 m_pMtrPosY->SetValue( basegfx::fround64(maRange.getMaxY()) );