summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-09-05 08:29:58 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-09-06 08:43:33 +0200
commitdccd1633a111ba124f9868a4a51579c95200d745 (patch)
tree221a16d33215ffde2b249c7aca6f8c83981dbec4 /filter
parent9c34471f54870fc685c343f4af30310e75d3a9ca (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 'filter')
-rw-r--r--filter/source/flash/swfexporter.cxx17
-rw-r--r--filter/source/svg/svgexport.cxx8
-rw-r--r--filter/source/svg/svgfontexport.cxx8
-rw-r--r--filter/source/svg/svgwriter.cxx152
4 files changed, 89 insertions, 96 deletions
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
}