diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-24 15:06:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-29 10:41:40 +0200 |
| commit | 2a6806a81b3fd9218af18c685b2ede36a86956f6 (patch) | |
| tree | a99801054274dbda906b1a46908e3467671554d3 /include/svx | |
| parent | 62f9bc737c928ceed89af09ff927c92bea4896ca (diff) | |
convert SDRSNAP_ constants to scoped enum
Change-Id: Ida0b0e3f017c53588ea9208d078c24948a63eb92
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/svddrgmt.hxx | 2 | ||||
| -rw-r--r-- | include/svx/svdsnpv.hxx | 23 |
2 files changed, 17 insertions, 8 deletions
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index 0e4603d649ea..530517a3f12d 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -169,7 +169,7 @@ protected: const Rectangle& GetDragLimitRect() { return getSdrDragView().aDragLimit; } const SdrMarkList& GetMarkedObjectList() { return getSdrDragView().GetMarkedObjectList(); } Point GetSnapPos(const Point& rPt) const { return getSdrDragView().GetSnapPos(rPt,getSdrDragView().pMarkedPV); } - sal_uInt16 SnapPos(Point& rPt) const { return getSdrDragView().SnapPos(rPt,getSdrDragView().pMarkedPV); } + SdrSnap SnapPos(Point& rPt) const { return getSdrDragView().SnapPos(rPt,getSdrDragView().pMarkedPV); } inline const Rectangle& GetMarkedRect() const; SdrPageView* GetDragPV() const; SdrObject* GetDragObj() const; diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx index 66d630263330..8f2eeea7e102 100644 --- a/include/svx/svdsnpv.hxx +++ b/include/svx/svdsnpv.hxx @@ -23,12 +23,21 @@ #include <svx/svdpntv.hxx> #include <svx/svdhlpln.hxx> #include <svx/svxdllapi.h> +#include <o3tl/typed_flags_set.hxx> -#define SDRSNAP_NOTSNAPPED 0x0000 -#define SDRSNAP_XSNAPPED 0x0001 -#define SDRSNAP_YSNAPPED 0x0002 -#define SDRSNAP_XYSNAPPED 0x0003 +/** return value for SnapPos() method */ +enum class SdrSnap +{ + NOTSNAPPED = 0x00, + XSNAPPED = 0x01, + YSNAPPED = 0x02, + XYSNAPPED = XSNAPPED | YSNAPPED, +}; +namespace o3tl +{ + template<> struct typed_flags<SdrSnap> : is_typed_flags<SdrSnap, 3> {}; +} // SDRCROOK_STRETCH is not implemented yet! enum SdrCrookMode { @@ -112,9 +121,9 @@ public: void SetActualWin(const OutputDevice* pWin) { SdrPaintView::SetActualWin(pWin); if (pWin!=NULL) RecalcLogicSnapMagnetic(*pWin); } // Coordinates referred to the view! - // Returnvalues are SDRSNAP_NOTSNAPPED,SDRSNAP_XSNAPPED, - // SDRSNAP_YSNAPPED or SDRSNAP_XYSNAPPED - sal_uInt16 SnapPos(Point& rPnt, const SdrPageView* pPV) const; + // Returnvalues are SdrSnap::NOTSNAPPED,SdrSnap::XSNAPPED, + // SdrSnap::YSNAPPED or SdrSnap::XYSNAPPED + SdrSnap SnapPos(Point& rPnt, const SdrPageView* pPV) const; Point GetSnapPos(const Point& rPnt, const SdrPageView* pPV) const; void CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBestXSnap, long& nBestYSnap, bool& bXSnapped, bool& bYSnapped) const; |