convert RECT_POINT to scoped enum

Change-Id: I3f0304d69d5d638230b64135c73497192dc00cb3

9 files changed, 133 insertions, 133 deletions

diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index ea1404d35bcc..d43ab2c53801 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -59,7 +59,7 @@ namespace
     {
         short       nResIdName;
         short       nResIdDescr;
-        RECT_POINT  ePoint;
+        RectPoint  ePoint;
     };
 }
 
@@ -71,35 +71,35 @@ static const ChildIndexToPointData* IndexToPoint( long nIndex, bool bAngleContro
     // angles are counted reverse counter clock wise
     static const ChildIndexToPointData  pAngleData[] =
     {                                                   // index
-        {   RID_SVXSTR_RECTCTL_ACC_CHLD_A000,   RID_SVXSTR_RECTCTL_ACC_CHLD_A000,   RP_RM },    //  0
-        {   RID_SVXSTR_RECTCTL_ACC_CHLD_A045,   RID_SVXSTR_RECTCTL_ACC_CHLD_A045,   RP_RT },    //  1
-        {   RID_SVXSTR_RECTCTL_ACC_CHLD_A090,   RID_SVXSTR_RECTCTL_ACC_CHLD_A090,   RP_MT },    //  2
-        {   RID_SVXSTR_RECTCTL_ACC_CHLD_A135,   RID_SVXSTR_RECTCTL_ACC_CHLD_A135,   RP_LT },    //  3
-        {   RID_SVXSTR_RECTCTL_ACC_CHLD_A180,   RID_SVXSTR_RECTCTL_ACC_CHLD_A180,   RP_LM },    //  4
-        {   RID_SVXSTR_RECTCTL_ACC_CHLD_A225,   RID_SVXSTR_RECTCTL_ACC_CHLD_A225,   RP_LB },    //  5
-        {   RID_SVXSTR_RECTCTL_ACC_CHLD_A270,   RID_SVXSTR_RECTCTL_ACC_CHLD_A270,   RP_MB },    //  6
-        {   RID_SVXSTR_RECTCTL_ACC_CHLD_A315,   RID_SVXSTR_RECTCTL_ACC_CHLD_A315,   RP_RB }     //  7
+        {   RID_SVXSTR_RECTCTL_ACC_CHLD_A000,   RID_SVXSTR_RECTCTL_ACC_CHLD_A000,   RectPoint::RM },    //  0
+        {   RID_SVXSTR_RECTCTL_ACC_CHLD_A045,   RID_SVXSTR_RECTCTL_ACC_CHLD_A045,   RectPoint::RT },    //  1
+        {   RID_SVXSTR_RECTCTL_ACC_CHLD_A090,   RID_SVXSTR_RECTCTL_ACC_CHLD_A090,   RectPoint::MT },    //  2
+        {   RID_SVXSTR_RECTCTL_ACC_CHLD_A135,   RID_SVXSTR_RECTCTL_ACC_CHLD_A135,   RectPoint::LT },    //  3
+        {   RID_SVXSTR_RECTCTL_ACC_CHLD_A180,   RID_SVXSTR_RECTCTL_ACC_CHLD_A180,   RectPoint::LM },    //  4
+        {   RID_SVXSTR_RECTCTL_ACC_CHLD_A225,   RID_SVXSTR_RECTCTL_ACC_CHLD_A225,   RectPoint::LB },    //  5
+        {   RID_SVXSTR_RECTCTL_ACC_CHLD_A270,   RID_SVXSTR_RECTCTL_ACC_CHLD_A270,   RectPoint::MB },    //  6
+        {   RID_SVXSTR_RECTCTL_ACC_CHLD_A315,   RID_SVXSTR_RECTCTL_ACC_CHLD_A315,   RectPoint::RB }     //  7
     };
 
     // corners are counted from left to right and top to bottom
     static const ChildIndexToPointData  pCornerData[] =
     {                                                                   // index
-        {   RID_SVXSTR_RECTCTL_ACC_CHLD_LT, RID_SVXSTR_RECTCTL_ACC_CHLD_LT, RP_LT },    //  0
-        {   RID_SVXSTR_RECTCTL_ACC_CHLD_MT, RID_SVXSTR_RECTCTL_ACC_CHLD_MT, RP_MT },    //  1
-        {   RID_SVXSTR_RECTCTL_ACC_CHLD_RT, RID_SVXSTR_RECTCTL_ACC_CHLD_RT, RP_RT },    //  2
-        {   RID_SVXSTR_RECTCTL_ACC_CHLD_LM, RID_SVXSTR_RECTCTL_ACC_CHLD_LM, RP_LM },    //  3
-        {   RID_SVXSTR_RECTCTL_ACC_CHLD_MM, RID_SVXSTR_RECTCTL_ACC_CHLD_MM, RP_MM },    //  4
-        {   RID_SVXSTR_RECTCTL_ACC_CHLD_RM, RID_SVXSTR_RECTCTL_ACC_CHLD_RM, RP_RM },    //  5
-        {   RID_SVXSTR_RECTCTL_ACC_CHLD_LB, RID_SVXSTR_RECTCTL_ACC_CHLD_LB, RP_LB },    //  6
-        {   RID_SVXSTR_RECTCTL_ACC_CHLD_MB, RID_SVXSTR_RECTCTL_ACC_CHLD_MB, RP_MB },    //  7
-        {   RID_SVXSTR_RECTCTL_ACC_CHLD_RB, RID_SVXSTR_RECTCTL_ACC_CHLD_RB, RP_RB }     //  8
+        {   RID_SVXSTR_RECTCTL_ACC_CHLD_LT, RID_SVXSTR_RECTCTL_ACC_CHLD_LT, RectPoint::LT },    //  0
+        {   RID_SVXSTR_RECTCTL_ACC_CHLD_MT, RID_SVXSTR_RECTCTL_ACC_CHLD_MT, RectPoint::MT },    //  1
+        {   RID_SVXSTR_RECTCTL_ACC_CHLD_RT, RID_SVXSTR_RECTCTL_ACC_CHLD_RT, RectPoint::RT },    //  2
+        {   RID_SVXSTR_RECTCTL_ACC_CHLD_LM, RID_SVXSTR_RECTCTL_ACC_CHLD_LM, RectPoint::LM },    //  3
+        {   RID_SVXSTR_RECTCTL_ACC_CHLD_MM, RID_SVXSTR_RECTCTL_ACC_CHLD_MM, RectPoint::MM },    //  4
+        {   RID_SVXSTR_RECTCTL_ACC_CHLD_RM, RID_SVXSTR_RECTCTL_ACC_CHLD_RM, RectPoint::RM },    //  5
+        {   RID_SVXSTR_RECTCTL_ACC_CHLD_LB, RID_SVXSTR_RECTCTL_ACC_CHLD_LB, RectPoint::LB },    //  6
+        {   RID_SVXSTR_RECTCTL_ACC_CHLD_MB, RID_SVXSTR_RECTCTL_ACC_CHLD_MB, RectPoint::MB },    //  7
+        {   RID_SVXSTR_RECTCTL_ACC_CHLD_RB, RID_SVXSTR_RECTCTL_ACC_CHLD_RB, RectPoint::RB }     //  8
     };
 
     return ( bAngleControl? pAngleData : pCornerData ) + nIndex;
 }
 
 
-static long PointToIndex( RECT_POINT ePoint, bool bAngleControl )
+static long PointToIndex( RectPoint ePoint, bool bAngleControl )
 {
     long    nRet( (long) ePoint );
     if( bAngleControl )
@@ -107,22 +107,22 @@ static long PointToIndex( RECT_POINT ePoint, bool bAngleControl )
         // angles are counted reverse counter clock wise
         switch( ePoint )
         {
-            case RP_LT: nRet = 3;               break;
-            case RP_MT: nRet = 2;               break;
-            case RP_RT: nRet = 1;               break;
-            case RP_LM: nRet = 4;               break;
-            case RP_MM: nRet = NOCHILDSELECTED; break;
-            case RP_RM: nRet = 0;               break;
-            case RP_LB: nRet = 5;               break;
-            case RP_MB: nRet = 6;               break;
-            case RP_RB: nRet = 7;               break;
+            case RectPoint::LT: nRet = 3;               break;
+            case RectPoint::MT: nRet = 2;               break;
+            case RectPoint::RT: nRet = 1;               break;
+            case RectPoint::LM: nRet = 4;               break;
+            case RectPoint::MM: nRet = NOCHILDSELECTED; break;
+            case RectPoint::RM: nRet = 0;               break;
+            case RectPoint::LB: nRet = 5;               break;
+            case RectPoint::MB: nRet = 6;               break;
+            case RectPoint::RB: nRet = 7;               break;
         }
     }
     else
     {   // corner control
         // corners are counted from left to right and top to bottom
-        DBG_ASSERT( RP_LT == 0 && RP_MT == 1 && RP_RT == 2 && RP_LM == 3 && RP_MM == 4 && RP_RM == 5 &&
-                    RP_LB == 6 && RP_MB == 7 && RP_RB == 8, "*PointToIndex(): unexpected enum value!" );
+        DBG_ASSERT( (int)RectPoint::LT == 0 && (int)RectPoint::MT == 1 && (int)RectPoint::RT == 2 && (int)RectPoint::LM == 3 && (int)RectPoint::MM == 4 && (int)RectPoint::RM == 5 &&
+                    (int)RectPoint::LB == 6 && (int)RectPoint::MB == 7 && (int)RectPoint::RB == 8, "*PointToIndex(): unexpected enum value!" );
 
         nRet = ( long ) ePoint;
     }
@@ -570,7 +570,7 @@ void SvxRectCtlAccessibleContext::checkChildIndexOnSelection( long nIndex ) thro
         throw lang::IndexOutOfBoundsException();
 }
 
-void SvxRectCtlAccessibleContext::FireChildFocus( RECT_POINT eButton )
+void SvxRectCtlAccessibleContext::FireChildFocus( RectPoint eButton )
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     long nNew = PointToIndex( eButton, mbAngleMode );
@@ -630,7 +630,7 @@ void SvxRectCtlAccessibleContext::selectChild( long nNew )
     }
 }
 
-void SvxRectCtlAccessibleContext::selectChild(RECT_POINT eButton )
+void SvxRectCtlAccessibleContext::selectChild(RectPoint eButton )
 {
     // no guard -> is done in next selectChild
     selectChild(PointToIndex( eButton, mbAngleMode ));
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index dfba8b8d596d..662f62af4057 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -67,7 +67,7 @@ Bitmap& SvxRectCtl::GetRectBitmap()
     return *pBitmap;
 }
 
-SvxRectCtl::SvxRectCtl(vcl::Window* pParent, RECT_POINT eRpt,
+SvxRectCtl::SvxRectCtl(vcl::Window* pParent, RectPoint eRpt,
     sal_uInt16 nBorder, sal_uInt16 nCircle)
     : Control(pParent, WB_BORDER | WB_TABSTOP)
     , nBorderWidth(nBorder)
@@ -84,7 +84,7 @@ SvxRectCtl::SvxRectCtl(vcl::Window* pParent, RECT_POINT eRpt,
     Resize_Impl();
 }
 
-void SvxRectCtl::SetControlSettings(RECT_POINT eRpt, sal_uInt16 nBorder, sal_uInt16 nCircle)
+void SvxRectCtl::SetControlSettings(RectPoint eRpt, sal_uInt16 nBorder, sal_uInt16 nCircle)
 {
     nBorderWidth = nBorder;
     nRadius = nCircle;
@@ -281,7 +281,7 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
     // CompletelyDisabled() added to have a disabled state for SvxRectCtl
     if(!IsCompletelyDisabled())
     {
-        RECT_POINT eNewRP = eRP;
+        RectPoint eNewRP = eRP;
         bool bUseMM = (eCS != CTL_STYLE::Shadow) && (eCS != CTL_STYLE::Angle);
 
         switch( rKeyEvt.GetKeyCode().GetCode() )
@@ -291,12 +291,12 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
                 if( !(m_nState & CTL_STATE::NOVERT) )
                     switch( eNewRP )
                     {
-                        case RP_LT: eNewRP = RP_LM; break;
-                        case RP_MT: eNewRP = bUseMM ? RP_MM : RP_MB; break;
-                        case RP_RT: eNewRP = RP_RM; break;
-                        case RP_LM: eNewRP = RP_LB; break;
-                        case RP_MM: eNewRP = RP_MB; break;
-                        case RP_RM: eNewRP = RP_RB; break;
+                        case RectPoint::LT: eNewRP = RectPoint::LM; break;
+                        case RectPoint::MT: eNewRP = bUseMM ? RectPoint::MM : RectPoint::MB; break;
+                        case RectPoint::RT: eNewRP = RectPoint::RM; break;
+                        case RectPoint::LM: eNewRP = RectPoint::LB; break;
+                        case RectPoint::MM: eNewRP = RectPoint::MB; break;
+                        case RectPoint::RM: eNewRP = RectPoint::RB; break;
                         default: ; //prevent warning
                     }
             }
@@ -306,12 +306,12 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
                 if( !(m_nState & CTL_STATE::NOVERT) )
                     switch( eNewRP )
                     {
-                        case RP_LM: eNewRP = RP_LT; break;
-                        case RP_MM: eNewRP = RP_MT; break;
-                        case RP_RM: eNewRP = RP_RT; break;
-                        case RP_LB: eNewRP = RP_LM; break;
-                        case RP_MB: eNewRP = bUseMM ? RP_MM : RP_MT; break;
-                        case RP_RB: eNewRP = RP_RM; break;
+                        case RectPoint::LM: eNewRP = RectPoint::LT; break;
+                        case RectPoint::MM: eNewRP = RectPoint::MT; break;
+                        case RectPoint::RM: eNewRP = RectPoint::RT; break;
+                        case RectPoint::LB: eNewRP = RectPoint::LM; break;
+                        case RectPoint::MB: eNewRP = bUseMM ? RectPoint::MM : RectPoint::MT; break;
+                        case RectPoint::RB: eNewRP = RectPoint::RM; break;
                         default: ; //prevent warning
                     }
             }
@@ -321,12 +321,12 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
                 if( !(m_nState & CTL_STATE::NOHORZ) )
                     switch( eNewRP )
                     {
-                        case RP_MT: eNewRP = RP_LT; break;
-                        case RP_RT: eNewRP = RP_MT; break;
-                        case RP_MM: eNewRP = RP_LM; break;
-                        case RP_RM: eNewRP = bUseMM ? RP_MM : RP_LM; break;
-                        case RP_MB: eNewRP = RP_LB; break;
-                        case RP_RB: eNewRP = RP_MB; break;
+                        case RectPoint::MT: eNewRP = RectPoint::LT; break;
+                        case RectPoint::RT: eNewRP = RectPoint::MT; break;
+                        case RectPoint::MM: eNewRP = RectPoint::LM; break;
+                        case RectPoint::RM: eNewRP = bUseMM ? RectPoint::MM : RectPoint::LM; break;
+                        case RectPoint::MB: eNewRP = RectPoint::LB; break;
+                        case RectPoint::RB: eNewRP = RectPoint::MB; break;
                         default: ; //prevent warning
                     }
             }
@@ -336,12 +336,12 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
                 if( !(m_nState & CTL_STATE::NOHORZ) )
                     switch( eNewRP )
                     {
-                        case RP_LT: eNewRP = RP_MT; break;
-                        case RP_MT: eNewRP = RP_RT; break;
-                        case RP_LM: eNewRP = bUseMM ? RP_MM : RP_RM; break;
-                        case RP_MM: eNewRP = RP_RM; break;
-                        case RP_LB: eNewRP = RP_MB; break;
-                        case RP_MB: eNewRP = RP_RB; break;
+                        case RectPoint::LT: eNewRP = RectPoint::MT; break;
+                        case RectPoint::MT: eNewRP = RectPoint::RT; break;
+                        case RectPoint::LM: eNewRP = bUseMM ? RectPoint::MM : RectPoint::RM; break;
+                        case RectPoint::MM: eNewRP = RectPoint::RM; break;
+                        case RectPoint::LB: eNewRP = RectPoint::MB; break;
+                        case RectPoint::MB: eNewRP = RectPoint::RB; break;
                         default: ; //prevent warning
                     }
             }
@@ -511,21 +511,21 @@ void SvxRectCtl::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
     }
 }
 
-// Convert RECT_POINT Point
+// Convert RectPoint Point
 
-const Point& SvxRectCtl::GetPointFromRP( RECT_POINT _eRP) const
+const Point& SvxRectCtl::GetPointFromRP( RectPoint _eRP) const
 {
     switch( _eRP )
     {
-        case RP_LT: return aPtLT;
-        case RP_MT: return aPtMT;
-        case RP_RT: return aPtRT;
-        case RP_LM: return aPtLM;
-        case RP_MM: return aPtMM;
-        case RP_RM: return aPtRM;
-        case RP_LB: return aPtLB;
-        case RP_MB: return aPtMB;
-        case RP_RB: return aPtRB;
+        case RectPoint::LT: return aPtLT;
+        case RectPoint::MT: return aPtMT;
+        case RectPoint::RT: return aPtRT;
+        case RectPoint::LM: return aPtLM;
+        case RectPoint::MM: return aPtMM;
+        case RectPoint::RM: return aPtRM;
+        case RectPoint::LB: return aPtLB;
+        case RectPoint::MB: return aPtMB;
+        case RectPoint::RB: return aPtRB;
     }
     return aPtMM; // default
 }
@@ -538,7 +538,7 @@ void SvxRectCtl::SetFocusRect()
     ShowFocus( CalculateFocusRectangle() );
 }
 
-Point SvxRectCtl::SetActualRPWithoutInvalidate( RECT_POINT eNewRP )
+Point SvxRectCtl::SetActualRPWithoutInvalidate( RectPoint eNewRP )
 {
     Point aPtLast = aPtNew;
     aPtNew = GetPointFromRP( eNewRP );
@@ -612,20 +612,20 @@ Point SvxRectCtl::GetApproxLogPtFromPixPt( const Point& rPt ) const
 }
 
 
-// Converts Point in RECT_POINT
+// Converts Point in RectPoint
 
-RECT_POINT SvxRectCtl::GetRPFromPoint( Point aPt, bool bRTL ) const
+RectPoint SvxRectCtl::GetRPFromPoint( Point aPt, bool bRTL ) const
 {
-    RECT_POINT rPoint = RP_MM;  // default
+    RectPoint rPoint = RectPoint::MM;  // default
 
-    if     ( aPt == aPtLT) rPoint = bRTL ? RP_RT : RP_LT;
-    else if( aPt == aPtMT) rPoint = RP_MT;
-    else if( aPt == aPtRT) rPoint = bRTL ? RP_LT : RP_RT;
-    else if( aPt == aPtLM) rPoint = bRTL ? RP_RM : RP_LM;
-    else if( aPt == aPtRM) rPoint = bRTL ? RP_LM : RP_RM;
-    else if( aPt == aPtLB) rPoint = bRTL ? RP_RB : RP_LB;
-    else if( aPt == aPtMB) rPoint = RP_MB;
-    else if( aPt == aPtRB) rPoint = bRTL ? RP_LB : RP_RB;
+    if     ( aPt == aPtLT) rPoint = bRTL ? RectPoint::RT : RectPoint::LT;
+    else if( aPt == aPtMT) rPoint = RectPoint::MT;
+    else if( aPt == aPtRT) rPoint = bRTL ? RectPoint::LT : RectPoint::RT;
+    else if( aPt == aPtLM) rPoint = bRTL ? RectPoint::RM : RectPoint::LM;
+    else if( aPt == aPtRM) rPoint = bRTL ? RectPoint::LM : RectPoint::RM;
+    else if( aPt == aPtLB) rPoint = bRTL ? RectPoint::RB : RectPoint::LB;
+    else if( aPt == aPtMB) rPoint = RectPoint::MB;
+    else if( aPt == aPtRB) rPoint = bRTL ? RectPoint::LB : RectPoint::RB;
 
     return rPoint;
 }
@@ -639,10 +639,10 @@ void SvxRectCtl::Reset()
     Invalidate();
 }
 
-// Returns the currently selected RECT_POINT
+// Returns the currently selected RectPoint
 
 
-void SvxRectCtl::SetActualRP( RECT_POINT eNewRP )
+void SvxRectCtl::SetActualRP( RectPoint eNewRP )
 {
     Point aPtLast( SetActualRPWithoutInvalidate( eNewRP ) );
 
@@ -686,10 +686,10 @@ Rectangle SvxRectCtl::CalculateFocusRectangle() const
     return Rectangle( aPtNew - Point( aDstBtnSize.Width() >> 1, aDstBtnSize.Height() >> 1 ), aDstBtnSize );
 }
 
-Rectangle SvxRectCtl::CalculateFocusRectangle( RECT_POINT eRectPoint ) const
+Rectangle SvxRectCtl::CalculateFocusRectangle( RectPoint eRectPoint ) const
 {
     Rectangle   aRet;
-    RECT_POINT  eOldRectPoint = GetActualRP();
+    RectPoint  eOldRectPoint = GetActualRP();
 
     if( eOldRectPoint == eRectPoint )
         aRet = CalculateFocusRectangle();
@@ -725,7 +725,7 @@ Reference< XAccessible > SvxRectCtl::CreateAccessible()
         return Reference< XAccessible >();
 }
 
-RECT_POINT SvxRectCtl::GetApproxRPFromPixPt( const css::awt::Point& r ) const
+RectPoint SvxRectCtl::GetApproxRPFromPixPt( const css::awt::Point& r ) const
 {
     return GetRPFromPoint( GetApproxLogPtFromPixPt( Point( r.X, r.Y ) ) );
 }
@@ -793,7 +793,7 @@ long SvxPixelCtl::ShowPosition( const Point &pt)
 
     vcl::Window *pTabPage = getNonLayoutParent(this);
     if (pTabPage && WINDOW_TABPAGE == pTabPage->GetType())
-        static_cast<SvxTabPage*>(pTabPage)->PointChanged( this, RP_MM ); // RectPoint ist dummy
+        static_cast<SvxTabPage*>(pTabPage)->PointChanged( this, RectPoint::MM ); // RectPoint ist dummy
 
     return GetFocusPosIndex();
 
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx
index ce305c6f15b5..53a98cd07a65 100644
--- a/svx/source/dialog/grfflt.cxx
+++ b/svx/source/dialog/grfflt.cxx
@@ -175,7 +175,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 if(pFact)
                 {
-                    std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterEmboss(pWindow, rGraphic, RP_MM));
+                    std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterEmboss(pWindow, rGraphic, RectPoint::MM));
                     DBG_ASSERT(aDlg, "Dialog creation failed!");
                     if( aDlg->Execute() == RET_OK )
                         aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index f9dcc099258d..25a28165c5b7 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -225,8 +225,8 @@ public:
         @param eButton
             Button which belongs to the child which should be selected.
     */
-    void selectChild( RECT_POINT ePoint );
-    void FireChildFocus( RECT_POINT eButton );
+    void selectChild( RectPoint ePoint );
+    void FireChildFocus( RectPoint eButton );
 
 protected:
 
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index f514bf7c1978..bbfbbd87d8fa 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -156,20 +156,20 @@ namespace drawinglayer
             }
         }
 
-        basegfx::B2DVector RectPointToB2DVector(RECT_POINT eRectPoint)
+        basegfx::B2DVector RectPointToB2DVector(RectPoint eRectPoint)
         {
             basegfx::B2DVector aRetval(0.0, 0.0);
 
             // position changes X
             switch(eRectPoint)
             {
-                case RP_LT: case RP_LM: case RP_LB:
+                case RectPoint::LT: case RectPoint::LM: case RectPoint::LB:
                 {
                     aRetval.setX(-1.0);
                     break;
                 }
 
-                case RP_RT: case RP_RM: case RP_RB:
+                case RectPoint::RT: case RectPoint::RM: case RectPoint::RB:
                 {
                     aRetval.setX(1.0);
                     break;
@@ -184,13 +184,13 @@ namespace drawinglayer
             // position changes Y
             switch(eRectPoint)
             {
-                case RP_LT: case RP_MT: case RP_RT:
+                case RectPoint::LT: case RectPoint::MT: case RectPoint::RT:
                 {
                     aRetval.setY(-1.0);
                     break;
                 }
 
-                case RP_LB: case RP_MB: case RP_RB:
+                case RectPoint::LB: case RectPoint::MB: case RectPoint::RB:
                 {
                     aRetval.setY(1.0);
                     break;
@@ -700,7 +700,7 @@ namespace drawinglayer
                 aOffset,
                 aOffsetPosition,
                 RectPointToB2DVector(
-                    (RECT_POINT)static_cast<const SfxEnumItem&>(rSet.Get(XATTR_FILLBMP_POS)).GetValue()),
+                    (RectPoint)static_cast<const SfxEnumItem&>(rSet.Get(XATTR_FILLBMP_POS)).GetValue()),
                     static_cast<const SfxBoolItem&>(rSet.Get(XATTR_FILLBMP_TILE)).GetValue(),
                     static_cast<const SfxBoolItem&>(rSet.Get(XATTR_FILLBMP_STRETCH)).GetValue(),
                     static_cast<const SfxBoolItem&>(rSet.Get(XATTR_FILLBMP_SIZELOG)).GetValue());
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 53f5e9dd17c6..b9939b482d4a 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -823,7 +823,7 @@ void PosSizePropertyPanel::executeSize()
         // put Width & Height to itemset
         SfxUInt32Item aWidthItem( SID_ATTR_TRANSFORM_WIDTH, (sal_uInt32) lWidth);
         SfxUInt32Item aHeightItem( SID_ATTR_TRANSFORM_HEIGHT, (sal_uInt32) lHeight);
-        SfxAllEnumItem aPointItem (SID_ATTR_TRANSFORM_SIZE_POINT, (sal_uInt16)RP_LT);
+        SfxAllEnumItem aPointItem (SID_ATTR_TRANSFORM_SIZE_POINT, (sal_uInt16)RectPoint::LT);
         const sal_Int32 nCombinedContext(maContext.GetCombinedContext_DI());
 
         if( nCombinedContext == CombinedEnumContext(Application_WriterVariants, Context_Graphic)
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 1456c2c352c1..dddb0bd0ee98 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -1434,18 +1434,18 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const
     return aRetSet;
 }
 
-Point ImpGetPoint(const Rectangle& rRect, RECT_POINT eRP)
+Point ImpGetPoint(const Rectangle& rRect, RectPoint eRP)
 {
     switch(eRP) {
-        case RP_LT: return rRect.TopLeft();
-        case RP_MT: return rRect.TopCenter();
-        case RP_RT: return rRect.TopRight();
-        case RP_LM: return rRect.LeftCenter();
-        case RP_MM: return rRect.Center();
-        case RP_RM: return rRect.RightCenter();
-        case RP_LB: return rRect.BottomLeft();
-        case RP_MB: return rRect.BottomCenter();
-        case RP_RB: return rRect.BottomRight();
+        case RectPoint::LT: return rRect.TopLeft();
+        case RectPoint::MT: return rRect.TopCenter();
+        case RectPoint::RT: return rRect.TopRight();
+        case RectPoint::LM: return rRect.LeftCenter();
+        case RectPoint::MM: return rRect.Center();
+        case RectPoint::RM: return rRect.RightCenter();
+        case RectPoint::LB: return rRect.BottomLeft();
+        case RectPoint::MB: return rRect.BottomCenter();
+        case RectPoint::RB: return rRect.BottomRight();
     }
     return Point(); // Should not happen!
 }
@@ -1465,7 +1465,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
     const size_t nMarkCount=rMarkList.GetMarkCount();
     SdrObject* pObj=nullptr;
 
-    RECT_POINT eSizePoint=RP_MM;
+    RectPoint eSizePoint=RectPoint::MM;
     long nPosDX=0;
     long nPosDY=0;
     long nSizX=0;
@@ -1528,7 +1528,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
         bChgHgt=true;
     }
     if (bChgSiz) {
-        eSizePoint=(RECT_POINT)static_cast<const SfxAllEnumItem&>(rAttr.Get(SID_ATTR_TRANSFORM_SIZE_POINT)).GetValue();
+        eSizePoint=(RectPoint)static_cast<const SfxAllEnumItem&>(rAttr.Get(SID_ATTR_TRANSFORM_SIZE_POINT)).GetValue();
     }
 
     // rotation
diff --git a/svx/source/unodraw/unobrushitemhelper.cxx b/svx/source/unodraw/unobrushitemhelper.cxx
index ca484bc93a1e..c3d547d973d7 100644
--- a/svx/source/unodraw/unobrushitemhelper.cxx
+++ b/svx/source/unodraw/unobrushitemhelper.cxx
@@ -75,7 +75,7 @@ void setSvxBrushItemAsFillAttributesToTargetSet(const SvxBrushItem& rBrush, SfxI
             rToSet.Put(XFillBmpTileItem(false));
 
             // default for stretch is also top-left, but this will not be visible
-            rToSet.Put(XFillBmpPosItem(RP_LT));
+            rToSet.Put(XFillBmpPosItem(RectPoint::LT));
         }
         else if(GPOS_TILED == rBrush.GetGraphicPos())
         {
@@ -84,7 +84,7 @@ void setSvxBrushItemAsFillAttributesToTargetSet(const SvxBrushItem& rBrush, SfxI
             rToSet.Put(XFillBmpTileItem(true));
 
             // default for tiled is top-left
-            rToSet.Put(XFillBmpPosItem(RP_LT));
+            rToSet.Put(XFillBmpPosItem(RectPoint::LT));
         }
         else
         {
@@ -92,19 +92,19 @@ void setSvxBrushItemAsFillAttributesToTargetSet(const SvxBrushItem& rBrush, SfxI
             rToSet.Put(XFillBmpStretchItem(false));
             rToSet.Put(XFillBmpTileItem(false));
 
-            RECT_POINT aRectPoint(RP_MM);
+            RectPoint aRectPoint(RectPoint::MM);
 
             switch(rBrush.GetGraphicPos())
             {
-                case GPOS_LT: aRectPoint = RP_LT; break;
-                case GPOS_MT: aRectPoint = RP_MT; break;
-                case GPOS_RT: aRectPoint = RP_RT; break;
-                case GPOS_LM: aRectPoint = RP_LM; break;
-                case GPOS_MM: aRectPoint = RP_MM; break;
-                case GPOS_RM: aRectPoint = RP_RM; break;
-                case GPOS_LB: aRectPoint = RP_LB; break;
-                case GPOS_MB: aRectPoint = RP_MB; break;
-                case GPOS_RB: aRectPoint = RP_RB; break;
+                case GPOS_LT: aRectPoint = RectPoint::LT; break;
+                case GPOS_MT: aRectPoint = RectPoint::MT; break;
+                case GPOS_RT: aRectPoint = RectPoint::RT; break;
+                case GPOS_LM: aRectPoint = RectPoint::LM; break;
+                case GPOS_MM: aRectPoint = RectPoint::MM; break;
+                case GPOS_RM: aRectPoint = RectPoint::RM; break;
+                case GPOS_LB: aRectPoint = RectPoint::LB; break;
+                case GPOS_MB: aRectPoint = RectPoint::MB; break;
+                case GPOS_RB: aRectPoint = RectPoint::RB; break;
                 default: break; // GPOS_NONE, GPOS_AREA and GPOS_TILED already handled
             }
 
@@ -311,15 +311,15 @@ SvxBrushItem getSvxBrushItemFromSourceSet(const SfxItemSet& rSourceSet, sal_uInt
 
                 switch(rPosItem.GetValue())
                 {
-                    case RP_LT: aSvxGraphicPosition = GPOS_LT; break;
-                    case RP_MT: aSvxGraphicPosition = GPOS_MT; break;
-                    case RP_RT: aSvxGraphicPosition = GPOS_RT; break;
-                    case RP_LM: aSvxGraphicPosition = GPOS_LM; break;
-                    case RP_MM: aSvxGraphicPosition = GPOS_MM; break;
-                    case RP_RM: aSvxGraphicPosition = GPOS_RM; break;
-                    case RP_LB: aSvxGraphicPosition = GPOS_LB; break;
-                    case RP_MB: aSvxGraphicPosition = GPOS_MB; break;
-                    case RP_RB: aSvxGraphicPosition = GPOS_RB; break;
+                    case RectPoint::LT: aSvxGraphicPosition = GPOS_LT; break;
+                    case RectPoint::MT: aSvxGraphicPosition = GPOS_MT; break;
+                    case RectPoint::RT: aSvxGraphicPosition = GPOS_RT; break;
+                    case RectPoint::LM: aSvxGraphicPosition = GPOS_LM; break;
+                    case RectPoint::MM: aSvxGraphicPosition = GPOS_MM; break;
+                    case RectPoint::RM: aSvxGraphicPosition = GPOS_RM; break;
+                    case RectPoint::LB: aSvxGraphicPosition = GPOS_LB; break;
+                    case RectPoint::MB: aSvxGraphicPosition = GPOS_MB; break;
+                    case RectPoint::RB: aSvxGraphicPosition = GPOS_RB; break;
                 }
             }
 
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index ad53a7755bf8..6cba0981081f 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -557,7 +557,7 @@ void XFillBmpTileItem::dumpAsXml(xmlTextWriterPtr pWriter) const
 
 SfxPoolItem* XFillBmpPosItem::CreateDefault() {return new XFillBmpPosItem;}
 
-XFillBmpPosItem::XFillBmpPosItem( RECT_POINT eRP ) :
+XFillBmpPosItem::XFillBmpPosItem( RectPoint eRP ) :
     SfxEnumItem( XATTR_FILLBMP_POS, sal::static_int_cast< sal_uInt16 >( eRP ) )
 {
 }
@@ -598,7 +598,7 @@ void XFillBmpPosItem::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
     xmlTextWriterStartElement(pWriter, BAD_CAST("xFillBmpPosItem"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
-    xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(OString::number(GetValue()).getStr()));
+    xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(OString::number((int)GetValue()).getStr()));
     xmlTextWriterEndElement(pWriter);
 }