diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-24 14:53:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-29 10:41:40 +0200 |
| commit | 336ace7cf0a1b5abf7a56983ed1a7510f9b0d231 (patch) | |
| tree | ba7a2f36aa1baa5ac243788e944ed4d859386ce1 /include | |
| parent | 45ba5f2f24791ab659111527a8350df4898b0e0c (diff) | |
convert CUSTOMSHAPE_HANDLE_ constants to scoped enum
Change-Id: I4cbbf9d2e42ef5e361449fff8bc9280ac337720e
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/svdoashp.hxx | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index 4194b2d62191..261b8f62bb8c 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -28,6 +28,7 @@ #include <com/sun/star/drawing/XCustomShapeEngine.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> #include <svx/svxdllapi.h> +#include <o3tl/typed_flags_set.hxx> // Initial Declarations @@ -57,18 +58,26 @@ class SdrAShapeObjGeoData : public SdrTextObjGeoData aAdjustmentSeq; }; -#define CUSTOMSHAPE_HANDLE_RESIZE_FIXED 1 -#define CUSTOMSHAPE_HANDLE_CREATE_FIXED 2 -#define CUSTOMSHAPE_HANDLE_RESIZE_ABSOLUTE_X 4 -#define CUSTOMSHAPE_HANDLE_RESIZE_ABSOLUTE_Y 8 -#define CUSTOMSHAPE_HANDLE_MOVE_SHAPE 16 -#define CUSTOMSHAPE_HANDLE_ORTHO4 32 +enum class CustomShapeHandleModes +{ + NONE = 0, + RESIZE_FIXED = 1, + CREATE_FIXED = 2, + RESIZE_ABSOLUTE_X = 4, + RESIZE_ABSOLUTE_Y = 8, + MOVE_SHAPE = 16, + ORTHO4 = 32, +}; +namespace o3tl +{ + template<> struct typed_flags<CustomShapeHandleModes> : is_typed_flags<CustomShapeHandleModes, 63> {}; +} struct SdrCustomShapeInteraction { com::sun::star::uno::Reference< com::sun::star::drawing::XCustomShapeHandle > xInteraction; com::sun::star::awt::Point aPosition; - sal_Int32 nMode; + CustomShapeHandleModes nMode; }; |