convert META_*_ACTION constants to scoped enum

Change-Id: I8ecfbfecd765a35fafcbcc5452b0d04a89be2459

4 files changed, 139 insertions, 133 deletions

diff --git a/include/test/mtfxmldump.hxx b/include/test/mtfxmldump.hxx
index 5c21765574f9..6fc24e61992e 100644
--- a/include/test/mtfxmldump.hxx
+++ b/include/test/mtfxmldump.hxx
@@ -15,13 +15,15 @@
 
 #include <libxml/tree.h>
 #include <vcl/gdimtf.hxx>
-#include <vector>
+#include <vcl/metaactiontypes.hxx>
+#include <o3tl/enumarray.hxx>
 
 class XmlWriter;
+enum class MetaActionType;
 
 class OOO_DLLPUBLIC_TEST MetafileXmlDump
 {
-    std::vector<bool> maFilter;
+    o3tl::enumarray<MetaActionType, bool> maFilter;
 
     void writeXml(const GDIMetaFile& rMetaFile, XmlWriter& rWriter);
 
@@ -29,7 +31,7 @@ public:
     MetafileXmlDump();
     virtual ~MetafileXmlDump();
 
-    void filterActionType(const sal_uInt16 nActionType, bool bShouldFilter);
+    void filterActionType(const MetaActionType nActionType, bool bShouldFilter);
     void filterAllActionTypes();
 
     /** The actual result that will be used for testing.
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index d75d5ec73d3b..9885498c3075 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -60,17 +60,17 @@ struct ImplMetaWriteData
 class VCL_DLLPUBLIC MetaAction
 {
 private:
-    sal_uLong               mnRefCount;
-    sal_uInt16              mnType;
+    sal_uLong            mnRefCount;
+    MetaActionType       mnType;
 
-    virtual bool    Compare( const MetaAction& ) const;
+    virtual bool         Compare( const MetaAction& ) const;
 
 protected:
     virtual             ~MetaAction();
 
 public:
                         MetaAction();
-    explicit            MetaAction( sal_uInt16 nType );
+    explicit            MetaAction( MetaActionType nType );
 
     virtual void        Execute( OutputDevice* pOut );
 
@@ -82,8 +82,8 @@ public:
     virtual void        Write( SvStream& rOStm, ImplMetaWriteData* pData );
     virtual void        Read( SvStream& rIStm, ImplMetaReadData* pData );
 
-    sal_uInt16              GetType() const { return mnType; }
-    sal_uLong               GetRefCount() const { return mnRefCount; }
+    MetaActionType      GetType() const { return mnType; }
+    sal_uLong           GetRefCount() const { return mnRefCount; }
     void                ResetRefCount() { mnRefCount = 1; }
     void                Duplicate()  { mnRefCount++; }
     void                Delete() { if ( 0 == --mnRefCount ) delete this; }
@@ -98,7 +98,7 @@ private:
     Point               maPt;
     Color               maColor;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaPixelAction();
@@ -124,7 +124,7 @@ class VCL_DLLPUBLIC MetaPointAction : public MetaAction
 private:
     Point               maPt;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaPointAction();
@@ -152,7 +152,7 @@ private:
     Point               maStartPt;
     Point               maEndPt;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaLineAction();
@@ -182,7 +182,7 @@ private:
 
     Rectangle           maRect;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 public:
                         MetaRectAction();
 protected:
@@ -209,7 +209,7 @@ private:
     sal_uInt32          mnHorzRound;
     sal_uInt32          mnVertRound;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaRoundRectAction();
@@ -238,7 +238,7 @@ private:
 
     Rectangle           maRect;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaEllipseAction();
@@ -266,7 +266,7 @@ private:
     Point               maStartPt;
     Point               maEndPt;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaArcAction();
@@ -297,7 +297,7 @@ private:
     Point               maStartPt;
     Point               maEndPt;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaPieAction();
@@ -328,7 +328,7 @@ private:
     Point               maStartPt;
     Point               maEndPt;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaChordAction();
@@ -358,7 +358,7 @@ private:
     LineInfo            maLineInfo;
     Polygon             maPoly;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaPolyLineAction();
@@ -386,7 +386,7 @@ private:
 
     Polygon             maPoly;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaPolygonAction();
@@ -412,7 +412,7 @@ private:
 
     tools::PolyPolygon  maPolyPoly;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaPolyPolygonAction();
@@ -441,7 +441,7 @@ private:
     sal_Int32       mnIndex;
     sal_Int32       mnLen;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaTextAction();
@@ -475,7 +475,7 @@ private:
     sal_Int32   mnIndex;
     sal_Int32   mnLen;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 protected:
     virtual             ~MetaTextArrayAction();
@@ -514,7 +514,7 @@ private:
     sal_Int32   mnIndex;
     sal_Int32   mnLen;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaStretchTextAction();
@@ -545,10 +545,10 @@ class VCL_DLLPUBLIC MetaTextRectAction : public MetaAction
 private:
 
     Rectangle           maRect;
-    OUString       maStr;
+    OUString            maStr;
     sal_uInt16          mnStyle;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaTextRectAction();
@@ -581,7 +581,7 @@ private:
     FontUnderline       meUnderline;
     FontUnderline       meOverline;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaTextLineAction();
@@ -614,7 +614,7 @@ private:
     Bitmap              maBmp;
     Point               maPt;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaBmpAction();
@@ -643,7 +643,7 @@ private:
     Point               maPt;
     Size                maSz;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaBmpScaleAction();
@@ -676,7 +676,7 @@ private:
     Point               maSrcPt;
     Size                maSrcSz;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaBmpScalePartAction();
@@ -709,7 +709,7 @@ private:
     BitmapEx            maBmpEx;
     Point               maPt;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaBmpExAction();
@@ -738,7 +738,7 @@ private:
     Point               maPt;
     Size                maSz;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaBmpExScaleAction();
@@ -771,7 +771,7 @@ private:
     Point               maSrcPt;
     Size                maSrcSz;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaBmpExScalePartAction();
@@ -805,7 +805,7 @@ private:
     Color               maColor;
     Point               maPt;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaMaskAction();
@@ -838,7 +838,7 @@ private:
     Point               maPt;
     Size                maSz;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaMaskScaleAction();
@@ -874,7 +874,7 @@ private:
     Point               maSrcPt;
     Size                maSrcSz;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaMaskScalePartAction();
@@ -909,7 +909,7 @@ private:
     Rectangle           maRect;
     Gradient            maGradient;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaGradientAction();
@@ -937,7 +937,7 @@ private:
     tools::PolyPolygon  maPolyPoly;
     Gradient            maGradient;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaGradientExAction();
@@ -965,7 +965,7 @@ private:
     tools::PolyPolygon  maPolyPoly;
     Hatch               maHatch;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaHatchAction();
@@ -993,7 +993,7 @@ private:
     Rectangle           maRect;
     Wallpaper           maWallpaper;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaWallpaperAction();
@@ -1019,10 +1019,10 @@ class VCL_DLLPUBLIC MetaClipRegionAction : public MetaAction
 {
 private:
 
-    vcl::Region              maRegion;
+    vcl::Region         maRegion;
     bool                mbClip;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaClipRegionAction();
@@ -1039,7 +1039,7 @@ public:
     virtual void        Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE;
     virtual void        Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE;
 
-    const vcl::Region&       GetRegion() const { return maRegion; }
+    const vcl::Region&  GetRegion() const { return maRegion; }
     bool                IsClipping() const { return mbClip; }
 };
 
@@ -1049,7 +1049,7 @@ private:
 
     Rectangle           maRect;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaISectRectClipRegionAction();
@@ -1073,9 +1073,9 @@ class VCL_DLLPUBLIC MetaISectRegionClipRegionAction : public MetaAction
 {
 private:
 
-    vcl::Region              maRegion;
+    vcl::Region          maRegion;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaISectRegionClipRegionAction();
@@ -1092,7 +1092,7 @@ public:
     virtual void        Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE;
     virtual void        Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE;
 
-    const vcl::Region&       GetRegion() const { return maRegion; }
+    const vcl::Region&  GetRegion() const { return maRegion; }
 };
 
 class VCL_DLLPUBLIC MetaMoveClipRegionAction : public MetaAction
@@ -1102,7 +1102,7 @@ private:
     long                mnHorzMove;
     long                mnVertMove;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaMoveClipRegionAction();
@@ -1129,7 +1129,7 @@ private:
     Color               maColor;
     bool                mbSet;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaLineColorAction();
@@ -1154,7 +1154,7 @@ private:
     Color               maColor;
     bool                mbSet;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaFillColorAction();
@@ -1178,7 +1178,7 @@ private:
 
     Color               maColor;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaTextColorAction();
@@ -1202,7 +1202,7 @@ private:
     Color               maColor;
     bool                mbSet;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaTextFillColorAction();
@@ -1227,7 +1227,7 @@ private:
     Color               maColor;
     bool                mbSet;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaTextLineColorAction();
@@ -1252,7 +1252,7 @@ private:
     Color               maColor;
     bool                mbSet;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaOverlineColorAction();
@@ -1276,7 +1276,7 @@ private:
 
     TextAlign           maAlign;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaTextAlignAction();
@@ -1299,7 +1299,7 @@ private:
 
     MapMode             maMapMode;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaMapModeAction();
@@ -1347,9 +1347,9 @@ class VCL_DLLPUBLIC MetaPushAction : public MetaAction
 {
 private:
 
-    PushFlags              mnFlags;
+    PushFlags           mnFlags;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaPushAction();
@@ -1386,7 +1386,7 @@ private:
 
     RasterOp            meRasterOp;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaRasterOpAction();
@@ -1407,10 +1407,10 @@ class VCL_DLLPUBLIC MetaTransparentAction : public MetaAction
 {
 private:
 
-    tools::PolyPolygon      maPolyPoly;
-    sal_uInt16              mnTransPercent;
+    tools::PolyPolygon  maPolyPoly;
+    sal_uInt16          mnTransPercent;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaTransparentAction();
@@ -1440,7 +1440,7 @@ private:
     Size                maSize;
     Gradient            maGradient;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaFloatTransparentAction();
@@ -1473,7 +1473,7 @@ private:
     Point               maPoint;
     Size                maSize;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaEPSAction();
@@ -1504,7 +1504,7 @@ private:
     Point               maRefPoint;
     bool                mbSet;
 
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaRefPointAction();
@@ -1526,7 +1526,7 @@ class VCL_DLLPUBLIC MetaCommentAction : public MetaAction
 {
 private:
 
-    OString        maComment;
+    OString             maComment;
     sal_Int32           mnValue;
     sal_uInt32          mnDataSize;
     sal_uInt8*          mpData;
@@ -1550,10 +1550,10 @@ public:
     virtual void        Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE;
     virtual void        Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE;
 
-    const OString& GetComment() const { return maComment; }
+    const OString&      GetComment() const { return maComment; }
     sal_Int32           GetValue() const { return mnValue; }
     sal_uInt32          GetDataSize() const { return mnDataSize; }
-    const sal_uInt8*        GetData() const { return mpData; }
+    const sal_uInt8*    GetData() const { return mpData; }
 };
 
 class VCL_DLLPUBLIC MetaLayoutModeAction : public MetaAction
@@ -1561,7 +1561,7 @@ class VCL_DLLPUBLIC MetaLayoutModeAction : public MetaAction
 private:
 
     ComplexTextLayoutMode  mnLayoutMode;
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaLayoutModeAction();
@@ -1583,7 +1583,7 @@ class VCL_DLLPUBLIC MetaTextLanguageAction : public MetaAction
 private:
 
     LanguageType        meTextLanguage;
-    virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
+    virtual bool        Compare( const MetaAction& ) const SAL_OVERRIDE;
 
 public:
                         MetaTextLanguageAction();
diff --git a/include/vcl/metaactiontypes.hxx b/include/vcl/metaactiontypes.hxx
index 63ce8c05e548..8fcdf1a99f0d 100644
--- a/include/vcl/metaactiontypes.hxx
+++ b/include/vcl/metaactiontypes.hxx
@@ -8,11 +8,11 @@
  *
  * This file incorporates work covered by the following license notice:
  *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   Licensed to the Apache Software Foundation = ASF, under one or more
  *   contributor license agreements. See the NOTICE file distributed
  *   with this work for additional information regarding copyright
  *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
+ *   License, Version 2.0 = the "License",; you may not use this file
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
@@ -20,61 +20,65 @@
 #ifndef INCLUDED_VCL_METAACTIONTYPES_HXX
 #define INCLUDED_VCL_METAACTIONTYPES_HXX
 
-#define META_NULL_ACTION                    (0)
-#define META_PIXEL_ACTION                   (100)
-#define META_POINT_ACTION                   (101)
-#define META_LINE_ACTION                    (102)
-#define META_RECT_ACTION                    (103)
-#define META_ROUNDRECT_ACTION               (104)
-#define META_ELLIPSE_ACTION                 (105)
-#define META_ARC_ACTION                     (106)
-#define META_PIE_ACTION                     (107)
-#define META_CHORD_ACTION                   (108)
-#define META_POLYLINE_ACTION                (109)
-#define META_POLYGON_ACTION                 (110)
-#define META_POLYPOLYGON_ACTION             (111)
-#define META_TEXT_ACTION                    (112)
-#define META_TEXTARRAY_ACTION               (113)
-#define META_STRETCHTEXT_ACTION             (114)
-#define META_TEXTRECT_ACTION                (115)
-#define META_BMP_ACTION                     (116)
-#define META_BMPSCALE_ACTION                (117)
-#define META_BMPSCALEPART_ACTION            (118)
-#define META_BMPEX_ACTION                   (119)
-#define META_BMPEXSCALE_ACTION              (120)
-#define META_BMPEXSCALEPART_ACTION          (121)
-#define META_MASK_ACTION                    (122)
-#define META_MASKSCALE_ACTION               (123)
-#define META_MASKSCALEPART_ACTION           (124)
-#define META_GRADIENT_ACTION                (125)
-#define META_HATCH_ACTION                   (126)
-#define META_WALLPAPER_ACTION               (127)
-#define META_CLIPREGION_ACTION              (128)
-#define META_ISECTRECTCLIPREGION_ACTION     (129)
-#define META_ISECTREGIONCLIPREGION_ACTION   (130)
-#define META_MOVECLIPREGION_ACTION          (131)
-#define META_LINECOLOR_ACTION               (132)
-#define META_FILLCOLOR_ACTION               (133)
-#define META_TEXTCOLOR_ACTION               (134)
-#define META_TEXTFILLCOLOR_ACTION           (135)
-#define META_TEXTALIGN_ACTION               (136)
-#define META_MAPMODE_ACTION                 (137)
-#define META_FONT_ACTION                    (138)
-#define META_PUSH_ACTION                    (139)
-#define META_POP_ACTION                     (140)
-#define META_RASTEROP_ACTION                (141)
-#define META_TRANSPARENT_ACTION             (142)
-#define META_EPS_ACTION                     (143)
-#define META_REFPOINT_ACTION                (144)
-#define META_TEXTLINECOLOR_ACTION           (145)
-#define META_TEXTLINE_ACTION                (146)
-#define META_FLOATTRANSPARENT_ACTION        (147)
-#define META_GRADIENTEX_ACTION              (148)
-#define META_LAYOUTMODE_ACTION              (149)
-#define META_TEXTLANGUAGE_ACTION            (150)
-#define META_OVERLINECOLOR_ACTION           (151)
+enum class MetaActionType
+{
+    NONE                    = 0,
+    PIXEL                   = 100,
+    POINT                   = 101,
+    LINE                    = 102,
+    RECT                    = 103,
+    ROUNDRECT               = 104,
+    ELLIPSE                 = 105,
+    ARC                     = 106,
+    PIE                     = 107,
+    CHORD                   = 108,
+    POLYLINE                = 109,
+    POLYGON                 = 110,
+    POLYPOLYGON             = 111,
+    TEXT                    = 112,
+    TEXTARRAY               = 113,
+    STRETCHTEXT             = 114,
+    TEXTRECT                = 115,
+    BMP                     = 116,
+    BMPSCALE                = 117,
+    BMPSCALEPART            = 118,
+    BMPEX                   = 119,
+    BMPEXSCALE              = 120,
+    BMPEXSCALEPART          = 121,
+    MASK                    = 122,
+    MASKSCALE               = 123,
+    MASKSCALEPART           = 124,
+    GRADIENT                = 125,
+    HATCH                   = 126,
+    WALLPAPER               = 127,
+    CLIPREGION              = 128,
+    ISECTRECTCLIPREGION     = 129,
+    ISECTREGIONCLIPREGION   = 130,
+    MOVECLIPREGION          = 131,
+    LINECOLOR               = 132,
+    FILLCOLOR               = 133,
+    TEXTCOLOR               = 134,
+    TEXTFILLCOLOR           = 135,
+    TEXTALIGN               = 136,
+    MAPMODE                 = 137,
+    FONT                    = 138,
+    PUSH                    = 139,
+    POP                     = 140,
+    RASTEROP                = 141,
+    TRANSPARENT             = 142,
+    EPS                     = 143,
+    REFPOINT                = 144,
+    TEXTLINECOLOR           = 145,
+    TEXTLINE                = 146,
+    FLOATTRANSPARENT        = 147,
+    GRADIENTEX              = 148,
+    LAYOUTMODE              = 149,
+    TEXTLANGUAGE            = 150,
+    OVERLINECOLOR           = 151,
 
-#define META_COMMENT_ACTION                 (512)
+    COMMENT                 = 512,
+    LAST                    = COMMENT
+};
 
 #endif // INCLUDED_VCL_METAACTIONTYPES_HXX
 
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index a5673eae558a..3d1b0dbaa9a2 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1318,7 +1318,7 @@ public:
                 const Point& rSrcPtPixel,
                 const Size& rSecSizePixel,
                 const Bitmap& rBitmap,
-                sal_uLong nAction = META_BMPSCALEPART_ACTION)
+                MetaActionType nAction = MetaActionType::BMPSCALEPART)
       */
     void                        DrawBitmap(
                                     const Point& rDestPt,
@@ -1331,7 +1331,7 @@ public:
                 const Point& rSrcPtPixel,
                 const Size& rSecSizePixel,
                 const Bitmap& rBitmap,
-                sal_uLong nAction = META_BMPSCALEPART_ACTION)
+                MetaActionType nAction = MetaActionType::BMPSCALEPART)
       */
     void                        DrawBitmap(
                                     const Point& rDestPt,
@@ -1344,7 +1344,7 @@ public:
                                     const Point& rSrcPtPixel,
                                     const Size& rSrcSizePixel,
                                     const Bitmap& rBitmap,
-                                    sal_uLong nAction = META_BMPSCALEPART_ACTION );
+                                    MetaActionType nAction = MetaActionType::BMPSCALEPART );
 
     /** @overload
         void DrawBitmapEx(
@@ -1353,7 +1353,7 @@ public:
                 const Point& rSrcPtPixel,
                 const Size& rSecSizePixel,
                 const BitmapEx& rBitmapEx,
-                sal_uLong nAction = META_BMPEXSCALEPART_ACTION)
+                MetaActionType nAction = MetaActionType::BMPEXSCALEPART)
      */
     void                        DrawBitmapEx(
                                     const Point& rDestPt,
@@ -1367,7 +1367,7 @@ public:
                 const Point& rSrcPtPixel,
                 const Size& rSecSizePixel,
                 const BitmapEx& rBitmapEx,
-                sal_uLong nAction = META_BMPEXSCALEPART_ACTION)
+                MetaActionType nAction = MetaActionType::BMPEXSCALEPART)
      */
     void                        DrawBitmapEx(
                                     const Point& rDestPt,
@@ -1380,7 +1380,7 @@ public:
                                     const Point& rSrcPtPixel,
                                     const Size& rSrcSizePixel,
                                     const BitmapEx& rBitmapEx,
-                                    sal_uLong nAction = META_BMPEXSCALEPART_ACTION );
+                                    MetaActionType nAction = MetaActionType::BMPEXSCALEPART );
 
     /** @overload
         virtual void DrawImage(
@@ -1603,7 +1603,7 @@ public:
     void                        DrawMask( const Point& rDestPt, const Size& rDestSize,
                                           const Point& rSrcPtPixel, const Size& rSrcSizePixel,
                                           const Bitmap& rBitmap, const Color& rMaskColor,
-                                          sal_uLong nAction );
+                                          MetaActionType nAction );
 
 protected: