diff options
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/dlgctrl.hxx | 22 | ||||
| -rw-r--r-- | include/svx/rectenum.hxx | 12 | ||||
| -rw-r--r-- | include/svx/svxdlg.hxx | 2 | ||||
| -rw-r--r-- | include/svx/xflbmpit.hxx | 4 |
4 files changed, 24 insertions, 16 deletions
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index e32bfc1ffe29..21581ff4d844 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -47,7 +47,7 @@ public: : SfxTabPage(pParent, rID, rUIXMLDescription, &rAttrSet) { } - virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) = 0; + virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) = 0; }; /************************************************************************* @@ -86,7 +86,7 @@ protected: Point aPtLM, aPtMM, aPtRM; Point aPtLB, aPtMB, aPtRB; Point aPtNew; - RECT_POINT eRP, eDefRP; + RectPoint eRP, eDefRP; CTL_STYLE eCS; Bitmap* pBitmap; CTL_STATE m_nState; @@ -97,19 +97,19 @@ protected: void MarkToResetSettings(bool bUpdateForeground, bool bUpdateBackground); - RECT_POINT GetRPFromPoint( Point, bool bRTL = false ) const; - const Point& GetPointFromRP( RECT_POINT ) const; + RectPoint GetRPFromPoint( Point, bool bRTL = false ) const; + const Point& GetPointFromRP( RectPoint ) const; void SetFocusRect(); - Point SetActualRPWithoutInvalidate( RECT_POINT eNewRP ); // returns the last point + Point SetActualRPWithoutInvalidate( RectPoint eNewRP ); // returns the last point virtual void GetFocus() override; virtual void LoseFocus() override; Point GetApproxLogPtFromPixPt( const Point& rRoughPixelPoint ) const; public: - SvxRectCtl( vcl::Window* pParent, RECT_POINT eRpt = RP_MM, + SvxRectCtl( vcl::Window* pParent, RectPoint eRpt = RectPoint::MM, sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80 ); - void SetControlSettings(RECT_POINT eRpt = RP_MM, sal_uInt16 nBorder = 200, + void SetControlSettings(RectPoint eRpt = RectPoint::MM, sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80); virtual ~SvxRectCtl(); virtual void dispose() override; @@ -123,19 +123,19 @@ public: virtual Size GetOptimalSize() const override; void Reset(); - RECT_POINT GetActualRP() const { return eRP;} - void SetActualRP( RECT_POINT eNewRP ); + RectPoint GetActualRP() const { return eRP;} + void SetActualRP( RectPoint eNewRP ); void SetState( CTL_STATE nState ); sal_uInt8 GetNumOfChildren() const; // returns number of usable radio buttons Rectangle CalculateFocusRectangle() const; - Rectangle CalculateFocusRectangle( RECT_POINT eRectPoint ) const; + Rectangle CalculateFocusRectangle( RectPoint eRectPoint ) const; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; - RECT_POINT GetApproxRPFromPixPt( const css::awt::Point& rPixelPoint ) const; + RectPoint GetApproxRPFromPixPt( const css::awt::Point& rPixelPoint ) const; bool IsCompletelyDisabled() const { return mbCompleteDisable; } void DoCompletelyDisable(bool bNew); diff --git a/include/svx/rectenum.hxx b/include/svx/rectenum.hxx index 9ca2e6546d9c..817df20ef8d9 100644 --- a/include/svx/rectenum.hxx +++ b/include/svx/rectenum.hxx @@ -21,9 +21,17 @@ // enum ------------------------------------------------------------------ -enum RECT_POINT +enum class RectPoint { - RP_LT, RP_MT, RP_RT, RP_LM, RP_MM, RP_RM, RP_LB, RP_MB, RP_RB + LT, // top left + MT, // top center + RT, // top right + LM, // left center + MM, // center + RM, // right center + LB, // bottom left + MB, // bottom center + RB // bottom right }; enum class CTL_STYLE diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index f3a21ca0f8d9..7cd86f74d2d0 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -362,7 +362,7 @@ public: const Link<FmSearchContext&,sal_uInt32>& lnkContextSupplier)=0; virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(vcl::Window* pParent, const Graphic& rGraphic, - RECT_POINT eLightSource)=0; + RectPoint eLightSource)=0; virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nCount)=0; diff --git a/include/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx index 280f40c9b618..df73cb4b4410 100644 --- a/include/svx/xflbmpit.hxx +++ b/include/svx/xflbmpit.hxx @@ -28,7 +28,7 @@ class SVX_DLLPUBLIC XFillBmpPosItem : public SfxEnumItem { public: static SfxPoolItem* CreateDefault(); - XFillBmpPosItem( RECT_POINT eRP = RP_MM ); + XFillBmpPosItem( RectPoint eRP = RectPoint::MM ); SVX_DLLPRIVATE XFillBmpPosItem( SvStream& rIn ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; @@ -40,7 +40,7 @@ public: OUString &rText, const IntlWrapper * = nullptr ) const override; SVX_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override; - SVX_DLLPRIVATE RECT_POINT GetValue() const { return (RECT_POINT) SfxEnumItem::GetValue(); } + SVX_DLLPRIVATE RectPoint GetValue() const { return (RectPoint) SfxEnumItem::GetValue(); } void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; |