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 /vcl/source/filter | |
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>
Diffstat (limited to 'vcl/source/filter')
-rw-r--r-- | vcl/source/filter/graphicfilter.cxx | 22 | ||||
-rw-r--r-- | vcl/source/filter/graphicfilter2.cxx | 50 | ||||
-rw-r--r-- | vcl/source/filter/wmf/emfwr.cxx | 84 | ||||
-rw-r--r-- | vcl/source/filter/wmf/wmfwr.cxx | 2 |
4 files changed, 79 insertions, 79 deletions
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 |