summaryrefslogtreecommitdiff
path: root/svtools/source/graphic
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-02-18 08:26:33 +0200
committerNoel Grandin <noel@peralex.com>2016-03-15 08:52:23 +0200
commit52e438caafc3cd24b3759b08c1aaee88e5b67877 (patch)
treeceb8aef8dd12c2b81caf2138ac194b086d9a77ff /svtools/source/graphic
parenta0d5f0896ed7f2de8ceffd664ee469a383ce7d53 (diff)
remove unnecessary parentheses in case labels
Change-Id: I987bf68c767709080c67c8b183c036a4109c6caa
Diffstat (limited to 'svtools/source/graphic')
-rw-r--r--svtools/source/graphic/descriptor.cxx84
-rw-r--r--svtools/source/graphic/grfcache.cxx8
-rw-r--r--svtools/source/graphic/grfmgr2.cxx18
-rw-r--r--svtools/source/graphic/renderer.cxx12
4 files changed, 61 insertions, 61 deletions
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index f9e64af9acef..a911317f6d33 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -106,32 +106,32 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const OUString* pURL )
switch( aDescriptor.GetFileFormat() )
{
- case( GraphicFileFormat::BMP ): pMimeType = MIMETYPE_BMP; cType = graphic::GraphicType::PIXEL; break;
- case( GraphicFileFormat::GIF ): pMimeType = MIMETYPE_GIF; cType = graphic::GraphicType::PIXEL; break;
- case( GraphicFileFormat::JPG ): pMimeType = MIMETYPE_JPG; cType = graphic::GraphicType::PIXEL; break;
- case( GraphicFileFormat::PCD ): pMimeType = MIMETYPE_PCD; cType = graphic::GraphicType::PIXEL; break;
- case( GraphicFileFormat::PCX ): pMimeType = MIMETYPE_PCX; cType = graphic::GraphicType::PIXEL; break;
- case( GraphicFileFormat::PNG ): pMimeType = MIMETYPE_PNG; cType = graphic::GraphicType::PIXEL; break;
- case( GraphicFileFormat::TIF ): pMimeType = MIMETYPE_TIF; cType = graphic::GraphicType::PIXEL; break;
- case( GraphicFileFormat::XBM ): pMimeType = MIMETYPE_XBM; cType = graphic::GraphicType::PIXEL; break;
- case( GraphicFileFormat::XPM ): pMimeType = MIMETYPE_XPM; cType = graphic::GraphicType::PIXEL; break;
- case( GraphicFileFormat::PBM ): pMimeType = MIMETYPE_PBM; cType = graphic::GraphicType::PIXEL; break;
- case( GraphicFileFormat::PGM ): pMimeType = MIMETYPE_PGM; cType = graphic::GraphicType::PIXEL; break;
- case( GraphicFileFormat::PPM ): pMimeType = MIMETYPE_PPM; cType = graphic::GraphicType::PIXEL; break;
- case( GraphicFileFormat::RAS ): pMimeType = MIMETYPE_RAS; cType = graphic::GraphicType::PIXEL; break;
- case( GraphicFileFormat::TGA ): pMimeType = MIMETYPE_TGA; cType = graphic::GraphicType::PIXEL; break;
- case( GraphicFileFormat::PSD ): pMimeType = MIMETYPE_PSD; cType = graphic::GraphicType::PIXEL; break;
-
- case( GraphicFileFormat::EPS ): pMimeType = MIMETYPE_EPS; cType = graphic::GraphicType::VECTOR; break;
- case( GraphicFileFormat::DXF ): pMimeType = MIMETYPE_DXF; cType = graphic::GraphicType::VECTOR; break;
- case( GraphicFileFormat::MET ): pMimeType = MIMETYPE_MET; cType = graphic::GraphicType::VECTOR; break;
- case( GraphicFileFormat::PCT ): pMimeType = MIMETYPE_PCT; cType = graphic::GraphicType::VECTOR; break;
- case( GraphicFileFormat::SGF ): pMimeType = MIMETYPE_SGF; cType = graphic::GraphicType::VECTOR; break;
- case( GraphicFileFormat::SVM ): pMimeType = MIMETYPE_SVM; cType = graphic::GraphicType::VECTOR; break;
- case( GraphicFileFormat::WMF ): pMimeType = MIMETYPE_WMF; cType = graphic::GraphicType::VECTOR; break;
- case( GraphicFileFormat::SGV ): pMimeType = MIMETYPE_SGV; cType = graphic::GraphicType::VECTOR; break;
- case( GraphicFileFormat::EMF ): pMimeType = MIMETYPE_EMF; cType = graphic::GraphicType::VECTOR; break;
- case( GraphicFileFormat::SVG ): pMimeType = MIMETYPE_SVG; cType = graphic::GraphicType::VECTOR; break;
+ case GraphicFileFormat::BMP: pMimeType = MIMETYPE_BMP; cType = graphic::GraphicType::PIXEL; break;
+ case GraphicFileFormat::GIF: pMimeType = MIMETYPE_GIF; cType = graphic::GraphicType::PIXEL; break;
+ case GraphicFileFormat::JPG: pMimeType = MIMETYPE_JPG; cType = graphic::GraphicType::PIXEL; break;
+ case GraphicFileFormat::PCD: pMimeType = MIMETYPE_PCD; cType = graphic::GraphicType::PIXEL; break;
+ case GraphicFileFormat::PCX: pMimeType = MIMETYPE_PCX; cType = graphic::GraphicType::PIXEL; break;
+ case GraphicFileFormat::PNG: pMimeType = MIMETYPE_PNG; cType = graphic::GraphicType::PIXEL; break;
+ case GraphicFileFormat::TIF: pMimeType = MIMETYPE_TIF; cType = graphic::GraphicType::PIXEL; break;
+ case GraphicFileFormat::XBM: pMimeType = MIMETYPE_XBM; cType = graphic::GraphicType::PIXEL; break;
+ case GraphicFileFormat::XPM: pMimeType = MIMETYPE_XPM; cType = graphic::GraphicType::PIXEL; break;
+ case GraphicFileFormat::PBM: pMimeType = MIMETYPE_PBM; cType = graphic::GraphicType::PIXEL; break;
+ case GraphicFileFormat::PGM: pMimeType = MIMETYPE_PGM; cType = graphic::GraphicType::PIXEL; break;
+ case GraphicFileFormat::PPM: pMimeType = MIMETYPE_PPM; cType = graphic::GraphicType::PIXEL; break;
+ case GraphicFileFormat::RAS: pMimeType = MIMETYPE_RAS; cType = graphic::GraphicType::PIXEL; break;
+ case GraphicFileFormat::TGA: pMimeType = MIMETYPE_TGA; cType = graphic::GraphicType::PIXEL; break;
+ case GraphicFileFormat::PSD: pMimeType = MIMETYPE_PSD; cType = graphic::GraphicType::PIXEL; break;
+
+ case GraphicFileFormat::EPS: pMimeType = MIMETYPE_EPS; cType = graphic::GraphicType::VECTOR; break;
+ case GraphicFileFormat::DXF: pMimeType = MIMETYPE_DXF; cType = graphic::GraphicType::VECTOR; break;
+ case GraphicFileFormat::MET: pMimeType = MIMETYPE_MET; cType = graphic::GraphicType::VECTOR; break;
+ case GraphicFileFormat::PCT: pMimeType = MIMETYPE_PCT; cType = graphic::GraphicType::VECTOR; break;
+ case GraphicFileFormat::SGF: pMimeType = MIMETYPE_SGF; cType = graphic::GraphicType::VECTOR; break;
+ case GraphicFileFormat::SVM: pMimeType = MIMETYPE_SVM; cType = graphic::GraphicType::VECTOR; break;
+ case GraphicFileFormat::WMF: pMimeType = MIMETYPE_WMF; cType = graphic::GraphicType::VECTOR; break;
+ case GraphicFileFormat::SGV: pMimeType = MIMETYPE_SGV; cType = graphic::GraphicType::VECTOR; break;
+ case GraphicFileFormat::EMF: pMimeType = MIMETYPE_EMF; cType = graphic::GraphicType::VECTOR; break;
+ case GraphicFileFormat::SVG: pMimeType = MIMETYPE_SVG; cType = graphic::GraphicType::VECTOR; break;
default:
break;
@@ -296,7 +296,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
{
switch( (*ppEntries)->mnHandle )
{
- case( UNOGRAPHIC_GRAPHICTYPE ):
+ case UNOGRAPHIC_GRAPHICTYPE:
{
const GraphicType eType( mpGraphic ? mpGraphic->GetType() : meType );
@@ -306,7 +306,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
}
break;
- case( UNOGRAPHIC_MIMETYPE ):
+ case UNOGRAPHIC_MIMETYPE:
{
OUString aMimeType;
@@ -318,19 +318,19 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
switch( mpGraphic->GetLink().GetType() )
{
- case( GFX_LINK_TYPE_NATIVE_GIF ): pMimeType = MIMETYPE_GIF; break;
+ case GFX_LINK_TYPE_NATIVE_GIF: pMimeType = MIMETYPE_GIF; break;
// #i15508# added BMP type for better exports (checked, works)
- case( GFX_LINK_TYPE_NATIVE_BMP ): pMimeType = MIMETYPE_BMP; break;
+ case GFX_LINK_TYPE_NATIVE_BMP: pMimeType = MIMETYPE_BMP; break;
- case( GFX_LINK_TYPE_NATIVE_JPG ): pMimeType = MIMETYPE_JPG; break;
- case( GFX_LINK_TYPE_NATIVE_PNG ): pMimeType = MIMETYPE_PNG; break;
- case( GFX_LINK_TYPE_NATIVE_WMF ): pMimeType = MIMETYPE_WMF; break;
- case( GFX_LINK_TYPE_NATIVE_MET ): pMimeType = MIMETYPE_MET; break;
- case( GFX_LINK_TYPE_NATIVE_PCT ): pMimeType = MIMETYPE_PCT; break;
+ case GFX_LINK_TYPE_NATIVE_JPG: pMimeType = MIMETYPE_JPG; break;
+ case GFX_LINK_TYPE_NATIVE_PNG: pMimeType = MIMETYPE_PNG; break;
+ case GFX_LINK_TYPE_NATIVE_WMF: pMimeType = MIMETYPE_WMF; break;
+ case GFX_LINK_TYPE_NATIVE_MET: pMimeType = MIMETYPE_MET; break;
+ case GFX_LINK_TYPE_NATIVE_PCT: pMimeType = MIMETYPE_PCT; break;
// added Svg mimetype support
- case( GFX_LINK_TYPE_NATIVE_SVG ): pMimeType = MIMETYPE_SVG; break;
+ case GFX_LINK_TYPE_NATIVE_SVG: pMimeType = MIMETYPE_SVG; break;
default:
pMimeType = nullptr;
@@ -351,7 +351,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
}
break;
- case( UNOGRAPHIC_SIZEPIXEL ):
+ case UNOGRAPHIC_SIZEPIXEL:
{
awt::Size aAWTSize( 0, 0 );
@@ -370,7 +370,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
}
break;
- case( UNOGRAPHIC_SIZE100THMM ):
+ case UNOGRAPHIC_SIZE100THMM:
{
awt::Size aAWTSize( 0, 0 );
@@ -389,7 +389,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
}
break;
- case( UNOGRAPHIC_BITSPERPIXEL ):
+ case UNOGRAPHIC_BITSPERPIXEL:
{
sal_uInt16 nBitsPerPixel = 0;
@@ -405,19 +405,19 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
}
break;
- case( UNOGRAPHIC_TRANSPARENT ):
+ case UNOGRAPHIC_TRANSPARENT:
{
*pValues <<= mpGraphic ? mpGraphic->IsTransparent() : mbTransparent;
}
break;
- case( UNOGRAPHIC_ALPHA ):
+ case UNOGRAPHIC_ALPHA:
{
*pValues <<= mpGraphic ? mpGraphic->IsAlpha() : mbAlpha;
}
break;
- case( UNOGRAPHIC_ANIMATED ):
+ case UNOGRAPHIC_ANIMATED:
{
*pValues <<= mpGraphic ? mpGraphic->IsAnimated() : mbAnimated;
}
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 623e7b14d296..5ef6e8763dd7 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -69,7 +69,7 @@ GraphicID::GraphicID( const GraphicObject& rObj )
switch( rGraphic.GetType() )
{
- case( GRAPHIC_BITMAP ):
+ case GRAPHIC_BITMAP:
{
if(rGraphic.getSvgData().get())
{
@@ -102,7 +102,7 @@ GraphicID::GraphicID( const GraphicObject& rObj )
}
break;
- case( GRAPHIC_GDIMETAFILE ):
+ case GRAPHIC_GDIMETAFILE:
{
const GDIMetaFile& rMtf = rGraphic.GetGDIMetaFile();
@@ -227,7 +227,7 @@ bool GraphicCacheEntry::ImplInit( const GraphicObject& rObj )
switch( rGraphic.GetType() )
{
- case( GRAPHIC_BITMAP ):
+ case GRAPHIC_BITMAP:
{
if(rGraphic.getSvgData().get())
{
@@ -244,7 +244,7 @@ bool GraphicCacheEntry::ImplInit( const GraphicObject& rObj )
}
break;
- case( GRAPHIC_GDIMETAFILE ):
+ case GRAPHIC_GDIMETAFILE:
{
mpMtf = new GDIMetaFile( rGraphic.GetGDIMetaFile() );
}
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index fc9d81945042..b71c56bff751 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -1410,15 +1410,15 @@ void GraphicManager::ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, Gra
{
switch( aAttr.GetDrawMode() )
{
- case( GRAPHICDRAWMODE_MONO ):
+ case GRAPHICDRAWMODE_MONO:
rBmpEx.Convert( BMP_CONVERSION_1BIT_THRESHOLD );
break;
- case( GRAPHICDRAWMODE_GREYS ):
+ case GRAPHICDRAWMODE_GREYS:
rBmpEx.Convert( BMP_CONVERSION_8BIT_GREYS );
break;
- case( GRAPHICDRAWMODE_WATERMARK ):
+ case GRAPHICDRAWMODE_WATERMARK:
{
aAttr.SetLuminance( aAttr.GetLuminance() + WATERMARK_LUM_OFFSET );
aAttr.SetContrast( aAttr.GetContrast() + WATERMARK_CON_OFFSET );
@@ -1513,15 +1513,15 @@ void GraphicManager::ImplAdjust( GDIMetaFile& rMtf, const GraphicAttr& rAttr, Gr
{
switch( aAttr.GetDrawMode() )
{
- case( GRAPHICDRAWMODE_MONO ):
+ case GRAPHICDRAWMODE_MONO:
rMtf.Convert( MTF_CONVERSION_1BIT_THRESHOLD );
break;
- case( GRAPHICDRAWMODE_GREYS ):
+ case GRAPHICDRAWMODE_GREYS:
rMtf.Convert( MTF_CONVERSION_8BIT_GREYS );
break;
- case( GRAPHICDRAWMODE_WATERMARK ):
+ case GRAPHICDRAWMODE_WATERMARK:
{
aAttr.SetLuminance( aAttr.GetLuminance() + WATERMARK_LUM_OFFSET );
aAttr.SetContrast( aAttr.GetContrast() + WATERMARK_CON_OFFSET );
@@ -1564,15 +1564,15 @@ void GraphicManager::ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr
{
switch( aAttr.GetDrawMode() )
{
- case( GRAPHICDRAWMODE_MONO ):
+ case GRAPHICDRAWMODE_MONO:
rAnimation.Convert( BMP_CONVERSION_1BIT_THRESHOLD );
break;
- case( GRAPHICDRAWMODE_GREYS ):
+ case GRAPHICDRAWMODE_GREYS:
rAnimation.Convert( BMP_CONVERSION_8BIT_GREYS );
break;
- case( GRAPHICDRAWMODE_WATERMARK ):
+ case GRAPHICDRAWMODE_WATERMARK:
{
aAttr.SetLuminance( aAttr.GetLuminance() + WATERMARK_LUM_OFFSET );
aAttr.SetContrast( aAttr.GetContrast() + WATERMARK_CON_OFFSET );
diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx
index f40036cfb3d5..250be8d46a07 100644
--- a/svtools/source/graphic/renderer.cxx
+++ b/svtools/source/graphic/renderer.cxx
@@ -177,7 +177,7 @@ void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry*
{
switch( (*ppEntries)->mnHandle )
{
- case( UNOGRAPHIC_DEVICE ):
+ case UNOGRAPHIC_DEVICE:
{
uno::Reference< awt::XDevice > xDevice;
@@ -194,7 +194,7 @@ void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry*
}
break;
- case( UNOGRAPHIC_DESTINATIONRECT ):
+ case UNOGRAPHIC_DESTINATIONRECT:
{
awt::Rectangle aAWTRect;
@@ -206,7 +206,7 @@ void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry*
}
break;
- case( UNOGRAPHIC_RENDERDATA ):
+ case UNOGRAPHIC_RENDERDATA:
{
*pValues >>= maRenderData;
}
@@ -228,14 +228,14 @@ void GraphicRendererVCL::_getPropertyValues( const comphelper::PropertyMapEntry*
{
switch( (*ppEntries)->mnHandle )
{
- case( UNOGRAPHIC_DEVICE ):
+ case UNOGRAPHIC_DEVICE:
{
if( mxDevice.is() )
*pValues <<= mxDevice;
}
break;
- case( UNOGRAPHIC_DESTINATIONRECT ):
+ case UNOGRAPHIC_DESTINATIONRECT:
{
const awt::Rectangle aAWTRect( maDestRect.Left(), maDestRect.Top(),
maDestRect.GetWidth(), maDestRect.GetHeight() );
@@ -244,7 +244,7 @@ void GraphicRendererVCL::_getPropertyValues( const comphelper::PropertyMapEntry*
}
break;
- case( UNOGRAPHIC_RENDERDATA ):
+ case UNOGRAPHIC_RENDERDATA:
{
*pValues <<= maRenderData;
}