diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2017-03-09 13:08:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-13 08:38:33 +0000 |
| commit | 7c0e3d0b37131b12262d0f610505b3384923c4a1 (patch) | |
| tree | 572046e375af0e25864ff2e155a0fa0226bd4ca7 /include | |
| parent | 25ea809f5b4548ff887aa4bb10bbf7b2fe86aedb (diff) | |
convert GraphicDrawMode to scoped enum
Change-Id: I18eec89c4e1ebb86d64297e7cef4b36bf12df59f
Reviewed-on: https://gerrit.libreoffice.org/35004
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/grfmgr.hxx | 12 | ||||
| -rw-r--r-- | include/svx/sdgmoitm.hxx | 5 |
2 files changed, 7 insertions, 10 deletions
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 60be20134dc3..f85a175a314a 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -63,12 +63,12 @@ namespace o3tl template<> struct typed_flags<GraphicAdjustmentFlags> : is_typed_flags<GraphicAdjustmentFlags, 0x1f> {}; } -enum GraphicDrawMode +enum class GraphicDrawMode { - GRAPHICDRAWMODE_STANDARD = 0, - GRAPHICDRAWMODE_GREYS = 1, - GRAPHICDRAWMODE_MONO = 2, - GRAPHICDRAWMODE_WATERMARK = 3 + Standard = 0, + Greys = 1, + Mono = 2, + Watermark = 3 }; class GraphicManager; @@ -149,7 +149,7 @@ public: void SetTransparency( sal_uInt8 cTransparency ) { mcTransparency = cTransparency; } sal_uInt8 GetTransparency() const { return mcTransparency; } - bool IsSpecialDrawMode() const { return( meDrawMode != GRAPHICDRAWMODE_STANDARD ); } + bool IsSpecialDrawMode() const { return( meDrawMode != GraphicDrawMode::Standard ); } bool IsMirrored() const { return mnMirrFlags != BmpMirrorFlags::NONE; } bool IsCropped() const { diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx index 3d38fb107a17..2ff3c6e0fcc9 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -26,13 +26,10 @@ #include <svx/svxdllapi.h> -// SdrGrafModeItem - - - class SVX_DLLPUBLIC SdrGrafModeItem : public SfxEnumItem<GraphicDrawMode> { public: - SdrGrafModeItem( GraphicDrawMode eMode = GRAPHICDRAWMODE_STANDARD ) : SfxEnumItem( SDRATTR_GRAFMODE, eMode ) {} + SdrGrafModeItem( GraphicDrawMode eMode = GraphicDrawMode::Standard ) : SfxEnumItem( SDRATTR_GRAFMODE, eMode ) {} SdrGrafModeItem( SvStream& rIn ) : SfxEnumItem( SDRATTR_GRAFMODE, rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; |