summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-05-15 10:03:53 +0200
committerNoel Grandin <noel@peralex.com>2015-05-15 10:05:03 +0200
commitad0c5e6c663642c1e4b212e4e6a38ebfe8c3e0a7 (patch)
tree6176009e3c65a6a1ce392ca4c4a9eccea3c3517c /filter
parentd93915b2aeabbde90b7eb539116b9be49e0d1a5c (diff)
convert META_*_ACTION constants to scoped enum
Change-Id: I8ecfbfecd765a35fafcbcc5452b0d04a89be2459
Diffstat (limited to 'filter')
-rw-r--r--filter/qa/cppunit/filters-pict-test.cxx2
-rw-r--r--filter/source/flash/swfexporter.cxx7
-rw-r--r--filter/source/flash/swfwriter1.cxx127
-rw-r--r--filter/source/graphicfilter/eos2met/eos2met.cxx132
-rw-r--r--filter/source/graphicfilter/epict/epict.cxx120
-rw-r--r--filter/source/graphicfilter/eps/eps.cxx114
-rw-r--r--filter/source/svg/svgexport.cxx20
-rw-r--r--filter/source/svg/svgfontexport.cxx14
-rw-r--r--filter/source/svg/svgwriter.cxx194
9 files changed, 373 insertions, 357 deletions
diff --git a/filter/qa/cppunit/filters-pict-test.cxx b/filter/qa/cppunit/filters-pict-test.cxx
index ec6982486208..bdfa9c2134b9 100644
--- a/filter/qa/cppunit/filters-pict-test.cxx
+++ b/filter/qa/cppunit/filters-pict-test.cxx
@@ -86,7 +86,7 @@ void PictFilterTest::testDontClipTooMuch()
MetafileXmlDump dumper;
dumper.filterAllActionTypes();
- dumper.filterActionType(META_CLIPREGION_ACTION, false);
+ dumper.filterActionType(MetaActionType::CLIPREGION, false);
xmlDocPtr pDoc = dumper.dumpAndParse(aGDIMetaFile);
CPPUNIT_ASSERT (pDoc);
diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx
index c443a1e05c46..f7e5250102de 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -711,18 +711,19 @@ bool FlashExporter::getMetaFile( Reference< XComponent >&xComponent, GDIMetaFile
Rectangle clipRect;
for( size_t i = 0, nCount = rMtf.GetActionSize(); i < nCount; i++ )
{
- const MetaAction* pAction = rMtf.GetAction( i );
- const sal_uInt16 nType = pAction->GetType();
+ const MetaAction* pAction = rMtf.GetAction( i );
+ const MetaActionType nType = pAction->GetType();
switch( nType )
{
- case( META_ISECTRECTCLIPREGION_ACTION ):
+ case( MetaActionType::ISECTRECTCLIPREGION ):
{
const MetaISectRectClipRegionAction* pA = static_cast<const MetaISectRectClipRegionAction*>(pAction);
clipRect = pA->GetRect();
i = nCount;
break;
}
+ default: break;
}
}
MetaBmpExScaleAction *pmetaAct = new MetaBmpExScaleAction(Point(clipRect.Left(), clipRect.Top()), Size(clipRect.GetWidth(), clipRect.GetHeight()), rBitmapEx);
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 06dcb7323516..2dcaf36c682e 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -1178,7 +1178,7 @@ bool Writer::Impl_writeStroke( SvtGraphicStroke& rStroke )
// as log as not LINESTYLE2 and DefineShape4 is used (which
// added support for LineJoin), only round LineJoins are
- // supported. Fallback to META_POLYLINE_ACTION and META_LINE_ACTION
+ // supported. Fallback to MetaActionType::POLYLINE and MetaActionType::LINE
if(SvtGraphicStroke::joinRound != rStroke.getJoinType())
return false;
@@ -1381,12 +1381,12 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
int bMap = 0;
for( size_t i = 0, nCount = rMtf.GetActionSize(); i < nCount; i++ )
{
- const MetaAction* pAction = rMtf.GetAction( i );
- const sal_uInt16 nType = pAction->GetType();
+ const MetaAction* pAction = rMtf.GetAction( i );
+ const MetaActionType nType = pAction->GetType();
switch( nType )
{
- case( META_PIXEL_ACTION ):
+ case( MetaActionType::PIXEL ):
{
const MetaPixelAction* pA = static_cast<const MetaPixelAction*>(pAction);
@@ -1394,7 +1394,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
break;
- case( META_POINT_ACTION ):
+ case( MetaActionType::POINT ):
{
const MetaPointAction* pA = static_cast<const MetaPointAction*>(pAction);
@@ -1402,7 +1402,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
break;
- case( META_LINE_ACTION ):
+ case( MetaActionType::LINE ):
{
const MetaLineAction* pA = static_cast<const MetaLineAction*>(pAction);
@@ -1421,13 +1421,13 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
break;
- case( META_RECT_ACTION ):
+ case( MetaActionType::RECT ):
{
Impl_writeRect( static_cast<const MetaRectAction*>(pAction)->GetRect(), 0, 0 );
}
break;
- case( META_ROUNDRECT_ACTION ):
+ case( MetaActionType::ROUNDRECT ):
{
const MetaRoundRectAction* pA = static_cast<const MetaRoundRectAction*>(pAction);
@@ -1435,7 +1435,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
break;
- case( META_ELLIPSE_ACTION ):
+ case( MetaActionType::ELLIPSE ):
{
const MetaEllipseAction* pA = static_cast<const MetaEllipseAction*>(pAction);
const Rectangle& rRect = pA->GetRect();
@@ -1444,39 +1444,40 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
break;
- case( META_ARC_ACTION ):
- case( META_PIE_ACTION ):
- case( META_CHORD_ACTION ):
- case( META_POLYGON_ACTION ):
+ case( MetaActionType::ARC ):
+ case( MetaActionType::PIE ):
+ case( MetaActionType::CHORD ):
+ case( MetaActionType::POLYGON ):
{
Polygon aPoly;
switch( nType )
{
- case( META_ARC_ACTION ):
+ case( MetaActionType::ARC ):
{
const MetaArcAction* pA = static_cast<const MetaArcAction*>(pAction);
aPoly = Polygon( pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), POLY_ARC );
}
break;
- case( META_PIE_ACTION ):
+ case( MetaActionType::PIE ):
{
const MetaPieAction* pA = static_cast<const MetaPieAction*>(pAction);
aPoly = Polygon( pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), POLY_PIE );
}
break;
- case( META_CHORD_ACTION ):
+ case( MetaActionType::CHORD ):
{
const MetaChordAction* pA = static_cast<const MetaChordAction*>(pAction);
aPoly = Polygon( pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), POLY_CHORD );
}
break;
- case( META_POLYGON_ACTION ):
+ case( MetaActionType::POLYGON ):
aPoly = static_cast<const MetaPolygonAction*>(pAction)->GetPolygon();
break;
+ default: break;
}
if( aPoly.GetSize() )
@@ -1486,7 +1487,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
break;
- case( META_POLYLINE_ACTION ):
+ case( MetaActionType::POLYLINE ):
{
const MetaPolyLineAction* pA = static_cast<const MetaPolyLineAction*>(pAction);
const Polygon& rPoly = pA->GetPolygon();
@@ -1506,7 +1507,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
break;
- case( META_POLYPOLYGON_ACTION ):
+ case( MetaActionType::POLYPOLYGON ):
{
const MetaPolyPolygonAction* pA = static_cast<const MetaPolyPolygonAction*>(pAction);
const tools::PolyPolygon& rPolyPoly = pA->GetPolyPolygon();
@@ -1516,7 +1517,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
break;
- case( META_GRADIENT_ACTION ):
+ case( MetaActionType::GRADIENT ):
{
const MetaGradientAction* pA = static_cast<const MetaGradientAction*>(pAction);
@@ -1525,14 +1526,14 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
break;
- case( META_GRADIENTEX_ACTION ):
+ case( MetaActionType::GRADIENTEX ):
{
const MetaGradientExAction* pA = static_cast<const MetaGradientExAction*>(pAction);
Impl_writeGradientEx( pA->GetPolyPolygon(), pA->GetGradient() );
}
break;
- case META_HATCH_ACTION:
+ case MetaActionType::HATCH:
{
const MetaHatchAction* pA = static_cast<const MetaHatchAction*>(pAction);
GDIMetaFile aTmpMtf;
@@ -1542,7 +1543,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
break;
- case( META_TRANSPARENT_ACTION ):
+ case( MetaActionType::TRANSPARENT ):
{
const MetaTransparentAction* pA = static_cast<const MetaTransparentAction*>(pAction);
const tools::PolyPolygon& rPolyPoly = pA->GetPolyPolygon();
@@ -1556,7 +1557,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
break;
- case( META_FLOATTRANSPARENT_ACTION ):
+ case( MetaActionType::FLOATTRANSPARENT ):
{
const MetaFloatTransparentAction* pA = static_cast<const MetaFloatTransparentAction*>(pAction);
GDIMetaFile aTmpMtf( pA->GetGDIMetaFile() );
@@ -1594,7 +1595,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
break;
- case( META_EPS_ACTION ):
+ case( MetaActionType::EPS ):
{
const MetaEPSAction* pA = static_cast<const MetaEPSAction*>(pAction);
const GDIMetaFile aGDIMetaFile( pA->GetSubstitute() );
@@ -1604,7 +1605,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
{
const MetaAction* pSubstAct = aGDIMetaFile.GetAction( j );
- if( pSubstAct->GetType() == META_BMPSCALE_ACTION )
+ if( pSubstAct->GetType() == MetaActionType::BMPSCALE )
{
bFound = true;
const MetaBmpScaleAction* pBmpScaleAction = static_cast<const MetaBmpScaleAction*>(pSubstAct);
@@ -1616,7 +1617,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
break;
- case( META_COMMENT_ACTION ):
+ case( MetaActionType::COMMENT ):
{
const MetaCommentAction* pA = static_cast<const MetaCommentAction*>(pAction);
const sal_uInt8* pData = pA->GetData();
@@ -1630,9 +1631,9 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
{
pAction = rMtf.GetAction( i );
- 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") ) )
{
bDone = true;
@@ -1664,7 +1665,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
{
pAction = rMtf.GetAction( i );
- if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
+ if( ( pAction->GetType() == MetaActionType::COMMENT ) &&
( static_cast<const MetaCommentAction*>(pAction)->GetComment().equalsIgnoreAsciiCase("XPATHFILL_SEQ_END") ) )
{
bDone = true;
@@ -1694,7 +1695,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
{
pAction = rMtf.GetAction( i );
- if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
+ if( ( pAction->GetType() == MetaActionType::COMMENT ) &&
( static_cast<const MetaCommentAction*>(pAction)->GetComment().equalsIgnoreAsciiCase("XPATHSTROKE_SEQ_END") ) )
{
bDone = true;
@@ -1705,7 +1706,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
break;
- case( META_BMPSCALE_ACTION ):
+ case( MetaActionType::BMPSCALE ):
{
const MetaBmpScaleAction* pA = static_cast<const MetaBmpScaleAction*>(pAction);
@@ -1715,7 +1716,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
break;
- case( META_BMP_ACTION ):
+ case( MetaActionType::BMP ):
{
const MetaBmpAction* pA = static_cast<const MetaBmpAction*>(pAction);
Impl_writeImage( pA->GetBitmap(),
@@ -1724,7 +1725,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
break;
- case( META_BMPSCALEPART_ACTION ):
+ case( MetaActionType::BMPSCALEPART ):
{
const MetaBmpScalePartAction* pA = static_cast<const MetaBmpScalePartAction*>(pAction);
Impl_writeImage( pA->GetBitmap(),
@@ -1733,7 +1734,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
break;
- case( META_BMPEX_ACTION ):
+ case( MetaActionType::BMPEX ):
{
const MetaBmpExAction* pA = static_cast<const MetaBmpExAction*>(pAction);
Impl_writeImage( pA->GetBitmapEx(),
@@ -1742,7 +1743,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
break;
- case( META_BMPEXSCALE_ACTION ):
+ case( MetaActionType::BMPEXSCALE ):
{
const MetaBmpExScaleAction* pA = static_cast<const MetaBmpExScaleAction*>(pAction);
Impl_writeImage( pA->GetBitmapEx(),
@@ -1751,7 +1752,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
break;
- case( META_BMPEXSCALEPART_ACTION ):
+ case( MetaActionType::BMPEXSCALEPART ):
{
const MetaBmpExScalePartAction* pA = static_cast<const MetaBmpExScalePartAction*>(pAction);
Impl_writeImage( pA->GetBitmapEx(),
@@ -1760,75 +1761,75 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
break;
- case( META_TEXT_ACTION ):
+ case( MetaActionType::TEXT ):
{
const MetaTextAction* pA = static_cast<const MetaTextAction*>(pAction);
Impl_writeText( pA->GetPoint(), pA->GetText().copy( pA->GetIndex(), pA->GetLen() ), NULL, 0);
}
break;
- case( META_TEXTRECT_ACTION ):
+ case( MetaActionType::TEXTRECT ):
{
const MetaTextRectAction* pA = static_cast<const MetaTextRectAction*>(pAction);
Impl_writeText( pA->GetRect().TopLeft(), pA->GetText(), NULL, 0 );
}
break;
- case( META_TEXTARRAY_ACTION ):
+ case( MetaActionType::TEXTARRAY ):
{
const MetaTextArrayAction* pA = static_cast<const MetaTextArrayAction*>(pAction);
Impl_writeText( pA->GetPoint(), pA->GetText().copy( pA->GetIndex(), pA->GetLen() ), pA->GetDXArray(), 0 );
}
break;
- case( META_STRETCHTEXT_ACTION ):
+ case( MetaActionType::STRETCHTEXT ):
{
const MetaStretchTextAction* pA = static_cast<const MetaStretchTextAction*>(pAction);
Impl_writeText( pA->GetPoint(), pA->GetText().copy( pA->GetIndex(), pA->GetLen() ), NULL, pA->GetWidth() );
}
break;
- case( META_ISECTRECTCLIPREGION_ACTION ):
+ case( MetaActionType::ISECTRECTCLIPREGION ):
{
const MetaISectRectClipRegionAction* pA = static_cast<const MetaISectRectClipRegionAction*>(pAction);
clipRect = pA->GetRect();
}
// fall-through
- case( META_CLIPREGION_ACTION ):
- case( META_ISECTREGIONCLIPREGION_ACTION ):
- case( META_MOVECLIPREGION_ACTION ):
+ case( MetaActionType::CLIPREGION ):
+ case( MetaActionType::ISECTREGIONCLIPREGION ):
+ case( MetaActionType::MOVECLIPREGION ):
{
const_cast<MetaAction*>(pAction)->Execute( mpVDev );
}
break;
- case( META_MAPMODE_ACTION ):
+ case( MetaActionType::MAPMODE ):
{
bMap++;
}
// fall-through
- case( META_REFPOINT_ACTION ):
- case( META_LINECOLOR_ACTION ):
- case( META_FILLCOLOR_ACTION ):
- case( META_TEXTLINECOLOR_ACTION ):
- case( META_TEXTFILLCOLOR_ACTION ):
- case( META_TEXTCOLOR_ACTION ):
- case( META_TEXTALIGN_ACTION ):
- case( META_FONT_ACTION ):
- case( META_PUSH_ACTION ):
- case( META_POP_ACTION ):
- case( META_LAYOUTMODE_ACTION ):
+ case( MetaActionType::REFPOINT ):
+ case( MetaActionType::LINECOLOR ):
+ case( MetaActionType::FILLCOLOR ):
+ case( MetaActionType::TEXTLINECOLOR ):
+ case( MetaActionType::TEXTFILLCOLOR ):
+ case( MetaActionType::TEXTCOLOR ):
+ case( MetaActionType::TEXTALIGN ):
+ case( MetaActionType::FONT ):
+ case( MetaActionType::PUSH ):
+ case( MetaActionType::POP ):
+ case( MetaActionType::LAYOUTMODE ):
{
const_cast<MetaAction*>(pAction)->Execute( mpVDev );
}
break;
- case( META_RASTEROP_ACTION ):
- case( META_MASK_ACTION ):
- case( META_MASKSCALE_ACTION ):
- case( META_MASKSCALEPART_ACTION ):
- case( META_WALLPAPER_ACTION ):
- case( META_TEXTLINE_ACTION ):
+ case( MetaActionType::RASTEROP ):
+ case( MetaActionType::MASK ):
+ case( MetaActionType::MASKSCALE ):
+ case( MetaActionType::MASKSCALEPART ):
+ case( MetaActionType::WALLPAPER ):
+ case( MetaActionType::TEXTLINE ):
{
// !!! >>> we don't want to support these actions
}
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;
}
}
}
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 8cb737e0b768..a697793e5473 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -425,11 +425,11 @@ bool ObjectRepresentation::operator==( const ObjectRepresentation& rPresentation
sal_uLong GetBitmapChecksum( const MetaAction* pAction )
{
sal_uLong nChecksum = 0;
- const sal_uInt16 nType = pAction->GetType();
+ const MetaActionType nType = pAction->GetType();
switch( nType )
{
- case( META_BMPSCALE_ACTION ):
+ case( MetaActionType::BMPSCALE ):
{
const MetaBmpScaleAction* pA = static_cast<const MetaBmpScaleAction*>(pAction);
if( pA )
@@ -438,7 +438,7 @@ sal_uLong GetBitmapChecksum( const MetaAction* pAction )
OSL_FAIL( "GetBitmapChecksum: MetaBmpScaleAction pointer is null." );
}
break;
- case( META_BMPEXSCALE_ACTION ):
+ case( MetaActionType::BMPEXSCALE ):
{
const MetaBmpExScaleAction* pA = static_cast<const MetaBmpExScaleAction*>(pAction);
if( pA )
@@ -447,6 +447,7 @@ sal_uLong GetBitmapChecksum( const MetaAction* pAction )
OSL_FAIL( "GetBitmapChecksum: MetaBmpExScaleAction pointer is null." );
}
break;
+ default: break;
}
return nChecksum;
}
@@ -454,10 +455,10 @@ sal_uLong GetBitmapChecksum( const MetaAction* pAction )
void MetaBitmapActionGetPoint( const MetaAction* pAction, Point& rPt )
{
- const sal_uInt16 nType = pAction->GetType();
+ const MetaActionType nType = pAction->GetType();
switch( nType )
{
- case( META_BMPSCALE_ACTION ):
+ case( MetaActionType::BMPSCALE ):
{
const MetaBmpScaleAction* pA = static_cast<const MetaBmpScaleAction*>(pAction);
if( pA )
@@ -466,7 +467,7 @@ void MetaBitmapActionGetPoint( const MetaAction* pAction, Point& rPt )
OSL_FAIL( "MetaBitmapActionGetPoint: MetaBmpScaleAction pointer is null." );
}
break;
- case( META_BMPEXSCALE_ACTION ):
+ case( MetaActionType::BMPEXSCALE ):
{
const MetaBmpExScaleAction* pA = static_cast<const MetaBmpExScaleAction*>(pAction);
if( pA )
@@ -475,6 +476,7 @@ void MetaBitmapActionGetPoint( const MetaAction* pAction, Point& rPt )
OSL_FAIL( "MetaBitmapActionGetPoint: MetaBmpExScaleAction pointer is null." );
}
break;
+ default: break;
}
}
@@ -1997,9 +1999,9 @@ bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & rxPag
for( sal_uLong nCurAction = 0; nCurAction < nCount; ++nCurAction )
{
pAction = rMtf.GetAction( nCurAction );
- const sal_uInt16 nType = pAction->GetType();
+ const MetaActionType nType = pAction->GetType();
- if( nType == META_COMMENT_ACTION )
+ if( nType == MetaActionType::COMMENT )
{
const MetaCommentAction* pA = static_cast<const MetaCommentAction*>(pAction);
if( ( pA->GetComment().equalsIgnoreAsciiCase("XTEXT_PAINTSHAPE_BEGIN") ) )
@@ -2011,7 +2013,7 @@ bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & rxPag
bIsTextShapeStarted = false;
}
}
- if( bIsTextShapeStarted && ( nType == META_BMPSCALE_ACTION || nType == META_BMPEXSCALE_ACTION ) )
+ if( bIsTextShapeStarted && ( nType == MetaActionType::BMPSCALE || nType == MetaActionType::BMPEXSCALE ) )
{
GDIMetaFile aEmbeddedBitmapMtf;
pAction->Duplicate();
diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx
index cc2a5563660d..9783797975db 100644
--- a/filter/source/svg/svgfontexport.cxx
+++ b/filter/source/svg/svgfontexport.cxx
@@ -93,13 +93,13 @@ void SVGFontExport::implCollectGlyphs()
for( size_t i = 0, nCount = rMtf.GetActionSize(); i < nCount; ++i )
{
- OUString aText;
- MetaAction* pAction = rMtf.GetAction( i );
- const sal_uInt16 nType = pAction->GetType();
+ OUString aText;
+ MetaAction* pAction = rMtf.GetAction( i );
+ const MetaActionType nType = pAction->GetType();
switch( nType )
{
- case( META_TEXT_ACTION ):
+ case( MetaActionType::TEXT ):
{
const MetaTextAction* pA = static_cast<const MetaTextAction*>(pAction);
sal_Int32 aLength=std::min( pA->GetText().getLength(), pA->GetLen() );
@@ -107,14 +107,14 @@ void SVGFontExport::implCollectGlyphs()
}
break;
- case( META_TEXTRECT_ACTION ):
+ case( MetaActionType::TEXTRECT ):
{
const MetaTextRectAction* pA = static_cast<const MetaTextRectAction*>(pAction);
aText = pA->GetText();
}
break;
- case( META_TEXTARRAY_ACTION ):
+ case( MetaActionType::TEXTARRAY ):
{
const MetaTextArrayAction* pA = static_cast<const MetaTextArrayAction*>(pAction);
sal_Int32 aLength=std::min( pA->GetText().getLength(), pA->GetLen() );
@@ -122,7 +122,7 @@ void SVGFontExport::implCollectGlyphs()
}
break;
- case( META_STRETCHTEXT_ACTION ):
+ case( MetaActionType::STRETCHTEXT ):
{
const MetaStretchTextAction* pA = static_cast<const MetaStretchTextAction*>(pAction);
sal_Int32 aLength=std::min( pA->GetText().getLength(), pA->GetLen() );
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index cbcc2992ddb0..f9d8bceb1c07 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -551,42 +551,42 @@ sal_Int32 SVGTextWriter::setTextPosition( const GDIMetaFile& rMtf, sal_uLong& nC
sal_uLong nActionIndex = nCurAction + 1;
for( ; nActionIndex < nCount; ++nActionIndex )
{
- const MetaAction* pAction = rMtf.GetAction( nActionIndex );
- const sal_uInt16 nType = pAction->GetType();
+ const MetaAction* pAction = rMtf.GetAction( nActionIndex );
+ const MetaActionType nType = pAction->GetType();
switch( nType )
{
- case( META_TEXT_ACTION ):
+ case( MetaActionType::TEXT ):
{
bConfigured = implGetTextPosition<MetaTextAction>( pAction, aPos, bEmpty );
}
break;
- case( META_TEXTRECT_ACTION ):
+ case( MetaActionType::TEXTRECT ):
{
bConfigured = implGetTextPosition<MetaTextRectAction>( pAction, aPos, bEmpty );
}
break;
- case( META_TEXTARRAY_ACTION ):
+ case( MetaActionType::TEXTARRAY ):
{
bConfigured = implGetTextPosition<MetaTextArrayAction>( pAction, aPos, bEmpty );
}
break;
- case( META_STRETCHTEXT_ACTION ):
+ case( MetaActionType::STRETCHTEXT ):
{
bConfigured = implGetTextPosition<MetaStretchTextAction>( pAction, aPos, bEmpty );
}
break;
- case( META_BMPSCALE_ACTION ):
+ case( MetaActionType::BMPSCALE ):
{
bConfigured = implGetTextPositionFromBitmap<MetaBmpScaleAction>( pAction, aPos, bEmpty );
}
break;
- case( META_BMPEXSCALE_ACTION ):
+ case( MetaActionType::BMPEXSCALE ):
{
bConfigured = implGetTextPositionFromBitmap<MetaBmpExScaleAction>( pAction, aPos, bEmpty );
}
@@ -594,7 +594,7 @@ sal_Int32 SVGTextWriter::setTextPosition( const GDIMetaFile& rMtf, sal_uLong& nC
// If we reach the end of the current line, paragraph or text shape
// without finding any text we stop searching
- case( META_COMMENT_ACTION ):
+ case( MetaActionType::COMMENT ):
{
const MetaCommentAction* pA = static_cast<const MetaCommentAction*>(pAction);
const OString& rsComment = pA->GetComment();
@@ -643,6 +643,7 @@ sal_Int32 SVGTextWriter::setTextPosition( const GDIMetaFile& rMtf, sal_uLong& nC
}
}
break;
+ default: break;
}
if( bConfigured || bEOL || bEOP || bETS ) break;
}
@@ -666,43 +667,43 @@ void SVGTextWriter::setTextProperties( const GDIMetaFile& rMtf, sal_uLong nCurAc
bool bConfigured = false;
for( sal_uLong nActionIndex = nCurAction + 1; nActionIndex < nCount; ++nActionIndex )
{
- const MetaAction* pAction = rMtf.GetAction( nActionIndex );
- const sal_uInt16 nType = pAction->GetType();
+ const MetaAction* pAction = rMtf.GetAction( nActionIndex );
+ const MetaActionType nType = pAction->GetType();
switch( nType )
{
- case( META_TEXTLINECOLOR_ACTION ):
- case( META_TEXTFILLCOLOR_ACTION ):
- case( META_TEXTCOLOR_ACTION ):
- case( META_TEXTALIGN_ACTION ):
- case( META_FONT_ACTION ):
- case( META_LAYOUTMODE_ACTION ):
+ case( MetaActionType::TEXTLINECOLOR ):
+ case( MetaActionType::TEXTFILLCOLOR ):
+ case( MetaActionType::TEXTCOLOR ):
+ case( MetaActionType::TEXTALIGN ):
+ case( MetaActionType::FONT ):
+ case( MetaActionType::LAYOUTMODE ):
{
const_cast<MetaAction*>(pAction)->Execute( mpVDev );
}
break;
- case( META_TEXT_ACTION ):
+ case( MetaActionType::TEXT ):
{
const MetaTextAction* pA = static_cast<const MetaTextAction*>(pAction);
if( pA->GetLen() > 2 )
bConfigured = true;
}
break;
- case( META_TEXTRECT_ACTION ):
+ case( MetaActionType::TEXTRECT ):
{
const MetaTextRectAction* pA = static_cast<const MetaTextRectAction*>(pAction);
if( pA->GetText().getLength() > 2 )
bConfigured = true;
}
break;
- case( META_TEXTARRAY_ACTION ):
+ case( MetaActionType::TEXTARRAY ):
{
const MetaTextArrayAction* pA = static_cast<const MetaTextArrayAction*>(pAction);
if( pA->GetLen() > 2 )
bConfigured = true;
}
break;
- case( META_STRETCHTEXT_ACTION ):
+ case( MetaActionType::STRETCHTEXT ):
{
const MetaStretchTextAction* pA = static_cast<const MetaStretchTextAction*>(pAction);
if( pA->GetLen() > 2 )
@@ -711,7 +712,7 @@ void SVGTextWriter::setTextProperties( const GDIMetaFile& rMtf, sal_uLong nCurAc
break;
// If we reach the end of the paragraph without finding any text
// we stop searching
- case( META_COMMENT_ACTION ):
+ case( MetaActionType::COMMENT ):
{
const MetaCommentAction* pA = static_cast<const MetaCommentAction*>(pAction);
const OString& rsComment = pA->GetComment();
@@ -721,6 +722,7 @@ void SVGTextWriter::setTextProperties( const GDIMetaFile& rMtf, sal_uLong nCurAc
}
}
break;
+ default: break;
}
if( bConfigured || bEOP ) break;
}
@@ -1388,12 +1390,12 @@ void SVGTextWriter::implWriteEmbeddedBitmaps()
for( sal_uLong nCurAction = 0; nCurAction < nCount; nCurAction++ )
{
- const MetaAction* pAction = rMtf.GetAction( nCurAction );
- const sal_uInt16 nType = pAction->GetType();
+ const MetaAction* pAction = rMtf.GetAction( nCurAction );
+ const MetaActionType nType = pAction->GetType();
switch( nType )
{
- case( META_BMPSCALE_ACTION ):
+ case( MetaActionType::BMPSCALE ):
{
const MetaBmpScaleAction* pA = static_cast<const MetaBmpScaleAction*>(pAction);
nChecksum = pA->GetBitmap().GetChecksum();
@@ -1401,7 +1403,7 @@ void SVGTextWriter::implWriteEmbeddedBitmaps()
aSz = pA->GetSize();
}
break;
- case( META_BMPEXSCALE_ACTION ):
+ case( MetaActionType::BMPEXSCALE ):
{
const MetaBmpExScaleAction* pA = static_cast<const MetaBmpExScaleAction*>(pAction);
nChecksum = pA->GetBitmapEx().GetChecksum();
@@ -1409,6 +1411,7 @@ void SVGTextWriter::implWriteEmbeddedBitmaps()
aSz = pA->GetSize();
}
break;
+ default: break;
}
// <g id="?" > (used by animations)
@@ -2667,8 +2670,8 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
for( sal_uLong nCurAction = 0, nCount = rMtf.GetActionSize(); nCurAction < nCount; nCurAction++ )
{
- const MetaAction* pAction = rMtf.GetAction( nCurAction );
- const sal_uInt16 nType = pAction->GetType();
+ const MetaAction* pAction = rMtf.GetAction( nCurAction );
+ const MetaActionType nType = pAction->GetType();
#if OSL_DEBUG_LEVEL > 0
if( bIsTextShape )
@@ -2677,8 +2680,8 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
{
SvXMLElementExport aElem( mrExport,
XML_NAMESPACE_NONE, "desc", false, false );
- OUStringBuffer sType(OUString::number(nType));
- if (pAction && (nType == META_COMMENT_ACTION))
+ OUStringBuffer sType(OUString::number(static_cast<sal_uInt16>(nType)));
+ if (pAction && (nType == MetaActionType::COMMENT))
{
sType.append(": ");
const MetaCommentAction* pA = static_cast<const MetaCommentAction*>(pAction);
@@ -2720,7 +2723,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
#endif
switch( nType )
{
- case( META_PIXEL_ACTION ):
+ case( MetaActionType::PIXEL ):
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
@@ -2732,7 +2735,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_POINT_ACTION ):
+ case( MetaActionType::POINT ):
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
@@ -2744,7 +2747,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_LINE_ACTION ):
+ case( MetaActionType::LINE ):
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
@@ -2756,7 +2759,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_RECT_ACTION ):
+ case( MetaActionType::RECT ):
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
@@ -2766,7 +2769,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_ROUNDRECT_ACTION ):
+ case( MetaActionType::ROUNDRECT ):
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
@@ -2778,7 +2781,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_ELLIPSE_ACTION ):
+ case( MetaActionType::ELLIPSE ):
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
@@ -2791,10 +2794,10 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_ARC_ACTION ):
- case( META_PIE_ACTION ):
- case( META_CHORD_ACTION ):
- case( META_POLYGON_ACTION ):
+ case( MetaActionType::ARC ):
+ case( MetaActionType::PIE ):
+ case( MetaActionType::CHORD ):
+ case( MetaActionType::POLYGON ):
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
@@ -2802,30 +2805,31 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
switch( nType )
{
- case( META_ARC_ACTION ):
+ case( MetaActionType::ARC ):
{
const MetaArcAction* pA = static_cast<const MetaArcAction*>(pAction);
aPoly = Polygon( pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), POLY_ARC );
}
break;
- case( META_PIE_ACTION ):
+ case( MetaActionType::PIE ):
{
const MetaPieAction* pA = static_cast<const MetaPieAction*>(pAction);
aPoly = Polygon( pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), POLY_PIE );
}
break;
- case( META_CHORD_ACTION ):
+ case( MetaActionType::CHORD ):
{
const MetaChordAction* pA = static_cast<const MetaChordAction*>(pAction);
aPoly = Polygon( pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), POLY_CHORD );
}
break;
- case( META_POLYGON_ACTION ):
+ case( MetaActionType::POLYGON ):
aPoly = static_cast<const MetaPolygonAction*>(pAction)->GetPolygon();
break;
+ default: break;
}
if( aPoly.GetSize() )
@@ -2837,7 +2841,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_POLYLINE_ACTION ):
+ case( MetaActionType::POLYLINE ):
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
@@ -2854,7 +2858,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_POLYPOLYGON_ACTION ):
+ case( MetaActionType::POLYPOLYGON ):
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
@@ -2870,7 +2874,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_GRADIENT_ACTION ):
+ case( MetaActionType::GRADIENT ):
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
@@ -2883,7 +2887,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_GRADIENTEX_ACTION ):
+ case( MetaActionType::GRADIENTEX ):
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
@@ -2893,7 +2897,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case META_HATCH_ACTION:
+ case MetaActionType::HATCH:
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
@@ -2903,7 +2907,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_TRANSPARENT_ACTION ):
+ case( MetaActionType::TRANSPARENT ):
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
@@ -2924,7 +2928,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_FLOATTRANSPARENT_ACTION ):
+ case( MetaActionType::FLOATTRANSPARENT ):
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
@@ -2936,7 +2940,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_EPS_ACTION ):
+ case( MetaActionType::EPS ):
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
@@ -2948,7 +2952,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
{
const MetaAction* pSubstAct = aGDIMetaFile.GetAction( k );
- if( pSubstAct->GetType() == META_BMPSCALE_ACTION )
+ if( pSubstAct->GetType() == MetaActionType::BMPSCALE )
{
bFound = true;
const MetaBmpScaleAction* pBmpScaleAction = static_cast<const MetaBmpScaleAction*>(pSubstAct);
@@ -2961,7 +2965,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_COMMENT_ACTION ):
+ case( MetaActionType::COMMENT ):
{
const MetaCommentAction* pA = static_cast<const MetaCommentAction*>(pAction);
@@ -2975,9 +2979,9 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
{
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") ) )
{
@@ -3035,18 +3039,18 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
{
pAction = rMtf.GetAction( nCurAction );
- if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
+ if( ( pAction->GetType() == MetaActionType::COMMENT ) &&
( static_cast<const MetaCommentAction*>(pAction)->GetComment().
equalsIgnoreAsciiCase("XPATHFILL_SEQ_END") ) )
{
bSkip = false;
}
- else if( pAction->GetType() == META_GRADIENTEX_ACTION )
+ else if( pAction->GetType() == MetaActionType::GRADIENTEX )
{
mapCurShape->mapShapeGradient.reset( new Gradient(
static_cast< const MetaGradientExAction* >( pAction )->GetGradient() ) );
}
- else if( pAction->GetType() == META_GRADIENT_ACTION )
+ else if( pAction->GetType() == MetaActionType::GRADIENT )
{
mapCurShape->mapShapeGradient.reset( new Gradient(
static_cast< const MetaGradientAction* >( pAction )->GetGradient() ) );
@@ -3063,7 +3067,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
{
pAction = rMtf.GetAction( nCurAction );
- if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
+ if( ( pAction->GetType() == MetaActionType::COMMENT ) &&
( static_cast<const MetaCommentAction*>( pAction )->GetComment().
equalsIgnoreAsciiCase("XPATHFILL_SEQ_END") ) )
{
@@ -3211,7 +3215,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
{
pAction = rMtf.GetAction( nCurAction );
- if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
+ if( ( pAction->GetType() == MetaActionType::COMMENT ) &&
( static_cast<const MetaCommentAction*>(pAction)->GetComment().
equalsIgnoreAsciiCase("XPATHSTROKE_SEQ_END") ) )
{
@@ -3263,7 +3267,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
else if( ( pA->GetComment().equalsIgnoreAsciiCase( "XTEXT_EOP" ) ) )
{
const MetaAction* pNextAction = rMtf.GetAction( nCurAction + 1 );
- if( !( ( pNextAction->GetType() == META_COMMENT_ACTION ) &&
+ if( !( ( pNextAction->GetType() == MetaActionType::COMMENT ) &&
( static_cast<const MetaCommentAction*>(pNextAction)->GetComment().equalsIgnoreAsciiCase("XTEXT_PAINTSHAPE_END") ) ))
{
// nTextFound == -1 => no text found and end of paragraph reached
@@ -3296,7 +3300,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
else if( ( pA->GetComment().equalsIgnoreAsciiCase( "XTEXT_EOL" ) ) )
{
const MetaAction* pNextAction = rMtf.GetAction( nCurAction + 1 );
- if( !( ( pNextAction->GetType() == META_COMMENT_ACTION ) &&
+ if( !( ( pNextAction->GetType() == MetaActionType::COMMENT ) &&
( static_cast<const MetaCommentAction*>(pNextAction)->GetComment().equalsIgnoreAsciiCase("XTEXT_EOP") ) ) )
{
// nTextFound == -2 => no text found and end of line reached
@@ -3328,7 +3332,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_BMP_ACTION ):
+ case( MetaActionType::BMP ):
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
@@ -3341,7 +3345,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_BMPSCALE_ACTION ):
+ case( MetaActionType::BMPSCALE ):
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
@@ -3362,7 +3366,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_BMPSCALEPART_ACTION ):
+ case( MetaActionType::BMPSCALEPART ):
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
@@ -3375,7 +3379,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_BMPEX_ACTION ):
+ case( MetaActionType::BMPEX ):
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
@@ -3388,7 +3392,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_BMPEXSCALE_ACTION ):
+ case( MetaActionType::BMPEXSCALE ):
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
@@ -3409,7 +3413,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_BMPEXSCALEPART_ACTION ):
+ case( MetaActionType::BMPEXSCALEPART ):
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
@@ -3422,7 +3426,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_TEXT_ACTION ):
+ case( MetaActionType::TEXT ):
{
if( nWriteFlags & SVGWRITER_WRITE_TEXT )
{
@@ -3463,7 +3467,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_TEXTRECT_ACTION ):
+ case( MetaActionType::TEXTRECT ):
{
if( nWriteFlags & SVGWRITER_WRITE_TEXT )
{
@@ -3500,7 +3504,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_TEXTARRAY_ACTION ):
+ case( MetaActionType::TEXTARRAY ):
{
if( nWriteFlags & SVGWRITER_WRITE_TEXT )
{
@@ -3541,7 +3545,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_STRETCHTEXT_ACTION ):
+ case( MetaActionType::STRETCHTEXT ):
{
if( nWriteFlags & SVGWRITER_WRITE_TEXT )
{
@@ -3582,39 +3586,39 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
break;
- case( META_CLIPREGION_ACTION ):
- case( META_ISECTRECTCLIPREGION_ACTION ):
- case( META_ISECTREGIONCLIPREGION_ACTION ):
- case( META_MOVECLIPREGION_ACTION ):
+ case( MetaActionType::CLIPREGION ):
+ case( MetaActionType::ISECTRECTCLIPREGION ):
+ case( MetaActionType::ISECTREGIONCLIPREGION ):
+ case( MetaActionType::MOVECLIPREGION ):
{
const_cast<MetaAction*>(pAction)->Execute( mpVDev );
mbClipAttrChanged = true;
}
break;
- case( META_REFPOINT_ACTION ):
- case( META_MAPMODE_ACTION ):
- case( META_LINECOLOR_ACTION ):
- case( META_FILLCOLOR_ACTION ):
- case( META_TEXTLINECOLOR_ACTION ):
- case( META_TEXTFILLCOLOR_ACTION ):
- case( META_TEXTCOLOR_ACTION ):
- case( META_TEXTALIGN_ACTION ):
- case( META_FONT_ACTION ):
- case( META_PUSH_ACTION ):
- case( META_POP_ACTION ):
- case( META_LAYOUTMODE_ACTION ):
+ case( MetaActionType::REFPOINT ):
+ case( MetaActionType::MAPMODE ):
+ case( MetaActionType::LINECOLOR ):
+ case( MetaActionType::FILLCOLOR ):
+ case( MetaActionType::TEXTLINECOLOR ):
+ case( MetaActionType::TEXTFILLCOLOR ):
+ case( MetaActionType::TEXTCOLOR ):
+ case( MetaActionType::TEXTALIGN ):
+ case( MetaActionType::FONT ):
+ case( MetaActionType::PUSH ):
+ case( MetaActionType::POP ):
+ case( MetaActionType::LAYOUTMODE ):
{
const_cast<MetaAction*>(pAction)->Execute( mpVDev );
}
break;
- case( META_RASTEROP_ACTION ):
- case( META_MASK_ACTION ):
- case( META_MASKSCALE_ACTION ):
- case( META_MASKSCALEPART_ACTION ):
- case( META_WALLPAPER_ACTION ):
- case( META_TEXTLINE_ACTION ):
+ case( MetaActionType::RASTEROP ):
+ case( MetaActionType::MASK ):
+ case( MetaActionType::MASKSCALE ):
+ case( MetaActionType::MASKSCALEPART ):
+ case( MetaActionType::WALLPAPER ):
+ case( MetaActionType::TEXTLINE ):
{
// !!! >>> we don't want to support these actions
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 13:42:48 +0000