diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-05 08:29:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-06 08:43:33 +0200 |
| commit | dccd1633a111ba124f9868a4a51579c95200d745 (patch) | |
| tree | 221a16d33215ffde2b249c7aca6f8c83981dbec4 | |
| parent | 9c34471f54870fc685c343f4af30310e75d3a9ca (diff) | |
loplugin:unnecessaryparen include case statements
Change-Id: I79fb3eec0d5d466e33b2e18621a7169695edf82f
Reviewed-on: https://gerrit.libreoffice.org/41920
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
27 files changed, 433 insertions, 434 deletions
diff --git a/avmedia/source/framework/MediaControlBase.cxx b/avmedia/source/framework/MediaControlBase.cxx index a0a03f9eb783..b1998202dbe4 100644 --- a/avmedia/source/framework/MediaControlBase.cxx +++ b/avmedia/source/framework/MediaControlBase.cxx @@ -180,19 +180,19 @@ void MediaControlBase::UpdateToolBoxes(MediaItem aMediaItem) switch( aMediaItem.getZoom() ) { - case( css::media::ZoomLevel_ZOOM_1_TO_2 ): + case css::media::ZoomLevel_ZOOM_1_TO_2: nSelectEntryPos = AVMEDIA_ZOOMLEVEL_50; break; - case( css::media::ZoomLevel_ORIGINAL ): + case css::media::ZoomLevel_ORIGINAL: nSelectEntryPos = AVMEDIA_ZOOMLEVEL_100; break; - case( css::media::ZoomLevel_ZOOM_2_TO_1 ): + case css::media::ZoomLevel_ZOOM_2_TO_1: nSelectEntryPos = AVMEDIA_ZOOMLEVEL_200; break; - case( css::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT ): + case css::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT: nSelectEntryPos = AVMEDIA_ZOOMLEVEL_FIT; break; - case( css::media::ZoomLevel_FIT_TO_WINDOW ): + case css::media::ZoomLevel_FIT_TO_WINDOW: nSelectEntryPos = AVMEDIA_ZOOMLEVEL_SCALED; break; diff --git a/compilerplugins/clang/test/unnecessaryparen.cxx b/compilerplugins/clang/test/unnecessaryparen.cxx index 1ea22288673e..cb237c551889 100644 --- a/compilerplugins/clang/test/unnecessaryparen.cxx +++ b/compilerplugins/clang/test/unnecessaryparen.cxx @@ -23,10 +23,9 @@ int main() int y = (x); // expected-error {{unnecessary parentheses around identifier [loplugin:unnecessaryparen]}} (void)y; - // lots of our code uses this style, which I'm loathe to bulk-fix as yet EFoo foo = EFoo::Bar; switch (foo) { - case (EFoo::Bar): break; + case (EFoo::Bar): break; // expected-error {{parentheses immediately inside case statement [loplugin:unnecessaryparen]}} } // lots of our code uses this style, which I'm loathe to bulk-fix as yet diff --git a/compilerplugins/clang/unnecessaryparen.cxx b/compilerplugins/clang/unnecessaryparen.cxx index 7f0e532585c1..8a94051d5bf4 100644 --- a/compilerplugins/clang/unnecessaryparen.cxx +++ b/compilerplugins/clang/unnecessaryparen.cxx @@ -55,6 +55,7 @@ public: bool VisitDoStmt(const DoStmt *); bool VisitWhileStmt(const WhileStmt *); bool VisitSwitchStmt(const SwitchStmt *); + bool VisitCaseStmt(const CaseStmt *); bool VisitReturnStmt(const ReturnStmt* ); bool VisitCallExpr(const CallExpr *); bool TraverseUnaryExprOrTypeTraitExpr(UnaryExprOrTypeTraitExpr *); @@ -175,6 +176,12 @@ bool UnnecessaryParen::VisitSwitchStmt(const SwitchStmt* switchStmt) return true; } +bool UnnecessaryParen::VisitCaseStmt(const CaseStmt* caseStmt) +{ + VisitSomeStmt(caseStmt, caseStmt->getLHS(), "case"); + return true; +} + bool UnnecessaryParen::VisitReturnStmt(const ReturnStmt* returnStmt) { if (ignoreLocation(returnStmt)) diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx index 7f52201540c9..7b796a5c4bed 100644 --- a/filter/source/flash/swfexporter.cxx +++ b/filter/source/flash/swfexporter.cxx @@ -670,19 +670,12 @@ bool FlashExporter::getMetaFile( Reference< XComponent > const &xComponent, GDIM tools::Rectangle clipRect; for( size_t i = 0, nCount = rMtf.GetActionSize(); i < nCount; i++ ) { - const MetaAction* pAction = rMtf.GetAction( i ); - const MetaActionType nType = pAction->GetType(); - - switch( nType ) + const MetaAction* pAction = rMtf.GetAction( i ); + if (pAction->GetType() == MetaActionType::ISECTRECTCLIPREGION) { - case( MetaActionType::ISECTRECTCLIPREGION ): - { - const MetaISectRectClipRegionAction* pA = static_cast<const MetaISectRectClipRegionAction*>(pAction); - clipRect = pA->GetRect(); - i = nCount; - break; - } - default: break; + const MetaISectRectClipRegionAction* pA = static_cast<const MetaISectRectClipRegionAction*>(pAction); + clipRect = pA->GetRect(); + break; } } MetaBmpExScaleAction *pmetaAct = new MetaBmpExScaleAction(Point(clipRect.Left(), clipRect.Top()), Size(clipRect.GetWidth(), clipRect.GetHeight()), rBitmapEx); diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index a4d3fe17c06e..23a64e98ea08 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -401,7 +401,7 @@ BitmapChecksum GetBitmapChecksum( const MetaAction* pAction ) switch( nType ) { - case( MetaActionType::BMPSCALE ): + case MetaActionType::BMPSCALE: { const MetaBmpScaleAction* pA = static_cast<const MetaBmpScaleAction*>(pAction); if( pA ) @@ -410,7 +410,7 @@ BitmapChecksum GetBitmapChecksum( const MetaAction* pAction ) OSL_FAIL( "GetBitmapChecksum: MetaBmpScaleAction pointer is null." ); } break; - case( MetaActionType::BMPEXSCALE ): + case MetaActionType::BMPEXSCALE: { const MetaBmpExScaleAction* pA = static_cast<const MetaBmpExScaleAction*>(pAction); if( pA ) @@ -432,7 +432,7 @@ void MetaBitmapActionGetPoint( const MetaAction* pAction, Point& rPt ) const MetaActionType nType = pAction->GetType(); switch( nType ) { - case( MetaActionType::BMPSCALE ): + case MetaActionType::BMPSCALE: { const MetaBmpScaleAction* pA = static_cast<const MetaBmpScaleAction*>(pAction); if( pA ) @@ -441,7 +441,7 @@ void MetaBitmapActionGetPoint( const MetaAction* pAction, Point& rPt ) OSL_FAIL( "MetaBitmapActionGetPoint: MetaBmpScaleAction pointer is null." ); } break; - case( MetaActionType::BMPEXSCALE ): + case MetaActionType::BMPEXSCALE: { const MetaBmpExScaleAction* pA = static_cast<const MetaBmpExScaleAction*>(pAction); if( pA ) diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx index eba5fe313f48..27e092974a44 100644 --- a/filter/source/svg/svgfontexport.cxx +++ b/filter/source/svg/svgfontexport.cxx @@ -92,7 +92,7 @@ void SVGFontExport::implCollectGlyphs() switch( nType ) { - case( MetaActionType::TEXT ): + case MetaActionType::TEXT: { const MetaTextAction* pA = static_cast<const MetaTextAction*>(pAction); sal_Int32 aLength=std::min( pA->GetText().getLength(), pA->GetLen() ); @@ -100,14 +100,14 @@ void SVGFontExport::implCollectGlyphs() } break; - case( MetaActionType::TEXTRECT ): + case MetaActionType::TEXTRECT: { const MetaTextRectAction* pA = static_cast<const MetaTextRectAction*>(pAction); aText = pA->GetText(); } break; - case( MetaActionType::TEXTARRAY ): + case MetaActionType::TEXTARRAY: { const MetaTextArrayAction* pA = static_cast<const MetaTextArrayAction*>(pAction); sal_Int32 aLength=std::min( pA->GetText().getLength(), pA->GetLen() ); @@ -115,7 +115,7 @@ void SVGFontExport::implCollectGlyphs() } break; - case( MetaActionType::STRETCHTEXT ): + 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 3daad7bfe0a4..dab4070a32f2 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -599,37 +599,37 @@ sal_Int32 SVGTextWriter::setTextPosition( const GDIMetaFile& rMtf, sal_uLong& nC switch( nType ) { - case( MetaActionType::TEXT ): + case MetaActionType::TEXT: { bConfigured = implGetTextPosition<MetaTextAction>( pAction, aPos, bEmpty ); } break; - case( MetaActionType::TEXTRECT ): + case MetaActionType::TEXTRECT: { bConfigured = implGetTextPosition<MetaTextRectAction>( pAction, aPos, bEmpty ); } break; - case( MetaActionType::TEXTARRAY ): + case MetaActionType::TEXTARRAY: { bConfigured = implGetTextPosition<MetaTextArrayAction>( pAction, aPos, bEmpty ); } break; - case( MetaActionType::STRETCHTEXT ): + case MetaActionType::STRETCHTEXT: { bConfigured = implGetTextPosition<MetaStretchTextAction>( pAction, aPos, bEmpty ); } break; - case( MetaActionType::BMPSCALE ): + case MetaActionType::BMPSCALE: { bConfigured = implGetTextPositionFromBitmap<MetaBmpScaleAction>( pAction, aPos, bEmpty ); } break; - case( MetaActionType::BMPEXSCALE ): + case MetaActionType::BMPEXSCALE: { bConfigured = implGetTextPositionFromBitmap<MetaBmpExScaleAction>( pAction, aPos, bEmpty ); } @@ -637,7 +637,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( MetaActionType::COMMENT ): + case MetaActionType::COMMENT: { const MetaCommentAction* pA = static_cast<const MetaCommentAction*>(pAction); const OString& rsComment = pA->GetComment(); @@ -715,39 +715,39 @@ void SVGTextWriter::setTextProperties( const GDIMetaFile& rMtf, sal_uLong nCurAc const MetaActionType nType = pAction->GetType(); switch( nType ) { - case( MetaActionType::TEXTLINECOLOR ): - case( MetaActionType::TEXTFILLCOLOR ): - case( MetaActionType::TEXTCOLOR ): - case( MetaActionType::TEXTALIGN ): - case( MetaActionType::FONT ): - case( MetaActionType::LAYOUTMODE ): + 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( MetaActionType::TEXT ): + case MetaActionType::TEXT: { const MetaTextAction* pA = static_cast<const MetaTextAction*>(pAction); if( pA->GetLen() > 2 ) bConfigured = true; } break; - case( MetaActionType::TEXTRECT ): + case MetaActionType::TEXTRECT: { const MetaTextRectAction* pA = static_cast<const MetaTextRectAction*>(pAction); if( pA->GetText().getLength() > 2 ) bConfigured = true; } break; - case( MetaActionType::TEXTARRAY ): + case MetaActionType::TEXTARRAY: { const MetaTextArrayAction* pA = static_cast<const MetaTextArrayAction*>(pAction); if( pA->GetLen() > 2 ) bConfigured = true; } break; - case( MetaActionType::STRETCHTEXT ): + case MetaActionType::STRETCHTEXT: { const MetaStretchTextAction* pA = static_cast<const MetaStretchTextAction*>(pAction); if( pA->GetLen() > 2 ) @@ -756,7 +756,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( MetaActionType::COMMENT ): + case MetaActionType::COMMENT: { const MetaCommentAction* pA = static_cast<const MetaCommentAction*>(pAction); const OString& rsComment = pA->GetComment(); @@ -1276,10 +1276,10 @@ void SVGTextWriter::startTextParagraph() OUString sNumberingType; switch( meNumberingType ) { - case( NumberingType::CHAR_SPECIAL ): + case NumberingType::CHAR_SPECIAL: sNumberingType = "bullet-style"; break; - case( NumberingType::BITMAP ): + case NumberingType::BITMAP: sNumberingType = "image-style"; break; default: @@ -1466,7 +1466,7 @@ void SVGTextWriter::implWriteEmbeddedBitmaps() switch( nType ) { - case( MetaActionType::BMPSCALE ): + case MetaActionType::BMPSCALE: { const MetaBmpScaleAction* pA = static_cast<const MetaBmpScaleAction*>(pAction); nChecksum = pA->GetBitmap().GetChecksum(); @@ -1474,7 +1474,7 @@ void SVGTextWriter::implWriteEmbeddedBitmaps() aSz = pA->GetSize(); } break; - case( MetaActionType::BMPEXSCALE ): + case MetaActionType::BMPEXSCALE: { const MetaBmpExScaleAction* pA = static_cast<const MetaBmpExScaleAction*>(pAction); nChecksum = pA->GetBitmapEx().GetChecksum(); @@ -2843,7 +2843,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, #endif switch( nType ) { - case( MetaActionType::PIXEL ): + case MetaActionType::PIXEL: { if( nWriteFlags & SVGWRITER_WRITE_FILL ) { @@ -2855,7 +2855,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::POINT ): + case MetaActionType::POINT: { if( nWriteFlags & SVGWRITER_WRITE_FILL ) { @@ -2867,7 +2867,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::LINE ): + case MetaActionType::LINE: { if( nWriteFlags & SVGWRITER_WRITE_FILL ) { @@ -2879,7 +2879,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::RECT ): + case MetaActionType::RECT: { if( nWriteFlags & SVGWRITER_WRITE_FILL ) { @@ -2889,7 +2889,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::ROUNDRECT ): + case MetaActionType::ROUNDRECT: { if( nWriteFlags & SVGWRITER_WRITE_FILL ) { @@ -2901,7 +2901,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::ELLIPSE ): + case MetaActionType::ELLIPSE: { if( nWriteFlags & SVGWRITER_WRITE_FILL ) { @@ -2914,10 +2914,10 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::ARC ): - case( MetaActionType::PIE ): - case( MetaActionType::CHORD ): - case( MetaActionType::POLYGON ): + case MetaActionType::ARC: + case MetaActionType::PIE: + case MetaActionType::CHORD: + case MetaActionType::POLYGON: { if( nWriteFlags & SVGWRITER_WRITE_FILL ) { @@ -2925,28 +2925,28 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, switch( nType ) { - case( MetaActionType::ARC ): + case MetaActionType::ARC: { const MetaArcAction* pA = static_cast<const MetaArcAction*>(pAction); aPoly = tools::Polygon( pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), PolyStyle::Arc ); } break; - case( MetaActionType::PIE ): + case MetaActionType::PIE: { const MetaPieAction* pA = static_cast<const MetaPieAction*>(pAction); aPoly = tools::Polygon( pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), PolyStyle::Pie ); } break; - case( MetaActionType::CHORD ): + case MetaActionType::CHORD: { const MetaChordAction* pA = static_cast<const MetaChordAction*>(pAction); aPoly = tools::Polygon( pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), PolyStyle::Chord ); } break; - case( MetaActionType::POLYGON ): + case MetaActionType::POLYGON: aPoly = static_cast<const MetaPolygonAction*>(pAction)->GetPolygon(); break; default: break; @@ -2961,7 +2961,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::POLYLINE ): + case MetaActionType::POLYLINE: { if( nWriteFlags & SVGWRITER_WRITE_FILL ) { @@ -2978,7 +2978,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::POLYPOLYGON ): + case MetaActionType::POLYPOLYGON: { if( nWriteFlags & SVGWRITER_WRITE_FILL ) { @@ -2994,7 +2994,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::GRADIENT ): + case MetaActionType::GRADIENT: { if( nWriteFlags & SVGWRITER_WRITE_FILL ) { @@ -3007,7 +3007,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::GRADIENTEX ): + case MetaActionType::GRADIENTEX: { if( nWriteFlags & SVGWRITER_WRITE_FILL ) { @@ -3027,7 +3027,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::Transparent ): + case MetaActionType::Transparent: { if( nWriteFlags & SVGWRITER_WRITE_FILL ) { @@ -3048,7 +3048,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::FLOATTRANSPARENT ): + case MetaActionType::FLOATTRANSPARENT: { if( nWriteFlags & SVGWRITER_WRITE_FILL ) { @@ -3060,7 +3060,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::EPS ): + case MetaActionType::EPS: { if( nWriteFlags & SVGWRITER_WRITE_FILL ) { @@ -3085,7 +3085,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::COMMENT ): + case MetaActionType::COMMENT: { const MetaCommentAction* pA = static_cast<const MetaCommentAction*>(pAction); @@ -3452,7 +3452,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::BMP ): + case MetaActionType::BMP: { if( nWriteFlags & SVGWRITER_WRITE_FILL ) { @@ -3465,7 +3465,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::BMPSCALE ): + case MetaActionType::BMPSCALE: { if( nWriteFlags & SVGWRITER_WRITE_FILL ) { @@ -3486,7 +3486,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::BMPSCALEPART ): + case MetaActionType::BMPSCALEPART: { if( nWriteFlags & SVGWRITER_WRITE_FILL ) { @@ -3499,7 +3499,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::BMPEX ): + case MetaActionType::BMPEX: { if( nWriteFlags & SVGWRITER_WRITE_FILL ) { @@ -3512,7 +3512,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::BMPEXSCALE ): + case MetaActionType::BMPEXSCALE: { if( nWriteFlags & SVGWRITER_WRITE_FILL ) { @@ -3533,7 +3533,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::BMPEXSCALEPART ): + case MetaActionType::BMPEXSCALEPART: { if( nWriteFlags & SVGWRITER_WRITE_FILL ) { @@ -3546,7 +3546,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::TEXT ): + case MetaActionType::TEXT: { if( nWriteFlags & SVGWRITER_WRITE_TEXT ) { @@ -3571,7 +3571,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::TEXTRECT ): + case MetaActionType::TEXTRECT: { if( nWriteFlags & SVGWRITER_WRITE_TEXT ) { @@ -3591,7 +3591,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::TEXTARRAY ): + case MetaActionType::TEXTARRAY: { if( nWriteFlags & SVGWRITER_WRITE_TEXT ) { @@ -3616,7 +3616,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::STRETCHTEXT ): + case MetaActionType::STRETCHTEXT: { if( nWriteFlags & SVGWRITER_WRITE_TEXT ) { @@ -3641,10 +3641,10 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::CLIPREGION ): - case( MetaActionType::ISECTRECTCLIPREGION ): - case( MetaActionType::ISECTREGIONCLIPREGION ): - case( MetaActionType::MOVECLIPREGION ): + case MetaActionType::CLIPREGION: + case MetaActionType::ISECTRECTCLIPREGION: + case MetaActionType::ISECTREGIONCLIPREGION: + case MetaActionType::MOVECLIPREGION: { const_cast<MetaAction*>(pAction)->Execute( mpVDev ); const vcl::Region& rClipRegion = mpVDev->GetActiveClipRegion(); @@ -3654,7 +3654,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::PUSH ): + case MetaActionType::PUSH: { const MetaPushAction* pA = static_cast<const MetaPushAction*>(pAction); PushFlags mnFlags = pA->GetFlags(); @@ -3665,7 +3665,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - case( MetaActionType::POP ): + case MetaActionType::POP: { const_cast<MetaAction*>(pAction)->Execute( mpVDev ); @@ -3681,27 +3681,27 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } break; - 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::LAYOUTMODE ): + 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::LAYOUTMODE: { const_cast<MetaAction*>(pAction)->Execute( mpVDev ); } break; - case( MetaActionType::RASTEROP ): - case( MetaActionType::MASK ): - case( MetaActionType::MASKSCALE ): - case( MetaActionType::MASKSCALEPART ): - case( MetaActionType::WALLPAPER ): - case( MetaActionType::TEXTLINE ): + 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/oox/source/drawingml/textbodyproperties.cxx b/oox/source/drawingml/textbodyproperties.cxx index 0ddc59435d2b..926d4d54809c 100644 --- a/oox/source/drawingml/textbodyproperties.cxx +++ b/oox/source/drawingml/textbodyproperties.cxx @@ -67,9 +67,9 @@ void TextBodyProperties::pushRotationAdjustments() switch( moRotation.get(0) ) { - case (90*1*60000): nOff = 3; break; - case (90*2*60000): nOff = 2; break; - case (90*3*60000): nOff = 1; break; + case 90*1*60000: nOff = 3; break; + case 90*2*60000: nOff = 2; break; + case 90*3*60000: nOff = 1; break; default: break; } diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index 6582a4543444..6b4f71010f2f 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -88,7 +88,7 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 pHandler = new XMLEnumPropertyHdl( pXML_VerticalAlign_Enum ); } break; - case (XML_SD_TYPES_START+34): + case XML_SD_TYPES_START+34: // XML_SD_TYPE_IMAGE_SCALE_MODE pHandler = new xmloff::ImageScaleModeHandler(); break; default: diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 69e2cddc734a..437e847b0682 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -1711,7 +1711,7 @@ void DrawViewShell::GetPageProperties( SfxItemSet &rSet ) switch (eXFS) { - case (drawing::FillStyle_SOLID): + case drawing::FillStyle_SOLID: { Color aColor = static_cast<const XFillColorItem*>( rPageAttr.GetItem( XATTR_FILLCOLOR ) )->GetColorValue(); XFillColorItem aFillColorItem( OUString(), aColor ); @@ -1720,7 +1720,7 @@ void DrawViewShell::GetPageProperties( SfxItemSet &rSet ) } break; - case (drawing::FillStyle_GRADIENT): + case drawing::FillStyle_GRADIENT: { const XFillGradientItem *pGradient = static_cast<const XFillGradientItem*>( rPageAttr.GetItem( XATTR_FILLGRADIENT ) ); XFillGradientItem aFillGradientItem( pGradient->GetName(), pGradient->GetGradientValue(), SID_ATTR_PAGE_GRADIENT ); @@ -1728,7 +1728,7 @@ void DrawViewShell::GetPageProperties( SfxItemSet &rSet ) } break; - case (drawing::FillStyle_HATCH): + case drawing::FillStyle_HATCH: { const XFillHatchItem *pFillHatchItem( static_cast<const XFillHatchItem*>( rPageAttr.GetItem( XATTR_FILLHATCH ) ) ); XFillHatchItem aFillHatchItem( pFillHatchItem->GetName(), pFillHatchItem->GetHatchValue()); @@ -1737,7 +1737,7 @@ void DrawViewShell::GetPageProperties( SfxItemSet &rSet ) } break; - case (drawing::FillStyle_BITMAP): + case drawing::FillStyle_BITMAP: { const XFillBitmapItem *pFillBitmapItem = static_cast<const XFillBitmapItem*>( rPageAttr.GetItem( XATTR_FILLBITMAP ) ); XFillBitmapItem aFillBitmapItem( pFillBitmapItem->GetName(), pFillBitmapItem->GetGraphicObject() ); @@ -1775,7 +1775,7 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq) switch (nSlotId) { - case(SID_ATTR_PAGE_FILLSTYLE): + case SID_ATTR_PAGE_FILLSTYLE: { XFillStyleItem aFSItem( static_cast<const XFillStyleItem&>(pArgs->Get( XATTR_FILLSTYLE )) ); drawing::FillStyle eXFS = aFSItem.GetValue(); @@ -1785,7 +1785,7 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq) } break; - case(SID_ATTR_PAGE_COLOR): + case SID_ATTR_PAGE_COLOR: { XFillColorItem aColorItem( static_cast<const XFillColorItem&>(pArgs->Get( XATTR_FILLCOLOR )) ); rPageProperties.PutItem( XFillStyleItem( drawing::FillStyle_SOLID ) ); @@ -1793,7 +1793,7 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq) } break; - case(SID_ATTR_PAGE_GRADIENT): + case SID_ATTR_PAGE_GRADIENT: { XFillGradientItem aGradientItem( static_cast<const XFillGradientItem&>(pArgs->Get( XATTR_FILLGRADIENT )) ); @@ -1807,7 +1807,7 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq) } break; - case(SID_ATTR_PAGE_HATCH): + case SID_ATTR_PAGE_HATCH: { XFillHatchItem aHatchItem( static_cast<const XFillHatchItem&>(pArgs->Get( XATTR_FILLHATCH )) ); rPageProperties.PutItem( XFillStyleItem( drawing::FillStyle_HATCH ) ); @@ -1815,7 +1815,7 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq) } break; - case(SID_ATTR_PAGE_BITMAP): + case SID_ATTR_PAGE_BITMAP: { XFillBitmapItem aBitmapItem( static_cast<const XFillBitmapItem&>(pArgs->Get( XATTR_FILLBITMAP )) ); rPageProperties.PutItem( XFillStyleItem( drawing::FillStyle_BITMAP ) ); diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 892f4299977f..41e606535600 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -634,24 +634,24 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal switch( pAction->GetType() ) { // only optimizing common bitmap actions: - case( MetaActionType::MAPMODE ): + case MetaActionType::MAPMODE: { pAction->Execute( aDummyVDev.get() ); break; } - case( MetaActionType::PUSH ): + case MetaActionType::PUSH: { const MetaPushAction* pA = static_cast<const MetaPushAction*>(pAction); aDummyVDev->Push( pA->GetFlags() ); break; } - case( MetaActionType::POP ): + case MetaActionType::POP: { aDummyVDev->Pop(); break; } - case( MetaActionType::BMPSCALE ): - case( MetaActionType::BMPEXSCALE ): + case MetaActionType::BMPSCALE: + case MetaActionType::BMPEXSCALE: { BitmapEx aBmpEx; Point aPos; @@ -689,12 +689,12 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal break; } default: - case( MetaActionType::BMP ): - case( MetaActionType::BMPSCALEPART ): - case( MetaActionType::BMPEX ): - case( MetaActionType::BMPEXSCALEPART ): - case( MetaActionType::MASK ): - case( MetaActionType::MASKSCALE ): + case MetaActionType::BMP: + case MetaActionType::BMPSCALEPART: + case MetaActionType::BMPEX: + case MetaActionType::BMPEXSCALEPART: + case MetaActionType::MASK: + case MetaActionType::MASKSCALE: break; } } diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 42941ec644bb..ebfe64ff5ad1 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -1819,8 +1819,8 @@ bool TransferableDataHelper::GetINetBookmark( const css::datatransfer::DataFlavo const SotClipboardFormatId nFormat = SotExchange::GetFormat( rFlavor ); switch( nFormat ) { - case( SotClipboardFormatId::SOLK ): - case( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ): + case SotClipboardFormatId::SOLK: + case SotClipboardFormatId::UNIFORMRESOURCELOCATOR: { OUString aString; if( GetString( rFlavor, aString ) ) @@ -1866,7 +1866,7 @@ bool TransferableDataHelper::GetINetBookmark( const css::datatransfer::DataFlavo } break; - case( SotClipboardFormatId::NETSCAPE_BOOKMARK ): + case SotClipboardFormatId::NETSCAPE_BOOKMARK: { Sequence<sal_Int8> aSeq = GetSequence(rFlavor, OUString()); diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 628f6abdfb23..fb7a4d81b4a1 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -437,11 +437,11 @@ void GalleryBrowser1::Notify( SfxBroadcaster&, const SfxHint& rHint ) switch( rGalleryHint.GetType() ) { - case( GalleryHintType::THEME_CREATED ): + case GalleryHintType::THEME_CREATED: ImplInsertThemeEntry( mpGallery->GetThemeInfo( rGalleryHint.GetThemeName() ) ); break; - case( GalleryHintType::THEME_RENAMED ): + case GalleryHintType::THEME_RENAMED: { const sal_Int32 nCurSelectPos = mpThemes->GetSelectEntryPos(); const sal_Int32 nRenameEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() ); @@ -457,13 +457,13 @@ void GalleryBrowser1::Notify( SfxBroadcaster&, const SfxHint& rHint ) } break; - case( GalleryHintType::THEME_REMOVED ): + case GalleryHintType::THEME_REMOVED: { mpThemes->RemoveEntry( rGalleryHint.GetThemeName() ); } break; - case( GalleryHintType::CLOSE_THEME ): + case GalleryHintType::CLOSE_THEME: { const sal_Int32 nCurSelectPos = mpThemes->GetSelectEntryPos(); const sal_Int32 nCloseEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() ); diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 05ce91bb1e2f..01a87998c156 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -513,7 +513,7 @@ void GalleryBrowser2::Notify( SfxBroadcaster&, const SfxHint& rHint ) switch( rGalleryHint.GetType() ) { - case( GalleryHintType::THEME_UPDATEVIEW ): + case GalleryHintType::THEME_UPDATEVIEW: { if( GALLERYBROWSERMODE_PREVIEW == GetMode() ) SetMode( meLastMode ); diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index 4b23a33e025f..f035bc174b22 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -304,7 +304,7 @@ void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint ) switch( rGalleryHint.GetType() ) { - case( GalleryHintType::CLOSE_THEME ): + case GalleryHintType::CLOSE_THEME: { DBG_ASSERT( !mpTheme || mpGallery, "Theme is living without Gallery" ); @@ -318,7 +318,7 @@ void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint ) } break; - case( GalleryHintType::CLOSE_OBJECT ): + case GalleryHintType::CLOSE_OBJECT: { GalleryObject* pObj = reinterpret_cast< GalleryObject* >( rGalleryHint.GetData1() ); diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index 7e78a67c4ae1..5bfb97c0b831 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -262,11 +262,11 @@ bool XLineCapItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCo pId = RID_SVXSTR_LINECAP_BUTT; break; - case(css::drawing::LineCap_ROUND): + case css::drawing::LineCap_ROUND: pId = RID_SVXSTR_LINECAP_ROUND; break; - case(css::drawing::LineCap_SQUARE): + case css::drawing::LineCap_SQUARE: pId = RID_SVXSTR_LINECAP_SQUARE; break; } diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx index ad92a7ae6e21..ef8b0752eeb6 100644 --- a/sw/source/uibase/uiview/viewtab.cxx +++ b/sw/source/uibase/uiview/viewtab.cxx @@ -1130,7 +1130,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq ) SwFrameFormat &rMaster = aDesc.GetMaster(); switch (nSlot) { - case(SID_ATTR_PAGE_FILLSTYLE): + case SID_ATTR_PAGE_FILLSTYLE: { XFillStyleItem aFSItem( static_cast<const XFillStyleItem&>(pReqArgs->Get( XATTR_FILLSTYLE )) ); drawing::FillStyle eXFS = aFSItem.GetValue(); @@ -1140,7 +1140,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq ) } break; - case(SID_ATTR_PAGE_COLOR): + case SID_ATTR_PAGE_COLOR: { XFillColorItem aColorItem( static_cast<const XFillColorItem&>(pReqArgs->Get( XATTR_FILLCOLOR )) ); rMaster.SetFormatAttr( XFillStyleItem( drawing::FillStyle_SOLID ) ); @@ -1148,7 +1148,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq ) } break; - case(SID_ATTR_PAGE_GRADIENT): + case SID_ATTR_PAGE_GRADIENT: { XFillGradientItem aGradientItem( static_cast<const XFillGradientItem&>(pReqArgs->Get( XATTR_FILLGRADIENT )) ); rMaster.SetFormatAttr( XFillStyleItem( drawing::FillStyle_GRADIENT ) ); @@ -1156,7 +1156,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq ) } break; - case(SID_ATTR_PAGE_HATCH): + case SID_ATTR_PAGE_HATCH: { XFillHatchItem aHatchItem( static_cast<const XFillHatchItem&>(pReqArgs->Get( XATTR_FILLHATCH )) ); rMaster.SetFormatAttr( XFillStyleItem( drawing::FillStyle_HATCH ) ); @@ -1164,7 +1164,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq ) } break; - case(SID_ATTR_PAGE_BITMAP): + case SID_ATTR_PAGE_BITMAP: { XFillBitmapItem aBitmapItem( static_cast<const XFillBitmapItem&>(pReqArgs->Get( XATTR_FILLBITMAP )) ); rMaster.SetFormatAttr( XFillStyleItem( drawing::FillStyle_BITMAP ) ); @@ -2316,7 +2316,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) rSet.Put(aFillStyleItem); switch(eXFS) { - case (drawing::FillStyle_SOLID): + case drawing::FillStyle_SOLID: { Color aColor = aSet.GetItem<XFillColorItem>( XATTR_FILLCOLOR, false )->GetColorValue(); XFillColorItem aFillColorItem( OUString(), aColor ); @@ -2325,7 +2325,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) } break; - case (drawing::FillStyle_GRADIENT): + case drawing::FillStyle_GRADIENT: { const XGradient& xGradient = aSet.GetItem<XFillGradientItem>( XATTR_FILLGRADIENT )->GetGradientValue(); XFillGradientItem aFillGradientItem( OUString(), xGradient, SID_ATTR_PAGE_GRADIENT ); @@ -2333,7 +2333,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) } break; - case (drawing::FillStyle_HATCH): + case drawing::FillStyle_HATCH: { const XFillHatchItem *pFillHatchItem( aSet.GetItem<XFillHatchItem>( XATTR_FILLHATCH ) ); XFillHatchItem aFillHatchItem( pFillHatchItem->GetName(), pFillHatchItem->GetHatchValue()); @@ -2342,7 +2342,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) } break; - case (drawing::FillStyle_BITMAP): + case drawing::FillStyle_BITMAP: { const XFillBitmapItem *pFillBitmapItem = aSet.GetItem<XFillBitmapItem>( XATTR_FILLBITMAP ); XFillBitmapItem aFillBitmapItem( pFillBitmapItem->GetName(), pFillBitmapItem->GetGraphicObject() ); @@ -2350,7 +2350,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) rSet.Put( aFillBitmapItem ); } break; - case (drawing::FillStyle_NONE): + case drawing::FillStyle_NONE: { } break; diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 47f755b368b3..377403057860 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -2357,17 +2357,17 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData&, rData, bool ) OString aShortName; switch( rData.mnFormat ) { - case( ConvertDataFormat::BMP ): aShortName = BMP_SHORTNAME; break; - case( ConvertDataFormat::GIF ): aShortName = GIF_SHORTNAME; break; - case( ConvertDataFormat::JPG ): aShortName = JPG_SHORTNAME; break; - case( ConvertDataFormat::MET ): aShortName = MET_SHORTNAME; break; - case( ConvertDataFormat::PCT ): aShortName = PCT_SHORTNAME; break; - case( ConvertDataFormat::PNG ): aShortName = PNG_SHORTNAME; break; - case( ConvertDataFormat::SVM ): aShortName = SVM_SHORTNAME; break; - case( ConvertDataFormat::TIF ): aShortName = TIF_SHORTNAME; break; - case( ConvertDataFormat::WMF ): aShortName = WMF_SHORTNAME; break; - case( ConvertDataFormat::EMF ): aShortName = EMF_SHORTNAME; break; - case( ConvertDataFormat::SVG ): aShortName = SVG_SHORTNAME; break; + case ConvertDataFormat::BMP: aShortName = BMP_SHORTNAME; break; + case ConvertDataFormat::GIF: aShortName = GIF_SHORTNAME; break; + case ConvertDataFormat::JPG: aShortName = JPG_SHORTNAME; break; + case ConvertDataFormat::MET: aShortName = MET_SHORTNAME; break; + case ConvertDataFormat::PCT: aShortName = PCT_SHORTNAME; break; + case ConvertDataFormat::PNG: aShortName = PNG_SHORTNAME; break; + case ConvertDataFormat::SVM: aShortName = SVM_SHORTNAME; break; + case ConvertDataFormat::TIF: aShortName = TIF_SHORTNAME; break; + case ConvertDataFormat::WMF: aShortName = WMF_SHORTNAME; break; + case ConvertDataFormat::EMF: aShortName = EMF_SHORTNAME; break; + case ConvertDataFormat::SVG: aShortName = SVG_SHORTNAME; break; default: break; diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx index 780d11d24eba..ba1d2180ab65 100644 --- a/vcl/source/filter/graphicfilter2.cxx +++ b/vcl/source/filter/graphicfilter2.cxx @@ -1099,31 +1099,31 @@ OUString GraphicDescriptor::GetImportFormatShortName( GraphicFileFormat nFormat switch( nFormat ) { - case( GraphicFileFormat::BMP ) : pKeyName = "bmp"; break; - case( GraphicFileFormat::GIF ) : pKeyName = "gif"; break; - case( GraphicFileFormat::JPG ) : pKeyName = "jpg"; break; - case( GraphicFileFormat::PCD ) : pKeyName = "pcd"; break; - case( GraphicFileFormat::PCX ) : pKeyName = "pcx"; break; - case( GraphicFileFormat::PNG ) : pKeyName = "png"; break; - case( GraphicFileFormat::XBM ) : pKeyName = "xbm"; break; - case( GraphicFileFormat::XPM ) : pKeyName = "xpm"; break; - case( GraphicFileFormat::PBM ) : pKeyName = "pbm"; break; - case( GraphicFileFormat::PGM ) : pKeyName = "pgm"; break; - case( GraphicFileFormat::PPM ) : pKeyName = "ppm"; break; - case( GraphicFileFormat::RAS ) : pKeyName = "ras"; break; - case( GraphicFileFormat::TGA ) : pKeyName = "tga"; break; - case( GraphicFileFormat::PSD ) : pKeyName = "psd"; break; - case( GraphicFileFormat::EPS ) : pKeyName = "eps"; break; - case( GraphicFileFormat::TIF ) : pKeyName = "tif"; break; - case( GraphicFileFormat::DXF ) : pKeyName = "dxf"; break; - case( GraphicFileFormat::MET ) : pKeyName = "met"; break; - case( GraphicFileFormat::PCT ) : pKeyName = "pct"; break; - case( GraphicFileFormat::SGF ) : pKeyName = "sgf"; break; - case( GraphicFileFormat::SGV ) : pKeyName = "sgv"; break; - case( GraphicFileFormat::SVM ) : pKeyName = "svm"; break; - case( GraphicFileFormat::WMF ) : pKeyName = "wmf"; break; - case( GraphicFileFormat::EMF ) : pKeyName = "emf"; break; - case( GraphicFileFormat::SVG ) : pKeyName = "svg"; break; + case GraphicFileFormat::BMP : pKeyName = "bmp"; break; + case GraphicFileFormat::GIF : pKeyName = "gif"; break; + case GraphicFileFormat::JPG : pKeyName = "jpg"; break; + case GraphicFileFormat::PCD : pKeyName = "pcd"; break; + case GraphicFileFormat::PCX : pKeyName = "pcx"; break; + case GraphicFileFormat::PNG : pKeyName = "png"; break; + case GraphicFileFormat::XBM : pKeyName = "xbm"; break; + case GraphicFileFormat::XPM : pKeyName = "xpm"; break; + case GraphicFileFormat::PBM : pKeyName = "pbm"; break; + case GraphicFileFormat::PGM : pKeyName = "pgm"; break; + case GraphicFileFormat::PPM : pKeyName = "ppm"; break; + case GraphicFileFormat::RAS : pKeyName = "ras"; break; + case GraphicFileFormat::TGA : pKeyName = "tga"; break; + case GraphicFileFormat::PSD : pKeyName = "psd"; break; + case GraphicFileFormat::EPS : pKeyName = "eps"; break; + case GraphicFileFormat::TIF : pKeyName = "tif"; break; + case GraphicFileFormat::DXF : pKeyName = "dxf"; break; + case GraphicFileFormat::MET : pKeyName = "met"; break; + case GraphicFileFormat::PCT : pKeyName = "pct"; break; + case GraphicFileFormat::SGF : pKeyName = "sgf"; break; + case GraphicFileFormat::SGV : pKeyName = "sgv"; break; + case GraphicFileFormat::SVM : pKeyName = "svm"; break; + case GraphicFileFormat::WMF : pKeyName = "wmf"; break; + case GraphicFileFormat::EMF : pKeyName = "emf"; break; + case GraphicFileFormat::SVG : pKeyName = "svg"; break; default: assert(false); } diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index 5438652aef72..ccfa8860510f 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -948,7 +948,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) switch( nType ) { - case( MetaActionType::PIXEL ): + case MetaActionType::PIXEL: { const MetaPixelAction* pA = static_cast<const MetaPixelAction*>(pAction); @@ -960,7 +960,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::POINT ): + case MetaActionType::POINT: { if( maVDev->IsLineColor() ) { @@ -975,7 +975,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::LINE ): + case MetaActionType::LINE: { if( maVDev->IsLineColor() ) { @@ -1010,7 +1010,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::RECT ): + case MetaActionType::RECT: { if( maVDev->IsLineColor() || maVDev->IsFillColor() ) { @@ -1026,7 +1026,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::ROUNDRECT ): + case MetaActionType::ROUNDRECT: { if( maVDev->IsLineColor() || maVDev->IsFillColor() ) { @@ -1043,7 +1043,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::ELLIPSE ): + case MetaActionType::ELLIPSE: { if( maVDev->IsLineColor() || maVDev->IsFillColor() ) { @@ -1059,10 +1059,10 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::ARC ): - case( MetaActionType::PIE ): - case( MetaActionType::CHORD ): - case( MetaActionType::POLYGON ): + case MetaActionType::ARC: + case MetaActionType::PIE: + case MetaActionType::CHORD: + case MetaActionType::POLYGON: { if( maVDev->IsLineColor() || maVDev->IsFillColor() ) { @@ -1070,28 +1070,28 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) switch( nType ) { - case( MetaActionType::ARC ): + case MetaActionType::ARC: { const MetaArcAction* pA = static_cast<const MetaArcAction*>(pAction); aPoly = tools::Polygon( pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), PolyStyle::Arc ); } break; - case( MetaActionType::PIE ): + case MetaActionType::PIE: { const MetaPieAction* pA = static_cast<const MetaPieAction*>(pAction); aPoly = tools::Polygon( pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), PolyStyle::Pie ); } break; - case( MetaActionType::CHORD ): + case MetaActionType::CHORD: { const MetaChordAction* pA = static_cast<const MetaChordAction*>(pAction); aPoly = tools::Polygon( pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), PolyStyle::Chord ); } break; - case( MetaActionType::POLYGON ): + case MetaActionType::POLYGON: aPoly = static_cast<const MetaPolygonAction*>(pAction)->GetPolygon(); break; default: break; @@ -1102,7 +1102,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::POLYLINE ): + case MetaActionType::POLYLINE: { if( maVDev->IsLineColor() ) { @@ -1125,14 +1125,14 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::POLYPOLYGON ): + case MetaActionType::POLYPOLYGON: { if( maVDev->IsLineColor() || maVDev->IsFillColor() ) ImplWritePolyPolygonRecord( static_cast<const MetaPolyPolygonAction*>(pAction)->GetPolyPolygon() ); } break; - case( MetaActionType::GRADIENT ): + case MetaActionType::GRADIENT: { const MetaGradientAction* pA = static_cast<const MetaGradientAction*>(pAction); GDIMetaFile aTmpMtf; @@ -1200,7 +1200,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::EPS ): + case MetaActionType::EPS: { const MetaEPSAction* pA = static_cast<const MetaEPSAction*>(pAction); const GDIMetaFile aSubstitute( pA->GetSubstitute() ); @@ -1352,32 +1352,32 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::LINECOLOR ): + case MetaActionType::LINECOLOR: { const_cast<MetaAction*>(pAction)->Execute( maVDev ); mbLineChanged = true; } break; - case( MetaActionType::FILLCOLOR ): + case MetaActionType::FILLCOLOR: { const_cast<MetaAction*>(pAction)->Execute( maVDev ); mbFillChanged = true; } break; - case( MetaActionType::TEXTCOLOR ): - case( MetaActionType::TEXTLINECOLOR ): - case( MetaActionType::TEXTFILLCOLOR ): - case( MetaActionType::TEXTALIGN ): - case( MetaActionType::FONT ): + case MetaActionType::TEXTCOLOR: + case MetaActionType::TEXTLINECOLOR: + case MetaActionType::TEXTFILLCOLOR: + case MetaActionType::TEXTALIGN: + case MetaActionType::FONT: { const_cast<MetaAction*>(pAction)->Execute( maVDev ); mbTextChanged = true; } break; - case( MetaActionType::ISECTRECTCLIPREGION ): + case MetaActionType::ISECTRECTCLIPREGION: { const_cast<MetaAction*>(pAction)->Execute( maVDev ); @@ -1387,20 +1387,20 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::CLIPREGION ): - case( MetaActionType::ISECTREGIONCLIPREGION ): - case( MetaActionType::MOVECLIPREGION ): + case MetaActionType::CLIPREGION: + case MetaActionType::ISECTREGIONCLIPREGION: + case MetaActionType::MOVECLIPREGION: { const_cast<MetaAction*>(pAction)->Execute( maVDev ); } break; - case( MetaActionType::REFPOINT ): - case( MetaActionType::MAPMODE ): + case MetaActionType::REFPOINT: + case MetaActionType::MAPMODE: const_cast<MetaAction*>(pAction)->Execute( maVDev ); break; - case( MetaActionType::PUSH ): + case MetaActionType::PUSH: { const_cast<MetaAction*>(pAction)->Execute( maVDev ); @@ -1409,7 +1409,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::POP ): + case MetaActionType::POP: { const_cast<MetaAction*>(pAction)->Execute( maVDev ); @@ -1422,14 +1422,14 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::RASTEROP ): + case MetaActionType::RASTEROP: { const_cast<MetaAction*>(pAction)->Execute( maVDev ); ImplWriteRasterOp( static_cast<const MetaRasterOpAction*>(pAction)->GetRasterOp() ); } break; - case( MetaActionType::LAYOUTMODE ): + case MetaActionType::LAYOUTMODE: { ComplexTextLayoutFlags nLayoutMode = static_cast<const MetaLayoutModeAction*>(pAction)->GetLayoutMode(); mnHorTextAlign = 0; @@ -1444,7 +1444,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) break; } - case( MetaActionType::COMMENT ): + case MetaActionType::COMMENT: { MetaCommentAction const*const pCommentAction( static_cast<MetaCommentAction const*>(pAction)); @@ -1458,12 +1458,12 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::MASK ): - case( MetaActionType::MASKSCALE ): - case( MetaActionType::MASKSCALEPART ): - case( MetaActionType::WALLPAPER ): - case( MetaActionType::TEXTLINE ): - case( MetaActionType::GRADIENTEX ): + case MetaActionType::MASK: + case MetaActionType::MASKSCALE: + case MetaActionType::MASKSCALEPART: + case MetaActionType::WALLPAPER: + case MetaActionType::TEXTLINE: + case MetaActionType::GRADIENTEX: // Explicitly ignored cases break; diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index 8013c1e2f09c..51c7a6807bb5 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -1589,7 +1589,7 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) } break; - case( MetaActionType::LAYOUTMODE ): + case MetaActionType::LAYOUTMODE: { ComplexTextLayoutFlags nLayoutMode = static_cast<const MetaLayoutModeAction*>(pMA)->GetLayoutMode(); eSrcHorTextAlign = 0; // TA_LEFT diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 5fe087fa478e..f0b9ce1fbbbb 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -869,7 +869,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) switch( nActionType ) { - case( MetaActionType::PIXEL ): + case MetaActionType::PIXEL: { MetaPixelAction* pAct = static_cast<MetaPixelAction*>(pAction); aMtf.AddAction( new MetaPixelAction( ImplGetRotatedPoint( pAct->GetPoint(), aRotAnchor, aRotOffset, fSin, fCos ), @@ -877,14 +877,14 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::POINT ): + case MetaActionType::POINT: { MetaPointAction* pAct = static_cast<MetaPointAction*>(pAction); aMtf.AddAction( new MetaPointAction( ImplGetRotatedPoint( pAct->GetPoint(), aRotAnchor, aRotOffset, fSin, fCos ) ) ); } break; - case( MetaActionType::LINE ): + case MetaActionType::LINE: { MetaLineAction* pAct = static_cast<MetaLineAction*>(pAction); aMtf.AddAction( new MetaLineAction( ImplGetRotatedPoint( pAct->GetStartPoint(), aRotAnchor, aRotOffset, fSin, fCos ), @@ -893,14 +893,14 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::RECT ): + case MetaActionType::RECT: { MetaRectAction* pAct = static_cast<MetaRectAction*>(pAction); aMtf.AddAction( new MetaPolygonAction( ImplGetRotatedPolygon( pAct->GetRect(), aRotAnchor, aRotOffset, fSin, fCos ) ) ); } break; - case( MetaActionType::ROUNDRECT ): + case MetaActionType::ROUNDRECT: { MetaRoundRectAction* pAct = static_cast<MetaRoundRectAction*>(pAction); const tools::Polygon aRoundRectPoly( pAct->GetRect(), pAct->GetHorzRound(), pAct->GetVertRound() ); @@ -909,7 +909,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::ELLIPSE ): + case MetaActionType::ELLIPSE: { MetaEllipseAction* pAct = static_cast<MetaEllipseAction*>(pAction); const tools::Polygon aEllipsePoly( pAct->GetRect().Center(), pAct->GetRect().GetWidth() >> 1, pAct->GetRect().GetHeight() >> 1 ); @@ -918,7 +918,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::ARC ): + case MetaActionType::ARC: { MetaArcAction* pAct = static_cast<MetaArcAction*>(pAction); const tools::Polygon aArcPoly( pAct->GetRect(), pAct->GetStartPoint(), pAct->GetEndPoint(), PolyStyle::Arc ); @@ -927,7 +927,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::PIE ): + case MetaActionType::PIE: { MetaPieAction* pAct = static_cast<MetaPieAction*>(pAction); const tools::Polygon aPiePoly( pAct->GetRect(), pAct->GetStartPoint(), pAct->GetEndPoint(), PolyStyle::Pie ); @@ -936,7 +936,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::CHORD ): + case MetaActionType::CHORD: { MetaChordAction* pAct = static_cast<MetaChordAction*>(pAction); const tools::Polygon aChordPoly( pAct->GetRect(), pAct->GetStartPoint(), pAct->GetEndPoint(), PolyStyle::Chord ); @@ -945,28 +945,28 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::POLYLINE ): + case MetaActionType::POLYLINE: { MetaPolyLineAction* pAct = static_cast<MetaPolyLineAction*>(pAction); aMtf.AddAction( new MetaPolyLineAction( ImplGetRotatedPolygon( pAct->GetPolygon(), aRotAnchor, aRotOffset, fSin, fCos ), pAct->GetLineInfo() ) ); } break; - case( MetaActionType::POLYGON ): + case MetaActionType::POLYGON: { MetaPolygonAction* pAct = static_cast<MetaPolygonAction*>(pAction); aMtf.AddAction( new MetaPolygonAction( ImplGetRotatedPolygon( pAct->GetPolygon(), aRotAnchor, aRotOffset, fSin, fCos ) ) ); } break; - case( MetaActionType::POLYPOLYGON ): + case MetaActionType::POLYPOLYGON: { MetaPolyPolygonAction* pAct = static_cast<MetaPolyPolygonAction*>(pAction); aMtf.AddAction( new MetaPolyPolygonAction( ImplGetRotatedPolyPolygon( pAct->GetPolyPolygon(), aRotAnchor, aRotOffset, fSin, fCos ) ) ); } break; - case( MetaActionType::TEXT ): + case MetaActionType::TEXT: { MetaTextAction* pAct = static_cast<MetaTextAction*>(pAction); aMtf.AddAction( new MetaTextAction( ImplGetRotatedPoint( pAct->GetPoint(), aRotAnchor, aRotOffset, fSin, fCos ), @@ -974,7 +974,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::TEXTARRAY ): + case MetaActionType::TEXTARRAY: { MetaTextArrayAction* pAct = static_cast<MetaTextArrayAction*>(pAction); aMtf.AddAction( new MetaTextArrayAction( ImplGetRotatedPoint( pAct->GetPoint(), aRotAnchor, aRotOffset, fSin, fCos ), @@ -982,7 +982,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::STRETCHTEXT ): + case MetaActionType::STRETCHTEXT: { MetaStretchTextAction* pAct = static_cast<MetaStretchTextAction*>(pAction); aMtf.AddAction( new MetaStretchTextAction( ImplGetRotatedPoint( pAct->GetPoint(), aRotAnchor, aRotOffset, fSin, fCos ), @@ -990,7 +990,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::TEXTLINE ): + case MetaActionType::TEXTLINE: { MetaTextLineAction* pAct = static_cast<MetaTextLineAction*>(pAction); aMtf.AddAction( new MetaTextLineAction( ImplGetRotatedPoint( pAct->GetStartPoint(), aRotAnchor, aRotOffset, fSin, fCos ), @@ -998,7 +998,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::BMPSCALE ): + case MetaActionType::BMPSCALE: { MetaBmpScaleAction* pAct = static_cast<MetaBmpScaleAction*>(pAction); tools::Polygon aBmpPoly( ImplGetRotatedPolygon( tools::Rectangle( pAct->GetPoint(), pAct->GetSize() ), aRotAnchor, aRotOffset, fSin, fCos ) ); @@ -1011,7 +1011,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::BMPSCALEPART ): + case MetaActionType::BMPSCALEPART: { MetaBmpScalePartAction* pAct = static_cast<MetaBmpScalePartAction*>(pAction); tools::Polygon aBmpPoly( ImplGetRotatedPolygon( tools::Rectangle( pAct->GetDestPoint(), pAct->GetDestSize() ), aRotAnchor, aRotOffset, fSin, fCos ) ); @@ -1025,7 +1025,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::BMPEXSCALE ): + case MetaActionType::BMPEXSCALE: { MetaBmpExScaleAction* pAct = static_cast<MetaBmpExScaleAction*>(pAction); tools::Polygon aBmpPoly( ImplGetRotatedPolygon( tools::Rectangle( pAct->GetPoint(), pAct->GetSize() ), aRotAnchor, aRotOffset, fSin, fCos ) ); @@ -1038,7 +1038,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::BMPEXSCALEPART ): + case MetaActionType::BMPEXSCALEPART: { MetaBmpExScalePartAction* pAct = static_cast<MetaBmpExScalePartAction*>(pAction); tools::Polygon aBmpPoly( ImplGetRotatedPolygon( tools::Rectangle( pAct->GetDestPoint(), pAct->GetDestSize() ), aRotAnchor, aRotOffset, fSin, fCos ) ); @@ -1052,7 +1052,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::GRADIENT ): + case MetaActionType::GRADIENT: { MetaGradientAction* pAct = static_cast<MetaGradientAction*>(pAction); @@ -1062,7 +1062,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::GRADIENTEX ): + case MetaActionType::GRADIENTEX: { MetaGradientExAction* pAct = static_cast<MetaGradientExAction*>(pAction); aMtf.AddAction( new MetaGradientExAction( ImplGetRotatedPolyPolygon( pAct->GetPolyPolygon(), aRotAnchor, aRotOffset, fSin, fCos ), @@ -1071,7 +1071,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) break; // Handle gradientex comment block correctly - case( MetaActionType::COMMENT ): + case MetaActionType::COMMENT: { MetaCommentAction* pCommentAct = static_cast<MetaCommentAction*>(pAction); if( pCommentAct->GetComment() == "XGRAD_SEQ_BEGIN" ) @@ -1159,7 +1159,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::HATCH ): + case MetaActionType::HATCH: { MetaHatchAction* pAct = static_cast<MetaHatchAction*>(pAction); Hatch aHatch( pAct->GetHatch() ); @@ -1170,7 +1170,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::Transparent ): + case MetaActionType::Transparent: { MetaTransparentAction* pAct = static_cast<MetaTransparentAction*>(pAction); aMtf.AddAction( new MetaTransparentAction( ImplGetRotatedPolyPolygon( pAct->GetPolyPolygon(), aRotAnchor, aRotOffset, fSin, fCos ), @@ -1178,7 +1178,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::FLOATTRANSPARENT ): + case MetaActionType::FLOATTRANSPARENT: { MetaFloatTransparentAction* pAct = static_cast<MetaFloatTransparentAction*>(pAction); GDIMetaFile aTransMtf( pAct->GetGDIMetaFile() ); @@ -1191,7 +1191,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::EPS ): + case MetaActionType::EPS: { MetaEPSAction* pAct = static_cast<MetaEPSAction*>(pAction); GDIMetaFile aEPSMtf( pAct->GetSubstitute() ); @@ -1204,7 +1204,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::CLIPREGION ): + case MetaActionType::CLIPREGION: { MetaClipRegionAction* pAct = static_cast<MetaClipRegionAction*>(pAction); @@ -1218,7 +1218,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::ISECTRECTCLIPREGION ): + case MetaActionType::ISECTRECTCLIPREGION: { MetaISectRectClipRegionAction* pAct = static_cast<MetaISectRectClipRegionAction*>(pAction); aMtf.AddAction( new MetaISectRegionClipRegionAction(vcl::Region( @@ -1227,7 +1227,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::ISECTREGIONCLIPREGION ): + case MetaActionType::ISECTREGIONCLIPREGION: { MetaISectRegionClipRegionAction* pAct = static_cast<MetaISectRegionClipRegionAction*>(pAction); const vcl::Region& rRegion = pAct->GetRegion(); @@ -1242,14 +1242,14 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::REFPOINT ): + case MetaActionType::REFPOINT: { MetaRefPointAction* pAct = static_cast<MetaRefPointAction*>(pAction); aMtf.AddAction( new MetaRefPointAction( ImplGetRotatedPoint( pAct->GetRefPoint(), aRotAnchor, aRotOffset, fSin, fCos ), pAct->IsSetting() ) ); } break; - case( MetaActionType::FONT ): + case MetaActionType::FONT: { MetaFontAction* pAct = static_cast<MetaFontAction*>(pAction); vcl::Font aFont( pAct->GetFont() ); @@ -1259,14 +1259,14 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; - case( MetaActionType::BMP ): - case( MetaActionType::BMPEX ): - case( MetaActionType::MASK ): - case( MetaActionType::MASKSCALE ): - case( MetaActionType::MASKSCALEPART ): - case( MetaActionType::WALLPAPER ): - case( MetaActionType::TEXTRECT ): - case( MetaActionType::MOVECLIPREGION ): + case MetaActionType::BMP: + case MetaActionType::BMPEX: + case MetaActionType::MASK: + case MetaActionType::MASKSCALE: + case MetaActionType::MASKSCALEPART: + case MetaActionType::WALLPAPER: + case MetaActionType::TEXTRECT: + case MetaActionType::MOVECLIPREGION: { OSL_FAIL( "GDIMetaFile::Rotate(): unsupported action" ); } @@ -1349,7 +1349,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R switch( nActionType ) { - case( MetaActionType::PIXEL ): + case MetaActionType::PIXEL: { MetaPixelAction* pAct = static_cast<MetaPixelAction*>(pAction); ImplActionBounds( aBound, @@ -1359,7 +1359,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::POINT ): + case MetaActionType::POINT: { MetaPointAction* pAct = static_cast<MetaPointAction*>(pAction); ImplActionBounds( aBound, @@ -1369,7 +1369,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::LINE ): + case MetaActionType::LINE: { MetaLineAction* pAct = static_cast<MetaLineAction*>(pAction); Point aP1( pAct->GetStartPoint() ), aP2( pAct->GetEndPoint() ); @@ -1388,28 +1388,28 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::RECT ): + case MetaActionType::RECT: { MetaRectAction* pAct = static_cast<MetaRectAction*>(pAction); ImplActionBounds( aBound, OutputDevice::LogicToLogic( pAct->GetRect(), aMapVDev->GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); } break; - case( MetaActionType::ROUNDRECT ): + case MetaActionType::ROUNDRECT: { MetaRoundRectAction* pAct = static_cast<MetaRoundRectAction*>(pAction); ImplActionBounds( aBound, OutputDevice::LogicToLogic( pAct->GetRect(), aMapVDev->GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); } break; - case( MetaActionType::ELLIPSE ): + case MetaActionType::ELLIPSE: { MetaEllipseAction* pAct = static_cast<MetaEllipseAction*>(pAction); ImplActionBounds( aBound, OutputDevice::LogicToLogic( pAct->GetRect(), aMapVDev->GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); } break; - case( MetaActionType::ARC ): + case MetaActionType::ARC: { MetaArcAction* pAct = static_cast<MetaArcAction*>(pAction); // FIXME: this is imprecise @@ -1418,7 +1418,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::PIE ): + case MetaActionType::PIE: { MetaPieAction* pAct = static_cast<MetaPieAction*>(pAction); // FIXME: this is imprecise @@ -1427,7 +1427,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::CHORD ): + case MetaActionType::CHORD: { MetaChordAction* pAct = static_cast<MetaChordAction*>(pAction); // FIXME: this is imprecise @@ -1436,7 +1436,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::POLYLINE ): + case MetaActionType::POLYLINE: { MetaPolyLineAction* pAct = static_cast<MetaPolyLineAction*>(pAction); tools::Rectangle aRect( pAct->GetPolygon().GetBoundRect() ); @@ -1453,7 +1453,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::POLYGON ): + case MetaActionType::POLYGON: { MetaPolygonAction* pAct = static_cast<MetaPolygonAction*>(pAction); tools::Rectangle aRect( pAct->GetPolygon().GetBoundRect() ); @@ -1461,7 +1461,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::POLYPOLYGON ): + case MetaActionType::POLYPOLYGON: { MetaPolyPolygonAction* pAct = static_cast<MetaPolyPolygonAction*>(pAction); tools::Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() ); @@ -1469,7 +1469,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::TEXT ): + case MetaActionType::TEXT: { MetaTextAction* pAct = static_cast<MetaTextAction*>(pAction); tools::Rectangle aRect; @@ -1481,7 +1481,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::TEXTARRAY ): + case MetaActionType::TEXTARRAY: { MetaTextArrayAction* pAct = static_cast<MetaTextArrayAction*>(pAction); tools::Rectangle aRect; @@ -1494,7 +1494,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::STRETCHTEXT ): + case MetaActionType::STRETCHTEXT: { MetaStretchTextAction* pAct = static_cast<MetaStretchTextAction*>(pAction); tools::Rectangle aRect; @@ -1507,7 +1507,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::TEXTLINE ): + case MetaActionType::TEXTLINE: { MetaTextLineAction* pAct = static_cast<MetaTextLineAction*>(pAction); // measure a test string to get ascend and descent right @@ -1523,7 +1523,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::BMPSCALE ): + case MetaActionType::BMPSCALE: { MetaBmpScaleAction* pAct = static_cast<MetaBmpScaleAction*>(pAction); tools::Rectangle aRect( pAct->GetPoint(), pAct->GetSize() ); @@ -1531,7 +1531,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::BMPSCALEPART ): + case MetaActionType::BMPSCALEPART: { MetaBmpScalePartAction* pAct = static_cast<MetaBmpScalePartAction*>(pAction); tools::Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() ); @@ -1539,7 +1539,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::BMPEXSCALE ): + case MetaActionType::BMPEXSCALE: { MetaBmpExScaleAction* pAct = static_cast<MetaBmpExScaleAction*>(pAction); tools::Rectangle aRect( pAct->GetPoint(), pAct->GetSize() ); @@ -1547,7 +1547,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::BMPEXSCALEPART ): + case MetaActionType::BMPEXSCALEPART: { MetaBmpExScalePartAction* pAct = static_cast<MetaBmpExScalePartAction*>(pAction); tools::Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() ); @@ -1555,7 +1555,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::GRADIENT ): + case MetaActionType::GRADIENT: { MetaGradientAction* pAct = static_cast<MetaGradientAction*>(pAction); tools::Rectangle aRect( pAct->GetRect() ); @@ -1563,7 +1563,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::GRADIENTEX ): + case MetaActionType::GRADIENTEX: { MetaGradientExAction* pAct = static_cast<MetaGradientExAction*>(pAction); tools::Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() ); @@ -1571,13 +1571,13 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::COMMENT ): + case MetaActionType::COMMENT: { // nothing to do }; break; - case( MetaActionType::HATCH ): + case MetaActionType::HATCH: { MetaHatchAction* pAct = static_cast<MetaHatchAction*>(pAction); tools::Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() ); @@ -1585,7 +1585,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::Transparent ): + case MetaActionType::Transparent: { MetaTransparentAction* pAct = static_cast<MetaTransparentAction*>(pAction); tools::Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() ); @@ -1593,7 +1593,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::FLOATTRANSPARENT ): + case MetaActionType::FLOATTRANSPARENT: { MetaFloatTransparentAction* pAct = static_cast<MetaFloatTransparentAction*>(pAction); // MetaFloatTransparentAction is defined limiting its content Metafile @@ -1603,7 +1603,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::EPS ): + case MetaActionType::EPS: { MetaEPSAction* pAct = static_cast<MetaEPSAction*>(pAction); tools::Rectangle aRect( pAct->GetPoint(), pAct->GetSize() ); @@ -1611,7 +1611,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::CLIPREGION ): + case MetaActionType::CLIPREGION: { MetaClipRegionAction* pAct = static_cast<MetaClipRegionAction*>(pAction); if( pAct->IsClipping() ) @@ -1621,7 +1621,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::ISECTRECTCLIPREGION ): + case MetaActionType::ISECTRECTCLIPREGION: { MetaISectRectClipRegionAction* pAct = static_cast<MetaISectRectClipRegionAction*>(pAction); tools::Rectangle aRect( OutputDevice::LogicToLogic( pAct->GetRect(), aMapVDev->GetMapMode(), GetPrefMapMode() ) ); @@ -1632,7 +1632,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::ISECTREGIONCLIPREGION ): + case MetaActionType::ISECTREGIONCLIPREGION: { MetaISectRegionClipRegionAction* pAct = static_cast<MetaISectRegionClipRegionAction*>(pAction); tools::Rectangle aRect( OutputDevice::LogicToLogic( pAct->GetRegion().GetBoundRect(), aMapVDev->GetMapMode(), GetPrefMapMode() ) ); @@ -1643,7 +1643,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::BMP ): + case MetaActionType::BMP: { MetaBmpAction* pAct = static_cast<MetaBmpAction*>(pAction); tools::Rectangle aRect( pAct->GetPoint(), aMapVDev->PixelToLogic( pAct->GetBitmap().GetSizePixel() ) ); @@ -1651,7 +1651,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::BMPEX ): + case MetaActionType::BMPEX: { MetaBmpExAction* pAct = static_cast<MetaBmpExAction*>(pAction); tools::Rectangle aRect( pAct->GetPoint(), aMapVDev->PixelToLogic( pAct->GetBitmapEx().GetSizePixel() ) ); @@ -1659,7 +1659,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::MASK ): + case MetaActionType::MASK: { MetaMaskAction* pAct = static_cast<MetaMaskAction*>(pAction); tools::Rectangle aRect( pAct->GetPoint(), aMapVDev->PixelToLogic( pAct->GetBitmap().GetSizePixel() ) ); @@ -1667,7 +1667,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::MASKSCALE ): + case MetaActionType::MASKSCALE: { MetaMaskScalePartAction* pAct = static_cast<MetaMaskScalePartAction*>(pAction); tools::Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() ); @@ -1675,7 +1675,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::MASKSCALEPART ): + case MetaActionType::MASKSCALEPART: { MetaMaskScalePartAction* pAct = static_cast<MetaMaskScalePartAction*>(pAction); tools::Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() ); @@ -1683,7 +1683,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::WALLPAPER ): + case MetaActionType::WALLPAPER: { MetaWallpaperAction* pAct = static_cast<MetaWallpaperAction*>(pAction); tools::Rectangle aRect( pAct->GetRect() ); @@ -1691,7 +1691,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::TEXTRECT ): + case MetaActionType::TEXTRECT: { MetaTextRectAction* pAct = static_cast<MetaTextRectAction*>(pAction); tools::Rectangle aRect( pAct->GetRect() ); @@ -1699,7 +1699,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R } break; - case( MetaActionType::MOVECLIPREGION ): + case MetaActionType::MOVECLIPREGION: { MetaMoveClipRegionAction* pAct = static_cast<MetaMoveClipRegionAction*>(pAction); if( ! aClipStack.back().IsEmpty() ) @@ -1854,14 +1854,14 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol switch( nType ) { - case( MetaActionType::PIXEL ): + case MetaActionType::PIXEL: { MetaPixelAction* pAct = static_cast<MetaPixelAction*>(pAction); aMtf.push_back( new MetaPixelAction( pAct->GetPoint(), pFncCol( pAct->GetColor(), pColParam ) ) ); } break; - case( MetaActionType::LINECOLOR ): + case MetaActionType::LINECOLOR: { MetaLineColorAction* pAct = static_cast<MetaLineColorAction*>(pAction); @@ -1874,7 +1874,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol } break; - case( MetaActionType::FILLCOLOR ): + case MetaActionType::FILLCOLOR: { MetaFillColorAction* pAct = static_cast<MetaFillColorAction*>(pAction); @@ -1887,14 +1887,14 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol } break; - case( MetaActionType::TEXTCOLOR ): + case MetaActionType::TEXTCOLOR: { MetaTextColorAction* pAct = static_cast<MetaTextColorAction*>(pAction); aMtf.push_back( new MetaTextColorAction( pFncCol( pAct->GetColor(), pColParam ) ) ); } break; - case( MetaActionType::TEXTFILLCOLOR ): + case MetaActionType::TEXTFILLCOLOR: { MetaTextFillColorAction* pAct = static_cast<MetaTextFillColorAction*>(pAction); @@ -1907,7 +1907,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol } break; - case( MetaActionType::TEXTLINECOLOR ): + case MetaActionType::TEXTLINECOLOR: { MetaTextLineColorAction* pAct = static_cast<MetaTextLineColorAction*>(pAction); @@ -1920,7 +1920,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol } break; - case( MetaActionType::OVERLINECOLOR ): + case MetaActionType::OVERLINECOLOR: { MetaOverlineColorAction* pAct = static_cast<MetaOverlineColorAction*>(pAction); @@ -1933,7 +1933,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol } break; - case( MetaActionType::FONT ): + case MetaActionType::FONT: { MetaFontAction* pAct = static_cast<MetaFontAction*>(pAction); vcl::Font aFont( pAct->GetFont() ); @@ -1944,7 +1944,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol } break; - case( MetaActionType::WALLPAPER ): + case MetaActionType::WALLPAPER: { MetaWallpaperAction* pAct = static_cast<MetaWallpaperAction*>(pAction); Wallpaper aWall( pAct->GetWallpaper() ); @@ -1968,15 +1968,15 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol } break; - case( MetaActionType::BMP ): - case( MetaActionType::BMPEX ): - case( MetaActionType::MASK ): + case MetaActionType::BMP: + case MetaActionType::BMPEX: + case MetaActionType::MASK: { OSL_FAIL( "Don't use bitmap actions of this type in metafiles!" ); } break; - case( MetaActionType::BMPSCALE ): + case MetaActionType::BMPSCALE: { MetaBmpScaleAction* pAct = static_cast<MetaBmpScaleAction*>(pAction); aMtf.push_back( new MetaBmpScaleAction( pAct->GetPoint(), pAct->GetSize(), @@ -1984,7 +1984,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol } break; - case( MetaActionType::BMPSCALEPART ): + case MetaActionType::BMPSCALEPART: { MetaBmpScalePartAction* pAct = static_cast<MetaBmpScalePartAction*>(pAction); aMtf.push_back( new MetaBmpScalePartAction( pAct->GetDestPoint(), pAct->GetDestSize(), @@ -1994,7 +1994,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol } break; - case( MetaActionType::BMPEXSCALE ): + case MetaActionType::BMPEXSCALE: { MetaBmpExScaleAction* pAct = static_cast<MetaBmpExScaleAction*>(pAction); aMtf.push_back( new MetaBmpExScaleAction( pAct->GetPoint(), pAct->GetSize(), @@ -2003,7 +2003,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol } break; - case( MetaActionType::BMPEXSCALEPART ): + case MetaActionType::BMPEXSCALEPART: { MetaBmpExScalePartAction* pAct = static_cast<MetaBmpExScalePartAction*>(pAction); aMtf.push_back( new MetaBmpExScalePartAction( pAct->GetDestPoint(), pAct->GetDestSize(), @@ -2013,7 +2013,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol } break; - case( MetaActionType::MASKSCALE ): + case MetaActionType::MASKSCALE: { MetaMaskScaleAction* pAct = static_cast<MetaMaskScaleAction*>(pAction); aMtf.push_back( new MetaMaskScaleAction( pAct->GetPoint(), pAct->GetSize(), @@ -2023,7 +2023,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol } break; - case( MetaActionType::MASKSCALEPART ): + case MetaActionType::MASKSCALEPART: { MetaMaskScalePartAction* pAct = static_cast<MetaMaskScalePartAction*>(pAction); aMtf.push_back( new MetaMaskScalePartAction( pAct->GetDestPoint(), pAct->GetDestSize(), @@ -2034,7 +2034,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol } break; - case( MetaActionType::GRADIENT ): + case MetaActionType::GRADIENT: { MetaGradientAction* pAct = static_cast<MetaGradientAction*>(pAction); Gradient aGradient( pAct->GetGradient() ); @@ -2045,7 +2045,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol } break; - case( MetaActionType::GRADIENTEX ): + case MetaActionType::GRADIENTEX: { MetaGradientExAction* pAct = static_cast<MetaGradientExAction*>(pAction); Gradient aGradient( pAct->GetGradient() ); @@ -2056,7 +2056,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol } break; - case( MetaActionType::HATCH ): + case MetaActionType::HATCH: { MetaHatchAction* pAct = static_cast<MetaHatchAction*>(pAction); Hatch aHatch( pAct->GetHatch() ); @@ -2066,7 +2066,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol } break; - case( MetaActionType::FLOATTRANSPARENT ): + case MetaActionType::FLOATTRANSPARENT: { MetaFloatTransparentAction* pAct = static_cast<MetaFloatTransparentAction*>(pAction); GDIMetaFile aTransMtf( pAct->GetGDIMetaFile() ); @@ -2079,7 +2079,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol } break; - case( MetaActionType::EPS ): + case MetaActionType::EPS: { MetaEPSAction* pAct = static_cast<MetaEPSAction*>(pAction); GDIMetaFile aSubst( pAct->GetSubstitute() ); @@ -2278,7 +2278,7 @@ BitmapChecksum GDIMetaFile::GetChecksum() const switch( pAction->GetType() ) { - case( MetaActionType::BMP ): + case MetaActionType::BMP: { MetaBmpAction* pAct = static_cast<MetaBmpAction*>(pAction); @@ -2296,7 +2296,7 @@ BitmapChecksum GDIMetaFile::GetChecksum() const } break; - case( MetaActionType::BMPSCALE ): + case MetaActionType::BMPSCALE: { MetaBmpScaleAction* pAct = static_cast<MetaBmpScaleAction*>(pAction); @@ -2320,7 +2320,7 @@ BitmapChecksum GDIMetaFile::GetChecksum() const } break; - case( MetaActionType::BMPSCALEPART ): + case MetaActionType::BMPSCALEPART: { MetaBmpScalePartAction* pAct = static_cast<MetaBmpScalePartAction*>(pAction); @@ -2356,7 +2356,7 @@ BitmapChecksum GDIMetaFile::GetChecksum() const } break; - case( MetaActionType::BMPEX ): + case MetaActionType::BMPEX: { MetaBmpExAction* pAct = static_cast<MetaBmpExAction*>(pAction); @@ -2374,7 +2374,7 @@ BitmapChecksum GDIMetaFile::GetChecksum() const } break; - case( MetaActionType::BMPEXSCALE ): + case MetaActionType::BMPEXSCALE: { MetaBmpExScaleAction* pAct = static_cast<MetaBmpExScaleAction*>(pAction); @@ -2398,7 +2398,7 @@ BitmapChecksum GDIMetaFile::GetChecksum() const } break; - case( MetaActionType::BMPEXSCALEPART ): + case MetaActionType::BMPEXSCALEPART: { MetaBmpExScalePartAction* pAct = static_cast<MetaBmpExScalePartAction*>(pAction); @@ -2434,7 +2434,7 @@ BitmapChecksum GDIMetaFile::GetChecksum() const } break; - case( MetaActionType::MASK ): + case MetaActionType::MASK: { MetaMaskAction* pAct = static_cast<MetaMaskAction*>(pAction); @@ -2455,7 +2455,7 @@ BitmapChecksum GDIMetaFile::GetChecksum() const } break; - case( MetaActionType::MASKSCALE ): + case MetaActionType::MASKSCALE: { MetaMaskScaleAction* pAct = static_cast<MetaMaskScaleAction*>(pAction); @@ -2482,7 +2482,7 @@ BitmapChecksum GDIMetaFile::GetChecksum() const } break; - case( MetaActionType::MASKSCALEPART ): + case MetaActionType::MASKSCALEPART: { MetaMaskScalePartAction* pAct = static_cast<MetaMaskScalePartAction*>(pAction); @@ -2621,21 +2621,21 @@ sal_uLong GDIMetaFile::GetSizeBytes() const // add sizes for large action content switch( pAction->GetType() ) { - case( MetaActionType::BMP ): nSizeBytes += static_cast<MetaBmpAction*>( pAction )->GetBitmap().GetSizeBytes(); break; - case( MetaActionType::BMPSCALE ): nSizeBytes += static_cast<MetaBmpScaleAction*>( pAction )->GetBitmap().GetSizeBytes(); break; - case( MetaActionType::BMPSCALEPART ): nSizeBytes += static_cast<MetaBmpScalePartAction*>( pAction )->GetBitmap().GetSizeBytes(); break; + case MetaActionType::BMP: nSizeBytes += static_cast<MetaBmpAction*>( pAction )->GetBitmap().GetSizeBytes(); break; + case MetaActionType::BMPSCALE: nSizeBytes += static_cast<MetaBmpScaleAction*>( pAction )->GetBitmap().GetSizeBytes(); break; + case MetaActionType::BMPSCALEPART: nSizeBytes += static_cast<MetaBmpScalePartAction*>( pAction )->GetBitmap().GetSizeBytes(); break; - case( MetaActionType::BMPEX ): nSizeBytes += static_cast<MetaBmpExAction*>( pAction )->GetBitmapEx().GetSizeBytes(); break; - case( MetaActionType::BMPEXSCALE ): nSizeBytes += static_cast<MetaBmpExScaleAction*>( pAction )->GetBitmapEx().GetSizeBytes(); break; - case( MetaActionType::BMPEXSCALEPART ): nSizeBytes += static_cast<MetaBmpExScalePartAction*>( pAction )->GetBitmapEx().GetSizeBytes(); break; + case MetaActionType::BMPEX: nSizeBytes += static_cast<MetaBmpExAction*>( pAction )->GetBitmapEx().GetSizeBytes(); break; + case MetaActionType::BMPEXSCALE: nSizeBytes += static_cast<MetaBmpExScaleAction*>( pAction )->GetBitmapEx().GetSizeBytes(); break; + case MetaActionType::BMPEXSCALEPART: nSizeBytes += static_cast<MetaBmpExScalePartAction*>( pAction )->GetBitmapEx().GetSizeBytes(); break; - case( MetaActionType::MASK ): nSizeBytes += static_cast<MetaMaskAction*>( pAction )->GetBitmap().GetSizeBytes(); break; - case( MetaActionType::MASKSCALE ): nSizeBytes += static_cast<MetaMaskScaleAction*>( pAction )->GetBitmap().GetSizeBytes(); break; - case( MetaActionType::MASKSCALEPART ): nSizeBytes += static_cast<MetaMaskScalePartAction*>( pAction )->GetBitmap().GetSizeBytes(); break; + case MetaActionType::MASK: nSizeBytes += static_cast<MetaMaskAction*>( pAction )->GetBitmap().GetSizeBytes(); break; + case MetaActionType::MASKSCALE: nSizeBytes += static_cast<MetaMaskScaleAction*>( pAction )->GetBitmap().GetSizeBytes(); break; + case MetaActionType::MASKSCALEPART: nSizeBytes += static_cast<MetaMaskScalePartAction*>( pAction )->GetBitmap().GetSizeBytes(); break; - case( MetaActionType::POLYLINE ): nSizeBytes += static_cast<MetaPolyLineAction*>( pAction )->GetPolygon().GetSize() * sizeof( Point ); break; - case( MetaActionType::POLYGON ): nSizeBytes += static_cast<MetaPolygonAction*>( pAction )->GetPolygon().GetSize() * sizeof( Point ); break; - case( MetaActionType::POLYPOLYGON ): + case MetaActionType::POLYLINE: nSizeBytes += static_cast<MetaPolyLineAction*>( pAction )->GetPolygon().GetSize() * sizeof( Point ); break; + case MetaActionType::POLYGON: nSizeBytes += static_cast<MetaPolygonAction*>( pAction )->GetPolygon().GetSize() * sizeof( Point ); break; + case MetaActionType::POLYPOLYGON: { const tools::PolyPolygon& rPolyPoly = static_cast<MetaPolyPolygonAction*>( pAction )->GetPolyPolygon(); @@ -2644,10 +2644,10 @@ sal_uLong GDIMetaFile::GetSizeBytes() const } break; - case( MetaActionType::TEXT ): nSizeBytes += static_cast<MetaTextAction*>( pAction )->GetText().getLength() * sizeof( sal_Unicode ); break; - case( MetaActionType::STRETCHTEXT ): nSizeBytes += static_cast<MetaStretchTextAction*>( pAction )->GetText().getLength() * sizeof( sal_Unicode ); break; - case( MetaActionType::TEXTRECT ): nSizeBytes += static_cast<MetaTextRectAction*>( pAction )->GetText().getLength() * sizeof( sal_Unicode ); break; - case( MetaActionType::TEXTARRAY ): + case MetaActionType::TEXT: nSizeBytes += static_cast<MetaTextAction*>( pAction )->GetText().getLength() * sizeof( sal_Unicode ); break; + case MetaActionType::STRETCHTEXT: nSizeBytes += static_cast<MetaStretchTextAction*>( pAction )->GetText().getLength() * sizeof( sal_Unicode ); break; + case MetaActionType::TEXTRECT: nSizeBytes += static_cast<MetaTextRectAction*>( pAction )->GetText().getLength() * sizeof( sal_Unicode ); break; + case MetaActionType::TEXTARRAY: { MetaTextArrayAction* pTextArrayAction = static_cast<MetaTextArrayAction*>(pAction); diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 94a3772a00c7..b7ce3650f65f 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -273,21 +273,21 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa switch( nType ) { - case( MetaActionType::PIXEL ): + case MetaActionType::PIXEL: { const MetaPixelAction* pA = static_cast<const MetaPixelAction*>(pAction); m_rOuterFace.DrawPixel( pA->GetPoint(), pA->GetColor() ); } break; - case( MetaActionType::POINT ): + case MetaActionType::POINT: { const MetaPointAction* pA = static_cast<const MetaPointAction*>(pAction); m_rOuterFace.DrawPixel( pA->GetPoint() ); } break; - case( MetaActionType::LINE ): + case MetaActionType::LINE: { const MetaLineAction* pA = static_cast<const MetaLineAction*>(pAction); if ( pA->GetLineInfo().IsDefault() ) @@ -297,56 +297,56 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::RECT ): + case MetaActionType::RECT: { const MetaRectAction* pA = static_cast<const MetaRectAction*>(pAction); m_rOuterFace.DrawRect( pA->GetRect() ); } break; - case( MetaActionType::ROUNDRECT ): + case MetaActionType::ROUNDRECT: { const MetaRoundRectAction* pA = static_cast<const MetaRoundRectAction*>(pAction); m_rOuterFace.DrawRect( pA->GetRect(), pA->GetHorzRound(), pA->GetVertRound() ); } break; - case( MetaActionType::ELLIPSE ): + case MetaActionType::ELLIPSE: { const MetaEllipseAction* pA = static_cast<const MetaEllipseAction*>(pAction); m_rOuterFace.DrawEllipse( pA->GetRect() ); } break; - case( MetaActionType::ARC ): + case MetaActionType::ARC: { const MetaArcAction* pA = static_cast<const MetaArcAction*>(pAction); m_rOuterFace.DrawArc( pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint() ); } break; - case( MetaActionType::PIE ): + case MetaActionType::PIE: { const MetaArcAction* pA = static_cast<const MetaArcAction*>(pAction); m_rOuterFace.DrawPie( pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint() ); } break; - case( MetaActionType::CHORD ): + case MetaActionType::CHORD: { const MetaChordAction* pA = static_cast<const MetaChordAction*>(pAction); m_rOuterFace.DrawChord( pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint() ); } break; - case( MetaActionType::POLYGON ): + case MetaActionType::POLYGON: { const MetaPolygonAction* pA = static_cast<const MetaPolygonAction*>(pAction); m_rOuterFace.DrawPolygon( pA->GetPolygon() ); } break; - case( MetaActionType::POLYLINE ): + case MetaActionType::POLYLINE: { const MetaPolyLineAction* pA = static_cast<const MetaPolyLineAction*>(pAction); if ( pA->GetLineInfo().IsDefault() ) @@ -356,14 +356,14 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::POLYPOLYGON ): + case MetaActionType::POLYPOLYGON: { const MetaPolyPolygonAction* pA = static_cast<const MetaPolyPolygonAction*>(pAction); m_rOuterFace.DrawPolyPolygon( pA->GetPolyPolygon() ); } break; - case( MetaActionType::GRADIENT ): + case MetaActionType::GRADIENT: { const MetaGradientAction* pA = static_cast<const MetaGradientAction*>(pAction); const Gradient& rGradient = pA->GetGradient(); @@ -379,7 +379,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::GRADIENTEX ): + case MetaActionType::GRADIENTEX: { const MetaGradientExAction* pA = static_cast<const MetaGradientExAction*>(pAction); const Gradient& rGradient = pA->GetGradient(); @@ -398,14 +398,14 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::Transparent ): + case MetaActionType::Transparent: { const MetaTransparentAction* pA = static_cast<const MetaTransparentAction*>(pAction); m_rOuterFace.DrawTransparent( pA->GetPolyPolygon(), pA->GetTransparence() ); } break; - case( MetaActionType::FLOATTRANSPARENT ): + case MetaActionType::FLOATTRANSPARENT: { const MetaFloatTransparentAction* pA = static_cast<const MetaFloatTransparentAction*>(pAction); @@ -500,7 +500,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::EPS ): + case MetaActionType::EPS: { const MetaEPSAction* pA = static_cast<const MetaEPSAction*>(pAction); const GDIMetaFile aSubstitute( pA->GetSubstitute() ); @@ -522,7 +522,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::COMMENT ): + case MetaActionType::COMMENT: if( ! i_rContext.m_bTransparenciesWereRemoved ) { const MetaCommentAction* pA = static_cast<const MetaCommentAction*>(pAction); @@ -784,7 +784,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::BMP ): + case MetaActionType::BMP: { const MetaBmpAction* pA = static_cast<const MetaBmpAction*>(pAction); BitmapEx aBitmapEx( pA->GetBitmap() ); @@ -798,7 +798,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::BMPSCALE ): + case MetaActionType::BMPSCALE: { const MetaBmpScaleAction* pA = static_cast<const MetaBmpScaleAction*>(pAction); Graphic aGraphic = i_pOutDevData ? i_pOutDevData->GetCurrentGraphic() : Graphic(); @@ -806,7 +806,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::BMPSCALEPART ): + case MetaActionType::BMPSCALEPART: { const MetaBmpScalePartAction* pA = static_cast<const MetaBmpScalePartAction*>(pAction); BitmapEx aBitmapEx( pA->GetBitmap() ); @@ -816,7 +816,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::BMPEX ): + case MetaActionType::BMPEX: { const MetaBmpExAction* pA = static_cast<const MetaBmpExAction*>(pAction); BitmapEx aBitmapEx( pA->GetBitmapEx() ); @@ -827,7 +827,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::BMPEXSCALE ): + case MetaActionType::BMPEXSCALE: { const MetaBmpExScaleAction* pA = static_cast<const MetaBmpExScaleAction*>(pAction); Graphic aGraphic = i_pOutDevData ? i_pOutDevData->GetCurrentGraphic() : Graphic(); @@ -835,7 +835,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::BMPEXSCALEPART ): + case MetaActionType::BMPEXSCALEPART: { const MetaBmpExScalePartAction* pA = static_cast<const MetaBmpExScalePartAction*>(pAction); BitmapEx aBitmapEx( pA->GetBitmapEx() ); @@ -845,43 +845,43 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::MASK ): - case( MetaActionType::MASKSCALE ): - case( MetaActionType::MASKSCALEPART ): + case MetaActionType::MASK: + case MetaActionType::MASKSCALE: + case MetaActionType::MASKSCALEPART: { SAL_WARN( "vcl", "MetaMask...Action not supported yet" ); } break; - case( MetaActionType::TEXT ): + case MetaActionType::TEXT: { const MetaTextAction* pA = static_cast<const MetaTextAction*>(pAction); m_rOuterFace.DrawText( pA->GetPoint(), pA->GetText().copy( pA->GetIndex(), std::min<sal_Int32>(pA->GetText().getLength() - pA->GetIndex(), pA->GetLen()) ) ); } break; - case( MetaActionType::TEXTRECT ): + case MetaActionType::TEXTRECT: { const MetaTextRectAction* pA = static_cast<const MetaTextRectAction*>(pAction); m_rOuterFace.DrawText( pA->GetRect(), pA->GetText(), pA->GetStyle() ); } break; - case( MetaActionType::TEXTARRAY ): + case MetaActionType::TEXTARRAY: { const MetaTextArrayAction* pA = static_cast<const MetaTextArrayAction*>(pAction); m_rOuterFace.DrawTextArray( pA->GetPoint(), pA->GetText(), pA->GetDXArray(), pA->GetIndex(), pA->GetLen() ); } break; - case( MetaActionType::STRETCHTEXT ): + case MetaActionType::STRETCHTEXT: { const MetaStretchTextAction* pA = static_cast<const MetaStretchTextAction*>(pAction); m_rOuterFace.DrawStretchText( pA->GetPoint(), pA->GetWidth(), pA->GetText(), pA->GetIndex(), pA->GetLen() ); } break; - case( MetaActionType::TEXTLINE ): + case MetaActionType::TEXTLINE: { const MetaTextLineAction* pA = static_cast<const MetaTextLineAction*>(pAction); m_rOuterFace.DrawTextLine( pA->GetStartPoint(), pA->GetWidth(), pA->GetStrikeout(), pA->GetUnderline(), pA->GetOverline() ); @@ -889,7 +889,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::CLIPREGION ): + case MetaActionType::CLIPREGION: { const MetaClipRegionAction* pA = static_cast<const MetaClipRegionAction*>(pAction); @@ -908,14 +908,14 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::ISECTRECTCLIPREGION ): + case MetaActionType::ISECTRECTCLIPREGION: { const MetaISectRectClipRegionAction* pA = static_cast<const MetaISectRectClipRegionAction*>(pAction); m_rOuterFace.IntersectClipRegion( pA->GetRect() ); } break; - case( MetaActionType::ISECTREGIONCLIPREGION ): + case MetaActionType::ISECTREGIONCLIPREGION: { const MetaISectRegionClipRegionAction* pA = static_cast<const MetaISectRegionClipRegionAction*>(pAction); vcl::Region aReg( pA->GetRegion() ); @@ -923,21 +923,21 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::MOVECLIPREGION ): + case MetaActionType::MOVECLIPREGION: { const MetaMoveClipRegionAction* pA = static_cast<const MetaMoveClipRegionAction*>(pAction); m_rOuterFace.MoveClipRegion( pA->GetHorzMove(), pA->GetVertMove() ); } break; - case( MetaActionType::MAPMODE ): + case MetaActionType::MAPMODE: { const_cast< MetaAction* >( pAction )->Execute( pDummyVDev ); m_rOuterFace.SetMapMode( pDummyVDev->GetMapMode() ); } break; - case( MetaActionType::LINECOLOR ): + case MetaActionType::LINECOLOR: { const MetaLineColorAction* pA = static_cast<const MetaLineColorAction*>(pAction); @@ -948,7 +948,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::FILLCOLOR ): + case MetaActionType::FILLCOLOR: { const MetaFillColorAction* pA = static_cast<const MetaFillColorAction*>(pAction); @@ -959,7 +959,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::TEXTLINECOLOR ): + case MetaActionType::TEXTLINECOLOR: { const MetaTextLineColorAction* pA = static_cast<const MetaTextLineColorAction*>(pAction); @@ -970,7 +970,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::OVERLINECOLOR ): + case MetaActionType::OVERLINECOLOR: { const MetaOverlineColorAction* pA = static_cast<const MetaOverlineColorAction*>(pAction); @@ -981,7 +981,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::TEXTFILLCOLOR ): + case MetaActionType::TEXTFILLCOLOR: { const MetaTextFillColorAction* pA = static_cast<const MetaTextFillColorAction*>(pAction); @@ -992,28 +992,28 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::TEXTCOLOR ): + case MetaActionType::TEXTCOLOR: { const MetaTextColorAction* pA = static_cast<const MetaTextColorAction*>(pAction); m_rOuterFace.SetTextColor( pA->GetColor() ); } break; - case( MetaActionType::TEXTALIGN ): + case MetaActionType::TEXTALIGN: { const MetaTextAlignAction* pA = static_cast<const MetaTextAlignAction*>(pAction); m_rOuterFace.SetTextAlign( pA->GetTextAlign() ); } break; - case( MetaActionType::FONT ): + case MetaActionType::FONT: { const MetaFontAction* pA = static_cast<const MetaFontAction*>(pAction); m_rOuterFace.SetFont( pA->GetFont() ); } break; - case( MetaActionType::PUSH ): + case MetaActionType::PUSH: { const MetaPushAction* pA = static_cast<const MetaPushAction*>(pAction); @@ -1022,14 +1022,14 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::POP ): + case MetaActionType::POP: { pDummyVDev->Pop(); m_rOuterFace.Pop(); } break; - case( MetaActionType::LAYOUTMODE ): + case MetaActionType::LAYOUTMODE: { const MetaLayoutModeAction* pA = static_cast<const MetaLayoutModeAction*>(pAction); m_rOuterFace.SetLayoutMode( pA->GetLayoutMode() ); @@ -1043,20 +1043,20 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( MetaActionType::WALLPAPER ): + case MetaActionType::WALLPAPER: { const MetaWallpaperAction* pA = static_cast<const MetaWallpaperAction*>(pAction); m_rOuterFace.DrawWallpaper( pA->GetRect(), pA->GetWallpaper() ); } break; - case( MetaActionType::RASTEROP ): + case MetaActionType::RASTEROP: { // !!! >>> we don't want to support this actions } break; - case( MetaActionType::REFPOINT ): + case MetaActionType::REFPOINT: { // !!! >>> we don't want to support this actions } diff --git a/vcl/source/outdev/mask.cxx b/vcl/source/outdev/mask.cxx index 5ce47c676e84..17cd06e4ba68 100644 --- a/vcl/source/outdev/mask.cxx +++ b/vcl/source/outdev/mask.cxx @@ -64,17 +64,17 @@ void OutputDevice::DrawMask( const Point& rDestPt, const Size& rDestSize, { switch( nAction ) { - case( MetaActionType::MASK ): + case MetaActionType::MASK: mpMetaFile->AddAction( new MetaMaskAction( rDestPt, rBitmap, rMaskColor ) ); break; - case( MetaActionType::MASKSCALE ): + case MetaActionType::MASKSCALE: mpMetaFile->AddAction( new MetaMaskScaleAction( rDestPt, rDestSize, rBitmap, rMaskColor ) ); break; - case( MetaActionType::MASKSCALEPART ): + case MetaActionType::MASKSCALEPART: mpMetaFile->AddAction( new MetaMaskScalePartAction( rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel, rBitmap, rMaskColor ) ); break; diff --git a/vcl/source/outdev/wallpaper.cxx b/vcl/source/outdev/wallpaper.cxx index bb22f2be95ea..e6aaf70e23cd 100644 --- a/vcl/source/outdev/wallpaper.cxx +++ b/vcl/source/outdev/wallpaper.cxx @@ -187,7 +187,7 @@ void OutputDevice::DrawBitmapWallpaper( long nX, long nY, switch( eStyle ) { - case( WallpaperStyle::Scale ): + case WallpaperStyle::Scale: if( !pCached || ( pCached->GetSizePixel() != aSize ) ) { if( pCached ) @@ -199,41 +199,41 @@ void OutputDevice::DrawBitmapWallpaper( long nX, long nY, } break; - case( WallpaperStyle::TopLeft ): + case WallpaperStyle::TopLeft: break; - case( WallpaperStyle::Top ): + case WallpaperStyle::Top: aPos.X() += ( aSize.Width() - nBmpWidth ) >> 1; break; - case( WallpaperStyle::TopRight ): + case WallpaperStyle::TopRight: aPos.X() += ( aSize.Width() - nBmpWidth ); break; - case( WallpaperStyle::Left ): + case WallpaperStyle::Left: aPos.Y() += ( aSize.Height() - nBmpHeight ) >> 1; break; - case( WallpaperStyle::Center ): + case WallpaperStyle::Center: aPos.X() += ( aSize.Width() - nBmpWidth ) >> 1; aPos.Y() += ( aSize.Height() - nBmpHeight ) >> 1; break; - case( WallpaperStyle::Right ): + case WallpaperStyle::Right: aPos.X() += ( aSize.Width() - nBmpWidth ); aPos.Y() += ( aSize.Height() - nBmpHeight ) >> 1; break; - case( WallpaperStyle::BottomLeft ): + case WallpaperStyle::BottomLeft: aPos.Y() += ( aSize.Height() - nBmpHeight ); break; - case( WallpaperStyle::Bottom ): + case WallpaperStyle::Bottom: aPos.X() += ( aSize.Width() - nBmpWidth ) >> 1; aPos.Y() += ( aSize.Height() - nBmpHeight ); break; - case( WallpaperStyle::BottomRight ): + case WallpaperStyle::BottomRight: aPos.X() += ( aSize.Width() - nBmpWidth ); aPos.Y() += ( aSize.Height() - nBmpHeight ); break; diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 7127f2e7c22b..5e88bef81649 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -324,14 +324,14 @@ void ImplWheelWindow::MouseMove( const MouseEvent& rMEvt ) { switch( eActStyle ) { - case( PointerStyle::AutoScrollN ): mnActDeltaX = +0; mnActDeltaY = +1; break; - case( PointerStyle::AutoScrollS ): mnActDeltaX = +0; mnActDeltaY = -1; break; - case( PointerStyle::AutoScrollW ): mnActDeltaX = +1; mnActDeltaY = +0; break; - case( PointerStyle::AutoScrollE ): mnActDeltaX = -1; mnActDeltaY = +0; break; - case( PointerStyle::AutoScrollNW ): mnActDeltaX = +1; mnActDeltaY = +1; break; - case( PointerStyle::AutoScrollNE ): mnActDeltaX = -1; mnActDeltaY = +1; break; - case( PointerStyle::AutoScrollSW ): mnActDeltaX = +1; mnActDeltaY = -1; break; - case( PointerStyle::AutoScrollSE ): mnActDeltaX = -1; mnActDeltaY = -1; break; + case PointerStyle::AutoScrollN: mnActDeltaX = +0; mnActDeltaY = +1; break; + case PointerStyle::AutoScrollS: mnActDeltaX = +0; mnActDeltaY = -1; break; + case PointerStyle::AutoScrollW: mnActDeltaX = +1; mnActDeltaY = +0; break; + case PointerStyle::AutoScrollE: mnActDeltaX = -1; mnActDeltaY = +0; break; + case PointerStyle::AutoScrollNW: mnActDeltaX = +1; mnActDeltaY = +1; break; + case PointerStyle::AutoScrollNE: mnActDeltaX = -1; mnActDeltaY = +1; break; + case PointerStyle::AutoScrollSW: mnActDeltaX = +1; mnActDeltaY = -1; break; + case PointerStyle::AutoScrollSE: mnActDeltaX = -1; mnActDeltaY = -1; break; default: break; diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 364750933364..b13d1e9a685f 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -3381,14 +3381,14 @@ void XMLShapeExport::ImpExportMediaShape( xPropSet->getPropertyValue("Zoom") >>= eZoom; switch( eZoom ) { - case( media::ZoomLevel_ZOOM_1_TO_4 ) : aZoomValue = "25%"; break; - case( media::ZoomLevel_ZOOM_1_TO_2 ) : aZoomValue = "50%"; break; - case( media::ZoomLevel_ORIGINAL ) : aZoomValue = "100%"; break; - case( media::ZoomLevel_ZOOM_2_TO_1 ) : aZoomValue = "200%"; break; - case( media::ZoomLevel_ZOOM_4_TO_1 ) : aZoomValue = "400%"; break; - case( media::ZoomLevel_FIT_TO_WINDOW ): aZoomValue = "fit"; break; - case( media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT ): aZoomValue = "fixedfit"; break; - case( media::ZoomLevel_FULLSCREEN ) : aZoomValue = "fullscreen"; break; + case media::ZoomLevel_ZOOM_1_TO_4 : aZoomValue = "25%"; break; + case media::ZoomLevel_ZOOM_1_TO_2 : aZoomValue = "50%"; break; + case media::ZoomLevel_ORIGINAL : aZoomValue = "100%"; break; + case media::ZoomLevel_ZOOM_2_TO_1 : aZoomValue = "200%"; break; + case media::ZoomLevel_ZOOM_4_TO_1 : aZoomValue = "400%"; break; + case media::ZoomLevel_FIT_TO_WINDOW: aZoomValue = "fit"; break; + case media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT: aZoomValue = "fixedfit"; break; + case media::ZoomLevel_FULLSCREEN : aZoomValue = "fullscreen"; break; default: break; |