summaryrefslogtreecommitdiff
path: root/vcl
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 /vcl
parenta0d5f0896ed7f2de8ceffd664ee469a383ce7d53 (diff)
remove unnecessary parentheses in case labels
Change-Id: I987bf68c767709080c67c8b183c036a4109c6caa
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/control/slider.cxx2
-rw-r--r--vcl/source/filter/igif/gifread.cxx18
-rw-r--r--vcl/source/gdi/bitmap.cxx16
-rw-r--r--vcl/source/gdi/bitmap3.cxx20
-rw-r--r--vcl/source/gdi/bitmap4.cxx20
-rw-r--r--vcl/source/gdi/bmpacc.cxx32
-rw-r--r--vcl/source/gdi/dibtools.cxx36
-rw-r--r--vcl/source/gdi/gfxlink.cxx20
-rw-r--r--vcl/source/gdi/impgraph.cxx54
-rw-r--r--vcl/source/gdi/print.cxx8
-rw-r--r--vcl/source/gdi/svmconverter.cxx194
-rw-r--r--vcl/source/outdev/bitmap.cxx14
-rw-r--r--vcl/unx/generic/gdi/salbmp.cxx34
-rw-r--r--vcl/win/gdi/salprn.cxx194
14 files changed, 331 insertions, 331 deletions
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index 5996d141e08b..5c4f80ed2f59 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -539,7 +539,7 @@ void Slider::ImplDoMouseAction( const Point& rMousePos, bool bCallAction )
switch ( meScrollType )
{
- case( SCROLL_SET ):
+ case SCROLL_SET:
{
const bool bUp = ImplIsPageUp( rMousePos ), bDown = ImplIsPageDown( rMousePos );
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx
index 6c1825d2f7da..6437f39ca062 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -230,7 +230,7 @@ bool GIFReader::ReadExtension()
switch( cFunction )
{
// 'Graphic Control Extension'
- case( 0xf9 ) :
+ case 0xf9 :
{
sal_uInt8 cFlags(0);
rIStm.ReadUChar(cFlags);
@@ -250,7 +250,7 @@ bool GIFReader::ReadExtension()
break;
// Application extension
- case ( 0xff ) :
+ case 0xff :
{
if ( NO_PENDING( rIStm ) )
{
@@ -617,7 +617,7 @@ bool GIFReader::ProcessGIF()
switch( eActAction )
{
// read next marker
- case( MARKER_READING ):
+ case MARKER_READING:
{
sal_uInt8 cByte;
@@ -642,7 +642,7 @@ bool GIFReader::ProcessGIF()
break;
// read ScreenDescriptor
- case( GLOBAL_HEADER_READING ):
+ case GLOBAL_HEADER_READING:
{
if( ( bRead = ReadGlobalHeader() ) )
{
@@ -653,7 +653,7 @@ bool GIFReader::ProcessGIF()
break;
// read extension
- case( EXTENSION_READING ):
+ case EXTENSION_READING:
{
if( ( bRead = ReadExtension() ) )
eActAction = MARKER_READING;
@@ -661,7 +661,7 @@ bool GIFReader::ProcessGIF()
break;
// read Image-Descriptor
- case( LOCAL_HEADER_READING ):
+ case LOCAL_HEADER_READING:
{
if( ( bRead = ReadLocalHeader() ) )
{
@@ -672,7 +672,7 @@ bool GIFReader::ProcessGIF()
break;
// read first data block
- case( FIRST_BLOCK_READING ):
+ case FIRST_BLOCK_READING:
{
sal_uInt8 cDataSize;
@@ -695,7 +695,7 @@ bool GIFReader::ProcessGIF()
break;
// read next data block
- case( NEXT_BLOCK_READING ):
+ case NEXT_BLOCK_READING:
{
sal_uInt16 nLastX = nImageX;
sal_uInt16 nLastY = nImageY;
@@ -744,7 +744,7 @@ bool GIFReader::ProcessGIF()
break;
// an error occurred
- case( ABORT_READING ):
+ case ABORT_READING:
{
bEnd = true;
eActAction = END_READING;
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 89369ca3af9b..03915ea757c2 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -1721,7 +1721,7 @@ bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine )
switch( eCombine )
{
- case( BMP_COMBINE_COPY ):
+ case BMP_COMBINE_COPY:
{
for( long nY = 0L; nY < nHeight; nY++ ) for( long nX = 0L; nX < nWidth; nX++ )
{
@@ -1733,7 +1733,7 @@ bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine )
}
break;
- case( BMP_COMBINE_INVERT ):
+ case BMP_COMBINE_INVERT:
{
for( long nY = 0L; nY < nHeight; nY++ ) for( long nX = 0L; nX < nWidth; nX++ )
{
@@ -1745,7 +1745,7 @@ bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine )
}
break;
- case( BMP_COMBINE_AND ):
+ case BMP_COMBINE_AND:
{
for( long nY = 0L; nY < nHeight; nY++ ) for( long nX = 0L; nX < nWidth; nX++ )
{
@@ -1757,7 +1757,7 @@ bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine )
}
break;
- case( BMP_COMBINE_NAND ):
+ case BMP_COMBINE_NAND:
{
for( long nY = 0L; nY < nHeight; nY++ ) for( long nX = 0L; nX < nWidth; nX++ )
{
@@ -1769,7 +1769,7 @@ bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine )
}
break;
- case( BMP_COMBINE_OR ):
+ case BMP_COMBINE_OR:
{
for( long nY = 0L; nY < nHeight; nY++ ) for( long nX = 0L; nX < nWidth; nX++ )
{
@@ -1781,7 +1781,7 @@ bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine )
}
break;
- case( BMP_COMBINE_NOR ):
+ case BMP_COMBINE_NOR:
{
for( long nY = 0L; nY < nHeight; nY++ ) for( long nX = 0L; nX < nWidth; nX++ )
{
@@ -1793,7 +1793,7 @@ bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine )
}
break;
- case( BMP_COMBINE_XOR ):
+ case BMP_COMBINE_XOR:
{
for( long nY = 0L; nY < nHeight; nY++ ) for( long nX = 0L; nX < nWidth; nX++ )
{
@@ -1811,7 +1811,7 @@ bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine )
}
break;
- case( BMP_COMBINE_NXOR ):
+ case BMP_COMBINE_NXOR:
{
for( long nY = 0L; nY < nHeight; nY++ ) for( long nX = 0L; nX < nWidth; nX++ )
{
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 5d08e16aa8ff..bd9b90a2e58b 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -261,19 +261,19 @@ bool Bitmap::Convert( BmpConversion eConversion )
switch( eConversion )
{
- case( BMP_CONVERSION_1BIT_THRESHOLD ):
+ case BMP_CONVERSION_1BIT_THRESHOLD:
bRet = ImplMakeMono( 128 );
break;
- case( BMP_CONVERSION_1BIT_MATRIX ):
+ case BMP_CONVERSION_1BIT_MATRIX:
bRet = ImplMakeMonoDither();
break;
- case( BMP_CONVERSION_4BIT_GREYS ):
+ case BMP_CONVERSION_4BIT_GREYS:
bRet = ImplMakeGreyscales( 16 );
break;
- case( BMP_CONVERSION_4BIT_COLORS ):
+ case BMP_CONVERSION_4BIT_COLORS:
{
if( nBitCount < 4 )
bRet = ImplConvertUp( 4 );
@@ -284,7 +284,7 @@ bool Bitmap::Convert( BmpConversion eConversion )
}
break;
- case( BMP_CONVERSION_4BIT_TRANS ):
+ case BMP_CONVERSION_4BIT_TRANS:
{
Color aTrans( BMP_COL_TRANS );
@@ -295,11 +295,11 @@ bool Bitmap::Convert( BmpConversion eConversion )
}
break;
- case( BMP_CONVERSION_8BIT_GREYS ):
+ case BMP_CONVERSION_8BIT_GREYS:
bRet = ImplMakeGreyscales( 256 );
break;
- case( BMP_CONVERSION_8BIT_COLORS ):
+ case BMP_CONVERSION_8BIT_COLORS:
{
if( nBitCount < 8 )
bRet = ImplConvertUp( 8 );
@@ -310,7 +310,7 @@ bool Bitmap::Convert( BmpConversion eConversion )
}
break;
- case( BMP_CONVERSION_8BIT_TRANS ):
+ case BMP_CONVERSION_8BIT_TRANS:
{
Color aTrans( BMP_COL_TRANS );
@@ -321,7 +321,7 @@ bool Bitmap::Convert( BmpConversion eConversion )
}
break;
- case( BMP_CONVERSION_24BIT ):
+ case BMP_CONVERSION_24BIT:
{
if( nBitCount < 24 )
bRet = ImplConvertUp( 24 );
@@ -330,7 +330,7 @@ bool Bitmap::Convert( BmpConversion eConversion )
}
break;
- case( BMP_CONVERSION_GHOSTED ):
+ case BMP_CONVERSION_GHOSTED:
bRet = ImplConvertGhosted();
break;
diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx
index d5b190e9728c..b1e3ca8a3c2f 100644
--- a/vcl/source/gdi/bitmap4.cxx
+++ b/vcl/source/gdi/bitmap4.cxx
@@ -44,7 +44,7 @@ bool Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam )
switch( eFilter )
{
- case( BMP_FILTER_SMOOTH ):
+ case BMP_FILTER_SMOOTH:
{
// Blur for positive values of mnRadius
if (pFilterParam->mnRadius > 0.0)
@@ -63,42 +63,42 @@ bool Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam )
}
break;
- case( BMP_FILTER_SHARPEN ):
+ case BMP_FILTER_SHARPEN:
{
const long pSharpenMatrix[] = { -1, -1, -1, -1, 16, -1, -1, -1, -1 };
bRet = ImplConvolute3( &pSharpenMatrix[ 0 ], 8 );
}
break;
- case( BMP_FILTER_REMOVENOISE ):
+ case BMP_FILTER_REMOVENOISE:
bRet = ImplMedianFilter();
break;
- case( BMP_FILTER_SOBEL_GREY ):
+ case BMP_FILTER_SOBEL_GREY:
bRet = ImplSobelGrey();
break;
- case( BMP_FILTER_SOLARIZE ):
+ case BMP_FILTER_SOLARIZE:
bRet = ImplSolarize( pFilterParam );
break;
- case( BMP_FILTER_SEPIA ):
+ case BMP_FILTER_SEPIA:
bRet = ImplSepia( pFilterParam );
break;
- case( BMP_FILTER_MOSAIC ):
+ case BMP_FILTER_MOSAIC:
bRet = ImplMosaic( pFilterParam );
break;
- case( BMP_FILTER_EMBOSS_GREY ):
+ case BMP_FILTER_EMBOSS_GREY:
bRet = ImplEmbossGrey( pFilterParam );
break;
- case( BMP_FILTER_POPART ):
+ case BMP_FILTER_POPART:
bRet = ImplPopArt();
break;
- case( BMP_FILTER_DUOTONE ):
+ case BMP_FILTER_DUOTONE:
bRet = ImplDuotoneFilter( pFilterParam->mnProgressStart, pFilterParam->mnProgressEnd );
break;
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index 149a5336ed42..45ea184ec589 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -446,22 +446,22 @@ void BitmapWriteAccess::CopyScanline( long nY, ConstScanline aSrcScanline,
switch( nFormat )
{
- case( BMP_FORMAT_1BIT_MSB_PAL ): pFncGetPixel = GetPixelFor_1BIT_MSB_PAL; break;
- case( BMP_FORMAT_1BIT_LSB_PAL ): pFncGetPixel = GetPixelFor_1BIT_LSB_PAL; break;
- case( BMP_FORMAT_4BIT_MSN_PAL ): pFncGetPixel = GetPixelFor_4BIT_MSN_PAL; break;
- case( BMP_FORMAT_4BIT_LSN_PAL ): pFncGetPixel = GetPixelFor_4BIT_LSN_PAL; break;
- case( BMP_FORMAT_8BIT_PAL ): pFncGetPixel = GetPixelFor_8BIT_PAL; break;
- case( BMP_FORMAT_8BIT_TC_MASK ): pFncGetPixel = GetPixelFor_8BIT_TC_MASK; break;
- case( BMP_FORMAT_16BIT_TC_MSB_MASK ): pFncGetPixel = GetPixelFor_16BIT_TC_MSB_MASK; break;
- case( BMP_FORMAT_16BIT_TC_LSB_MASK ): pFncGetPixel = GetPixelFor_16BIT_TC_LSB_MASK; break;
- case( BMP_FORMAT_24BIT_TC_BGR ): pFncGetPixel = GetPixelFor_24BIT_TC_BGR; break;
- case( BMP_FORMAT_24BIT_TC_RGB ): pFncGetPixel = GetPixelFor_24BIT_TC_RGB; break;
- case( BMP_FORMAT_24BIT_TC_MASK ): pFncGetPixel = GetPixelFor_24BIT_TC_MASK; break;
- case( BMP_FORMAT_32BIT_TC_ABGR ): pFncGetPixel = GetPixelFor_32BIT_TC_ABGR; break;
- case( BMP_FORMAT_32BIT_TC_ARGB ): pFncGetPixel = GetPixelFor_32BIT_TC_ARGB; break;
- case( BMP_FORMAT_32BIT_TC_BGRA ): pFncGetPixel = GetPixelFor_32BIT_TC_BGRA; break;
- case( BMP_FORMAT_32BIT_TC_RGBA ): pFncGetPixel = GetPixelFor_32BIT_TC_RGBA; break;
- case( BMP_FORMAT_32BIT_TC_MASK ): pFncGetPixel = GetPixelFor_32BIT_TC_MASK; break;
+ case BMP_FORMAT_1BIT_MSB_PAL: pFncGetPixel = GetPixelFor_1BIT_MSB_PAL; break;
+ case BMP_FORMAT_1BIT_LSB_PAL: pFncGetPixel = GetPixelFor_1BIT_LSB_PAL; break;
+ case BMP_FORMAT_4BIT_MSN_PAL: pFncGetPixel = GetPixelFor_4BIT_MSN_PAL; break;
+ case BMP_FORMAT_4BIT_LSN_PAL: pFncGetPixel = GetPixelFor_4BIT_LSN_PAL; break;
+ case BMP_FORMAT_8BIT_PAL: pFncGetPixel = GetPixelFor_8BIT_PAL; break;
+ case BMP_FORMAT_8BIT_TC_MASK: pFncGetPixel = GetPixelFor_8BIT_TC_MASK; break;
+ case BMP_FORMAT_16BIT_TC_MSB_MASK: pFncGetPixel = GetPixelFor_16BIT_TC_MSB_MASK; break;
+ case BMP_FORMAT_16BIT_TC_LSB_MASK: pFncGetPixel = GetPixelFor_16BIT_TC_LSB_MASK; break;
+ case BMP_FORMAT_24BIT_TC_BGR: pFncGetPixel = GetPixelFor_24BIT_TC_BGR; break;
+ case BMP_FORMAT_24BIT_TC_RGB: pFncGetPixel = GetPixelFor_24BIT_TC_RGB; break;
+ case BMP_FORMAT_24BIT_TC_MASK: pFncGetPixel = GetPixelFor_24BIT_TC_MASK; break;
+ case BMP_FORMAT_32BIT_TC_ABGR: pFncGetPixel = GetPixelFor_32BIT_TC_ABGR; break;
+ case BMP_FORMAT_32BIT_TC_ARGB: pFncGetPixel = GetPixelFor_32BIT_TC_ARGB; break;
+ case BMP_FORMAT_32BIT_TC_BGRA: pFncGetPixel = GetPixelFor_32BIT_TC_BGRA; break;
+ case BMP_FORMAT_32BIT_TC_RGBA: pFncGetPixel = GetPixelFor_32BIT_TC_RGBA; break;
+ case BMP_FORMAT_32BIT_TC_MASK: pFncGetPixel = GetPixelFor_32BIT_TC_MASK; break;
default:
pFncGetPixel = nullptr;
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 9547318ba680..57a3b879c859 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -480,10 +480,10 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
// Is native format?
switch(rAcc.GetScanlineFormat())
{
- case( BMP_FORMAT_1BIT_MSB_PAL ):
- case( BMP_FORMAT_4BIT_MSN_PAL ):
- case( BMP_FORMAT_8BIT_PAL ):
- case( BMP_FORMAT_24BIT_TC_BGR ):
+ case BMP_FORMAT_1BIT_MSB_PAL:
+ case BMP_FORMAT_4BIT_MSN_PAL:
+ case BMP_FORMAT_8BIT_PAL:
+ case BMP_FORMAT_24BIT_TC_BGR:
{
bNative = ( ( static_cast< bool >(rAcc.IsBottomUp()) != bTopDown ) && !bRLE && !bTCMask && ( rAcc.GetScanlineSize() == nAlignedWidth ) );
break;
@@ -548,7 +548,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
switch(rHeader.nBitCount)
{
- case( 1 ):
+ case 1:
{
for( ; nCount--; nY += nI )
{
@@ -574,7 +574,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
}
break;
- case( 4 ):
+ case 4:
{
for( ; nCount--; nY += nI )
{
@@ -600,7 +600,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
}
break;
- case( 8 ):
+ case 8:
{
for( ; nCount--; nY += nI )
{
@@ -617,7 +617,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
}
break;
- case( 16 ):
+ case 16:
{
ColorMaskElement aRedMask(nRMask);
if (!aRedMask.CalcMaskShift())
@@ -650,7 +650,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
}
break;
- case( 24 ):
+ case 24:
{
BitmapColor aPixelColor;
@@ -674,7 +674,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
}
break;
- case( 32 ):
+ case 32:
{
ColorMaskElement aRedMask(nRMask);
if (!aRedMask.CalcMaskShift())
@@ -1180,10 +1180,10 @@ bool ImplWriteDIBBits(SvStream& rOStm, BitmapReadAccess& rAcc, BitmapReadAccess*
switch(rAcc.GetScanlineFormat())
{
- case( BMP_FORMAT_1BIT_MSB_PAL ):
- case( BMP_FORMAT_4BIT_MSN_PAL ):
- case( BMP_FORMAT_8BIT_PAL ):
- case( BMP_FORMAT_24BIT_TC_BGR ):
+ case BMP_FORMAT_1BIT_MSB_PAL:
+ case BMP_FORMAT_4BIT_MSN_PAL:
+ case BMP_FORMAT_8BIT_PAL:
+ case BMP_FORMAT_24BIT_TC_BGR:
{
if(!pAccAlpha && rAcc.IsBottomUp() && (rAcc.GetScanlineSize() == nAlignedWidth))
{
@@ -1212,7 +1212,7 @@ bool ImplWriteDIBBits(SvStream& rOStm, BitmapReadAccess& rAcc, BitmapReadAccess*
std::unique_ptr<sal_uInt8[]> pBuf(new sal_uInt8[ nAlignedWidth ]);
switch( nBitCount )
{
- case( 1 ):
+ case 1:
{
//valgrind, zero out the trailing unused alignment bytes
size_t nUnusedBytes = nAlignedWidth - ((nWidth+7) / 8);
@@ -1241,7 +1241,7 @@ bool ImplWriteDIBBits(SvStream& rOStm, BitmapReadAccess& rAcc, BitmapReadAccess*
}
break;
- case( 4 ):
+ case 4:
{
//valgrind, zero out the trailing unused alignment bytes
size_t nUnusedBytes = nAlignedWidth - ((nWidth+1) / 2);
@@ -1269,7 +1269,7 @@ bool ImplWriteDIBBits(SvStream& rOStm, BitmapReadAccess& rAcc, BitmapReadAccess*
}
break;
- case( 8 ):
+ case 8:
{
for( long nY = nHeight - 1; nY >= 0L; nY-- )
{
@@ -1286,7 +1286,7 @@ bool ImplWriteDIBBits(SvStream& rOStm, BitmapReadAccess& rAcc, BitmapReadAccess*
// #i59239# fallback to 24 bit format, if bitcount is non-default
default:
// FALLTHROUGH intended
- case( 24 ):
+ case 24:
{
BitmapColor aPixelColor;
const bool bWriteAlpha(32 == nBitCount && pAccAlpha);
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index 5839d071b966..291fe59e34cb 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -178,18 +178,18 @@ bool GfxLink::LoadNative( Graphic& rGraphic )
switch( meType )
{
- case( GFX_LINK_TYPE_NATIVE_GIF ): nCvtType = ConvertDataFormat::GIF; break;
+ case GFX_LINK_TYPE_NATIVE_GIF: nCvtType = ConvertDataFormat::GIF; break;
// #i15508# added BMP type for better exports (reload when swapped - checked, works)
- case( GFX_LINK_TYPE_NATIVE_BMP ): nCvtType = ConvertDataFormat::BMP; break;
-
- case( GFX_LINK_TYPE_NATIVE_JPG ): nCvtType = ConvertDataFormat::JPG; break;
- case( GFX_LINK_TYPE_NATIVE_PNG ): nCvtType = ConvertDataFormat::PNG; break;
- case( GFX_LINK_TYPE_NATIVE_TIF ): nCvtType = ConvertDataFormat::TIF; break;
- case( GFX_LINK_TYPE_NATIVE_WMF ): nCvtType = ConvertDataFormat::WMF; break;
- case( GFX_LINK_TYPE_NATIVE_MET ): nCvtType = ConvertDataFormat::MET; break;
- case( GFX_LINK_TYPE_NATIVE_PCT ): nCvtType = ConvertDataFormat::PCT; break;
- case( GFX_LINK_TYPE_NATIVE_SVG ): nCvtType = ConvertDataFormat::SVG; break;
+ case GFX_LINK_TYPE_NATIVE_BMP: nCvtType = ConvertDataFormat::BMP; break;
+
+ case GFX_LINK_TYPE_NATIVE_JPG: nCvtType = ConvertDataFormat::JPG; break;
+ case GFX_LINK_TYPE_NATIVE_PNG: nCvtType = ConvertDataFormat::PNG; break;
+ case GFX_LINK_TYPE_NATIVE_TIF: nCvtType = ConvertDataFormat::TIF; break;
+ case GFX_LINK_TYPE_NATIVE_WMF: nCvtType = ConvertDataFormat::WMF; break;
+ case GFX_LINK_TYPE_NATIVE_MET: nCvtType = ConvertDataFormat::MET; break;
+ case GFX_LINK_TYPE_NATIVE_PCT: nCvtType = ConvertDataFormat::PCT; break;
+ case GFX_LINK_TYPE_NATIVE_SVG: nCvtType = ConvertDataFormat::SVG; break;
default: nCvtType = ConvertDataFormat::Unknown; break;
}
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index deb143effa8b..e6f0f77f9eda 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -271,18 +271,18 @@ bool ImpGraphic::operator==( const ImpGraphic& rImpGraphic ) const
{
switch( meType )
{
- case( GRAPHIC_NONE ):
+ case GRAPHIC_NONE:
bRet = true;
break;
- case( GRAPHIC_GDIMETAFILE ):
+ case GRAPHIC_GDIMETAFILE:
{
if( rImpGraphic.maMetaFile == maMetaFile )
bRet = true;
}
break;
- case( GRAPHIC_BITMAP ):
+ case GRAPHIC_BITMAP:
{
if(maSvgData.get())
{
@@ -650,11 +650,11 @@ Size ImpGraphic::ImplGetPrefSize() const
{
switch( meType )
{
- case( GRAPHIC_NONE ):
- case( GRAPHIC_DEFAULT ):
+ case GRAPHIC_NONE:
+ case GRAPHIC_DEFAULT:
break;
- case( GRAPHIC_BITMAP ):
+ case GRAPHIC_BITMAP:
{
if(maSvgData.get() && maEx.IsEmpty())
{
@@ -691,11 +691,11 @@ void ImpGraphic::ImplSetPrefSize( const Size& rPrefSize )
{
switch( meType )
{
- case( GRAPHIC_NONE ):
- case( GRAPHIC_DEFAULT ):
+ case GRAPHIC_NONE:
+ case GRAPHIC_DEFAULT:
break;
- case( GRAPHIC_BITMAP ):
+ case GRAPHIC_BITMAP:
{
//UUUU used when importing a writer FlyFrame with SVG as graphic, added conversion
// to allow setting the PrefSize at the BitmapEx to hold it
@@ -735,11 +735,11 @@ MapMode ImpGraphic::ImplGetPrefMapMode() const
{
switch( meType )
{
- case( GRAPHIC_NONE ):
- case( GRAPHIC_DEFAULT ):
+ case GRAPHIC_NONE:
+ case GRAPHIC_DEFAULT:
break;
- case( GRAPHIC_BITMAP ):
+ case GRAPHIC_BITMAP:
{
if(maSvgData.get() && maEx.IsEmpty())
{
@@ -772,11 +772,11 @@ void ImpGraphic::ImplSetPrefMapMode( const MapMode& rPrefMapMode )
{
switch( meType )
{
- case( GRAPHIC_NONE ):
- case( GRAPHIC_DEFAULT ):
+ case GRAPHIC_NONE:
+ case GRAPHIC_DEFAULT:
break;
- case( GRAPHIC_BITMAP ):
+ case GRAPHIC_BITMAP:
{
if(maSvgData.get())
{
@@ -836,10 +836,10 @@ void ImpGraphic::ImplDraw( OutputDevice* pOutDev, const Point& rDestPt ) const
{
switch( meType )
{
- case( GRAPHIC_DEFAULT ):
+ case GRAPHIC_DEFAULT:
break;
- case( GRAPHIC_BITMAP ):
+ case GRAPHIC_BITMAP:
{
if(maSvgData.get() && !maEx)
{
@@ -872,10 +872,10 @@ void ImpGraphic::ImplDraw( OutputDevice* pOutDev,
{
switch( meType )
{
- case( GRAPHIC_DEFAULT ):
+ case GRAPHIC_DEFAULT:
break;
- case( GRAPHIC_BITMAP ):
+ case GRAPHIC_BITMAP:
{
if(maSvgData.get() && maEx.IsEmpty())
{
@@ -1048,10 +1048,10 @@ bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm )
switch( sal::static_int_cast<sal_uLong>(meType) )
{
- case( SYS_WINMETAFILE ):
- case( SYS_WNTMETAFILE ): nCvtType = ConvertDataFormat::WMF; break;
- case( SYS_OS2METAFILE ): nCvtType = ConvertDataFormat::MET; break;
- case( SYS_MACMETAFILE ): nCvtType = ConvertDataFormat::PCT; break;
+ case SYS_WINMETAFILE:
+ case SYS_WNTMETAFILE: nCvtType = ConvertDataFormat::WMF; break;
+ case SYS_OS2METAFILE: nCvtType = ConvertDataFormat::MET; break;
+ case SYS_MACMETAFILE: nCvtType = ConvertDataFormat::PCT; break;
default:
nCvtType = ConvertDataFormat::Unknown;
@@ -1373,10 +1373,10 @@ BitmapChecksum ImpGraphic::ImplGetChecksum() const
{
switch( meType )
{
- case( GRAPHIC_DEFAULT ):
+ case GRAPHIC_DEFAULT:
break;
- case( GRAPHIC_BITMAP ):
+ case GRAPHIC_BITMAP:
{
if(maSvgData.get() && maEx.IsEmpty())
{
@@ -1607,8 +1607,8 @@ SvStream& WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic )
switch( rImpGraphic.ImplGetType() )
{
- case( GRAPHIC_NONE ):
- case( GRAPHIC_DEFAULT ):
+ case GRAPHIC_NONE:
+ case GRAPHIC_DEFAULT:
break;
case GRAPHIC_BITMAP:
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 9e9156ad7589..0509015c1428 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -262,12 +262,12 @@ void Printer::EmulateDrawTransparent ( const tools::PolyPolygon& rPolyPoly,
switch( nTrans )
{
- case( 25 ): nMove = nBaseExtent * 3; break;
- case( 50 ): nMove = nBaseExtent * 4; break;
- case( 75 ): nMove = nBaseExtent * 6; break;
+ case 25: nMove = nBaseExtent * 3; break;
+ case 50: nMove = nBaseExtent * 4; break;
+ case 75: nMove = nBaseExtent * 6; break;
// #i112959# very transparent (88 < nTransparencePercent <= 99)
- case( 100 ): nMove = nBaseExtent * 8; break;
+ case 100: nMove = nBaseExtent * 8; break;
// #i112959# not transparent (nTransparencePercent < 13)
default: nMove = 0; break;
diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index bfa97a6a863b..f28daa662aad 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -534,7 +534,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
switch( nType )
{
- case( GDI_PIXEL_ACTION ):
+ case GDI_PIXEL_ACTION:
{
ReadPair( rIStm, aPt );
ImplReadColor( rIStm, aActionColor );
@@ -542,14 +542,14 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_POINT_ACTION ):
+ case GDI_POINT_ACTION:
{
ReadPair( rIStm, aPt );
rMtf.AddAction( new MetaPointAction( aPt ) );
}
break;
- case( GDI_LINE_ACTION ):
+ case GDI_LINE_ACTION:
{
ReadPair( rIStm, aPt );
ReadPair( rIStm, aPt1 );
@@ -557,7 +557,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case (GDI_LINEJOIN_ACTION) :
+ case GDI_LINEJOIN_ACTION :
{
sal_Int16 nLineJoin(0);
rIStm.ReadInt16( nLineJoin );
@@ -565,7 +565,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case (GDI_LINECAP_ACTION) :
+ case GDI_LINECAP_ACTION :
{
sal_Int16 nLineCap(0);
rIStm.ReadInt16( nLineCap );
@@ -573,7 +573,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case (GDI_LINEDASHDOT_ACTION) :
+ case GDI_LINEDASHDOT_ACTION :
{
sal_Int16 a(0);
sal_Int32 b(0);
@@ -593,7 +593,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case (GDI_EXTENDEDPOLYGON_ACTION) :
+ case GDI_EXTENDEDPOLYGON_ACTION :
{
// read the tools::PolyPolygon in every case
tools::PolyPolygon aInputPolyPolygon;
@@ -661,7 +661,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_RECT_ACTION ):
+ case GDI_RECT_ACTION:
{
ImplReadRect( rIStm, aRect );
rIStm.ReadInt32( nTmp ).ReadInt32( nTmp1 );
@@ -678,7 +678,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_ELLIPSE_ACTION ):
+ case GDI_ELLIPSE_ACTION:
{
ImplReadRect( rIStm, aRect );
@@ -697,7 +697,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_ARC_ACTION ):
+ case GDI_ARC_ACTION:
{
ImplReadRect( rIStm, aRect );
ReadPair( rIStm, aPt );
@@ -718,7 +718,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_PIE_ACTION ):
+ case GDI_PIE_ACTION:
{
ImplReadRect( rIStm, aRect );
ReadPair( rIStm, aPt );
@@ -739,8 +739,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_INVERTRECT_ACTION ):
- case( GDI_HIGHLIGHTRECT_ACTION ):
+ case GDI_INVERTRECT_ACTION:
+ case GDI_HIGHLIGHTRECT_ACTION:
{
ImplReadRect( rIStm, aRect );
rMtf.AddAction( new MetaPushAction( PushFlags::RASTEROP ) );
@@ -750,7 +750,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_POLYLINE_ACTION ):
+ case GDI_POLYLINE_ACTION:
{
ImplReadPoly( rIStm, aActionPoly );
nLastPolygonAction = rMtf.GetActionSize();
@@ -762,7 +762,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_POLYGON_ACTION ):
+ case GDI_POLYGON_ACTION:
{
ImplReadPoly( rIStm, aActionPoly );
@@ -782,7 +782,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_POLYPOLYGON_ACTION ):
+ case GDI_POLYPOLYGON_ACTION:
{
tools::PolyPolygon aPolyPoly;
@@ -806,7 +806,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_FONT_ACTION ):
+ case GDI_FONT_ACTION:
{
vcl::Font aFont;
char aName[ 32 ];
@@ -853,7 +853,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_TEXT_ACTION ):
+ case GDI_TEXT_ACTION:
{
sal_Int32 nIndex, nLen;
@@ -874,7 +874,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_TEXTARRAY_ACTION ):
+ case GDI_TEXTARRAY_ACTION:
{
sal_Int32 nIndex, nLen, nAryLen;
@@ -933,7 +933,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_STRETCHTEXT_ACTION ):
+ case GDI_STRETCHTEXT_ACTION:
{
sal_Int32 nIndex, nLen, nWidth;
@@ -954,7 +954,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_BITMAP_ACTION ):
+ case GDI_BITMAP_ACTION:
{
Bitmap aBmp;
@@ -964,7 +964,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_BITMAPSCALE_ACTION ):
+ case GDI_BITMAPSCALE_ACTION:
{
Bitmap aBmp;
@@ -975,7 +975,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_BITMAPSCALEPART_ACTION ):
+ case GDI_BITMAPSCALEPART_ACTION:
{
Bitmap aBmp;
Size aSz2;
@@ -989,7 +989,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_PEN_ACTION ):
+ case GDI_PEN_ACTION:
{
sal_Int32 nPenWidth;
sal_Int16 nPenStyle;
@@ -1005,7 +1005,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_FILLBRUSH_ACTION ):
+ case GDI_FILLBRUSH_ACTION:
{
sal_Int16 nBrushStyle;
@@ -1017,7 +1017,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_MAPMODE_ACTION ):
+ case GDI_MAPMODE_ACTION:
{
ImplReadMapMode( rIStm, aMapMode );
rMtf.AddAction( new MetaMapModeAction( aMapMode ) );
@@ -1027,7 +1027,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_CLIPREGION_ACTION ):
+ case GDI_CLIPREGION_ACTION:
{
vcl::Region aRegion;
sal_Int16 nRegType;
@@ -1039,10 +1039,10 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
switch( nRegType )
{
- case( 0 ):
+ case 0:
break;
- case( 1 ):
+ case 1:
{
Rectangle aRegRect;
@@ -1052,7 +1052,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( 2 ):
+ case 2:
{
ImplReadPoly( rIStm, aActionPoly );
aRegion = vcl::Region( aActionPoly );
@@ -1060,7 +1060,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( 3 ):
+ case 3:
{
tools::PolyPolygon aPolyPoly;
sal_Int32 nPolyCount;
@@ -1086,21 +1086,21 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_MOVECLIPREGION_ACTION ):
+ case GDI_MOVECLIPREGION_ACTION:
{
rIStm.ReadInt32( nTmp ).ReadInt32( nTmp1 );
rMtf.AddAction( new MetaMoveClipRegionAction( nTmp, nTmp1 ) );
}
break;
- case( GDI_ISECTCLIPREGION_ACTION ):
+ case GDI_ISECTCLIPREGION_ACTION:
{
ImplReadRect( rIStm, aRect );
rMtf.AddAction( new MetaISectRectClipRegionAction( aRect ) );
}
break;
- case( GDI_RASTEROP_ACTION ):
+ case GDI_RASTEROP_ACTION:
{
RasterOp eRasterOp;
sal_Int16 nRasterOp;
@@ -1109,12 +1109,12 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
switch( nRasterOp )
{
- case( 1 ):
+ case 1:
eRasterOp = ROP_INVERT;
break;
- case( 4 ):
- case( 5 ):
+ case 4:
+ case 5:
eRasterOp = ROP_XOR;
break;
@@ -1127,7 +1127,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_PUSH_ACTION ):
+ case GDI_PUSH_ACTION:
{
aLIStack.push( new LineInfo( aLineInfo ) );
rMtf.AddAction( new MetaPushAction( PushFlags::ALL ) );
@@ -1137,7 +1137,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_POP_ACTION ):
+ case GDI_POP_ACTION:
{
LineInfo* pLineInfo;
@@ -1164,7 +1164,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_GRADIENT_ACTION ):
+ case GDI_GRADIENT_ACTION:
{
Color aStartCol;
Color aEndCol;
@@ -1194,7 +1194,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_TRANSPARENT_COMMENT ):
+ case GDI_TRANSPARENT_COMMENT:
{
tools::PolyPolygon aPolyPoly;
sal_Int32 nFollowingActionCount;
@@ -1209,7 +1209,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_FLOATTRANSPARENT_COMMENT ):
+ case GDI_FLOATTRANSPARENT_COMMENT:
{
GDIMetaFile aMtf;
Point aPos;
@@ -1229,7 +1229,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_HATCH_COMMENT ):
+ case GDI_HATCH_COMMENT:
{
tools::PolyPolygon aPolyPoly;
Hatch aHatch;
@@ -1245,7 +1245,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_REFPOINT_COMMENT ):
+ case GDI_REFPOINT_COMMENT:
{
Point aRefPoint;
bool bSet;
@@ -1266,7 +1266,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_TEXTLINECOLOR_COMMENT ):
+ case GDI_TEXTLINECOLOR_COMMENT:
{
Color aColor;
bool bSet;
@@ -1281,7 +1281,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_TEXTLINE_COMMENT ):
+ case GDI_TEXTLINE_COMMENT:
{
Point aStartPt;
sal_Int32 nWidth;
@@ -1301,7 +1301,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_GRADIENTEX_COMMENT ):
+ case GDI_GRADIENTEX_COMMENT:
{
tools::PolyPolygon aPolyPoly;
Gradient aGradient;
@@ -1317,7 +1317,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case( GDI_COMMENT_COMMENT ):
+ case GDI_COMMENT_COMMENT:
{
sal_Int32 nValue;
sal_uInt32 nDataSize;
@@ -1343,7 +1343,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
break;
- case ( GDI_UNICODE_COMMENT ):
+ case GDI_UNICODE_COMMENT:
{
nUnicodeCommentActionNumber = i + 1;
nUnicodeCommentStreamPos = rIStm.Tell() - 6;
@@ -1421,7 +1421,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
switch( pAction->GetType() )
{
- case( MetaActionType::PIXEL ):
+ case MetaActionType::PIXEL:
{
const MetaPixelAction* pAct = static_cast<const MetaPixelAction*>(pAction);
@@ -1433,7 +1433,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::POINT ):
+ case MetaActionType::POINT:
{
const MetaPointAction* pAct = static_cast<const MetaPointAction*>(pAction);
@@ -1444,7 +1444,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::LINE ):
+ case MetaActionType::LINE:
{
const MetaLineAction* pAct = static_cast<const MetaLineAction*>(pAction);
const LineInfo& rInfo = pAct->GetLineInfo();
@@ -1513,7 +1513,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::RECT ):
+ case MetaActionType::RECT:
{
const MetaRectAction* pAct = static_cast<const MetaRectAction*>(pAction);
@@ -1526,7 +1526,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::ROUNDRECT ):
+ case MetaActionType::ROUNDRECT:
{
const MetaRoundRectAction* pAct = static_cast<const MetaRoundRectAction*>(pAction);
@@ -1539,7 +1539,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::ELLIPSE ):
+ case MetaActionType::ELLIPSE:
{
const MetaEllipseAction* pAct = static_cast<const MetaEllipseAction*>(pAction);
@@ -1550,7 +1550,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::ARC ):
+ case MetaActionType::ARC:
{
const MetaArcAction* pAct = static_cast<const MetaArcAction*>(pAction);
@@ -1563,7 +1563,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::PIE ):
+ case MetaActionType::PIE:
{
const MetaPieAction* pAct = static_cast<const MetaPieAction*>(pAction);
@@ -1576,7 +1576,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::CHORD ):
+ case MetaActionType::CHORD:
{
const MetaChordAction* pAct = static_cast<const MetaChordAction*>(pAction);
tools::Polygon aChordPoly( pAct->GetRect(), pAct->GetStartPoint(),
@@ -1593,7 +1593,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::POLYLINE ):
+ case MetaActionType::POLYLINE:
{
// #i102224#
const MetaPolyLineAction* pAct = static_cast<const MetaPolyLineAction*>(pAction);
@@ -1680,7 +1680,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::POLYGON ):
+ case MetaActionType::POLYGON:
{
const MetaPolygonAction* pAct = static_cast<const MetaPolygonAction*>(pAction);
// #i102224# Here the possible curved nature of Polygon was
@@ -1707,7 +1707,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::POLYPOLYGON ):
+ case MetaActionType::POLYPOLYGON:
{
const MetaPolyPolygonAction* pAct = static_cast<const MetaPolyPolygonAction*>(pAction);
ImplWritePolyPolyAction( rOStm, pAct->GetPolyPolygon() );
@@ -1720,7 +1720,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::TEXT ):
+ case MetaActionType::TEXT:
{
const MetaTextAction* pAct = static_cast<const MetaTextAction*>(pAction);
OUString aUniText( pAct->GetText() );
@@ -1741,7 +1741,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::TEXTARRAY ):
+ case MetaActionType::TEXTARRAY:
{
const MetaTextArrayAction* pAct = static_cast<const MetaTextArrayAction*>(pAction);
OString aText(OUStringToOString(pAct->GetText(), rActualCharSet));
@@ -1785,7 +1785,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::STRETCHTEXT ):
+ case MetaActionType::STRETCHTEXT:
{
const MetaStretchTextAction* pAct = static_cast<const MetaStretchTextAction*>(pAction);
OUString aUniText( pAct->GetText() );
@@ -1807,7 +1807,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::BMP ):
+ case MetaActionType::BMP:
{
const MetaBmpAction* pAct = static_cast<const MetaBmpAction*>(pAction);
@@ -1819,7 +1819,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::BMPSCALE ):
+ case MetaActionType::BMPSCALE:
{
const MetaBmpScaleAction* pAct = static_cast<const MetaBmpScaleAction*>(pAction);
@@ -1832,7 +1832,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::BMPSCALEPART ):
+ case MetaActionType::BMPSCALEPART:
{
const MetaBmpScalePartAction* pAct = static_cast<const MetaBmpScalePartAction*>(pAction);
@@ -1847,7 +1847,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::BMPEX ):
+ case MetaActionType::BMPEX:
{
const MetaBmpExAction* pAct = static_cast<const MetaBmpExAction*>(pAction);
const Bitmap aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() );
@@ -1860,7 +1860,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::BMPEXSCALE ):
+ case MetaActionType::BMPEXSCALE:
{
const MetaBmpExScaleAction* pAct = static_cast<const MetaBmpExScaleAction*>(pAction);
const Bitmap aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() );
@@ -1874,7 +1874,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::BMPEXSCALEPART ):
+ case MetaActionType::BMPEXSCALEPART:
{
const MetaBmpExScalePartAction* pAct = static_cast<const MetaBmpExScalePartAction*>(pAction);
const Bitmap aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() );
@@ -1890,7 +1890,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::GRADIENT ):
+ case MetaActionType::GRADIENT:
{
const MetaGradientAction* pAct = static_cast<const MetaGradientAction*>(pAction);
const Gradient& rGrad = pAct->GetGradient();
@@ -1911,7 +1911,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::GRADIENTEX ):
+ case MetaActionType::GRADIENTEX:
{
const MetaGradientExAction* pA = static_cast<const MetaGradientExAction*>(pAction);
sal_uLong nOldPos, nNewPos;
@@ -1938,7 +1938,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::WALLPAPER ):
+ case MetaActionType::WALLPAPER:
{
const MetaWallpaperAction* pAct = static_cast<const MetaWallpaperAction*>(pAction);
const Color& rColor = pAct->GetWallpaper().GetColor();
@@ -1958,7 +1958,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::CLIPREGION ):
+ case MetaActionType::CLIPREGION:
{
const MetaClipRegionAction* pAct = static_cast<const MetaClipRegionAction*>(pAction);
const vcl::Region& rRegion = pAct->GetRegion();
@@ -1985,7 +1985,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::ISECTRECTCLIPREGION ):
+ case MetaActionType::ISECTRECTCLIPREGION:
{
const MetaISectRectClipRegionAction* pAct = static_cast<const MetaISectRectClipRegionAction*>(pAction);
@@ -1996,7 +1996,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::MOVECLIPREGION ):
+ case MetaActionType::MOVECLIPREGION:
{
const MetaMoveClipRegionAction* pAct = static_cast<const MetaMoveClipRegionAction*>(pAction);
@@ -2008,7 +2008,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::LINECOLOR ):
+ case MetaActionType::LINECOLOR:
{
const MetaLineColorAction* pAct = static_cast<const MetaLineColorAction*>(pAction);
ImplWriteLineColor( rOStm, rLineCol = pAct->GetColor(), pAct->IsSetting() ? 1 : 0 );
@@ -2016,7 +2016,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::FILLCOLOR ):
+ case MetaActionType::FILLCOLOR:
{
const MetaFillColorAction* pAct = static_cast<const MetaFillColorAction*>(pAction);
ImplWriteFillColor( rOStm, pAct->GetColor(), pAct->IsSetting() ? 1 : 0 );
@@ -2024,7 +2024,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::FONT ):
+ case MetaActionType::FONT:
{
rSaveVDev.SetFont( static_cast<const MetaFontAction*>(pAction)->GetFont() );
ImplWriteFont( rOStm, rSaveVDev.GetFont(), rActualCharSet );
@@ -2032,7 +2032,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::TEXTCOLOR ):
+ case MetaActionType::TEXTCOLOR:
{
vcl::Font aSaveFont( rSaveVDev.GetFont() );
@@ -2043,7 +2043,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::TEXTFILLCOLOR ):
+ case MetaActionType::TEXTFILLCOLOR:
{
const MetaTextFillColorAction* pAct = static_cast<const MetaTextFillColorAction*>(pAction);
vcl::Font aSaveFont( rSaveVDev.GetFont() );
@@ -2059,7 +2059,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::TEXTALIGN ):
+ case MetaActionType::TEXTALIGN:
{
vcl::Font aSaveFont( rSaveVDev.GetFont() );
@@ -2070,7 +2070,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::MAPMODE ):
+ case MetaActionType::MAPMODE:
{
const MetaMapModeAction* pAct = static_cast<const MetaMapModeAction*>(pAction);
@@ -2081,7 +2081,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::PUSH ):
+ case MetaActionType::PUSH:
{
ImplWritePushAction( rOStm );
rLineColStack.push( new Color( rLineCol ) );
@@ -2090,7 +2090,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::POP ):
+ case MetaActionType::POP:
{
Color* pCol;
if (rLineColStack.empty())
@@ -2113,7 +2113,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::RASTEROP ):
+ case MetaActionType::RASTEROP:
{
const MetaRasterOpAction* pAct = static_cast<const MetaRasterOpAction*>(pAction);
@@ -2133,9 +2133,9 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
switch( pAct->GetRasterOp() )
{
- case( ROP_OVERPAINT ) : nRasterOp = 0; break;
- case( ROP_XOR ) : nRasterOp = 4; break;
- case( ROP_INVERT ): nRasterOp = 1; break;
+ case ROP_OVERPAINT : nRasterOp = 0; break;
+ case ROP_XOR : nRasterOp = 4; break;
+ case ROP_INVERT: nRasterOp = 1; break;
default: nRasterOp = 0; break;
}
@@ -2165,7 +2165,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::Transparent ):
+ case MetaActionType::Transparent:
{
const tools::PolyPolygon& rPolyPoly = static_cast<const MetaTransparentAction*>(pAction)->GetPolyPolygon();
const sal_Int16 nTrans = static_cast<const MetaTransparentAction*>(pAction)->GetTransparence();
@@ -2224,7 +2224,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::FLOATTRANSPARENT ):
+ case MetaActionType::FLOATTRANSPARENT:
{
const MetaFloatTransparentAction* pA = static_cast<const MetaFloatTransparentAction*>(pAction);
const GDIMetaFile& rTransMtf = pA->GetGDIMetaFile();
@@ -2288,7 +2288,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::HATCH ):
+ case MetaActionType::HATCH:
{
const MetaHatchAction* pA = static_cast<const MetaHatchAction*>(pAction);
const tools::PolyPolygon& rPolyPoly = pA->GetPolyPolygon();
@@ -2331,7 +2331,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::REFPOINT ):
+ case MetaActionType::REFPOINT:
{
const MetaRefPointAction* pA = static_cast<const MetaRefPointAction*>(pAction);
const Point& rRefPoint = pA->GetRefPoint();
@@ -2360,7 +2360,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::TEXTLINECOLOR ):
+ case MetaActionType::TEXTLINECOLOR:
{
const MetaTextLineColorAction* pA = static_cast<const MetaTextLineColorAction*>(pAction);
const Color& rColor = pA->GetColor();
@@ -2389,7 +2389,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::TEXTLINE ):
+ case MetaActionType::TEXTLINE:
{
const MetaTextLineAction* pA = static_cast<const MetaTextLineAction*>(pAction);
const Point& rStartPt = pA->GetStartPoint();
@@ -2420,10 +2420,10 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::EPS ):
+ case MetaActionType::EPS:
break;
- case( MetaActionType::COMMENT ):
+ case MetaActionType::COMMENT:
{
const MetaCommentAction* pA = static_cast<const MetaCommentAction*>(pAction);
const sal_uInt32 nDataSize = pA->GetDataSize();
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 0b44c0fa871d..5b63c89d9036 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -107,15 +107,15 @@ void OutputDevice::DrawBitmap( const Point& rDestPt, const Size& rDestSize,
{
switch( nAction )
{
- case( MetaActionType::BMP ):
+ case MetaActionType::BMP:
mpMetaFile->AddAction( new MetaBmpAction( rDestPt, aBmp ) );
break;
- case( MetaActionType::BMPSCALE ):
+ case MetaActionType::BMPSCALE:
mpMetaFile->AddAction( new MetaBmpScaleAction( rDestPt, rDestSize, aBmp ) );
break;
- case( MetaActionType::BMPSCALEPART ):
+ case MetaActionType::BMPSCALEPART:
mpMetaFile->AddAction( new MetaBmpScalePartAction(
rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel, aBmp ) );
break;
@@ -344,15 +344,15 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
{
switch( nAction )
{
- case( MetaActionType::BMPEX ):
+ case MetaActionType::BMPEX:
mpMetaFile->AddAction( new MetaBmpExAction( rDestPt, aBmpEx ) );
break;
- case( MetaActionType::BMPEXSCALE ):
+ case MetaActionType::BMPEXSCALE:
mpMetaFile->AddAction( new MetaBmpExScaleAction( rDestPt, rDestSize, aBmpEx ) );
break;
- case( MetaActionType::BMPEXSCALEPART ):
+ case MetaActionType::BMPEXSCALEPART:
mpMetaFile->AddAction( new MetaBmpExScalePartAction( rDestPt, rDestSize,
rSrcPtPixel, rSrcSizePixel, aBmpEx ) );
break;
@@ -1557,7 +1557,7 @@ Bitmap OutputDevice::BlendBitmap(
{
switch( pP->GetScanlineFormat() )
{
- case( BMP_FORMAT_8BIT_PAL ):
+ case BMP_FORMAT_8BIT_PAL:
{
for( nY = 0; nY < nDstHeight; nY++ )
{
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 0bfd9aa43651..537fa6d180ab 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -154,11 +154,11 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
switch( nBitCount )
{
- case( 1 ): pDIB->mnFormat |= BMP_FORMAT_1BIT_MSB_PAL; break;
- case( 4 ): pDIB->mnFormat |= BMP_FORMAT_4BIT_MSN_PAL; break;
- case( 8 ): pDIB->mnFormat |= BMP_FORMAT_8BIT_PAL; break;
+ case 1: pDIB->mnFormat |= BMP_FORMAT_1BIT_MSB_PAL; break;
+ case 4: pDIB->mnFormat |= BMP_FORMAT_4BIT_MSN_PAL; break;
+ case 8: pDIB->mnFormat |= BMP_FORMAT_8BIT_PAL; break;
#ifdef OSL_BIGENDIAN
- case(16 ):
+ case 16:
{
pDIB->mnFormat|= BMP_FORMAT_16BIT_TC_MSB_MASK;
ColorMaskElement aRedMask(0xf800);
@@ -171,7 +171,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
break;
}
#else
- case(16 ):
+ case 16:
{
pDIB->mnFormat|= BMP_FORMAT_16BIT_TC_LSB_MASK;
ColorMaskElement aRedMask(0xf800);
@@ -269,7 +269,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
switch( aSrcBuf.mnBitCount )
{
- case( 1 ):
+ case 1:
{
aSrcBuf.mnFormat |= ( LSBFirst == pImage->bitmap_bit_order
? BMP_FORMAT_1BIT_LSB_PAL
@@ -278,7 +278,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
}
break;
- case( 4 ):
+ case 4:
{
aSrcBuf.mnFormat |= ( LSBFirst == pImage->bitmap_bit_order
? BMP_FORMAT_4BIT_LSN_PAL
@@ -287,13 +287,13 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
}
break;
- case( 8 ):
+ case 8:
{
aSrcBuf.mnFormat |= BMP_FORMAT_8BIT_PAL;
}
break;
- case( 16 ):
+ case 16:
{
ColorMaskElement aRedMask(pImage->red_mask);
aRedMask.CalcMaskShift();
@@ -314,7 +314,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
}
break;
- case( 24 ):
+ case 24:
{
if( ( LSBFirst == pImage->byte_order ) && ( pImage->red_mask == 0xFF ) )
aSrcBuf.mnFormat |= BMP_FORMAT_24BIT_TC_RGB;
@@ -323,7 +323,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
}
break;
- case( 32 ):
+ case 32:
{
if( LSBFirst == pImage->byte_order )
aSrcBuf.mnFormat |= ( pSalDisp->GetVisual(nScreen).red_mask == 0xFF
@@ -436,25 +436,25 @@ XImage* X11SalBitmap::ImplCreateXImage(
switch( pImage->bits_per_pixel )
{
- case( 1 ):
+ case 1:
nDstFormat |= ( LSBFirst == pImage->bitmap_bit_order
? BMP_FORMAT_1BIT_LSB_PAL
: BMP_FORMAT_1BIT_MSB_PAL
);
break;
- case( 4 ):
+ case 4:
nDstFormat |= ( LSBFirst == pImage->bitmap_bit_order
? BMP_FORMAT_4BIT_LSN_PAL
: BMP_FORMAT_4BIT_MSN_PAL
);
break;
- case( 8 ):
+ case 8:
nDstFormat |= BMP_FORMAT_8BIT_PAL;
break;
- case( 16 ):
+ case 16:
{
#ifdef OSL_BIGENDIAN
@@ -481,7 +481,7 @@ XImage* X11SalBitmap::ImplCreateXImage(
}
break;
- case( 24 ):
+ case 24:
{
if( ( LSBFirst == pImage->byte_order ) && ( pImage->red_mask == 0xFF ) )
nDstFormat |= BMP_FORMAT_24BIT_TC_RGB;
@@ -490,7 +490,7 @@ XImage* X11SalBitmap::ImplCreateXImage(
}
break;
- case( 32 ):
+ case 32:
{
if( LSBFirst == pImage->byte_order )
nDstFormat |= ( pImage->red_mask == 0xFF
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index 0a81d110e998..0ddcc82b2832 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -539,31 +539,31 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
}
switch( CHOOSE_DEVMODE(dmPaperSize) )
{
- case( DMPAPER_LETTER ):
+ case DMPAPER_LETTER:
pSetupData->mePaperFormat = PAPER_LETTER;
break;
- case( DMPAPER_TABLOID ):
+ case DMPAPER_TABLOID:
pSetupData->mePaperFormat = PAPER_TABLOID;
break;
- case( DMPAPER_LEDGER ):
+ case DMPAPER_LEDGER:
pSetupData->mePaperFormat = PAPER_LEDGER;
break;
- case( DMPAPER_LEGAL ):
+ case DMPAPER_LEGAL:
pSetupData->mePaperFormat = PAPER_LEGAL;
break;
- case( DMPAPER_STATEMENT ):
+ case DMPAPER_STATEMENT:
pSetupData->mePaperFormat = PAPER_STATEMENT;
break;
- case( DMPAPER_EXECUTIVE ):
+ case DMPAPER_EXECUTIVE:
pSetupData->mePaperFormat = PAPER_EXECUTIVE;
break;
- case( DMPAPER_A3 ):
+ case DMPAPER_A3:
pSetupData->mePaperFormat = PAPER_A3;
break;
- case( DMPAPER_A4 ):
+ case DMPAPER_A4:
pSetupData->mePaperFormat = PAPER_A4;
break;
- case( DMPAPER_A5 ):
+ case DMPAPER_A5:
pSetupData->mePaperFormat = PAPER_A5;
break;
//See http://wiki.openoffice.org/wiki/DefaultPaperSize
@@ -579,124 +579,124 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
////"DMPAPER_B4 12 B4 (JIS) 250 x 354"
//which is bogus as it's either JIS 257 x 364 or ISO 250 x 353
//(cmc)
- case( DMPAPER_B4 ):
+ case DMPAPER_B4:
pSetupData->mePaperFormat = PAPER_B4_JIS;
break;
- case( DMPAPER_B5 ):
+ case DMPAPER_B5:
pSetupData->mePaperFormat = PAPER_B5_JIS;
break;
- case( DMPAPER_QUARTO ):
+ case DMPAPER_QUARTO:
pSetupData->mePaperFormat = PAPER_QUARTO;
break;
- case( DMPAPER_10X14 ):
+ case DMPAPER_10X14:
pSetupData->mePaperFormat = PAPER_10x14;
break;
- case( DMPAPER_NOTE ):
+ case DMPAPER_NOTE:
pSetupData->mePaperFormat = PAPER_LETTER;
break;
- case( DMPAPER_ENV_9 ):
+ case DMPAPER_ENV_9:
pSetupData->mePaperFormat = PAPER_ENV_9;
break;
- case( DMPAPER_ENV_10 ):
+ case DMPAPER_ENV_10:
pSetupData->mePaperFormat = PAPER_ENV_10;
break;
- case( DMPAPER_ENV_11 ):
+ case DMPAPER_ENV_11:
pSetupData->mePaperFormat = PAPER_ENV_11;
break;
- case( DMPAPER_ENV_12 ):
+ case DMPAPER_ENV_12:
pSetupData->mePaperFormat = PAPER_ENV_12;
break;
- case( DMPAPER_ENV_14 ):
+ case DMPAPER_ENV_14:
pSetupData->mePaperFormat = PAPER_ENV_14;
break;
- case( DMPAPER_CSHEET ):
+ case DMPAPER_CSHEET:
pSetupData->mePaperFormat = PAPER_C;
break;
- case( DMPAPER_DSHEET ):
+ case DMPAPER_DSHEET:
pSetupData->mePaperFormat = PAPER_D;
break;
- case( DMPAPER_ESHEET ):
+ case DMPAPER_ESHEET:
pSetupData->mePaperFormat = PAPER_E;
break;
- case( DMPAPER_ENV_DL):
+ case DMPAPER_ENV_DL:
pSetupData->mePaperFormat = PAPER_ENV_DL;
break;
- case( DMPAPER_ENV_C5):
+ case DMPAPER_ENV_C5:
pSetupData->mePaperFormat = PAPER_ENV_C5;
break;
- case( DMPAPER_ENV_C3):
+ case DMPAPER_ENV_C3:
pSetupData->mePaperFormat = PAPER_ENV_C3;
break;
- case( DMPAPER_ENV_C4):
+ case DMPAPER_ENV_C4:
pSetupData->mePaperFormat = PAPER_ENV_C4;
break;
- case( DMPAPER_ENV_C6):
+ case DMPAPER_ENV_C6:
pSetupData->mePaperFormat = PAPER_ENV_C6;
break;
- case( DMPAPER_ENV_C65):
+ case DMPAPER_ENV_C65:
pSetupData->mePaperFormat = PAPER_ENV_C65;
break;
- case( DMPAPER_ENV_ITALY ):
+ case DMPAPER_ENV_ITALY:
pSetupData->mePaperFormat = PAPER_ENV_ITALY;
break;
- case( DMPAPER_ENV_MONARCH ):
+ case DMPAPER_ENV_MONARCH:
pSetupData->mePaperFormat = PAPER_ENV_MONARCH;
break;
- case( DMPAPER_ENV_PERSONAL ):
+ case DMPAPER_ENV_PERSONAL:
pSetupData->mePaperFormat = PAPER_ENV_PERSONAL;
break;
- case( DMPAPER_FANFOLD_US ):
+ case DMPAPER_FANFOLD_US:
pSetupData->mePaperFormat = PAPER_FANFOLD_US;
break;
- case( DMPAPER_FANFOLD_STD_GERMAN ):
+ case DMPAPER_FANFOLD_STD_GERMAN:
pSetupData->mePaperFormat = PAPER_FANFOLD_DE;
break;
- case( DMPAPER_FANFOLD_LGL_GERMAN ):
+ case DMPAPER_FANFOLD_LGL_GERMAN:
pSetupData->mePaperFormat = PAPER_FANFOLD_LEGAL_DE;
break;
- case( DMPAPER_ISO_B4 ):
+ case DMPAPER_ISO_B4:
pSetupData->mePaperFormat = PAPER_B4_ISO;
break;
- case( DMPAPER_JAPANESE_POSTCARD ):
+ case DMPAPER_JAPANESE_POSTCARD:
pSetupData->mePaperFormat = PAPER_POSTCARD_JP;
break;
- case( DMPAPER_9X11 ):
+ case DMPAPER_9X11:
pSetupData->mePaperFormat = PAPER_9x11;
break;
- case( DMPAPER_10X11 ):
+ case DMPAPER_10X11:
pSetupData->mePaperFormat = PAPER_10x11;
break;
- case( DMPAPER_15X11 ):
+ case DMPAPER_15X11:
pSetupData->mePaperFormat = PAPER_15x11;
break;
- case( DMPAPER_ENV_INVITE ):
+ case DMPAPER_ENV_INVITE:
pSetupData->mePaperFormat = PAPER_ENV_INVITE;
break;
- case( DMPAPER_A_PLUS ):
+ case DMPAPER_A_PLUS:
pSetupData->mePaperFormat = PAPER_A_PLUS;
break;
- case( DMPAPER_B_PLUS ):
+ case DMPAPER_B_PLUS:
pSetupData->mePaperFormat = PAPER_B_PLUS;
break;
- case( DMPAPER_LETTER_PLUS ):
+ case DMPAPER_LETTER_PLUS:
pSetupData->mePaperFormat = PAPER_LETTER_PLUS;
break;
- case( DMPAPER_A4_PLUS ):
+ case DMPAPER_A4_PLUS:
pSetupData->mePaperFormat = PAPER_A4_PLUS;
break;
- case( DMPAPER_A2 ):
+ case DMPAPER_A2:
pSetupData->mePaperFormat = PAPER_A2;
break;
- case( DMPAPER_DBL_JAPANESE_POSTCARD ):
+ case DMPAPER_DBL_JAPANESE_POSTCARD:
pSetupData->mePaperFormat = PAPER_DOUBLEPOSTCARD_JP;
break;
- case( DMPAPER_A6 ):
+ case DMPAPER_A6:
pSetupData->mePaperFormat = PAPER_A6;
break;
- case( DMPAPER_B6_JIS ):
+ case DMPAPER_B6_JIS:
pSetupData->mePaperFormat = PAPER_B6_JIS;
break;
- case( DMPAPER_12X11 ):
+ case DMPAPER_12X11:
pSetupData->mePaperFormat = PAPER_12x11;
break;
default:
@@ -762,28 +762,28 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
switch( pSetupData->mePaperFormat )
{
- case( PAPER_A2 ):
+ case PAPER_A2:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_A2;
break;
- case( PAPER_A3 ):
+ case PAPER_A3:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_A3;
break;
- case( PAPER_A4 ):
+ case PAPER_A4:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_A4;
break;
- case( PAPER_A5 ):
+ case PAPER_A5:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_A5;
break;
- case( PAPER_B4_ISO):
+ case PAPER_B4_ISO:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ISO_B4;
break;
- case( PAPER_LETTER ):
+ case PAPER_LETTER:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_LETTER;
break;
- case( PAPER_LEGAL ):
+ case PAPER_LEGAL:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_LEGAL;
break;
- case( PAPER_TABLOID ):
+ case PAPER_TABLOID:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_TABLOID;
break;
#if 0
@@ -794,126 +794,126 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
//compare DMPAPER_ENV_B4 and DMPAPER_ENV_B4 as
//DMPAPER_ENV_B4 33 Envelope B4 250 x 353 mm
//DMPAPER_ENV_B5 34 Envelope B5 176 x 250 mm
- case( PAPER_B6_ISO ):
+ case PAPER_B6_ISO:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_B6;
break;
#endif
- case( PAPER_ENV_C4 ):
+ case PAPER_ENV_C4:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_C4;
break;
- case( PAPER_ENV_C5 ):
+ case PAPER_ENV_C5:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_C5;
break;
- case( PAPER_ENV_C6 ):
+ case PAPER_ENV_C6:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_C6;
break;
- case( PAPER_ENV_C65 ):
+ case PAPER_ENV_C65:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_C65;
break;
- case( PAPER_ENV_DL ):
+ case PAPER_ENV_DL:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_DL;
break;
- case( PAPER_C ):
+ case PAPER_C:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_CSHEET;
break;
- case( PAPER_D ):
+ case PAPER_D:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_DSHEET;
break;
- case( PAPER_E ):
+ case PAPER_E:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ESHEET;
break;
- case( PAPER_EXECUTIVE ):
+ case PAPER_EXECUTIVE:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_EXECUTIVE;
break;
- case( PAPER_FANFOLD_LEGAL_DE ):
+ case PAPER_FANFOLD_LEGAL_DE:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_FANFOLD_LGL_GERMAN;
break;
- case( PAPER_ENV_MONARCH ):
+ case PAPER_ENV_MONARCH:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_MONARCH;
break;
- case( PAPER_ENV_PERSONAL ):
+ case PAPER_ENV_PERSONAL:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_PERSONAL;
break;
- case( PAPER_ENV_9 ):
+ case PAPER_ENV_9:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_9;
break;
- case( PAPER_ENV_10 ):
+ case PAPER_ENV_10:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_10;
break;
- case( PAPER_ENV_11 ):
+ case PAPER_ENV_11:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_11;
break;
- case( PAPER_ENV_12 ):
+ case PAPER_ENV_12:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_12;
break;
//See the comments on DMPAPER_B4 above
- case( PAPER_B4_JIS ):
+ case PAPER_B4_JIS:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_B4;
break;
- case( PAPER_B5_JIS ):
+ case PAPER_B5_JIS:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_B5;
break;
- case( PAPER_B6_JIS ):
+ case PAPER_B6_JIS:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_B6_JIS;
break;
- case( PAPER_LEDGER ):
+ case PAPER_LEDGER:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_LEDGER;
break;
- case( PAPER_STATEMENT ):
+ case PAPER_STATEMENT:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_STATEMENT;
break;
- case( PAPER_10x14 ):
+ case PAPER_10x14:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_10X14;
break;
- case( PAPER_ENV_14 ):
+ case PAPER_ENV_14:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_14;
break;
- case( PAPER_ENV_C3 ):
+ case PAPER_ENV_C3:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_C3;
break;
- case( PAPER_ENV_ITALY ):
+ case PAPER_ENV_ITALY:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_ITALY;
break;
- case( PAPER_FANFOLD_US ):
+ case PAPER_FANFOLD_US:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_FANFOLD_US;
break;
- case( PAPER_FANFOLD_DE ):
+ case PAPER_FANFOLD_DE:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_FANFOLD_STD_GERMAN;
break;
- case( PAPER_POSTCARD_JP ):
+ case PAPER_POSTCARD_JP:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_JAPANESE_POSTCARD;
break;
- case( PAPER_9x11 ):
+ case PAPER_9x11:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_9X11;
break;
- case( PAPER_10x11 ):
+ case PAPER_10x11:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_10X11;
break;
- case( PAPER_15x11 ):
+ case PAPER_15x11:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_15X11;
break;
- case( PAPER_ENV_INVITE ):
+ case PAPER_ENV_INVITE:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_INVITE;
break;
- case( PAPER_A_PLUS ):
+ case PAPER_A_PLUS:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_A_PLUS;
break;
- case( PAPER_B_PLUS ):
+ case PAPER_B_PLUS:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_B_PLUS;
break;
- case( PAPER_LETTER_PLUS ):
+ case PAPER_LETTER_PLUS:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_LETTER_PLUS;
break;
- case( PAPER_A4_PLUS ):
+ case PAPER_A4_PLUS:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_A4_PLUS;
break;
- case( PAPER_DOUBLEPOSTCARD_JP ):
+ case PAPER_DOUBLEPOSTCARD_JP:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_DBL_JAPANESE_POSTCARD;
break;
- case( PAPER_A6 ):
+ case PAPER_A6:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_A6;
break;
- case( PAPER_12x11 ):
+ case PAPER_12x11:
CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_12X11;
break;
default:
generated by cgit (git 2.34.1) at 2025-01-01 18:46:10 +0000