convert META_*_ACTION constants to scoped enum

Change-Id: I8ecfbfecd765a35fafcbcc5452b0d04a89be2459

3 files changed, 187 insertions, 179 deletions

diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index ef7b1307e1bf..903973e1cbf0 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -315,25 +315,26 @@ void METWriter::CountActionsAndBitmaps(const GDIMetaFile * pMTF)
 
         switch (pMA->GetType())
         {
-            case META_EPS_ACTION :
+            case MetaActionType::EPS :
             {
                 const GDIMetaFile aGDIMetaFile( static_cast<const MetaEPSAction*>(pMA)->GetSubstitute() );
                 size_t nCount = aGDIMetaFile.GetActionSize();
                 size_t i;
                 for ( i = 0; i < nCount; i++ )
-                    if ( ((const MetaAction*)aGDIMetaFile.GetAction( i ))->GetType() == META_BMPSCALE_ACTION )
+                    if ( ((const MetaAction*)aGDIMetaFile.GetAction( i ))->GetType() == MetaActionType::BMPSCALE )
                         break;
                 if ( i == nCount)
                     break;
             }
-            case META_BMP_ACTION:
-            case META_BMPSCALE_ACTION:
-            case META_BMPSCALEPART_ACTION:
-            case META_BMPEX_ACTION:
-            case META_BMPEXSCALE_ACTION:
-            case META_BMPEXSCALEPART_ACTION:
+            case MetaActionType::BMP:
+            case MetaActionType::BMPSCALE:
+            case MetaActionType::BMPSCALEPART:
+            case MetaActionType::BMPEX:
+            case MetaActionType::BMPEXSCALE:
+            case MetaActionType::BMPEXSCALEPART:
                 nNumberOfBitmaps++;
             break;
+            default: break;
         }
         nNumberOfActions++;
     }
@@ -409,12 +410,13 @@ void METWriter::CreateChrSets(const GDIMetaFile * pMTF)
 
         switch (pMA->GetType())
         {
-            case META_FONT_ACTION:
+            case MetaActionType::FONT:
             {
                 const MetaFontAction* pA = static_cast<const MetaFontAction*>(pMA);
                 CreateChrSet( pA->GetFont() );
             }
             break;
+            default: break;
         }
     }
 }
@@ -741,49 +743,49 @@ void METWriter::WriteImageObjects(const GDIMetaFile * pMTF)
 
         switch (pMA->GetType())
         {
-            case META_BMP_ACTION:
+            case MetaActionType::BMP:
             {
                 METSetMix( eGDIRasterOp );
                 WriteImageObject( static_cast<const MetaBmpAction*>(pMA)->GetBitmap() );
             }
             break;
 
-            case META_BMPSCALE_ACTION:
+            case MetaActionType::BMPSCALE:
             {
                 METSetMix( eGDIRasterOp );
                 WriteImageObject( static_cast<const MetaBmpScaleAction*>(pMA)->GetBitmap() );
             }
             break;
 
-            case META_BMPSCALEPART_ACTION:
+            case MetaActionType::BMPSCALEPART:
             {
                 METSetMix( eGDIRasterOp );
                 WriteImageObject( static_cast<const MetaBmpScalePartAction*>(pMA)->GetBitmap() );
             }
             break;
 
-            case META_BMPEX_ACTION:
+            case MetaActionType::BMPEX:
             {
                 METSetMix( eGDIRasterOp );
                 WriteImageObject( Graphic( static_cast<const MetaBmpExAction*>(pMA)->GetBitmapEx() ).GetBitmap() );
             }
             break;
 
-            case META_BMPEXSCALE_ACTION:
+            case MetaActionType::BMPEXSCALE:
             {
                 METSetMix( eGDIRasterOp );
                 WriteImageObject( Graphic( static_cast<const MetaBmpExScaleAction*>(pMA)->GetBitmapEx() ).GetBitmap() );
             }
             break;
 
-            case META_BMPEXSCALEPART_ACTION:
+            case MetaActionType::BMPEXSCALEPART:
             {
                 METSetMix( eGDIRasterOp );
                 WriteImageObject( Graphic( static_cast<const MetaBmpExScalePartAction*>(pMA)->GetBitmapEx() ).GetBitmap() );
             }
             break;
 
-            case META_EPS_ACTION :
+            case MetaActionType::EPS :
             {
                 const MetaEPSAction* pA = static_cast<const MetaEPSAction*>(pMA);
                 const GDIMetaFile aGDIMetaFile( pA->GetSubstitute() );
@@ -792,7 +794,7 @@ void METWriter::WriteImageObjects(const GDIMetaFile * pMTF)
                 for ( size_t i = 0; i < nCount; i++ )
                 {
                     const MetaAction* pMetaAct = aGDIMetaFile.GetAction( i );
-                    if ( pMetaAct->GetType() == META_BMPSCALE_ACTION )
+                    if ( pMetaAct->GetType() == MetaActionType::BMPSCALE )
                     {
                         const MetaBmpScaleAction* pBmpScaleAction = static_cast<const MetaBmpScaleAction*>(pMetaAct);
                         METSetMix( eGDIRasterOp );
@@ -802,6 +804,7 @@ void METWriter::WriteImageObjects(const GDIMetaFile * pMTF)
                 }
             }
             break;
+            default: break;
         }
 
         if (!bStatus)
@@ -1492,7 +1495,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
 
         switch (pMA->GetType())
         {
-            case META_PIXEL_ACTION:
+            case MetaActionType::PIXEL:
             {
                 const MetaPixelAction* pA = static_cast<const MetaPixelAction*>(pMA);
                 METSetMix( eGDIRasterOp );
@@ -1501,7 +1504,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_POINT_ACTION:
+            case MetaActionType::POINT:
             {
                 const MetaPointAction* pA = static_cast<const MetaPointAction*>(pMA);
 
@@ -1514,7 +1517,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_LINE_ACTION:
+            case MetaActionType::LINE:
             {
                 const MetaLineAction* pA = static_cast<const MetaLineAction*>(pMA);
 
@@ -1537,7 +1540,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_RECT_ACTION:
+            case MetaActionType::RECT:
             {
                 const MetaRectAction* pA = static_cast<const MetaRectAction*>(pMA);
 
@@ -1558,7 +1561,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_ROUNDRECT_ACTION:
+            case MetaActionType::ROUNDRECT:
             {
                 const MetaRoundRectAction* pA = static_cast<const MetaRoundRectAction*>(pMA);
 
@@ -1579,7 +1582,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_ELLIPSE_ACTION:
+            case MetaActionType::ELLIPSE:
             {
                 const MetaEllipseAction*    pA = static_cast<const MetaEllipseAction*>(pMA);
                 Point                       aCenter;
@@ -1608,7 +1611,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_ARC_ACTION:
+            case MetaActionType::ARC:
             {
                 const MetaArcAction*    pA = static_cast<const MetaArcAction*>(pMA);
                 Point                   aStartPos,aCenter;
@@ -1645,7 +1648,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_PIE_ACTION:
+            case MetaActionType::PIE:
             {
                 const MetaPieAction*    pA = static_cast<const MetaPieAction*>(pMA);
                 Point                   aCenter;
@@ -1695,7 +1698,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_CHORD_ACTION:
+            case MetaActionType::CHORD:
             {
                 const MetaChordAction*  pA = static_cast<const MetaChordAction*>(pMA);
                 Point                   aStartPos,aCenter;
@@ -1745,7 +1748,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_POLYLINE_ACTION:
+            case MetaActionType::POLYLINE:
             {
                 const MetaPolyLineAction* pA = static_cast<const MetaPolyLineAction*>(pMA);
 
@@ -1774,7 +1777,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_POLYGON_ACTION:
+            case MetaActionType::POLYGON:
             {
                 const MetaPolygonAction* pA = static_cast<const MetaPolygonAction*>(pMA);
                 Polygon aSimplePoly;
@@ -1806,7 +1809,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_POLYPOLYGON_ACTION:
+            case MetaActionType::POLYPOLYGON:
             {
                 const MetaPolyPolygonAction* pA = static_cast<const MetaPolyPolygonAction*>(pMA);
 
@@ -1844,7 +1847,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_TEXT_ACTION:
+            case MetaActionType::TEXT:
             {
                 const MetaTextAction*   pA = static_cast<const MetaTextAction*>(pMA);
                 Point                   aPt( pA->GetPoint() );
@@ -1869,7 +1872,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_TEXTARRAY_ACTION:
+            case MetaActionType::TEXTARRAY:
             {
                 const MetaTextArrayAction*  pA = static_cast<const MetaTextArrayAction*>(pMA);
                 sal_uInt16                  i;
@@ -1920,7 +1923,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_STRETCHTEXT_ACTION:
+            case MetaActionType::STRETCHTEXT:
             {
                 const MetaStretchTextAction*    pA = static_cast<const MetaStretchTextAction*>(pMA);
                 ScopedVclPtrInstance< VirtualDevice > pVDev;
@@ -1970,13 +1973,13 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_TEXTRECT_ACTION:
+            case MetaActionType::TEXTRECT:
             {
-//              OSL_FAIL( "Unsupported MET-Action: META_TEXTRECT_ACTION!" );
+//              OSL_FAIL( "Unsupported MET-Action: MetaActionType::TEXTRECT!" );
             }
             break;
 
-            case META_BMP_ACTION:
+            case MetaActionType::BMP:
             {
                 const MetaBmpAction*    pA = static_cast<const MetaBmpAction*>(pMA);
                 const Size              aSizePixel( pA->GetBitmap().GetSizePixel() );
@@ -1986,7 +1989,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_BMPSCALE_ACTION:
+            case MetaActionType::BMPSCALE:
             {
                 const MetaBmpScaleAction* pA = static_cast<const MetaBmpScaleAction*>(pMA);
 
@@ -1995,7 +1998,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_BMPSCALEPART_ACTION:
+            case MetaActionType::BMPSCALEPART:
             {
                 const MetaBmpScalePartAction*   pA = static_cast<const MetaBmpScalePartAction*>(pMA);
                 Bitmap                          aTmp( pA->GetBitmap() );
@@ -2006,7 +2009,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_BMPEX_ACTION:
+            case MetaActionType::BMPEX:
             {
                 const MetaBmpExAction*  pA = static_cast<const MetaBmpExAction*>(pMA);
                 const Size              aSizePixel( pA->GetBitmapEx().GetSizePixel() );
@@ -2016,7 +2019,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_BMPEXSCALE_ACTION:
+            case MetaActionType::BMPEXSCALE:
             {
                 const MetaBmpExScaleAction* pA = static_cast<const MetaBmpExScaleAction*>(pMA);
                 const Size                  aSizePixel( pA->GetBitmapEx().GetSizePixel() );
@@ -2026,7 +2029,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_BMPEXSCALEPART_ACTION:
+            case MetaActionType::BMPEXSCALEPART:
             {
                 const MetaBmpExScalePartAction* pA = static_cast<const MetaBmpExScalePartAction*>(pMA);
                 Bitmap                          aTmp( Graphic( pA->GetBitmapEx() ).GetBitmap() );
@@ -2037,7 +2040,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_EPS_ACTION :
+            case MetaActionType::EPS :
             {
                 const MetaEPSAction* pA = static_cast<const MetaEPSAction*>(pMA);
                 const GDIMetaFile aGDIMetaFile( pA->GetSubstitute() );
@@ -2046,7 +2049,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
                 for ( size_t i = 0; i < nCount; i++ )
                 {
                     const MetaAction* pMetaAct = aGDIMetaFile.GetAction( i );
-                    if ( pMetaAct->GetType() == META_BMPSCALE_ACTION )
+                    if ( pMetaAct->GetType() == MetaActionType::BMPSCALE )
                     {
                         const MetaBmpScaleAction* pBmpScaleAction = static_cast<const MetaBmpScaleAction*>(pMetaAct);
                         METSetMix(eGDIRasterOp);
@@ -2057,16 +2060,16 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_MASK_ACTION:
+            case MetaActionType::MASK:
             break;
 
-            case META_MASKSCALE_ACTION:
+            case MetaActionType::MASKSCALE:
             break;
 
-            case META_MASKSCALEPART_ACTION:
+            case MetaActionType::MASKSCALEPART:
             break;
 
-            case META_GRADIENT_ACTION:
+            case MetaActionType::GRADIENT:
             {
                 ScopedVclPtrInstance< VirtualDevice > pVDev;
                 GDIMetaFile                 aTmpMtf;
@@ -2078,7 +2081,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_HATCH_ACTION:
+            case MetaActionType::HATCH:
             {
                 ScopedVclPtrInstance< VirtualDevice > pVDev;
                 GDIMetaFile             aTmpMtf;
@@ -2090,26 +2093,26 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_WALLPAPER_ACTION:
+            case MetaActionType::WALLPAPER:
             break;
 
-            case META_CLIPREGION_ACTION:
+            case MetaActionType::CLIPREGION:
             break;
 
-            case META_ISECTRECTCLIPREGION_ACTION:
+            case MetaActionType::ISECTRECTCLIPREGION:
             {
                 const MetaISectRectClipRegionAction* pA = static_cast<const MetaISectRectClipRegionAction*>(pMA);
                 WriteClipRect( pA->GetRect() );
             }
             break;
 
-            case META_ISECTREGIONCLIPREGION_ACTION:
+            case MetaActionType::ISECTREGIONCLIPREGION:
             break;
 
-            case META_MOVECLIPREGION_ACTION:
+            case MetaActionType::MOVECLIPREGION:
             break;
 
-            case META_LINECOLOR_ACTION:
+            case MetaActionType::LINECOLOR:
             {
                 const MetaLineColorAction* pA = static_cast<const MetaLineColorAction*>(pMA);
 
@@ -2120,7 +2123,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_FILLCOLOR_ACTION:
+            case MetaActionType::FILLCOLOR:
             {
                 const MetaFillColorAction* pA = static_cast<const MetaFillColorAction*>(pMA);
 
@@ -2131,14 +2134,14 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_TEXTCOLOR_ACTION:
+            case MetaActionType::TEXTCOLOR:
             {
                 const MetaTextColorAction* pA = static_cast<const MetaTextColorAction*>(pMA);
                 aGDIFont.SetColor( pA->GetColor() );
             }
             break;
 
-            case META_TEXTFILLCOLOR_ACTION:
+            case MetaActionType::TEXTFILLCOLOR:
             {
                 const MetaTextFillColorAction* pA = static_cast<const MetaTextFillColorAction*>(pMA);
 
@@ -2149,10 +2152,10 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_TEXTALIGN_ACTION:
+            case MetaActionType::TEXTALIGN:
             break;
 
-            case META_MAPMODE_ACTION:
+            case MetaActionType::MAPMODE:
             {
                 const MetaMapModeAction* pA = static_cast<const MetaMapModeAction*>(pMA);
 
@@ -2219,13 +2222,13 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_FONT_ACTION:
+            case MetaActionType::FONT:
             {
                 aGDIFont = static_cast<const MetaFontAction*>(pMA)->GetFont();
             }
             break;
 
-            case META_PUSH_ACTION:
+            case MetaActionType::PUSH:
             {
                 METGDIStackMember* pGS = new METGDIStackMember;
 
@@ -2239,7 +2242,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_POP_ACTION:
+            case MetaActionType::POP:
             {
                 METGDIStackMember* pGS;
 
@@ -2258,13 +2261,13 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_RASTEROP_ACTION:
+            case MetaActionType::RASTEROP:
             {
                 eGDIRasterOp = static_cast<const MetaRasterOpAction*>(pMA)->GetRasterOp();
             }
             break;
 
-            case META_TRANSPARENT_ACTION:
+            case MetaActionType::TRANSPARENT:
             {
                 if( aGDIFillColor != Color( COL_TRANSPARENT ) )
                 {
@@ -2289,7 +2292,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
             }
             break;
 
-            case META_FLOATTRANSPARENT_ACTION:
+            case MetaActionType::FLOATTRANSPARENT:
             {
                 const MetaFloatTransparentAction* pA = static_cast<const MetaFloatTransparentAction*>(pMA);
 
@@ -2316,6 +2319,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
                 WriteOrders( &aTmpMtf );
             }
             break;
+            default: break;
       }
 
       nWrittenActions++;
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index 9bf395375689..9a9ea84f4451 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -204,14 +204,15 @@ void PictWriter::CountActionsAndBitmaps(const GDIMetaFile & rMTF)
 
         switch( pMA->GetType() )
         {
-            case META_BMP_ACTION:
-            case META_BMPSCALE_ACTION:
-            case META_BMPSCALEPART_ACTION:
-            case META_BMPEX_ACTION:
-            case META_BMPEXSCALE_ACTION:
-            case META_BMPEXSCALEPART_ACTION:
+            case MetaActionType::BMP:
+            case MetaActionType::BMPSCALE:
+            case MetaActionType::BMPSCALEPART:
+            case MetaActionType::BMPEX:
+            case MetaActionType::BMPEXSCALE:
+            case MetaActionType::BMPEXSCALEPART:
                 nNumberOfBitmaps++;
             break;
+            default: break;
         }
 
         nNumberOfActions++;
@@ -1405,7 +1406,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
 
         switch (pMA->GetType())
         {
-            case META_PIXEL_ACTION:
+            case MetaActionType::PIXEL:
             {
                 const MetaPixelAction* pA = static_cast<const MetaPixelAction*>(pMA);
                 WriteOpcode_PnMode(eSrcRasterOp);
@@ -1416,7 +1417,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_POINT_ACTION:
+            case MetaActionType::POINT:
             {
                 const MetaPointAction* pA = static_cast<const MetaPointAction*>(pMA);
 
@@ -1428,7 +1429,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_LINE_ACTION:
+            case MetaActionType::LINE:
             {
                 const MetaLineAction* pA = static_cast<const MetaLineAction*>(pMA);
 
@@ -1451,7 +1452,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
                 break;
             }
 
-            case META_RECT_ACTION:
+            case MetaActionType::RECT:
             {
                 const MetaRectAction* pA = static_cast<const MetaRectAction*>(pMA);
 
@@ -1473,7 +1474,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_ROUNDRECT_ACTION:
+            case MetaActionType::ROUNDRECT:
             {
                 const MetaRoundRectAction* pA = static_cast<const MetaRoundRectAction*>(pMA);
 
@@ -1497,7 +1498,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_ELLIPSE_ACTION:
+            case MetaActionType::ELLIPSE:
             {
                 const MetaEllipseAction* pA = static_cast<const MetaEllipseAction*>(pMA);
 
@@ -1519,7 +1520,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_ARC_ACTION:
+            case MetaActionType::ARC:
             {
                 const MetaArcAction* pA = static_cast<const MetaArcAction*>(pMA);
 
@@ -1531,7 +1532,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_PIE_ACTION:
+            case MetaActionType::PIE:
             {
                 const MetaPieAction* pA = static_cast<const MetaPieAction *>(pMA);
 
@@ -1585,13 +1586,13 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_CHORD_ACTION:
+            case MetaActionType::CHORD:
             {
-                // OSL_FAIL( "Unsupported PICT-Action: META_CHORD_ACTION!" );
+                // OSL_FAIL( "Unsupported PICT-Action: MetaActionType::CHORD!" );
             }
             break;
 
-            case META_POLYLINE_ACTION:
+            case MetaActionType::POLYLINE:
             {
                 const MetaPolyLineAction* pA = static_cast<const MetaPolyLineAction*>(pMA);
 
@@ -1634,7 +1635,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_POLYGON_ACTION:
+            case MetaActionType::POLYGON:
             {
                 const MetaPolygonAction* pA = static_cast<const MetaPolygonAction*>(pMA);
 
@@ -1659,7 +1660,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_POLYPOLYGON_ACTION:
+            case MetaActionType::POLYPOLYGON:
             {
                 const MetaPolyPolygonAction* pA = static_cast<const MetaPolyPolygonAction*>(pMA);
 
@@ -1692,7 +1693,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_TEXT_ACTION:
+            case MetaActionType::TEXT:
             {
                 const MetaTextAction*   pA = static_cast<const MetaTextAction*>(pMA);
                 Point                   aPt( pA->GetPoint() );
@@ -1712,7 +1713,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_TEXTARRAY_ACTION:
+            case MetaActionType::TEXTARRAY:
             {
                 const MetaTextArrayAction*  pA = static_cast<const MetaTextArrayAction*>(pMA);
                 Point                       aPt( pA->GetPoint() );
@@ -1732,7 +1733,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
                 break;
             }
 
-            case META_STRETCHTEXT_ACTION:
+            case MetaActionType::STRETCHTEXT:
             {
                 const MetaStretchTextAction*    pA = static_cast<const MetaStretchTextAction*>(pMA);
                 Point                           aPt( pA->GetPoint() );
@@ -1763,13 +1764,13 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_TEXTRECT_ACTION:
+            case MetaActionType::TEXTRECT:
             {
-                // OSL_FAIL( "Unsupported PICT-Action: META_TEXTRECT_ACTION!" );
+                // OSL_FAIL( "Unsupported PICT-Action: MetaActionType::TEXTRECT!" );
             }
             break;
 
-            case META_BMP_ACTION:
+            case MetaActionType::BMP:
             {
                 const MetaBmpAction*    pA = static_cast<const MetaBmpAction*>(pMA);
                 const Bitmap            aBmp( pA->GetBitmap() );
@@ -1779,14 +1780,14 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_BMPSCALE_ACTION:
+            case MetaActionType::BMPSCALE:
             {
                 const MetaBmpScaleAction* pA = static_cast<const MetaBmpScaleAction*>(pMA);
                 WriteOpcode_BitsRect( pA->GetPoint(), pA->GetSize(), pA->GetBitmap() );
             }
             break;
 
-            case META_BMPSCALEPART_ACTION:
+            case MetaActionType::BMPSCALEPART:
             {
                 const MetaBmpScalePartAction*   pA = static_cast<const MetaBmpScalePartAction*>(pMA);
                 Bitmap                          aBmp( pA->GetBitmap() );
@@ -1796,7 +1797,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_BMPEX_ACTION:
+            case MetaActionType::BMPEX:
             {
                 const MetaBmpExAction*  pA = static_cast<const MetaBmpExAction*>(pMA);
                 const Bitmap            aBmp( Graphic( pA->GetBitmapEx() ).GetBitmap() );
@@ -1806,7 +1807,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_BMPEXSCALE_ACTION:
+            case MetaActionType::BMPEXSCALE:
             {
                 const MetaBmpExScaleAction* pA = static_cast<const MetaBmpExScaleAction*>(pMA);
                 const Bitmap                aBmp( Graphic( pA->GetBitmapEx() ).GetBitmap() );
@@ -1815,7 +1816,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_BMPEXSCALEPART_ACTION:
+            case MetaActionType::BMPEXSCALEPART:
             {
                 const MetaBmpExScalePartAction* pA = static_cast<const MetaBmpExScalePartAction*>(pMA);
                 Bitmap                          aBmp( Graphic( pA->GetBitmapEx() ).GetBitmap() );
@@ -1825,7 +1826,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_EPS_ACTION :
+            case MetaActionType::EPS :
             {
                 const MetaEPSAction* pA = static_cast<const MetaEPSAction*>(pMA);
                 const GDIMetaFile aGDIMetaFile( pA->GetSubstitute() );
@@ -1834,7 +1835,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
                 for ( size_t i = 0; i < nCount; i++ )
                 {
                     const MetaAction* pMetaAct = aGDIMetaFile.GetAction( i );
-                    if ( pMetaAct->GetType() == META_BMPSCALE_ACTION )
+                    if ( pMetaAct->GetType() == MetaActionType::BMPSCALE )
                     {
                         const MetaBmpScaleAction* pBmpScaleAction = static_cast<const MetaBmpScaleAction*>(pMetaAct);
                         WriteOpcode_BitsRect( pA->GetPoint(), pA->GetSize(), pBmpScaleAction->GetBitmap() );
@@ -1844,15 +1845,15 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_MASK_ACTION:
-            case META_MASKSCALE_ACTION:
-            case META_MASKSCALEPART_ACTION:
+            case MetaActionType::MASK:
+            case MetaActionType::MASKSCALE:
+            case MetaActionType::MASKSCALEPART:
             {
                 // OSL_FAIL( "Unsupported PICT-Action: META_MASK..._ACTION!" );
             }
             break;
 
-            case META_GRADIENT_ACTION:
+            case MetaActionType::GRADIENT:
             {
                 ScopedVclPtrInstance<VirtualDevice> aVDev;
                 GDIMetaFile                 aTmpMtf;
@@ -1864,7 +1865,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_HATCH_ACTION:
+            case MetaActionType::HATCH:
             {
                 ScopedVclPtrInstance<VirtualDevice> aVDev;
                 GDIMetaFile             aTmpMtf;
@@ -1876,38 +1877,38 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_WALLPAPER_ACTION:
+            case MetaActionType::WALLPAPER:
             {
-                // OSL_FAIL( "Unsupported PICT-Action: META_WALLPAPER_ACTION!" );
+                // OSL_FAIL( "Unsupported PICT-Action: MetaActionType::WALLPAPER!" );
             }
             break;
 
-            case META_CLIPREGION_ACTION:
+            case MetaActionType::CLIPREGION:
             {
-                // OSL_FAIL( "Unsupported PICT-Action: META_CLIPREGION_ACTION!" );
+                // OSL_FAIL( "Unsupported PICT-Action: MetaActionType::CLIPREGION!" );
             }
             break;
 
-            case META_ISECTRECTCLIPREGION_ACTION:
+            case MetaActionType::ISECTRECTCLIPREGION:
             {
                 const MetaISectRectClipRegionAction* pA = static_cast<const MetaISectRectClipRegionAction*>(pMA);
                 WriteOpcode_ClipRect( pA->GetRect() );
             }
             break;
 
-            case META_ISECTREGIONCLIPREGION_ACTION:
+            case MetaActionType::ISECTREGIONCLIPREGION:
             {
-                // OSL_FAIL( "Unsupported PICT-Action: META_ISECTREGIONCLIPREGION_ACTION!" );
+                // OSL_FAIL( "Unsupported PICT-Action: MetaActionType::ISECTREGIONCLIPREGION!" );
             }
             break;
 
-            case META_MOVECLIPREGION_ACTION:
+            case MetaActionType::MOVECLIPREGION:
             {
-                // OSL_FAIL( "Unsupported PICT-Action: META_MOVECLIPREGION_ACTION!" );
+                // OSL_FAIL( "Unsupported PICT-Action: MetaActionType::MOVECLIPREGION!" );
             }
             break;
 
-            case META_LINECOLOR_ACTION:
+            case MetaActionType::LINECOLOR:
             {
                 const MetaLineColorAction* pA = static_cast<const MetaLineColorAction*>(pMA);
 
@@ -1918,7 +1919,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_FILLCOLOR_ACTION:
+            case MetaActionType::FILLCOLOR:
             {
                 const MetaFillColorAction* pA = static_cast<const MetaFillColorAction*>(pMA);
 
@@ -1929,14 +1930,14 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_TEXTCOLOR_ACTION:
+            case MetaActionType::TEXTCOLOR:
             {
                 const MetaTextColorAction* pA = static_cast<const MetaTextColorAction*>(pMA);
                 aSrcFont.SetColor( pA->GetColor() );
             }
             break;
 
-            case META_TEXTFILLCOLOR_ACTION:
+            case MetaActionType::TEXTFILLCOLOR:
             {
                 const MetaTextFillColorAction* pA = static_cast<const MetaTextFillColorAction*>(pMA);
 
@@ -1947,13 +1948,13 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_TEXTALIGN_ACTION:
+            case MetaActionType::TEXTALIGN:
             {
-                // OSL_FAIL( "Unsupported PICT-Action: META_TEXTALIGN_ACTION!" );
+                // OSL_FAIL( "Unsupported PICT-Action: MetaActionType::TEXTALIGN!" );
             }
             break;
 
-            case META_MAPMODE_ACTION:
+            case MetaActionType::MAPMODE:
             {
                 const MetaMapModeAction* pA = static_cast<const MetaMapModeAction*>(pMA);
 
@@ -2018,14 +2019,14 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_FONT_ACTION:
+            case MetaActionType::FONT:
             {
                 const MetaFontAction* pA = static_cast<const MetaFontAction*>(pMA);
                 aSrcFont=pA->GetFont();
             }
             break;
 
-            case META_PUSH_ACTION:
+            case MetaActionType::PUSH:
             {
                 PictWriterAttrStackMember * pAt = new PictWriterAttrStackMember;
                 pAt->aLineColor=aLineColor;
@@ -2039,7 +2040,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_POP_ACTION:
+            case MetaActionType::POP:
             {
                 PictWriterAttrStackMember* pAt=pAttrStack;
 
@@ -2065,14 +2066,14 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_RASTEROP_ACTION:
+            case MetaActionType::RASTEROP:
             {
                 const MetaRasterOpAction* pA = static_cast<const MetaRasterOpAction*>(pMA);
                 eSrcRasterOp=pA->GetRasterOp();
             }
             break;
 
-            case META_TRANSPARENT_ACTION:
+            case MetaActionType::TRANSPARENT:
             {
                 const tools::PolyPolygon& rPolyPoly = static_cast<const MetaTransparentAction*>(pMA)->GetPolyPolygon();
 
@@ -2091,7 +2092,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             }
             break;
 
-            case META_FLOATTRANSPARENT_ACTION:
+            case MetaActionType::FLOATTRANSPARENT:
             {
                 const MetaFloatTransparentAction* pA = static_cast<const MetaFloatTransparentAction*>(pMA);
 
@@ -2118,6 +2119,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
                 WriteOpcodes( aTmpMtf );
             }
             break;
+            default: break;
         }
 
         nWrittenActions++;
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 53dec83b12f5..57007fa43fda 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -662,10 +662,10 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
 
         switch( pMA->GetType() )
         {
-            case META_NULL_ACTION :
+            case MetaActionType::NONE :
             break;
 
-            case META_PIXEL_ACTION :
+            case MetaActionType::PIXEL :
             {
                 Color aOldLineColor( aLineColor );
                 aLineColor = static_cast<const MetaPixelAction*>(pMA)->GetColor();
@@ -677,7 +677,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_POINT_ACTION :
+            case MetaActionType::POINT :
             {
                 ImplWriteLineColor( PS_SPACE );
                 ImplMoveTo( static_cast<const MetaPointAction*>(pMA)->GetPoint() );
@@ -686,7 +686,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_LINE_ACTION :
+            case MetaActionType::LINE :
             {
                 const LineInfo& rLineInfo = static_cast<const MetaLineAction*>(pMA)->GetLineInfo();
                 ImplWriteLineInfo( rLineInfo );
@@ -700,17 +700,17 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_RECT_ACTION :
+            case MetaActionType::RECT :
             {
                 ImplRect( static_cast<const MetaRectAction*>(pMA)->GetRect() );
             }
             break;
 
-            case META_ROUNDRECT_ACTION :
+            case MetaActionType::ROUNDRECT :
                 ImplRect( static_cast<const MetaRoundRectAction*>(pMA)->GetRect() );
             break;
 
-            case META_ELLIPSE_ACTION :
+            case MetaActionType::ELLIPSE :
             {
                 Rectangle   aRect = static_cast<const MetaEllipseAction*>(pMA)->GetRect();
                 Point       aCenter = aRect.Center();
@@ -720,7 +720,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_ARC_ACTION :
+            case MetaActionType::ARC :
             {
                 Polygon aPoly( static_cast<const MetaArcAction*>(pMA)->GetRect(), static_cast<const MetaArcAction*>(pMA)->GetStartPoint(),
                     static_cast<const MetaArcAction*>(pMA)->GetEndPoint(), POLY_ARC );
@@ -729,7 +729,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_PIE_ACTION :
+            case MetaActionType::PIE :
             {
                 Polygon aPoly( static_cast<const MetaPieAction*>(pMA)->GetRect(), static_cast<const MetaPieAction*>(pMA)->GetStartPoint(),
                     static_cast<const MetaPieAction*>(pMA)->GetEndPoint(), POLY_PIE );
@@ -738,7 +738,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_CHORD_ACTION :
+            case MetaActionType::CHORD :
             {
                 Polygon aPoly( static_cast<const MetaChordAction*>(pMA)->GetRect(), static_cast<const MetaChordAction*>(pMA)->GetStartPoint(),
                     static_cast<const MetaChordAction*>(pMA)->GetEndPoint(), POLY_CHORD );
@@ -747,7 +747,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_POLYLINE_ACTION :
+            case MetaActionType::POLYLINE :
             {
                 Polygon aPoly( static_cast<const MetaPolyLineAction*>(pMA)->GetPolygon() );
                 const LineInfo& rLineInfo = static_cast<const MetaPolyLineAction*>(pMA)->GetLineInfo();
@@ -789,20 +789,20 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_POLYGON_ACTION :
+            case MetaActionType::POLYGON :
             {
                 tools::PolyPolygon aPolyPoly( static_cast<const MetaPolygonAction*>(pMA)->GetPolygon() );
                 ImplPolyPoly( aPolyPoly );
             }
             break;
 
-            case META_POLYPOLYGON_ACTION :
+            case MetaActionType::POLYPOLYGON :
             {
                 ImplPolyPoly( static_cast<const MetaPolyPolygonAction*>(pMA)->GetPolyPolygon() );
             }
             break;
 
-            case META_TEXT_ACTION:
+            case MetaActionType::TEXT:
             {
                 const MetaTextAction * pA = static_cast<const MetaTextAction*>(pMA);
 
@@ -813,13 +813,13 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_TEXTRECT_ACTION:
+            case MetaActionType::TEXTRECT:
             {
                 OSL_FAIL( "Unsupported action: TextRect...Action!" );
             }
             break;
 
-            case META_STRETCHTEXT_ACTION :
+            case MetaActionType::STRETCHTEXT :
             {
                 const MetaStretchTextAction* pA = static_cast<const MetaStretchTextAction*>(pMA);
                 OUString  aUniStr = pA->GetText().copy( pA->GetIndex(), pA->GetLen() );
@@ -829,7 +829,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_TEXTARRAY_ACTION:
+            case MetaActionType::TEXTARRAY:
             {
                 const MetaTextArrayAction* pA = static_cast<const MetaTextArrayAction*>(pMA);
                 OUString  aUniStr = pA->GetText().copy( pA->GetIndex(), pA->GetLen() );
@@ -839,7 +839,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_BMP_ACTION :
+            case MetaActionType::BMP :
             {
                 Bitmap aBitmap = static_cast<const MetaBmpAction*>(pMA)->GetBitmap();
                 if ( mbGrayScale )
@@ -850,7 +850,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_BMPSCALE_ACTION :
+            case MetaActionType::BMPSCALE :
             {
                 Bitmap aBitmap = static_cast<const MetaBmpScaleAction*>(pMA)->GetBitmap();
                 if ( mbGrayScale )
@@ -861,7 +861,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_BMPSCALEPART_ACTION :
+            case MetaActionType::BMPSCALEPART :
             {
                 Bitmap  aBitmap( static_cast<const MetaBmpScalePartAction*>(pMA)->GetBitmap() );
                 aBitmap.Crop( Rectangle( static_cast<const MetaBmpScalePartAction*>(pMA)->GetSrcPoint(),
@@ -874,7 +874,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_BMPEX_ACTION :
+            case MetaActionType::BMPEX :
             {
                 BitmapEx aBitmapEx( static_cast<MetaBmpExAction*>(pMA)->GetBitmapEx() );
                 Bitmap aBitmap( aBitmapEx.GetBitmap() );
@@ -887,7 +887,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_BMPEXSCALE_ACTION :
+            case MetaActionType::BMPEXSCALE :
             {
                 BitmapEx aBitmapEx( static_cast<MetaBmpExScaleAction*>(pMA)->GetBitmapEx() );
                 Bitmap aBitmap( aBitmapEx.GetBitmap() );
@@ -900,7 +900,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_BMPEXSCALEPART_ACTION :
+            case MetaActionType::BMPEXSCALEPART :
             {
                 BitmapEx    aBitmapEx( static_cast<const MetaBmpExScalePartAction*>(pMA)->GetBitmapEx() );
                 aBitmapEx.Crop( Rectangle( static_cast<const MetaBmpExScalePartAction*>(pMA)->GetSrcPoint(),
@@ -916,29 +916,29 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             break;
 
             // Unsupported Actions
-            case META_MASK_ACTION:
-            case META_MASKSCALE_ACTION:
-            case META_MASKSCALEPART_ACTION:
+            case MetaActionType::MASK:
+            case MetaActionType::MASKSCALE:
+            case MetaActionType::MASKSCALEPART:
             {
                 OSL_FAIL( "Unsupported action: MetaMask...Action!" );
             }
             break;
 
-            case META_GRADIENT_ACTION :
+            case MetaActionType::GRADIENT :
             {
                 tools::PolyPolygon aPolyPoly( static_cast<const MetaGradientAction*>(pMA)->GetRect() );
                 ImplWriteGradient( aPolyPoly, static_cast<const MetaGradientAction*>(pMA)->GetGradient(), rVDev );
             }
             break;
 
-            case META_GRADIENTEX_ACTION :
+            case MetaActionType::GRADIENTEX :
             {
                 tools::PolyPolygon aPolyPoly( static_cast<const MetaGradientExAction*>(pMA)->GetPolyPolygon() );
                 ImplWriteGradient( aPolyPoly, static_cast<const MetaGradientExAction*>(pMA)->GetGradient(), rVDev );
             }
             break;
 
-            case META_HATCH_ACTION :
+            case MetaActionType::HATCH :
             {
                 ScopedVclPtrInstance< VirtualDevice > l_pVirDev;
                 GDIMetaFile     aTmpMtf;
@@ -950,7 +950,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_WALLPAPER_ACTION :
+            case MetaActionType::WALLPAPER :
             {
                 const MetaWallpaperAction* pA = static_cast<const MetaWallpaperAction*>(pMA);
                 Rectangle   aRect = pA->GetRect();
@@ -991,7 +991,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_ISECTRECTCLIPREGION_ACTION:
+            case MetaActionType::ISECTRECTCLIPREGION:
             {
                 const MetaISectRectClipRegionAction* pA = static_cast<const MetaISectRectClipRegionAction*>(pMA);
                 vcl::Region aRegion( pA->GetRect() );
@@ -999,7 +999,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_CLIPREGION_ACTION:
+            case MetaActionType::CLIPREGION:
             {
                 const MetaClipRegionAction* pA = static_cast<const MetaClipRegionAction*>(pMA);
                 vcl::Region aRegion( pA->GetRegion() );
@@ -1007,7 +1007,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_ISECTREGIONCLIPREGION_ACTION:
+            case MetaActionType::ISECTREGIONCLIPREGION:
             {
                 const MetaISectRegionClipRegionAction* pA = static_cast<const MetaISectRegionClipRegionAction*>(pMA);
                 vcl::Region aRegion( pA->GetRegion() );
@@ -1015,7 +1015,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_MOVECLIPREGION_ACTION:
+            case MetaActionType::MOVECLIPREGION:
             {
 /*
                 if ( !aClipRegion.IsEmpty() )
@@ -1028,7 +1028,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_LINECOLOR_ACTION :
+            case MetaActionType::LINECOLOR :
             {
                 if ( static_cast<const MetaLineColorAction*>(pMA)->IsSetting() )
                 {
@@ -1040,7 +1040,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_FILLCOLOR_ACTION :
+            case MetaActionType::FILLCOLOR :
             {
                 if ( static_cast<const MetaFillColorAction*>(pMA)->IsSetting() )
                 {
@@ -1052,13 +1052,13 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_TEXTCOLOR_ACTION :
+            case MetaActionType::TEXTCOLOR :
             {
                 aTextColor = static_cast<const MetaTextColorAction*>(pMA)->GetColor();
             }
             break;
 
-            case META_TEXTFILLCOLOR_ACTION :
+            case MetaActionType::TEXTFILLCOLOR :
             {
                 if ( static_cast<const MetaTextFillColorAction*>(pMA)->IsSetting() )
                 {
@@ -1070,27 +1070,27 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_TEXTALIGN_ACTION :
+            case MetaActionType::TEXTALIGN :
             {
                 eTextAlign = static_cast<const MetaTextAlignAction*>(pMA)->GetTextAlign();
             }
             break;
 
-            case META_MAPMODE_ACTION :
+            case MetaActionType::MAPMODE :
             {
                 pMA->Execute( &rVDev );
                 ImplGetMapMode( rVDev.GetMapMode() );
             }
             break;
 
-            case META_FONT_ACTION :
+            case MetaActionType::FONT :
             {
                 maFont = static_cast<const MetaFontAction*>(pMA)->GetFont();
                 rVDev.SetFont( maFont );
             }
             break;
 
-            case META_PUSH_ACTION :
+            case MetaActionType::PUSH :
             {
                 rVDev.Push(static_cast<const MetaPushAction*>(pMA)->GetFlags() );
                 StackMember* pGS = new StackMember;
@@ -1118,7 +1118,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_POP_ACTION :
+            case MetaActionType::POP :
             {
                 rVDev.Pop();
                 StackMember* pGS;
@@ -1157,7 +1157,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_EPS_ACTION :
+            case MetaActionType::EPS :
             {
                 GfxLink aGfxLink = static_cast<const MetaEPSAction*>(pMA)->GetLink();
                 const GDIMetaFile aSubstitute( static_cast<const MetaEPSAction*>(pMA)->GetSubstitute() );
@@ -1218,19 +1218,19 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_TRANSPARENT_ACTION:
+            case MetaActionType::TRANSPARENT:
             {
 //              ImplLine( ( (const MetaTransparentAction*) pMA )->GetPolyPolygon() );
             }
             break;
 
-            case META_RASTEROP_ACTION:
+            case MetaActionType::RASTEROP:
             {
                 pMA->Execute( &rVDev );
             }
             break;
 
-            case META_FLOATTRANSPARENT_ACTION:
+            case MetaActionType::FLOATTRANSPARENT:
             {
                 const MetaFloatTransparentAction* pA = static_cast<const MetaFloatTransparentAction*>(pMA);
 
@@ -1258,7 +1258,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             }
             break;
 
-            case META_COMMENT_ACTION:
+            case MetaActionType::COMMENT:
             {
                 const MetaCommentAction* pA = static_cast<const MetaCommentAction*>(pMA);
                 if ( pA->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_BEGIN") )
@@ -1267,9 +1267,9 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
                     while( ++nCurAction < nCount )
                     {
                         MetaAction* pAction = rMtf.GetAction( nCurAction );
-                        if( pAction->GetType() == META_GRADIENTEX_ACTION )
+                        if( pAction->GetType() == MetaActionType::GRADIENTEX )
                             pGradAction = static_cast<const MetaGradientExAction*>(pAction);
-                        else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
+                        else if( ( pAction->GetType() == MetaActionType::COMMENT ) &&
                                  ( static_cast<const MetaCommentAction*>(pAction)->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_END") ) )
                         {
                             break;
@@ -1391,21 +1391,22 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
                                         MetaAction* pAction = rMtf.GetAction( nCurAction );
                                         switch( pAction->GetType() )
                                         {
-                                            case META_BMPSCALE_ACTION :
-                                            case META_BMPSCALEPART_ACTION :
-                                            case META_BMPEXSCALE_ACTION :
-                                            case META_BMPEXSCALEPART_ACTION :
+                                            case MetaActionType::BMPSCALE :
+                                            case MetaActionType::BMPSCALEPART :
+                                            case MetaActionType::BMPEXSCALE :
+                                            case MetaActionType::BMPEXSCALEPART :
                                             {
                                                 nBitmapCount++;
                                                 nBitmapAction = nCurAction;
                                             }
                                             break;
-                                            case META_COMMENT_ACTION :
+                                            case MetaActionType::COMMENT :
                                             {
                                                 if (static_cast<const MetaCommentAction*>(pAction)->GetComment().equals("XPATHFILL_SEQ_END"))
                                                     bOk = false;
                                             }
                                             break;
+                                            default: break;
                                         }
                                     }
                                     if( nBitmapCount == 2 )
@@ -1441,7 +1442,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
                             while( ++nCurAction < nCount )
                             {
                                 pMA = rMtf.GetAction( nCurAction );
-                                if ( pMA->GetType() == META_COMMENT_ACTION )
+                                if ( pMA->GetType() == MetaActionType::COMMENT )
                                 {
                                     OString sComment( static_cast<MetaCommentAction*>(pMA)->GetComment() );
                                     if ( sComment.equals( sSeqEnd ) )
@@ -1453,6 +1454,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
                 }
             }
             break;
+            default: break;
         }
     }
 }