diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-20 09:18:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-22 10:28:40 +0200 |
| commit | 699ba641dbbe34df33c4a811492370720a36144f (patch) | |
| tree | 56462d14b2b8b934529dc366def80f765ccb4a43 /include/svtools/grfmgr.hxx | |
| parent | 24724aad8e24d0ef3006934a0de3f4b3f9bcd884 (diff) | |
convert ADJUSTMENT_ flags to scoped enum
Change-Id: I2b3d50eb7cbc3abc4cdc7e94219852f678b45e13
Diffstat (limited to 'include/svtools/grfmgr.hxx')
| -rw-r--r-- | include/svtools/grfmgr.hxx | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 7527d804d120..b4913398d549 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -46,14 +46,20 @@ namespace o3tl #define GRFMGR_AUTOSWAPSTREAM_NONE reinterpret_cast<SvStream*>(sal_IntPtr(-1)) // Adjustment defines - -#define ADJUSTMENT_NONE 0x00000000UL -#define ADJUSTMENT_DRAWMODE 0x00000001UL -#define ADJUSTMENT_COLORS 0x00000002UL -#define ADJUSTMENT_MIRROR 0x00000004UL -#define ADJUSTMENT_ROTATE 0x00000008UL -#define ADJUSTMENT_TRANSPARENCY 0x00000010UL -#define ADJUSTMENT_ALL 0xFFFFFFFFUL +enum class GraphicAdjustmentFlags +{ + NONE = 0x00, + DRAWMODE = 0x01, + COLORS = 0x02, + MIRROR = 0x04, + ROTATE = 0x08, + TRANSPARENCY = 0x10, + ALL = 0x1f, +}; +namespace o3tl +{ + template<> struct typed_flags<GraphicAdjustmentFlags> : is_typed_flags<GraphicAdjustmentFlags, 0x1f> {}; +} enum GraphicDrawMode { @@ -566,17 +572,17 @@ private: static void SVT_DLLPRIVATE ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, - sal_uLong nAdjustmentFlags + GraphicAdjustmentFlags nAdjustmentFlags ); static void SVT_DLLPRIVATE ImplAdjust( GDIMetaFile& rMtf, const GraphicAttr& rAttr, - sal_uLong nAdjustmentFlags + GraphicAdjustmentFlags nAdjustmentFlags ); static void SVT_DLLPRIVATE ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr, - sal_uLong nAdjustmentFlags + GraphicAdjustmentFlags nAdjustmentFlags ); static void SVT_DLLPRIVATE ImplDraw( |