accessibility/source/standard/accessiblemenuitemcomponent.cxx | 2 accessibility/source/standard/vclxaccessiblemenuitem.cxx | 2 cppcanvas/source/inc/implrenderer.hxx | 4 cppcanvas/source/mtfrenderer/implrenderer.cxx | 131 +- cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 100 +- cui/source/customize/cfg.cxx | 8 cui/source/dialogs/SpellDialog.cxx | 4 cui/source/tabpages/numfmt.cxx | 4 dbaccess/source/ui/control/toolboxcontroller.cxx | 2 drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 140 +-- drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 6 editeng/source/editeng/editview.cxx | 6 filter/qa/cppunit/filters-pict-test.cxx | 2 filter/source/flash/swfexporter.cxx | 7 filter/source/flash/swfwriter1.cxx | 127 +- filter/source/graphicfilter/eos2met/eos2met.cxx | 132 +- filter/source/graphicfilter/epict/epict.cxx | 120 +- filter/source/graphicfilter/eps/eps.cxx | 114 +- filter/source/svg/svgexport.cxx | 20 filter/source/svg/svgfontexport.cxx | 14 filter/source/svg/svgwriter.cxx | 194 ++-- framework/source/classes/menumanager.cxx | 6 framework/source/uielement/generictoolbarcontroller.cxx | 2 framework/source/uielement/menubarmanager.cxx | 6 framework/source/uielement/toolbarmanager.cxx | 2 include/test/mtfxmldump.hxx | 8 include/vcl/lstbox.h | 17 include/vcl/lstbox.hxx | 12 include/vcl/menu.hxx | 48 - include/vcl/metaact.hxx | 134 +- include/vcl/metaactiontypes.hxx | 116 +- include/vcl/outdev.hxx | 14 sc/source/ui/dbgui/csvgrid.cxx | 2 sc/source/ui/miscdlgs/acredlin.cxx | 2 sc/source/ui/navipi/content.cxx | 2 sc/source/ui/navipi/navipi.cxx | 2 sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 4 sd/source/ui/annotations/annotationmanager.cxx | 2 sd/source/ui/dlg/navigatr.cxx | 4 sd/source/ui/sidebar/LayoutMenu.cxx | 2 sd/source/ui/sidebar/MasterPagesSelector.cxx | 2 sd/source/ui/view/drviews4.cxx | 2 sd/source/ui/view/sdview3.cxx | 66 - sfx2/source/appl/newhelp.cxx | 2 sfx2/source/dialog/backingwindow.cxx | 2 sfx2/source/dialog/taskpane.cxx | 2 sfx2/source/dialog/templdlg.cxx | 2 sfx2/source/doc/templatedlg.cxx | 6 sfx2/source/menu/mnumgr.cxx | 4 sfx2/source/menu/virtmenu.cxx | 6 sfx2/source/sidebar/SidebarController.cxx | 2 slideshow/source/engine/shapes/drawshape.cxx | 2 slideshow/source/engine/shapes/drawshapesubsetting.cxx | 8 slideshow/source/engine/shapes/gdimtftools.cxx | 19 svtools/source/control/stdmenu.cxx | 4 svtools/source/graphic/grfcache.cxx | 106 +- svtools/source/graphic/grfmgr2.cxx | 106 +- svtools/source/graphic/provider.cxx | 26 svx/source/dialog/_bmpmask.cxx | 26 svx/source/mnuctrls/clipboardctl.cxx | 2 svx/source/svdraw/svdfmtf.cxx | 115 +- svx/source/unodraw/UnoGraphicExporter.cxx | 2 svx/source/xml/xmlgrhlp.cxx | 4 sw/source/ui/misc/outline.cxx | 2 sw/source/uibase/lingu/olmenu.cxx | 8 sw/source/uibase/ribbar/inputwin.cxx | 2 sw/source/uibase/ribbar/workctrl.cxx | 4 sw/source/uibase/utlui/navipi.cxx | 4 test/source/mtfxmldump.cxx | 159 +-- toolkit/source/awt/vclxmenu.cxx | 10 vcl/README.GDIMetaFile | 2 vcl/inc/ilstbox.hxx | 18 vcl/qa/cppunit/wmf/wmfimporttest.cxx | 8 vcl/source/control/edit.cxx | 4 vcl/source/control/ilstbox.cxx | 28 vcl/source/control/lstbox.cxx | 4 vcl/source/control/menubtn.cxx | 2 vcl/source/control/tabctrl.cxx | 2 vcl/source/filter/wmf/emfwr.cxx | 119 +- vcl/source/filter/wmf/wmfwr.cxx | 107 +- vcl/source/gdi/cvtsvm.cxx | 90 +- vcl/source/gdi/gdimetafiletools.cxx | 122 +- vcl/source/gdi/gdimtf.cxx | 327 +++---- vcl/source/gdi/impgraph.cxx | 2 vcl/source/gdi/metaact.cxx | 450 +++++----- vcl/source/gdi/pdfwriter_impl2.cxx | 118 +- vcl/source/gdi/print2.cxx | 186 ++-- vcl/source/outdev/bitmap.cxx | 30 vcl/source/outdev/mask.cxx | 14 vcl/source/outdev/text.cxx | 2 vcl/source/outdev/transparent.cxx | 2 vcl/source/window/menu.cxx | 34 vcl/source/window/menuitemlist.hxx | 2 vcl/source/window/toolbox2.cxx | 4 94 files changed, 1984 insertions(+), 1922 deletions(-)
New commits: commit ad0c5e6c663642c1e4b212e4e6a38ebfe8c3e0a7 Author: Noel Grandin <[email protected]> Date: Fri May 15 10:03:53 2015 +0200 convert META_*_ACTION constants to scoped enum Change-Id: I8ecfbfecd765a35fafcbcc5452b0d04a89be2459 diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index e264d77..b4b2b28 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -255,8 +255,8 @@ static float GetSwapFloat( SvStream& rSt ) sal_Int32& io_rCurrActionIndex ); static bool isActionContained( GDIMetaFile& rMtf, - const char* pCommentString, - sal_uInt16 nType ); + const char* pCommentString, + MetaActionType nType ); void createGradientAction( const ::tools::PolyPolygon& rPoly, const ::Gradient& rGradient, diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index c5febd0..dcdbf5e 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -99,7 +99,7 @@ namespace // force alpha part of color to // opaque. transparent painting is done - // explicitly via META_TRANSPARENT_ACTION + // explicitly via MetaActionType::TRANSPARENT aColor.SetTransparency(0); //aColor.SetTransparency(128); @@ -430,7 +430,7 @@ namespace cppcanvas // increment action index, we've skipped an action. ++io_rCurrActionIndex; - if( pCurrAct->GetType() == META_COMMENT_ACTION && + if( pCurrAct->GetType() == MetaActionType::COMMENT && static_cast<MetaCommentAction*>(pCurrAct)->GetComment().equalsIgnoreAsciiCase( pCommentString) ) { @@ -443,9 +443,9 @@ namespace cppcanvas return; } - bool ImplRenderer::isActionContained( GDIMetaFile& rMtf, - const char* pCommentString, - sal_uInt16 nType ) + bool ImplRenderer::isActionContained( GDIMetaFile& rMtf, + const char* pCommentString, + MetaActionType nType ) { ENSURE_OR_THROW( pCommentString, "ImplRenderer::isActionContained(): NULL string given" ); @@ -465,7 +465,7 @@ namespace cppcanvas break; } - if( pCurrAct->GetType() == META_COMMENT_ACTION && + if( pCurrAct->GetType() == MetaActionType::COMMENT && static_cast<MetaCommentAction*>(pCurrAct)->GetComment().equalsIgnoreAsciiCase( pCommentString) ) { @@ -1242,11 +1242,11 @@ namespace cppcanvas // execute every action, to keep VDev state up-to-date // currently used only for // - the map mode - // - the line/fill color when processing a META_TRANSPARENT_ACTION + // - the line/fill color when processing a MetaActionType::TRANSPARENT // - SetFont to process font metric specific actions pCurrAct->Execute( &rVDev ); - SAL_INFO("cppcanvas.emf", "MTF\trecord type: 0x" << pCurrAct->GetType() << " (" << pCurrAct->GetType() << ")"); + SAL_INFO("cppcanvas.emf", "MTF\trecord type: 0x" << static_cast<sal_uInt16>(pCurrAct->GetType()) << " (" << static_cast<sal_uInt16>(pCurrAct->GetType()) << ")"); switch( pCurrAct->GetType() ) { @@ -1258,24 +1258,24 @@ namespace cppcanvas - case META_PUSH_ACTION: + case MetaActionType::PUSH: { MetaPushAction* pPushAction = static_cast<MetaPushAction*>(pCurrAct); rStates.pushState(pPushAction->GetFlags()); } break; - case META_POP_ACTION: + case MetaActionType::POP: rStates.popState(); break; - case META_TEXTLANGUAGE_ACTION: + case MetaActionType::TEXTLANGUAGE: // FALLTHROUGH intended - case META_REFPOINT_ACTION: + case MetaActionType::REFPOINT: // handled via pCurrAct->Execute( &rVDev ) break; - case META_MAPMODE_ACTION: + case MetaActionType::MAPMODE: // modify current mapModeTransformation // transformation, such that subsequent // coordinates map correctly @@ -1284,7 +1284,7 @@ namespace cppcanvas break; // monitor clip regions, to assemble clip polygon on our own - case META_CLIPREGION_ACTION: + case MetaActionType::CLIPREGION: { MetaClipRegionAction* pClipAction = static_cast<MetaClipRegionAction*>(pCurrAct); @@ -1330,7 +1330,7 @@ namespace cppcanvas break; } - case META_ISECTRECTCLIPREGION_ACTION: + case MetaActionType::ISECTRECTCLIPREGION: { MetaISectRectClipRegionAction* pClipAction = static_cast<MetaISectRectClipRegionAction*>(pCurrAct); @@ -1347,7 +1347,7 @@ namespace cppcanvas break; } - case META_ISECTREGIONCLIPREGION_ACTION: + case MetaActionType::ISECTREGIONCLIPREGION: { MetaISectRegionClipRegionAction* pClipAction = static_cast<MetaISectRegionClipRegionAction*>(pCurrAct); @@ -1383,11 +1383,11 @@ namespace cppcanvas break; } - case META_MOVECLIPREGION_ACTION: + case MetaActionType::MOVECLIPREGION: // TODO(F2): NYI break; - case META_LINECOLOR_ACTION: + case MetaActionType::LINECOLOR: if( !rParms.maLineColor.is_initialized() ) { setStateColor( static_cast<MetaLineColorAction*>(pCurrAct), @@ -1404,7 +1404,7 @@ namespace cppcanvas } break; - case META_FILLCOLOR_ACTION: + case MetaActionType::FILLCOLOR: if( !rParms.maFillColor.is_initialized() ) { setStateColor( static_cast<MetaFillColorAction*>(pCurrAct), @@ -1421,7 +1421,7 @@ namespace cppcanvas } break; - case META_TEXTCOLOR_ACTION: + case MetaActionType::TEXTCOLOR: { if( !rParms.maTextColor.is_initialized() ) { @@ -1431,7 +1431,7 @@ namespace cppcanvas // force alpha part of color to // opaque. transparent painting is done - // explicitly via META_TRANSPARENT_ACTION + // explicitly via MetaActionType::TRANSPARENT aColor.SetTransparency(0); rStates.getState().textColor = @@ -1442,7 +1442,7 @@ namespace cppcanvas } break; - case META_TEXTFILLCOLOR_ACTION: + case MetaActionType::TEXTFILLCOLOR: if( !rParms.maTextColor.is_initialized() ) { setStateColor( static_cast<MetaTextFillColorAction*>(pCurrAct), @@ -1459,7 +1459,7 @@ namespace cppcanvas } break; - case META_TEXTLINECOLOR_ACTION: + case MetaActionType::TEXTLINECOLOR: if( !rParms.maTextColor.is_initialized() ) { setStateColor( static_cast<MetaTextLineColorAction*>(pCurrAct), @@ -1476,7 +1476,7 @@ namespace cppcanvas } break; - case META_TEXTALIGN_ACTION: + case MetaActionType::TEXTALIGN: { ::cppcanvas::internal::OutDevState& rState = rStates.getState(); const TextAlign eTextAlign( static_cast<MetaTextAlignAction*>(pCurrAct)->GetTextAlign() ); @@ -1485,7 +1485,7 @@ namespace cppcanvas } break; - case META_FONT_ACTION: + case MetaActionType::FONT: { ::cppcanvas::internal::OutDevState& rState = rStates.getState(); const vcl::Font& rFont( static_cast<MetaFontAction*>(pCurrAct)->GetFont() ); @@ -1508,11 +1508,11 @@ namespace cppcanvas } break; - case META_RASTEROP_ACTION: + case MetaActionType::RASTEROP: // TODO(F2): NYI break; - case META_LAYOUTMODE_ACTION: + case MetaActionType::LAYOUTMODE: { // TODO(F2): A lot is missing here ComplexTextLayoutMode nLayoutMode = static_cast<MetaLayoutModeAction*>(pCurrAct)->GetLayoutMode(); @@ -1546,7 +1546,7 @@ namespace cppcanvas - case META_GRADIENT_ACTION: + case MetaActionType::GRADIENT: { MetaGradientAction* pGradAct = static_cast<MetaGradientAction*>(pCurrAct); createGradientAction( ::Polygon( pGradAct->GetRect() ), @@ -1557,7 +1557,7 @@ namespace cppcanvas } break; - case META_HATCH_ACTION: + case MetaActionType::HATCH: { // TODO(F2): use native Canvas hatches here GDIMetaFile aTmpMtf; @@ -1570,7 +1570,7 @@ namespace cppcanvas } break; - case META_EPS_ACTION: + case MetaActionType::EPS: { MetaEPSAction* pAct = static_cast<MetaEPSAction*>(pCurrAct); const GDIMetaFile& rSubstitute = pAct->GetSubstitute(); @@ -1614,7 +1614,7 @@ namespace cppcanvas // handle metafile comments, to retrieve // meta-information for gradients, fills and // strokes. May skip actions, and may recurse. - case META_COMMENT_ACTION: + case MetaActionType::COMMENT: { MetaCommentAction* pAct = static_cast<MetaCommentAction*>(pCurrAct); @@ -1629,12 +1629,12 @@ namespace cppcanvas switch( pCurrAct->GetType() ) { // extract gradient info - case META_GRADIENTEX_ACTION: + case MetaActionType::GRADIENTEX: pGradAction = static_cast<MetaGradientExAction*>(pCurrAct); break; // skip broken-down rendering, output gradient when sequence is ended - case META_COMMENT_ACTION: + case MetaActionType::COMMENT: if( static_cast<MetaCommentAction*>(pCurrAct)->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_END") ) { bDone = true; @@ -1649,6 +1649,7 @@ namespace cppcanvas } } break; + default: break; } } } @@ -1677,7 +1678,7 @@ namespace cppcanvas if( aFill.getFillType() == SvtGraphicFill::fillTexture && !isActionContained( rMtf, "XPATHFILL_SEQ_END", - META_FLOATTRANSPARENT_ACTION ) ) + MetaActionType::FLOATTRANSPARENT ) ) { rendering::Texture aTexture; @@ -1810,7 +1811,7 @@ namespace cppcanvas - case META_POINT_ACTION: + case MetaActionType::POINT: { const OutDevState& rState( rStates.getState() ); if( rState.lineColor.getLength() ) @@ -1835,7 +1836,7 @@ namespace cppcanvas } break; - case META_PIXEL_ACTION: + case MetaActionType::PIXEL: { const OutDevState& rState( rStates.getState() ); if( rState.lineColor.getLength() ) @@ -1861,7 +1862,7 @@ namespace cppcanvas } break; - case META_LINE_ACTION: + case MetaActionType::LINE: { const OutDevState& rState( rStates.getState() ); if( rState.lineColor.getLength() ) @@ -1934,7 +1935,7 @@ namespace cppcanvas } break; - case META_RECT_ACTION: + case MetaActionType::RECT: { const Rectangle& rRect( static_cast<MetaRectAction*>(pCurrAct)->GetRect() ); @@ -1959,7 +1960,7 @@ namespace cppcanvas break; } - case META_ROUNDRECT_ACTION: + case MetaActionType::ROUNDRECT: { const Rectangle& rRect( static_cast<MetaRoundRectAction*>(pCurrAct)->GetRect()); @@ -1982,7 +1983,7 @@ namespace cppcanvas } break; - case META_ELLIPSE_ACTION: + case MetaActionType::ELLIPSE: { const Rectangle& rRect( static_cast<MetaEllipseAction*>(pCurrAct)->GetRect() ); @@ -2007,7 +2008,7 @@ namespace cppcanvas } break; - case META_ARC_ACTION: + case MetaActionType::ARC: { // TODO(F1): Missing basegfx functionality. Mind empty rects! const Polygon aToolsPoly( static_cast<MetaArcAction*>(pCurrAct)->GetRect(), @@ -2021,7 +2022,7 @@ namespace cppcanvas } break; - case META_PIE_ACTION: + case MetaActionType::PIE: { // TODO(F1): Missing basegfx functionality. Mind empty rects! const Polygon aToolsPoly( static_cast<MetaPieAction*>(pCurrAct)->GetRect(), @@ -2035,7 +2036,7 @@ namespace cppcanvas } break; - case META_CHORD_ACTION: + case MetaActionType::CHORD: { // TODO(F1): Missing basegfx functionality. Mind empty rects! const Polygon aToolsPoly( static_cast<MetaChordAction*>(pCurrAct)->GetRect(), @@ -2049,7 +2050,7 @@ namespace cppcanvas } break; - case META_POLYLINE_ACTION: + case MetaActionType::POLYLINE: { const OutDevState& rState( rStates.getState() ); if( rState.lineColor.getLength() || @@ -2114,7 +2115,7 @@ namespace cppcanvas } break; - case META_POLYGON_ACTION: + case MetaActionType::POLYGON: { ::basegfx::B2DPolygon aPoly( static_cast<MetaPolygonAction*>(pCurrAct)->GetPolygon().getB2DPolygon() ); aPoly.transform( rStates.getState().mapModeTransform ); @@ -2123,7 +2124,7 @@ namespace cppcanvas } break; - case META_POLYPOLYGON_ACTION: + case MetaActionType::POLYPOLYGON: { ::basegfx::B2DPolyPolygon aPoly( static_cast<MetaPolyPolygonAction*>(pCurrAct)->GetPolyPolygon().getB2DPolyPolygon() ); aPoly.transform( rStates.getState().mapModeTransform ); @@ -2132,7 +2133,7 @@ namespace cppcanvas } break; - case META_BMP_ACTION: + case MetaActionType::BMP: { MetaBmpAction* pAct = static_cast<MetaBmpAction*>(pCurrAct); @@ -2156,7 +2157,7 @@ namespace cppcanvas } break; - case META_BMPSCALE_ACTION: + case MetaActionType::BMPSCALE: { MetaBmpScaleAction* pAct = static_cast<MetaBmpScaleAction*>(pCurrAct); @@ -2182,7 +2183,7 @@ namespace cppcanvas } break; - case META_BMPSCALEPART_ACTION: + case MetaActionType::BMPSCALEPART: { MetaBmpScalePartAction* pAct = static_cast<MetaBmpScalePartAction*>(pCurrAct); @@ -2215,7 +2216,7 @@ namespace cppcanvas } break; - case META_BMPEX_ACTION: + case MetaActionType::BMPEX: { MetaBmpExAction* pAct = static_cast<MetaBmpExAction*>(pCurrAct); @@ -2239,7 +2240,7 @@ namespace cppcanvas } break; - case META_BMPEXSCALE_ACTION: + case MetaActionType::BMPEXSCALE: { MetaBmpExScaleAction* pAct = static_cast<MetaBmpExScaleAction*>(pCurrAct); @@ -2265,7 +2266,7 @@ namespace cppcanvas } break; - case META_BMPEXSCALEPART_ACTION: + case MetaActionType::BMPEXSCALEPART: { MetaBmpExScalePartAction* pAct = static_cast<MetaBmpExScalePartAction*>(pCurrAct); @@ -2298,7 +2299,7 @@ namespace cppcanvas } break; - case META_MASK_ACTION: + case MetaActionType::MASK: { MetaMaskAction* pAct = static_cast<MetaMaskAction*>(pCurrAct); @@ -2328,7 +2329,7 @@ namespace cppcanvas } break; - case META_MASKSCALE_ACTION: + case MetaActionType::MASKSCALE: { MetaMaskScaleAction* pAct = static_cast<MetaMaskScaleAction*>(pCurrAct); @@ -2360,7 +2361,7 @@ namespace cppcanvas } break; - case META_MASKSCALEPART_ACTION: + case MetaActionType::MASKSCALEPART: { MetaMaskScalePartAction* pAct = static_cast<MetaMaskScalePartAction*>(pCurrAct); @@ -2398,16 +2399,16 @@ namespace cppcanvas } break; - case META_GRADIENTEX_ACTION: + case MetaActionType::GRADIENTEX: // TODO(F1): use native Canvas gradients here - // action is ignored here, because redundant to META_GRADIENT_ACTION + // action is ignored here, because redundant to MetaActionType::GRADIENT break; - case META_WALLPAPER_ACTION: + case MetaActionType::WALLPAPER: // TODO(F2): NYI break; - case META_TRANSPARENT_ACTION: + case MetaActionType::TRANSPARENT: { const OutDevState& rState( rStates.getState() ); if( rState.lineColor.getLength() || @@ -2437,7 +2438,7 @@ namespace cppcanvas } break; - case META_FLOATTRANSPARENT_ACTION: + case MetaActionType::FLOATTRANSPARENT: { MetaFloatTransparentAction* pAct = static_cast<MetaFloatTransparentAction*>(pCurrAct); @@ -2474,7 +2475,7 @@ namespace cppcanvas } break; - case META_TEXT_ACTION: + case MetaActionType::TEXT: { MetaTextAction* pAct = static_cast<MetaTextAction*>(pCurrAct); OUString sText = pAct->GetText(); @@ -2495,7 +2496,7 @@ namespace cppcanvas } break; - case META_TEXTARRAY_ACTION: + case MetaActionType::TEXTARRAY: { MetaTextArrayAction* pAct = static_cast<MetaTextArrayAction*>(pCurrAct); OUString sText = pAct->GetText(); @@ -2516,7 +2517,7 @@ namespace cppcanvas } break; - case META_TEXTLINE_ACTION: + case MetaActionType::TEXTLINE: { MetaTextLineAction* pAct = static_cast<MetaTextLineAction*>(pCurrAct); @@ -2552,7 +2553,7 @@ namespace cppcanvas } break; - case META_TEXTRECT_ACTION: + case MetaActionType::TEXTRECT: { MetaTextRectAction* pAct = static_cast<MetaTextRectAction*>(pCurrAct); @@ -2575,7 +2576,7 @@ namespace cppcanvas break; } - case META_STRETCHTEXT_ACTION: + case MetaActionType::STRETCHTEXT: { MetaStretchTextAction* pAct = static_cast<MetaStretchTextAction*>(pCurrAct); OUString sText = pAct->GetText(); diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx index 412280b..b83f9a5 100644 --- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx +++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx @@ -264,60 +264,60 @@ namespace cppcanvas { switch( pCurrAct->GetType() ) { - case META_PUSH_ACTION: - case META_POP_ACTION: - case META_CLIPREGION_ACTION: - case META_ISECTRECTCLIPREGION_ACTION: - case META_ISECTREGIONCLIPREGION_ACTION: - case META_MOVECLIPREGION_ACTION: - case META_LINECOLOR_ACTION: - case META_FILLCOLOR_ACTION: - case META_TEXTCOLOR_ACTION: - case META_TEXTFILLCOLOR_ACTION: - case META_TEXTLINECOLOR_ACTION: - case META_TEXTALIGN_ACTION: - case META_FONT_ACTION: - case META_RASTEROP_ACTION: - case META_REFPOINT_ACTION: - case META_LAYOUTMODE_ACTION: + case MetaActionType::PUSH: + case MetaActionType::POP: + case MetaActionType::CLIPREGION: + case MetaActionType::ISECTRECTCLIPREGION: + case MetaActionType::ISECTREGIONCLIPREGION: + case MetaActionType::MOVECLIPREGION: + case MetaActionType::LINECOLOR: + case MetaActionType::FILLCOLOR: + case MetaActionType::TEXTCOLOR: + case MetaActionType::TEXTFILLCOLOR: + case MetaActionType::TEXTLINECOLOR: + case MetaActionType::TEXTALIGN: + case MetaActionType::FONT: + case MetaActionType::RASTEROP: + case MetaActionType::REFPOINT: + case MetaActionType::LAYOUTMODE: // state-changing action - copy as-is aMtf.AddAction( pCurrAct->Clone() ); break; - case META_GRADIENT_ACTION: - case META_HATCH_ACTION: - case META_EPS_ACTION: - case META_COMMENT_ACTION: - case META_POINT_ACTION: - case META_PIXEL_ACTION: - case META_LINE_ACTION: - case META_RECT_ACTION: - case META_ROUNDRECT_ACTION: - case META_ELLIPSE_ACTION: - case META_ARC_ACTION: - case META_PIE_ACTION: - case META_CHORD_ACTION: - case META_POLYLINE_ACTION: - case META_POLYGON_ACTION: - case META_POLYPOLYGON_ACTION: - 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 META_MASK_ACTION: - case META_MASKSCALE_ACTION: - case META_MASKSCALEPART_ACTION: - case META_GRADIENTEX_ACTION: - case META_WALLPAPER_ACTION: - case META_TRANSPARENT_ACTION: - case META_FLOATTRANSPARENT_ACTION: - case META_TEXT_ACTION: - case META_TEXTARRAY_ACTION: - case META_TEXTLINE_ACTION: - case META_TEXTRECT_ACTION: - case META_STRETCHTEXT_ACTION: + case MetaActionType::GRADIENT: + case MetaActionType::HATCH: + case MetaActionType::EPS: + case MetaActionType::COMMENT: + case MetaActionType::POINT: + case MetaActionType::PIXEL: + case MetaActionType::LINE: + case MetaActionType::RECT: + case MetaActionType::ROUNDRECT: + case MetaActionType::ELLIPSE: + case MetaActionType::ARC: + case MetaActionType::PIE: + case MetaActionType::CHORD: + case MetaActionType::POLYLINE: + case MetaActionType::POLYGON: + case MetaActionType::POLYPOLYGON: + case MetaActionType::BMP: + case MetaActionType::BMPSCALE: + case MetaActionType::BMPSCALEPART: + case MetaActionType::BMPEX: + case MetaActionType::BMPEXSCALE: + case MetaActionType::BMPEXSCALEPART: + case MetaActionType::MASK: + case MetaActionType::MASKSCALE: + case MetaActionType::MASKSCALEPART: + case MetaActionType::GRADIENTEX: + case MetaActionType::WALLPAPER: + case MetaActionType::TRANSPARENT: + case MetaActionType::FLOATTRANSPARENT: + case MetaActionType::TEXT: + case MetaActionType::TEXTARRAY: + case MetaActionType::TEXTLINE: + case MetaActionType::TEXTRECT: + case MetaActionType::STRETCHTEXT: // output-generating action - only // copy, if we're within the // requested subset diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index d953d3b..6deb31e 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -1596,7 +1596,7 @@ namespace /** This is the main interpreter method. It is designed to handle the given Metafile completely inside the given context and target. It may use and modify the context and target. This design allows to call itself recursively which adapted contexts and - targets as e.g. needed for the META_FLOATTRANSPARENT_ACTION where the content is expressed + targets as e.g. needed for the MetaActionType::FLOATTRANSPARENT where the content is expressed as a metafile as sub-content. This interpreter is as free of VCL functionality as possible. It uses VCL data classes @@ -1643,18 +1643,18 @@ namespace switch(pAction->GetType()) { - case META_NULL_ACTION : + case MetaActionType::NONE : { /** SIMPLE, DONE */ break; } - case META_PIXEL_ACTION : + case MetaActionType::PIXEL : { /** CHECKED, WORKS WELL */ std::vector< basegfx::B2DPoint > aPositions; Color aLastColor(COL_BLACK); - while(META_PIXEL_ACTION == pAction->GetType() && nAction < nCount) + while(MetaActionType::PIXEL == pAction->GetType() && nAction < nCount) { const MetaPixelAction* pA = static_cast<const MetaPixelAction*>(pAction); @@ -1683,14 +1683,14 @@ namespace break; } - case META_POINT_ACTION : + case MetaActionType::POINT : { /** CHECKED, WORKS WELL */ if(rPropertyHolders.Current().getLineColorActive()) { std::vector< basegfx::B2DPoint > aPositions; - while(META_POINT_ACTION == pAction->GetType() && nAction < nCount) + while(MetaActionType::POINT == pAction->GetType() && nAction < nCount) { const MetaPointAction* pA = static_cast<const MetaPointAction*>(pAction); const Point& rPoint = pA->GetPoint(); @@ -1708,7 +1708,7 @@ namespace break; } - case META_LINE_ACTION : + case MetaActionType::LINE : { /** CHECKED, WORKS WELL */ if(rPropertyHolders.Current().getLineColorActive()) @@ -1716,7 +1716,7 @@ namespace basegfx::B2DPolygon aLinePolygon; LineInfo aLineInfo; - while(META_LINE_ACTION == pAction->GetType() && nAction < nCount) + while(MetaActionType::LINE == pAction->GetType() && nAction < nCount) { const MetaLineAction* pA = static_cast<const MetaLineAction*>(pAction); const Point& rStartPoint = pA->GetStartPoint(); @@ -1762,7 +1762,7 @@ namespace break; } - case META_RECT_ACTION : + case MetaActionType::RECT : { /** CHECKED, WORKS WELL */ if(rPropertyHolders.Current().getLineOrFillActive()) @@ -1784,7 +1784,7 @@ namespace break; } - case META_ROUNDRECT_ACTION : + case MetaActionType::ROUNDRECT : { /** CHECKED, WORKS WELL */ /** The original OutputDevice::DrawRect paints nothing when nHor or nVer is zero; but just @@ -1828,7 +1828,7 @@ namespace break; } - case META_ELLIPSE_ACTION : + case MetaActionType::ELLIPSE : { /** CHECKED, WORKS WELL */ if(rPropertyHolders.Current().getLineOrFillActive()) @@ -1852,7 +1852,7 @@ namespace break; } - case META_ARC_ACTION : + case MetaActionType::ARC : { /** CHECKED, WORKS WELL */ if(rPropertyHolders.Current().getLineColorActive()) @@ -1866,7 +1866,7 @@ namespace break; } - case META_PIE_ACTION : + case MetaActionType::PIE : { /** CHECKED, WORKS WELL */ if(rPropertyHolders.Current().getLineOrFillActive()) @@ -1880,7 +1880,7 @@ namespace break; } - case META_CHORD_ACTION : + case MetaActionType::CHORD : { /** CHECKED, WORKS WELL */ if(rPropertyHolders.Current().getLineOrFillActive()) @@ -1894,7 +1894,7 @@ namespace break; } - case META_POLYLINE_ACTION : + case MetaActionType::POLYLINE : { /** CHECKED, WORKS WELL */ if(rPropertyHolders.Current().getLineColorActive()) @@ -1905,7 +1905,7 @@ namespace break; } - case META_POLYGON_ACTION : + case MetaActionType::POLYGON : { /** CHECKED, WORKS WELL */ if(rPropertyHolders.Current().getLineOrFillActive()) @@ -1926,7 +1926,7 @@ namespace break; } - case META_POLYPOLYGON_ACTION : + case MetaActionType::POLYPOLYGON : { /** CHECKED, WORKS WELL */ if(rPropertyHolders.Current().getLineOrFillActive()) @@ -1953,7 +1953,7 @@ namespace break; } - case META_TEXT_ACTION : + case MetaActionType::TEXT : { /** CHECKED, WORKS WELL */ const MetaTextAction* pA = static_cast<const MetaTextAction*>(pAction); @@ -1981,7 +1981,7 @@ namespace break; } - case META_TEXTARRAY_ACTION : + case MetaActionType::TEXTARRAY : { /** CHECKED, WORKS WELL */ const MetaTextArrayAction* pA = static_cast<const MetaTextArrayAction*>(pAction); @@ -2022,7 +2022,7 @@ namespace break; } - case META_STRETCHTEXT_ACTION : + case MetaActionType::STRETCHTEXT : { // #i108440# StarMath uses MetaStretchTextAction, thus support is needed. // It looks as if it pretty never really uses a width different from @@ -2085,10 +2085,10 @@ namespace break; } - case META_TEXTRECT_ACTION : + case MetaActionType::TEXTRECT : { /** CHECKED, WORKS WELL */ - // OSL_FAIL("META_TEXTRECT_ACTION requested (!)"); + // OSL_FAIL("MetaActionType::TEXTRECT requested (!)"); const MetaTextRectAction* pA = static_cast<const MetaTextRectAction*>(pAction); const Rectangle& rRectangle = pA->GetRect(); const sal_uInt32 nStringLength(pA->GetText().getLength()); @@ -2145,7 +2145,7 @@ namespace break; } - case META_BMP_ACTION : + case MetaActionType::BMP : { /** CHECKED, WORKS WELL */ const MetaBmpAction* pA = static_cast<const MetaBmpAction*>(pAction); @@ -2155,7 +2155,7 @@ namespace break; } - case META_BMPSCALE_ACTION : + case MetaActionType::BMPSCALE : { /** CHECKED, WORKS WELL */ const MetaBmpScaleAction* pA = static_cast<const MetaBmpScaleAction*>(pAction); @@ -2165,7 +2165,7 @@ namespace break; } - case META_BMPSCALEPART_ACTION : + case MetaActionType::BMPSCALEPART : { /** CHECKED, WORKS WELL */ const MetaBmpScalePartAction* pA = static_cast<const MetaBmpScalePartAction*>(pAction); @@ -2187,9 +2187,9 @@ namespace break; } - case META_BMPEX_ACTION : + case MetaActionType::BMPEX : { - /** CHECKED, WORKS WELL: Simply same as META_BMP_ACTION */ + /** CHECKED, WORKS WELL: Simply same as MetaActionType::BMP */ const MetaBmpExAction* pA = static_cast<const MetaBmpExAction*>(pAction); const BitmapEx& rBitmapEx = pA->GetBitmapEx(); @@ -2197,9 +2197,9 @@ namespace break; } - case META_BMPEXSCALE_ACTION : + case MetaActionType::BMPEXSCALE : { - /** CHECKED, WORKS WELL: Simply same as META_BMPSCALE_ACTION */ + /** CHECKED, WORKS WELL: Simply same as MetaActionType::BMPSCALE */ const MetaBmpExScaleAction* pA = static_cast<const MetaBmpExScaleAction*>(pAction); const BitmapEx& rBitmapEx = pA->GetBitmapEx(); @@ -2207,9 +2207,9 @@ namespace break; } - case META_BMPEXSCALEPART_ACTION : + case MetaActionType::BMPEXSCALEPART : { - /** CHECKED, WORKS WELL: Simply same as META_BMPSCALEPART_ACTION */ + /** CHECKED, WORKS WELL: Simply same as MetaActionType::BMPSCALEPART */ const MetaBmpExScalePartAction* pA = static_cast<const MetaBmpExScalePartAction*>(pAction); const BitmapEx& rBitmapEx = pA->GetBitmapEx(); @@ -2228,9 +2228,9 @@ namespace break; } - case META_MASK_ACTION : + case MetaActionType::MASK : { - /** CHECKED, WORKS WELL: Simply same as META_BMP_ACTION */ + /** CHECKED, WORKS WELL: Simply same as MetaActionType::BMP */ /** Huh, no it isn't!? */ const MetaMaskAction* pA = static_cast<const MetaMaskAction*>(pAction); const BitmapEx aBitmapEx(createMaskBmpEx(pA->GetBitmap(), pA->GetColor())); @@ -2239,9 +2239,9 @@ namespace break; } - case META_MASKSCALE_ACTION : + case MetaActionType::MASKSCALE : { - /** CHECKED, WORKS WELL: Simply same as META_BMPSCALE_ACTION */ + /** CHECKED, WORKS WELL: Simply same as MetaActionType::BMPSCALE */ const MetaMaskScaleAction* pA = static_cast<const MetaMaskScaleAction*>(pAction); const BitmapEx aBitmapEx(createMaskBmpEx(pA->GetBitmap(), pA->GetColor())); @@ -2249,9 +2249,9 @@ namespace break; } - case META_MASKSCALEPART_ACTION : + case MetaActionType::MASKSCALEPART : { - /** CHECKED, WORKS WELL: Simply same as META_BMPSCALEPART_ACTION */ + /** CHECKED, WORKS WELL: Simply same as MetaActionType::BMPSCALEPART */ const MetaMaskScalePartAction* pA = static_cast<const MetaMaskScalePartAction*>(pAction); const Bitmap& rBitmap = pA->GetBitmap(); @@ -2271,7 +2271,7 @@ namespace break; } - case META_GRADIENT_ACTION : + case MetaActionType::GRADIENT : { /** CHECKED, WORKS WELL */ const MetaGradientAction* pA = static_cast<const MetaGradientAction*>(pAction); @@ -2333,7 +2333,7 @@ namespace break; } - case META_HATCH_ACTION : + case MetaActionType::HATCH : { /** CHECKED, WORKS WELL */ const MetaHatchAction* pA = static_cast<const MetaHatchAction*>(pAction); @@ -2361,7 +2361,7 @@ namespace break; } - case META_WALLPAPER_ACTION : + case MetaActionType::WALLPAPER : { /** CHECKED, WORKS WELL */ const MetaWallpaperAction* pA = static_cast<const MetaWallpaperAction*>(pAction); @@ -2411,7 +2411,7 @@ namespace break; } - case META_CLIPREGION_ACTION : + case MetaActionType::CLIPREGION : { /** CHECKED, WORKS WELL */ const MetaClipRegionAction* pA = static_cast<const MetaClipRegionAction*>(pAction); @@ -2434,7 +2434,7 @@ namespace break; } - case META_ISECTRECTCLIPREGION_ACTION : + case MetaActionType::ISECTRECTCLIPREGION : { /** CHECKED, WORKS WELL */ const MetaISectRectClipRegionAction* pA = static_cast<const MetaISectRectClipRegionAction*>(pAction); @@ -2502,7 +2502,7 @@ namespace break; } - case META_ISECTREGIONCLIPREGION_ACTION : + case MetaActionType::ISECTREGIONCLIPREGION : { /** CHECKED, WORKS WELL */ const MetaISectRegionClipRegionAction* pA = static_cast<const MetaISectRegionClipRegionAction*>(pAction); @@ -2558,7 +2558,7 @@ namespace break; } - case META_MOVECLIPREGION_ACTION : + case MetaActionType::MOVECLIPREGION : { /** CHECKED, WORKS WELL */ const MetaMoveClipRegionAction* pA = static_cast<const MetaMoveClipRegionAction*>(pAction); @@ -2594,7 +2594,7 @@ namespace break; } - case META_LINECOLOR_ACTION : + case MetaActionType::LINECOLOR : { /** CHECKED, WORKS WELL */ const MetaLineColorAction* pA = static_cast<const MetaLineColorAction*>(pAction); @@ -2606,7 +2606,7 @@ namespace break; } - case META_FILLCOLOR_ACTION : + case MetaActionType::FILLCOLOR : { /** CHECKED, WORKS WELL */ const MetaFillColorAction* pA = static_cast<const MetaFillColorAction*>(pAction); @@ -2618,7 +2618,7 @@ namespace break; } - case META_TEXTCOLOR_ACTION : + case MetaActionType::TEXTCOLOR : { /** SIMPLE, DONE */ const MetaTextColorAction* pA = static_cast<const MetaTextColorAction*>(pAction); @@ -2629,7 +2629,7 @@ namespace break; } - case META_TEXTFILLCOLOR_ACTION : + case MetaActionType::TEXTFILLCOLOR : { /** SIMPLE, DONE */ const MetaTextFillColorAction* pA = static_cast<const MetaTextFillColorAction*>(pAction); @@ -2650,7 +2650,7 @@ namespace break; } - case META_TEXTALIGN_ACTION : + case MetaActionType::TEXTALIGN : { /** SIMPLE, DONE */ const MetaTextAlignAction* pA = static_cast<const MetaTextAlignAction*>(pAction); @@ -2668,7 +2668,7 @@ namespace break; } - case META_MAPMODE_ACTION : + case MetaActionType::MAPMODE : { /** CHECKED, WORKS WELL */ // the most necessary MapMode to be interpreted is MAP_RELATIVE, @@ -2708,7 +2708,7 @@ namespace } default : { - OSL_FAIL("interpretMetafile: META_MAPMODE_ACTION with unsupported MapUnit (!)"); + OSL_FAIL("interpretMetafile: MetaActionType::MAPMODE with unsupported MapUnit (!)"); break; } } @@ -2725,7 +2725,7 @@ namespace break; } - case META_FONT_ACTION : + case MetaActionType::FONT : { /** SIMPLE, DONE */ const MetaFontAction* pA = static_cast<const MetaFontAction*>(pAction); @@ -2749,7 +2749,7 @@ namespace rPropertyHolders.Current().setFont(aCorrectedFont); } - // older Metafiles have no META_TEXTCOLOR_ACTION which defines + // older Metafiles have no MetaActionType::TEXTCOLOR which defines // the FontColor now, so use the Font's color when not transparent const Color& rFontColor = pA->GetFont().GetColor(); const bool bActivate(COL_TRANSPARENT != rFontColor.GetColor()); @@ -2778,7 +2778,7 @@ namespace break; } - case META_PUSH_ACTION : + case MetaActionType::PUSH : { /** CHECKED, WORKS WELL */ const MetaPushAction* pA = static_cast<const MetaPushAction*>(pAction); @@ -2786,7 +2786,7 @@ namespace break; } - case META_POP_ACTION : + case MetaActionType::POP : { /** CHECKED, WORKS WELL */ const bool bRegionMayChange(rPropertyHolders.Current().getPushFlags() & PushFlags::CLIPREGION); @@ -2823,7 +2823,7 @@ namespace break; } - case META_RASTEROP_ACTION : + case MetaActionType::RASTEROP : { /** CHECKED, WORKS WELL */ const MetaRasterOpAction* pA = static_cast<const MetaRasterOpAction*>(pAction); @@ -2833,7 +2833,7 @@ namespace break; } - case META_TRANSPARENT_ACTION : + case MetaActionType::TRANSPARENT : { /** CHECKED, WORKS WELL */ const MetaTransparentAction* pA = static_cast<const MetaTransparentAction*>(pAction); @@ -2877,7 +2877,7 @@ namespace break; } - case META_EPS_ACTION : + case MetaActionType::EPS : { /** CHECKED, WORKS WELL */ // To support this action, i have added a EpsPrimitive2D which will @@ -2910,7 +2910,7 @@ namespace break; } - case META_REFPOINT_ACTION : + case MetaActionType::REFPOINT : { /** SIMPLE, DONE */ // only used for hatch and line pattern offsets, pretty much no longer @@ -2918,7 +2918,7 @@ namespace // const MetaRefPointAction* pA = (const MetaRefPointAction*)pAction; break; } - case META_TEXTLINECOLOR_ACTION : + case MetaActionType::TEXTLINECOLOR : { /** SIMPLE, DONE */ const MetaTextLineColorAction* pA = static_cast<const MetaTextLineColorAction*>(pAction); @@ -2930,7 +2930,7 @@ namespace break; } - case META_TEXTLINE_ACTION : + case MetaActionType::TEXTLINE : { /** CHECKED, WORKS WELL */ // actually creates overline, underline and strikeouts, so @@ -2949,7 +2949,7 @@ namespace break; } - case META_FLOATTRANSPARENT_ACTION : + case MetaActionType::FLOATTRANSPARENT : { /** CHECKED, WORKS WELL */ const MetaFloatTransparentAction* pA = static_cast<const MetaFloatTransparentAction*>(pAction); @@ -3050,29 +3050,29 @@ namespace break; } - case META_GRADIENTEX_ACTION : + case MetaActionType::GRADIENTEX : { /** SIMPLE, DONE */ // This is only a data holder which is interpreted inside comment actions, - // see META_COMMENT_ACTION for more info + // see MetaActionType::COMMENT for more info // const MetaGradientExAction* pA = (const MetaGradientExAction*)pAction; break; } - case META_LAYOUTMODE_ACTION : + case MetaActionType::LAYOUTMODE : { /** SIMPLE, DONE */ const MetaLayoutModeAction* pA = static_cast<const MetaLayoutModeAction*>(pAction); rPropertyHolders.Current().setLayoutMode(pA->GetLayoutMode()); break; } - case META_TEXTLANGUAGE_ACTION : + case MetaActionType::TEXTLANGUAGE : { /** SIMPLE, DONE */ const MetaTextLanguageAction* pA = static_cast<const MetaTextLanguageAction*>(pAction); rPropertyHolders.Current().setLanguageType(pA->GetTextLanguage()); break; } - case META_OVERLINECOLOR_ACTION : + case MetaActionType::OVERLINECOLOR : { /** SIMPLE, DONE */ const MetaOverlineColorAction* pA = static_cast<const MetaOverlineColorAction*>(pAction); @@ -3084,7 +3084,7 @@ namespace break; } - case META_COMMENT_ACTION : + case MetaActionType::COMMENT : { /** CHECKED, WORKS WELL */ // I already implemented @@ -3108,11 +3108,11 @@ namespace { pAction = rMetaFile.GetAction(b); - if(META_GRADIENTEX_ACTION == pAction->GetType()) + if(MetaActionType::GRADIENTEX == pAction->GetType()) { pMetaGradientExAction = static_cast<const MetaGradientExAction*>(pAction); } - else if(META_COMMENT_ACTION == pAction->GetType()) + else if(MetaActionType::COMMENT == pAction->GetType()) { if (static_cast<const MetaCommentAction*>(pAction)->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_END")) { diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index fb4402b..ffc0e29 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -1180,7 +1180,7 @@ namespace drawinglayer SvtGraphicStroke* pSvtGraphicStroke = 0; // #i121267# Not needed, does not give better quality compared with - // the META_POLYPOLYGON_ACTION written by RenderPolygonHairlinePrimitive2D + // the MetaActionType::POLYPOLYGON written by RenderPolygonHairlinePrimitive2D // below bool bSupportSvtGraphicStroke(false); @@ -1686,7 +1686,7 @@ namespace drawinglayer SvtGraphicFill* pSvtGraphicFill = 0; // #i121267# Not needed, does not give better quality compared with - // the META_POLYPOLYGON_ACTION written by the DrawPolyPolygon command + // the MetaActionType::POLYPOLYGON written by the DrawPolyPolygon command // below bool bSupportSvtGraphicFill(false); @@ -1864,7 +1864,7 @@ namespace drawinglayer SvtGraphicFill* pSvtGraphicFill = 0; // #i121267# Not needed, does not give better quality compared with - // the META_POLYPOLYGON_ACTION written by the DrawPolyPolygon command + // the MetaActionType::POLYPOLYGON written by the DrawPolyPolygon command // below bool bSupportSvtGraphicFill(false); diff --git a/filter/qa/cppunit/filters-pict-test.cxx b/filter/qa/cppunit/filters-pict-test.cxx index ec69824..bdfa9c2 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 c443a1e..f7e5250 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 06dcb73..2dcaf36 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 ef7b130..903973e 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 9bf3953..9a9ea84 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); ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
