diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-18 08:26:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-03-15 08:52:23 +0200 |
| commit | 52e438caafc3cd24b3759b08c1aaee88e5b67877 (patch) | |
| tree | ceb8aef8dd12c2b81caf2138ac194b086d9a77ff | |
| parent | a0d5f0896ed7f2de8ceffd664ee469a383ce7d53 (diff) | |
remove unnecessary parentheses in case labels
Change-Id: I987bf68c767709080c67c8b183c036a4109c6caa
53 files changed, 777 insertions, 777 deletions
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 8728fdff8b42..78ef5fbf040f 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -464,7 +464,7 @@ IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void ) switch( p->GetCurItemId() ) { - case( AVMEDIA_TOOLBOXITEM_OPEN ): + case AVMEDIA_TOOLBOXITEM_OPEN: { OUString aURL; @@ -482,7 +482,7 @@ IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void ) } break; - case( AVMEDIA_TOOLBOXITEM_INSERT ): + case AVMEDIA_TOOLBOXITEM_INSERT: { MediaFloater* pFloater = avmedia::getMediaFloater(); @@ -491,7 +491,7 @@ IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void ) } break; - case( AVMEDIA_TOOLBOXITEM_PLAY ): + case AVMEDIA_TOOLBOXITEM_PLAY: { aExecItem.setState( MediaState::Play ); @@ -502,26 +502,26 @@ IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void ) } break; - case( AVMEDIA_TOOLBOXITEM_PAUSE ): + case AVMEDIA_TOOLBOXITEM_PAUSE: { aExecItem.setState( MediaState::Pause ); } break; - case( AVMEDIA_TOOLBOXITEM_STOP ): + case AVMEDIA_TOOLBOXITEM_STOP: { aExecItem.setState( MediaState::Stop ); aExecItem.setTime( 0.0 ); } break; - case( AVMEDIA_TOOLBOXITEM_MUTE ): + case AVMEDIA_TOOLBOXITEM_MUTE: { aExecItem.setMute( !maMuteToolBox->IsItemChecked( AVMEDIA_TOOLBOXITEM_MUTE ) ); } break; - case( AVMEDIA_TOOLBOXITEM_LOOP ): + case AVMEDIA_TOOLBOXITEM_LOOP: { aExecItem.setLoop( !maPlayToolBox->IsItemChecked( AVMEDIA_TOOLBOXITEM_LOOP ) ); } @@ -550,11 +550,11 @@ IMPL_LINK_TYPED( MediaControl, implZoomSelectHdl, ListBox&, p, void ) switch( p.GetSelectEntryPos() ) { - case( AVMEDIA_ZOOMLEVEL_50 ): eLevel = css::media::ZoomLevel_ZOOM_1_TO_2; break; - case( AVMEDIA_ZOOMLEVEL_100 ): eLevel = css::media::ZoomLevel_ORIGINAL; break; - case( AVMEDIA_ZOOMLEVEL_200 ): eLevel = css::media::ZoomLevel_ZOOM_2_TO_1; break; - case( AVMEDIA_ZOOMLEVEL_FIT ): eLevel = css::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT; break; - case( AVMEDIA_ZOOMLEVEL_SCALED ): eLevel = css::media::ZoomLevel_FIT_TO_WINDOW; break; + case AVMEDIA_ZOOMLEVEL_50: eLevel = css::media::ZoomLevel_ZOOM_1_TO_2; break; + case AVMEDIA_ZOOMLEVEL_100: eLevel = css::media::ZoomLevel_ORIGINAL; break; + case AVMEDIA_ZOOMLEVEL_200: eLevel = css::media::ZoomLevel_ZOOM_2_TO_1; break; + case AVMEDIA_ZOOMLEVEL_FIT: eLevel = css::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT; break; + case AVMEDIA_ZOOMLEVEL_SCALED: eLevel = css::media::ZoomLevel_FIT_TO_WINDOW; break; default: eLevel = css::media::ZoomLevel_NOT_AVAILABLE; break; } diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx index 5bb45e07a1ad..c61305dbc9d5 100644 --- a/avmedia/source/win/player.cxx +++ b/avmedia/source/win/player.cxx @@ -54,7 +54,7 @@ LRESULT CALLBACK MediaPlayerWndProc_2( HWND hWnd,UINT nMsg, WPARAM nPar1, LPARAM { switch( nMsg ) { - case( WM_GRAPHNOTIFY ): + case WM_GRAPHNOTIFY: pPlayer->processEvent(); break; default: diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx index 4c13f07d265f..64bd7c4fe749 100644 --- a/avmedia/source/win/window.cxx +++ b/avmedia/source/win/window.cxx @@ -68,21 +68,21 @@ LRESULT CALLBACK MediaPlayerWndProc( HWND hWnd,UINT nMsg, WPARAM nPar1, LPARAM n { switch( nMsg ) { - case( WM_SETCURSOR ): + case WM_SETCURSOR: pWindow->updatePointer(); break; - case( WM_GRAPHNOTIFY ): + case WM_GRAPHNOTIFY: pWindow->processGraphEvent(); break; - case( WM_MOUSEMOVE ): - case( WM_LBUTTONDOWN ): - case( WM_MBUTTONDOWN ): - case( WM_RBUTTONDOWN ): - case( WM_LBUTTONUP ): - case( WM_MBUTTONUP ): - case( WM_RBUTTONUP ): + case WM_MOUSEMOVE: + case WM_LBUTTONDOWN: + case WM_MBUTTONDOWN: + case WM_RBUTTONDOWN: + case WM_LBUTTONUP: + case WM_MBUTTONUP: + case WM_RBUTTONUP: { awt::MouseEvent aUNOEvt; POINT aWinPoint; @@ -139,7 +139,7 @@ LRESULT CALLBACK MediaPlayerWndProc( HWND hWnd,UINT nMsg, WPARAM nPar1, LPARAM n } break; - case( WM_SETFOCUS ): + case WM_SETFOCUS: { const awt::FocusEvent aUNOEvt; pWindow->fireSetFocusEvent( aUNOEvt ); @@ -331,9 +331,9 @@ void Window::updatePointer() switch( mnPointerType ) { - case( awt::SystemPointer::CROSS ): pCursorName = IDC_CROSS; break; - case( awt::SystemPointer::MOVE ): pCursorName = IDC_SIZEALL; break; - case( awt::SystemPointer::WAIT ): pCursorName = IDC_WAIT; break; + case awt::SystemPointer::CROSS: pCursorName = IDC_CROSS; break; + case awt::SystemPointer::MOVE: pCursorName = IDC_SIZEALL; break; + case awt::SystemPointer::WAIT: pCursorName = IDC_WAIT; break; default: pCursorName = IDC_ARROW; diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 6a6af450ee18..4f0cea071c4d 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -573,15 +573,15 @@ Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, double { default: OSL_FAIL("svx::GraphicFilterEmboss::GetFilteredGraphic(), unknown Reference Point!" ); /* Fall through */ - case( RP_LT ): nAzim = 4500; nElev = 4500; break; - case( RP_MT ): nAzim = 9000; nElev = 4500; break; - case( RP_RT ): nAzim = 13500; nElev = 4500; break; - case( RP_LM ): nAzim = 0; nElev = 4500; break; - case( RP_MM ): nAzim = 0; nElev = 9000; break; - case( RP_RM ): nAzim = 18000; nElev = 4500; break; - case( RP_LB ): nAzim = 31500; nElev = 4500; break; - case( RP_MB ): nAzim = 27000; nElev = 4500; break; - case( RP_RB ): nAzim = 22500; nElev = 4500; break; + case RP_LT: nAzim = 4500; nElev = 4500; break; + case RP_MT: nAzim = 9000; nElev = 4500; break; + case RP_RT: nAzim = 13500; nElev = 4500; break; + case RP_LM: nAzim = 0; nElev = 4500; break; + case RP_MM: nAzim = 0; nElev = 9000; break; + case RP_RM: nAzim = 18000; nElev = 4500; break; + case RP_LB: nAzim = 31500; nElev = 4500; break; + case RP_MB: nAzim = 27000; nElev = 4500; break; + case RP_RB: nAzim = 22500; nElev = 4500; break; } BmpFilterParam aParam( nAzim, nElev ); diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index 009fec29eba0..027b2ece746e 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -381,11 +381,11 @@ void ImpTwain::ImplXfer() switch( PFUNC( &aAppIdent, &aSrcIdent, DG_IMAGE, DAT_IMAGENATIVEXFER, MSG_GET, &hDIB ) ) { - case( TWRC_CANCEL ): + case TWRC_CANCEL: nCurState = 7; break; - case( TWRC_XFERDONE ): + case TWRC_XFERDONE: { if( hDIB ) { @@ -428,8 +428,8 @@ IMPL_LINK_TYPED( ImpTwain, ImplFallbackHdl, void*, pData, void ) switch( nCurState ) { - case( 7 ): - case( 6 ): + case 7: + case 6: { TW_PENDINGXFERS aXfers; @@ -443,7 +443,7 @@ IMPL_LINK_TYPED( ImpTwain, ImplFallbackHdl, void*, pData, void ) } break; - case( 5 ): + case 5: { TW_USERINTERFACE aUI = { true, true, hTwainWnd }; @@ -455,21 +455,21 @@ IMPL_LINK_TYPED( ImpTwain, ImplFallbackHdl, void*, pData, void ) } break; - case( 4 ): + case 4: { PFUNC( &aAppIdent, NULL, DG_CONTROL, DAT_IDENTITY, MSG_CLOSEDS, &aSrcIdent ); nCurState = 3; } break; - case( 3 ): + case 3: { PFUNC( &aAppIdent, NULL, DG_CONTROL, DAT_PARENT, MSG_CLOSEDSM, &hTwainWnd ); nCurState = 2; } break; - case( 2 ): + case 2: { delete pMod; pMod = NULL; @@ -708,11 +708,11 @@ IMPL_LINK_TYPED( Twain, ImpNotifyHdl, unsigned long, nEvent, void ) { switch( nEvent ) { - case( TWAIN_EVENT_SCANNING ): + case TWAIN_EVENT_SCANNING: meState = TWAIN_STATE_SCANNING; break; - case( TWAIN_EVENT_QUIT ): + case TWAIN_EVENT_QUIT: { if( meState != TWAIN_STATE_DONE ) meState = TWAIN_STATE_CANCELED; @@ -731,7 +731,7 @@ IMPL_LINK_TYPED( Twain, ImpNotifyHdl, unsigned long, nEvent, void ) } break; - case( TWAIN_EVENT_XFER ): + case TWAIN_EVENT_XFER: { if( mpImpTwain ) { @@ -810,18 +810,18 @@ uno::Sequence< sal_Int8 > ScannerManager::getDIB() throw(std::exception) switch( pBIH->biBitCount ) { - case( 1 ): - case( 4 ): - case( 8 ): + case 1: + case 4: + case 8: nColEntries = pBIH->biClrUsed ? pBIH->biClrUsed : ( 1 << pBIH->biBitCount ); break; - case( 24 ): + case 24: nColEntries = pBIH->biClrUsed ? pBIH->biClrUsed : 0; break; - case( 16 ): - case( 32 ): + case 16: + case 32: { nColEntries = pBIH->biClrUsed; diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index 0bf5acaa0fe5..48ff5612dd5b 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -551,11 +551,11 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon // always adjust text position to match baseline alignment switch( aOldFont.GetAlignment() ) { - case( ALIGN_TOP ): + case ALIGN_TOP: aBaseLinePos.Y() += aMetric.GetAscent(); break; - case( ALIGN_BOTTOM ): + case ALIGN_BOTTOM: aBaseLinePos.Y() -= aMetric.GetDescent(); break; @@ -1359,7 +1359,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) switch( nType ) { - case( MetaActionType::PIXEL ): + case MetaActionType::PIXEL: { const MetaPixelAction* pA = static_cast<const MetaPixelAction*>(pAction); @@ -1367,7 +1367,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::POINT ): + case MetaActionType::POINT: { const MetaPointAction* pA = static_cast<const MetaPointAction*>(pAction); @@ -1375,7 +1375,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::LINE ): + case MetaActionType::LINE: { const MetaLineAction* pA = static_cast<const MetaLineAction*>(pAction); @@ -1394,13 +1394,13 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::RECT ): + case MetaActionType::RECT: { Impl_writeRect( static_cast<const MetaRectAction*>(pAction)->GetRect(), 0, 0 ); } break; - case( MetaActionType::ROUNDRECT ): + case MetaActionType::ROUNDRECT: { const MetaRoundRectAction* pA = static_cast<const MetaRoundRectAction*>(pAction); @@ -1408,7 +1408,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::ELLIPSE ): + case MetaActionType::ELLIPSE: { const MetaEllipseAction* pA = static_cast<const MetaEllipseAction*>(pAction); const Rectangle& rRect = pA->GetRect(); @@ -1417,37 +1417,37 @@ void Writer::Impl_writeActions( 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: { tools::Polygon aPoly; 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(), POLY_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(), POLY_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(), POLY_CHORD ); } break; - case( MetaActionType::POLYGON ): + case MetaActionType::POLYGON: aPoly = static_cast<const MetaPolygonAction*>(pAction)->GetPolygon(); break; default: break; @@ -1460,7 +1460,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::POLYLINE ): + case MetaActionType::POLYLINE: { const MetaPolyLineAction* pA = static_cast<const MetaPolyLineAction*>(pAction); const tools::Polygon& rPoly = pA->GetPolygon(); @@ -1480,7 +1480,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::POLYPOLYGON ): + case MetaActionType::POLYPOLYGON: { const MetaPolyPolygonAction* pA = static_cast<const MetaPolyPolygonAction*>(pAction); const tools::PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); @@ -1490,7 +1490,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::GRADIENT ): + case MetaActionType::GRADIENT: { const MetaGradientAction* pA = static_cast<const MetaGradientAction*>(pAction); @@ -1499,7 +1499,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::GRADIENTEX ): + case MetaActionType::GRADIENTEX: { const MetaGradientExAction* pA = static_cast<const MetaGradientExAction*>(pAction); Impl_writeGradientEx( pA->GetPolyPolygon(), pA->GetGradient() ); @@ -1516,7 +1516,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::Transparent ): + case MetaActionType::Transparent: { const MetaTransparentAction* pA = static_cast<const MetaTransparentAction*>(pAction); const tools::PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); @@ -1530,7 +1530,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::FLOATTRANSPARENT ): + case MetaActionType::FLOATTRANSPARENT: { const MetaFloatTransparentAction* pA = static_cast<const MetaFloatTransparentAction*>(pAction); GDIMetaFile aTmpMtf( pA->GetGDIMetaFile() ); @@ -1569,7 +1569,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::EPS ): + case MetaActionType::EPS: { const MetaEPSAction* pA = static_cast<const MetaEPSAction*>(pAction); const GDIMetaFile aGDIMetaFile( pA->GetSubstitute() ); @@ -1591,7 +1591,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::COMMENT ): + case MetaActionType::COMMENT: { const MetaCommentAction* pA = static_cast<const MetaCommentAction*>(pAction); const sal_uInt8* pData = pA->GetData(); @@ -1680,7 +1680,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::BMPSCALE ): + case MetaActionType::BMPSCALE: { const MetaBmpScaleAction* pA = static_cast<const MetaBmpScaleAction*>(pAction); @@ -1690,7 +1690,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::BMP ): + case MetaActionType::BMP: { const MetaBmpAction* pA = static_cast<const MetaBmpAction*>(pAction); Impl_writeImage( pA->GetBitmap(), @@ -1699,7 +1699,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::BMPSCALEPART ): + case MetaActionType::BMPSCALEPART: { const MetaBmpScalePartAction* pA = static_cast<const MetaBmpScalePartAction*>(pAction); Impl_writeImage( pA->GetBitmap(), @@ -1708,7 +1708,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::BMPEX ): + case MetaActionType::BMPEX: { const MetaBmpExAction* pA = static_cast<const MetaBmpExAction*>(pAction); Impl_writeImage( pA->GetBitmapEx(), @@ -1717,7 +1717,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::BMPEXSCALE ): + case MetaActionType::BMPEXSCALE: { const MetaBmpExScaleAction* pA = static_cast<const MetaBmpExScaleAction*>(pAction); Impl_writeImage( pA->GetBitmapEx(), @@ -1726,7 +1726,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::BMPEXSCALEPART ): + case MetaActionType::BMPEXSCALEPART: { const MetaBmpExScalePartAction* pA = static_cast<const MetaBmpExScalePartAction*>(pAction); Impl_writeImage( pA->GetBitmapEx(), @@ -1735,75 +1735,75 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::TEXT ): + case MetaActionType::TEXT: { const MetaTextAction* pA = static_cast<const MetaTextAction*>(pAction); Impl_writeText( pA->GetPoint(), pA->GetText().copy( pA->GetIndex(), pA->GetLen() ), nullptr, 0); } break; - case( MetaActionType::TEXTRECT ): + case MetaActionType::TEXTRECT: { const MetaTextRectAction* pA = static_cast<const MetaTextRectAction*>(pAction); Impl_writeText( pA->GetRect().TopLeft(), pA->GetText(), nullptr, 0 ); } break; - case( MetaActionType::TEXTARRAY ): + case MetaActionType::TEXTARRAY: { const MetaTextArrayAction* pA = static_cast<const MetaTextArrayAction*>(pAction); Impl_writeText( pA->GetPoint(), pA->GetText().copy( pA->GetIndex(), pA->GetLen() ), pA->GetDXArray(), 0 ); } break; - case( MetaActionType::STRETCHTEXT ): + case MetaActionType::STRETCHTEXT: { const MetaStretchTextAction* pA = static_cast<const MetaStretchTextAction*>(pAction); Impl_writeText( pA->GetPoint(), pA->GetText().copy( pA->GetIndex(), pA->GetLen() ), nullptr, pA->GetWidth() ); } break; - case( MetaActionType::ISECTRECTCLIPREGION ): + case MetaActionType::ISECTRECTCLIPREGION: { const MetaISectRectClipRegionAction* pA = static_cast<const MetaISectRectClipRegionAction*>(pAction); clipRect = pA->GetRect(); } // fall-through - case( MetaActionType::CLIPREGION ): - case( MetaActionType::ISECTREGIONCLIPREGION ): - case( MetaActionType::MOVECLIPREGION ): + case MetaActionType::CLIPREGION: + case MetaActionType::ISECTREGIONCLIPREGION: + case MetaActionType::MOVECLIPREGION: { const_cast<MetaAction*>(pAction)->Execute( mpVDev ); } break; - case( MetaActionType::MAPMODE ): + case MetaActionType::MAPMODE: { bMap++; } // fall-through - case( MetaActionType::REFPOINT ): - case( MetaActionType::LINECOLOR ): - case( MetaActionType::FILLCOLOR ): - case( MetaActionType::TEXTLINECOLOR ): - case( MetaActionType::TEXTFILLCOLOR ): - case( MetaActionType::TEXTCOLOR ): - case( MetaActionType::TEXTALIGN ): - case( MetaActionType::FONT ): - case( MetaActionType::PUSH ): - case( MetaActionType::POP ): - case( MetaActionType::LAYOUTMODE ): + case MetaActionType::REFPOINT: + case MetaActionType::LINECOLOR: + case MetaActionType::FILLCOLOR: + case MetaActionType::TEXTLINECOLOR: + case MetaActionType::TEXTFILLCOLOR: + case MetaActionType::TEXTCOLOR: + case MetaActionType::TEXTALIGN: + case MetaActionType::FONT: + case MetaActionType::PUSH: + case MetaActionType::POP: + case MetaActionType::LAYOUTMODE: { const_cast<MetaAction*>(pAction)->Execute( mpVDev ); } break; - case( MetaActionType::RASTEROP ): - case( MetaActionType::MASK ): - case( MetaActionType::MASKSCALE ): - case( MetaActionType::MASKSCALEPART ): - case( MetaActionType::WALLPAPER ): - case( MetaActionType::TEXTLINE ): + case MetaActionType::RASTEROP: + case MetaActionType::MASK: + case MetaActionType::MASKSCALE: + case MetaActionType::MASKSCALEPART: + case MetaActionType::WALLPAPER: + case MetaActionType::TEXTLINE: { // !!! >>> we don't want to support these actions } diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index 1055b2bfa067..9c069e9a2304 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -888,7 +888,7 @@ void VMLExport::AddFlipXY( ) { case SHAPEFLAG_FLIPH: m_pShapeStyle->append( ";flip:x" ); break; case SHAPEFLAG_FLIPV: m_pShapeStyle->append( ";flip:y" ); break; - case (nFlipHandV): m_pShapeStyle->append( ";flip:xy" ); break; + case nFlipHandV: m_pShapeStyle->append( ";flip:xy" ); break; } } diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 47c16c165523..f02acee3a766 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -1242,9 +1242,9 @@ css::text::WritingMode SdDrawDocument::GetDefaultWritingMode() const { switch( static_cast<const SvxFrameDirectionItem&>( *pItem ).GetValue() ) { - case( FRMDIR_HORI_LEFT_TOP ): eRet = css::text::WritingMode_LR_TB; break; - case( FRMDIR_HORI_RIGHT_TOP ): eRet = css::text::WritingMode_RL_TB; break; - case( FRMDIR_VERT_TOP_RIGHT ): eRet = css::text::WritingMode_TB_RL; break; + case FRMDIR_HORI_LEFT_TOP: eRet = css::text::WritingMode_LR_TB; break; + case FRMDIR_HORI_RIGHT_TOP: eRet = css::text::WritingMode_RL_TB; break; + case FRMDIR_VERT_TOP_RIGHT: eRet = css::text::WritingMode_TB_RL; break; default: OSL_FAIL( "Frame direction not supported yet" ); diff --git a/sd/source/core/sdobjfac.cxx b/sd/source/core/sdobjfac.cxx index b25c4b8c8f02..5d2c7bf1a0b5 100644 --- a/sd/source/core/sdobjfac.cxx +++ b/sd/source/core/sdobjfac.cxx @@ -41,11 +41,11 @@ IMPL_STATIC_LINK_TYPED( SdObjectFactory, MakeUserData, SdrObjFactory *, pObjFact { switch( pObjFactory->nIdentifier ) { - case( SD_ANIMATIONINFO_ID ): + case SD_ANIMATIONINFO_ID: pObjFactory->pNewData = new SdAnimationInfo( *pObjFactory->pObj ); break; - case( SD_IMAPINFO_ID ): + case SD_IMAPINFO_ID: pObjFactory->pNewData = new SdIMapInfo; break; diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index aea5e11ca475..52ed60cc2012 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -595,7 +595,7 @@ bool SdTransferable::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* switch( nObjectType ) { - case( SDTRANSFER_OBJECTTYPE_DRAWMODEL ): + case SDTRANSFER_OBJECTTYPE_DRAWMODEL: { try { @@ -625,7 +625,7 @@ bool SdTransferable::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* } break; - case( SDTRANSFER_OBJECTTYPE_DRAWOLE ): + case SDTRANSFER_OBJECTTYPE_DRAWOLE: { SfxObjectShell* pEmbObj = static_cast<SfxObjectShell*>(pObject); ::utl::TempFile aTempFile; diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 548039718438..d34b08ffb694 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -273,14 +273,14 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) switch ( rReq.GetSlot() ) { - case ( SID_BMPMASK_PIPETTE ) : + case SID_BMPMASK_PIPETTE : { mbPipette = static_cast<const SfxBoolItem&>( rReq.GetArgs()-> Get( SID_BMPMASK_PIPETTE ) ).GetValue(); } break; - case ( SID_BMPMASK_EXEC ) : + case SID_BMPMASK_EXEC : { SdrGrafObj* pObj = nullptr; if( mpDrawView && mpDrawView->GetMarkedObjectList().GetMarkCount() ) diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index b5d8267da4b8..8a47c30a6030 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -2460,7 +2460,7 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin ) switch ( n ) { - case ( 0 ) : + case 0 : { // Left SplitWindow // Get the width of the Window yourself, if no DummyWindow @@ -2474,7 +2474,7 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin ) aArea.Left() = nLeft; break; } - case ( 1 ) : + case 1 : { // Right SplitWindow // Position to correct the difference of the widths @@ -2501,7 +2501,7 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin ) aArea.Right() = nRight; break; } - case ( 2 ) : + case 2 : { // Top SplitWindow // Get the height of the Window yourself, if no DummyWindow @@ -2521,7 +2521,7 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin ) aArea.Top() = nTop; break; } - case ( 3 ) : + case 3 : { // The bottom SplitWindow // Position to correct the difference of the heights @@ -2573,16 +2573,16 @@ Rectangle SfxWorkWindow::GetFreeArea( bool bAutoHide ) const Size aSize = pSplit[n]->GetSizePixel(); switch ( n ) { - case ( 0 ) : + case 0 : aArea.Left() += aSize.Width(); break; - case ( 1 ) : + case 1 : aArea.Right() -= aSize.Width(); break; - case ( 2 ) : + case 2 : aArea.Top() += aSize.Height(); break; - case ( 3 ) : + case 3 : aArea.Bottom() -= aSize.Height(); break; } 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; } diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index c2ad3f1aecbf..e1e5c5964c8c 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -569,15 +569,15 @@ ImageMap::ImageMap( const ImageMap& rImageMap ) switch( pCopyObj->GetType() ) { - case( IMAP_OBJ_RECTANGLE ): + case IMAP_OBJ_RECTANGLE: maList.push_back( new IMapRectangleObject( *static_cast<IMapRectangleObject*>( pCopyObj ) ) ); break; - case( IMAP_OBJ_CIRCLE ): + case IMAP_OBJ_CIRCLE: maList.push_back( new IMapCircleObject( *static_cast<IMapCircleObject*>( pCopyObj ) ) ); break; - case( IMAP_OBJ_POLYGON ): + case IMAP_OBJ_POLYGON: maList.push_back( new IMapPolygonObject( *static_cast<IMapPolygonObject*>( pCopyObj ) ) ); break; @@ -637,15 +637,15 @@ ImageMap& ImageMap::operator=( const ImageMap& rImageMap ) switch( pCopyObj->GetType() ) { - case( IMAP_OBJ_RECTANGLE ): + case IMAP_OBJ_RECTANGLE: maList.push_back( new IMapRectangleObject( *static_cast<IMapRectangleObject*>(pCopyObj) ) ); break; - case( IMAP_OBJ_CIRCLE ): + case IMAP_OBJ_CIRCLE: maList.push_back( new IMapCircleObject( *static_cast<IMapCircleObject*>(pCopyObj) ) ); break; - case( IMAP_OBJ_POLYGON ): + case IMAP_OBJ_POLYGON: maList.push_back( new IMapPolygonObject( *static_cast<IMapPolygonObject*>(pCopyObj) ) ); break; @@ -685,21 +685,21 @@ bool ImageMap::operator==( const ImageMap& rImageMap ) { switch( pObj->GetType() ) { - case( IMAP_OBJ_RECTANGLE ): + case IMAP_OBJ_RECTANGLE: { if ( !( static_cast<IMapRectangleObject*>(pObj) )->IsEqual( *static_cast<IMapRectangleObject*>(pEqObj) ) ) bDifferent = true; } break; - case( IMAP_OBJ_CIRCLE ): + case IMAP_OBJ_CIRCLE: { if ( !( static_cast<IMapCircleObject*>(pObj) )->IsEqual( *static_cast<IMapCircleObject*>(pEqObj) ) ) bDifferent = true; } break; - case( IMAP_OBJ_POLYGON ): + case IMAP_OBJ_POLYGON: { if ( !( static_cast<IMapPolygonObject*>(pObj) )->IsEqual( *static_cast<IMapPolygonObject*>(pEqObj) ) ) bDifferent = true; @@ -744,15 +744,15 @@ void ImageMap::InsertIMapObject( const IMapObject& rIMapObject ) { switch( rIMapObject.GetType() ) { - case( IMAP_OBJ_RECTANGLE ): + case IMAP_OBJ_RECTANGLE: maList.push_back( new IMapRectangleObject( static_cast<const IMapRectangleObject&>( rIMapObject ) ) ); break; - case( IMAP_OBJ_CIRCLE ): + case IMAP_OBJ_CIRCLE: maList.push_back( new IMapCircleObject( static_cast<const IMapCircleObject&>( rIMapObject ) ) ); break; - case( IMAP_OBJ_POLYGON ): + case IMAP_OBJ_POLYGON: maList.push_back( new IMapPolygonObject( static_cast<const IMapPolygonObject&>( rIMapObject ) ) ); break; @@ -808,15 +808,15 @@ void ImageMap::Scale( const Fraction& rFracX, const Fraction& rFracY ) switch( pObj->GetType() ) { - case( IMAP_OBJ_RECTANGLE ): + case IMAP_OBJ_RECTANGLE: static_cast<IMapRectangleObject*>( pObj )->Scale( rFracX, rFracY ); break; - case( IMAP_OBJ_CIRCLE ): + case IMAP_OBJ_CIRCLE: static_cast<IMapCircleObject*>( pObj )->Scale( rFracX, rFracY ); break; - case( IMAP_OBJ_POLYGON ): + case IMAP_OBJ_POLYGON: static_cast<IMapPolygonObject*>( pObj )->Scale( rFracX, rFracY ); break; @@ -873,7 +873,7 @@ void ImageMap::ImpReadImageMap( SvStream& rIStm, size_t nCount, const OUString& switch( nType ) { - case ( IMAP_OBJ_RECTANGLE ): + case IMAP_OBJ_RECTANGLE: { IMapRectangleObject* pObj = new IMapRectangleObject; pObj->Read( rIStm, rBaseURL ); @@ -881,7 +881,7 @@ void ImageMap::ImpReadImageMap( SvStream& rIStm, size_t nCount, const OUString& } break; - case ( IMAP_OBJ_CIRCLE ): + case IMAP_OBJ_CIRCLE: { IMapCircleObject* pObj = new IMapCircleObject; pObj->Read( rIStm, rBaseURL ); @@ -889,7 +889,7 @@ void ImageMap::ImpReadImageMap( SvStream& rIStm, size_t nCount, const OUString& } break; - case ( IMAP_OBJ_POLYGON ): + case IMAP_OBJ_POLYGON: { IMapPolygonObject* pObj = new IMapPolygonObject; pObj->Read( rIStm, rBaseURL ); diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx index b9fb6ca032e1..282117562b42 100644 --- a/svtools/source/misc/imap2.cxx +++ b/svtools/source/misc/imap2.cxx @@ -144,9 +144,9 @@ void ImageMap::Write( SvStream& rOStm, sal_uLong nFormat, const OUString& rBaseU { switch( nFormat ) { - case( IMAP_FORMAT_BIN ) : Write( rOStm, rBaseURL ); break; - case( IMAP_FORMAT_CERN ) : ImpWriteCERN( rOStm, rBaseURL ); break; - case( IMAP_FORMAT_NCSA ) : ImpWriteNCSA( rOStm, rBaseURL ); break; + case IMAP_FORMAT_BIN : Write( rOStm, rBaseURL ); break; + case IMAP_FORMAT_CERN : ImpWriteCERN( rOStm, rBaseURL ); break; + case IMAP_FORMAT_NCSA : ImpWriteNCSA( rOStm, rBaseURL ); break; default: break; @@ -163,15 +163,15 @@ void ImageMap::ImpWriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const switch( pObj->GetType() ) { - case( IMAP_OBJ_RECTANGLE ): + case IMAP_OBJ_RECTANGLE: static_cast<IMapRectangleObject*>( pObj )->WriteCERN( rOStm, rBaseURL ); break; - case( IMAP_OBJ_CIRCLE ): + case IMAP_OBJ_CIRCLE: static_cast<IMapCircleObject*>( pObj )->WriteCERN( rOStm, rBaseURL ); break; - case( IMAP_OBJ_POLYGON ): + case IMAP_OBJ_POLYGON: static_cast<IMapPolygonObject*>( pObj )->WriteCERN( rOStm, rBaseURL ); break; @@ -191,15 +191,15 @@ void ImageMap::ImpWriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const switch( pObj->GetType() ) { - case( IMAP_OBJ_RECTANGLE ): + case IMAP_OBJ_RECTANGLE: static_cast<IMapRectangleObject*>( pObj )->WriteNCSA( rOStm, rBaseURL ); break; - case( IMAP_OBJ_CIRCLE ): + case IMAP_OBJ_CIRCLE: static_cast<IMapCircleObject*>( pObj )->WriteNCSA( rOStm, rBaseURL ); break; - case( IMAP_OBJ_POLYGON ): + case IMAP_OBJ_POLYGON: static_cast<IMapPolygonObject*>( pObj )->WriteNCSA( rOStm, rBaseURL ); break; @@ -218,9 +218,9 @@ sal_uLong ImageMap::Read( SvStream& rIStm, sal_uLong nFormat, const OUString& rB switch ( nFormat ) { - case ( IMAP_FORMAT_BIN ) : Read( rIStm, rBaseURL ); break; - case ( IMAP_FORMAT_CERN ) : nRet = ImpReadCERN( rIStm, rBaseURL ); break; - case ( IMAP_FORMAT_NCSA ) : nRet = ImpReadNCSA( rIStm, rBaseURL ); break; + case IMAP_FORMAT_BIN : Read( rIStm, rBaseURL ); break; + case IMAP_FORMAT_CERN : nRet = ImpReadCERN( rIStm, rBaseURL ); break; + case IMAP_FORMAT_NCSA : nRet = ImpReadNCSA( rIStm, rBaseURL ); break; default: break; diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index 4347544582d8..477c24d45108 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -639,7 +639,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, OString aCoords; switch( pObj->GetType() ) { - case( IMAP_OBJ_RECTANGLE ): + case IMAP_OBJ_RECTANGLE: { const IMapRectangleObject* pRectObj = static_cast<const IMapRectangleObject *>(pObj); @@ -657,7 +657,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, .makeStringAndClear(); } break; - case( IMAP_OBJ_CIRCLE ): + case IMAP_OBJ_CIRCLE: { const IMapCircleObject* pCirc = static_cast<const IMapCircleObject *>(pObj); @@ -674,7 +674,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, .makeStringAndClear(); } break; - case( IMAP_OBJ_POLYGON ): + case IMAP_OBJ_POLYGON: { const IMapPolygonObject* pPolyObj = static_cast<const IMapPolygonObject *>(pObj); diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index a2455646741a..9156d265db81 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -746,7 +746,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) switch( pAction->GetType() ) { - case( MetaActionType::PIXEL ): + case MetaActionType::PIXEL: { MetaPixelAction* pAct = static_cast<MetaPixelAction*>(pAction); @@ -762,7 +762,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::LINECOLOR ): + case MetaActionType::LINECOLOR: { MetaLineColorAction* pAct = static_cast<MetaLineColorAction*>(pAction); @@ -778,7 +778,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::FILLCOLOR ): + case MetaActionType::FILLCOLOR: { MetaFillColorAction* pAct = static_cast<MetaFillColorAction*>(pAction); @@ -794,7 +794,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::TEXTCOLOR ): + case MetaActionType::TEXTCOLOR: { MetaTextColorAction* pAct = static_cast<MetaTextColorAction*>(pAction); @@ -810,7 +810,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::TEXTFILLCOLOR ): + case MetaActionType::TEXTFILLCOLOR: { MetaTextFillColorAction* pAct = static_cast<MetaTextFillColorAction*>(pAction); @@ -826,7 +826,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::FONT ): + case MetaActionType::FONT: { MetaFontAction* pAct = static_cast<MetaFontAction*>(pAction); vcl::Font aFont( pAct->GetFont() ); @@ -846,7 +846,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::WALLPAPER ): + case MetaActionType::WALLPAPER: { MetaWallpaperAction* pAct = static_cast<MetaWallpaperAction*>(pAction); Wallpaper aWall( pAct->GetWallpaper() ); @@ -866,7 +866,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::BMP ): + case MetaActionType::BMP: { MetaBmpAction* pAct = static_cast<MetaBmpAction*>(pAction); const Bitmap aBmp( Mask( pAct->GetBitmap() ).GetBitmap() ); @@ -876,7 +876,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::BMPSCALE ): + case MetaActionType::BMPSCALE: { MetaBmpScaleAction* pAct = static_cast<MetaBmpScaleAction*>(pAction); const Bitmap aBmp( Mask( pAct->GetBitmap() ).GetBitmap() ); @@ -886,7 +886,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::BMPSCALEPART ): + case MetaActionType::BMPSCALEPART: { MetaBmpScalePartAction* pAct = static_cast<MetaBmpScalePartAction*>(pAction); const Bitmap aBmp( Mask( pAct->GetBitmap() ).GetBitmap() ); @@ -897,7 +897,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::BMPEX ): + case MetaActionType::BMPEX: { MetaBmpExAction* pAct = static_cast<MetaBmpExAction*>(pAction); const BitmapEx aBmpEx( Mask( pAct->GetBitmapEx() ).GetBitmapEx() ); @@ -907,7 +907,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::BMPEXSCALE ): + case MetaActionType::BMPEXSCALE: { MetaBmpExScaleAction* pAct = static_cast<MetaBmpExScaleAction*>(pAction); const BitmapEx aBmpEx( Mask( pAct->GetBitmapEx() ).GetBitmapEx() ); @@ -917,7 +917,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) } break; - case( MetaActionType::BMPEXSCALEPART ): + case MetaActionType::BMPEXSCALEPART: { MetaBmpExScalePartAction* pAct = static_cast<MetaBmpExScalePartAction*>(pAction); const BitmapEx aBmpEx( Mask( pAct->GetBitmapEx() ).GetBitmapEx() ); @@ -1013,7 +1013,7 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic ) switch( rGraphic.GetType() ) { - case( GRAPHIC_BITMAP ): + case GRAPHIC_BITMAP: { if( rGraphic.IsAnimated() ) { @@ -1078,7 +1078,7 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic ) } break; - case( GRAPHIC_GDIMETAFILE ): + case GRAPHIC_GDIMETAFILE: { GDIMetaFile aMtf( aGraphic.GetGDIMetaFile() ); diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index d948c3a60fdc..93e3d91e2e76 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -637,8 +637,8 @@ IMPL_LINK_TYPED( SvxSuperContourDlg, StateHdl, GraphCtrl*, pWnd, void ) switch( pWnd->GetPolyEditMode() ) { - case( SID_BEZIER_MOVE ): nId = mnPolyMoveId; break; - case( SID_BEZIER_INSERT ): nId = mnPolyInsertId; break; + case SID_BEZIER_MOVE: nId = mnPolyMoveId; break; + case SID_BEZIER_INSERT: nId = mnPolyInsertId; break; default: break; diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index cccbef8c476e..183338e3121b 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -40,12 +40,12 @@ void GraphCtrlUserCall::Changed( const SdrObject& rObj, SdrUserCallType eType, c { switch( eType ) { - case( SDRUSERCALL_MOVEONLY ): - case( SDRUSERCALL_RESIZE ): + case SDRUSERCALL_MOVEONLY: + case SDRUSERCALL_RESIZE: rWin.SdrObjChanged( rObj ); break; - case( SDRUSERCALL_INSERTED ): + case SDRUSERCALL_INSERTED: rWin.SdrObjCreated( rObj ); break; diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx index e86e8010af7d..eb492a9b4345 100644 --- a/svx/source/dialog/grfflt.cxx +++ b/svx/source/dialog/grfflt.cxx @@ -44,7 +44,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj switch( rReq.GetSlot() ) { - case( SID_GRFFILTER_INVERT ): + case SID_GRFFILTER_INVERT: { if( pShell ) pShell->SetWaitCursor( true ); @@ -69,7 +69,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj } break; - case( SID_GRFFILTER_SMOOTH ): + case SID_GRFFILTER_SMOOTH: { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) @@ -82,7 +82,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj } break; - case( SID_GRFFILTER_SHARPEN ): + case SID_GRFFILTER_SHARPEN: { if( pShell ) pShell->SetWaitCursor( true ); @@ -107,7 +107,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj } break; - case( SID_GRFFILTER_REMOVENOISE ): + case SID_GRFFILTER_REMOVENOISE: { if( pShell ) pShell->SetWaitCursor( true ); @@ -132,7 +132,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj } break; - case( SID_GRFFILTER_SOBEL ): + case SID_GRFFILTER_SOBEL: { if( pShell ) pShell->SetWaitCursor( true ); @@ -157,7 +157,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj } break; - case( SID_GRFFILTER_MOSAIC ): + case SID_GRFFILTER_MOSAIC: { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) @@ -170,7 +170,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj } break; - case( SID_GRFFILTER_EMBOSS ): + case SID_GRFFILTER_EMBOSS: { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) @@ -183,7 +183,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj } break; - case( SID_GRFFILTER_POSTER ): + case SID_GRFFILTER_POSTER: { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) @@ -196,7 +196,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj } break; - case( SID_GRFFILTER_POPART ): + case SID_GRFFILTER_POPART: { if( pShell ) pShell->SetWaitCursor( true ); @@ -221,7 +221,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj } break; - case( SID_GRFFILTER_SEPIA ): + case SID_GRFFILTER_SEPIA: { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) @@ -234,7 +234,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj } break; - case( SID_GRFFILTER_SOLARIZE ): + case SID_GRFFILTER_SOLARIZE: { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 0d8125e0ee04..39e801490e58 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -788,8 +788,8 @@ IMPL_LINK_TYPED( SvxIMapDlg, StateHdl, GraphCtrl*, pWnd, void ) switch( pWnd->GetPolyEditMode() ) { - case( SID_BEZIER_MOVE ): nId = mnPolyMoveId; break; - case( SID_BEZIER_INSERT ): nId = mnPolyInsertId; break; + case SID_BEZIER_MOVE: nId = mnPolyMoveId; break; + case SID_BEZIER_INSERT: nId = mnPolyInsertId; break; default: break; diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 397c708414d2..42e2fd42ec38 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -190,7 +190,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) switch( pIMapObj->GetType() ) { - case( IMAP_OBJ_RECTANGLE ): + case IMAP_OBJ_RECTANGLE: { const IMapRectangleObject* pIMapRectObj = static_cast<const IMapRectangleObject*>(pIMapObj); Rectangle aDrawRect( pIMapRectObj->GetRectangle( false ) ); @@ -203,7 +203,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) } break; - case( IMAP_OBJ_CIRCLE ): + case IMAP_OBJ_CIRCLE: { const IMapCircleObject* pIMapCircleObj = static_cast<const IMapCircleObject*>(pIMapObj); const Point aCenter( pIMapCircleObj->GetCenter( false ) ); @@ -219,7 +219,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) } break; - case( IMAP_OBJ_POLYGON ): + case IMAP_OBJ_POLYGON: { const IMapPolygonObject* pIMapPolyObj = static_cast<const IMapPolygonObject*>(pIMapObj); @@ -297,7 +297,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj ) { switch( rObj.GetObjIdentifier() ) { - case( OBJ_RECT ): + case OBJ_RECT: { SdrRectObj* pRectObj = const_cast<SdrRectObj*>(static_cast<const SdrRectObj*>(&rObj)); IMapRectangleObject* pObj = new IMapRectangleObject( pRectObj->GetLogicRect(), "", "", "", "", "", true, false ); @@ -306,7 +306,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj ) } break; - case( OBJ_CIRC ): + case OBJ_CIRC: { SdrCircObj* pCircObj = const_cast<SdrCircObj*>( static_cast<const SdrCircObj*>(&rObj) ); SdrPathObj* pPathObj = static_cast<SdrPathObj*>( pCircObj->ConvertToPolyObj( false, false ) ); @@ -319,10 +319,10 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj ) } break; - case( OBJ_POLY ): - case( OBJ_FREEFILL ): - case( OBJ_PATHPOLY ): - case( OBJ_PATHFILL ): + case OBJ_POLY: + case OBJ_FREEFILL: + case OBJ_PATHPOLY: + case OBJ_PATHFILL: { SdrPathObj* pPathObj = const_cast<SdrPathObj*>( static_cast<const SdrPathObj*>(&rObj) ); const basegfx::B2DPolyPolygon& rXPolyPoly = pPathObj->GetPathPoly(); @@ -365,14 +365,14 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj ) switch( rObj.GetObjIdentifier() ) { - case( OBJ_RECT ): + case OBJ_RECT: { pUserData->ReplaceObject( IMapObjectPtr(new IMapRectangleObject( static_cast<const SdrRectObj&>(rObj).GetLogicRect(), aURL, aAltText, aDesc, aTarget, "", bActive, false ) ) ); } break; - case( OBJ_CIRC ): + case OBJ_CIRC: { const SdrCircObj& rCircObj = static_cast<const SdrCircObj&>(rObj); SdrPathObj* pPathObj = static_cast<SdrPathObj*>( rCircObj.ConvertToPolyObj( false, false ) ); @@ -387,10 +387,10 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj ) } break; - case( OBJ_POLY ): - case( OBJ_FREEFILL ): - case( OBJ_PATHPOLY ): - case( OBJ_PATHFILL ): + case OBJ_POLY: + case OBJ_FREEFILL: + case OBJ_PATHPOLY: + case OBJ_PATHFILL: { const SdrPathObj& rPathObj = static_cast<const SdrPathObj&>(rObj); const basegfx::B2DPolyPolygon& rXPolyPoly = rPathObj.GetPathPoly(); @@ -713,15 +713,15 @@ IMPL_LINK_TYPED( IMapWindow, MenuSelectHdl, Menu*, pMenu, bool ) switch(nId) { - case( MN_URL ): + case MN_URL: DoPropertyDialog(); break; - case( MN_MACRO ): + case MN_MACRO: DoMacroAssign(); break; - case( MN_ACTIVATE ): + case MN_ACTIVATE: { const bool bNewState = !pMenu->IsItemChecked( MN_ACTIVATE ); @@ -731,27 +731,27 @@ IMPL_LINK_TYPED( IMapWindow, MenuSelectHdl, Menu*, pMenu, bool ) } break; - case( MN_FRAME_TO_TOP ): + case MN_FRAME_TO_TOP: pView->PutMarkedToTop(); break; - case( MN_MOREFRONT ): + case MN_MOREFRONT: pView->MovMarkedToTop(); break; - case( MN_MOREBACK ): + case MN_MOREBACK: pView->MovMarkedToBtm(); break; - case( MN_FRAME_TO_BOTTOM ): + case MN_FRAME_TO_BOTTOM: pView->PutMarkedToBtm(); break; - case( MN_MARK_ALL ): + case MN_MARK_ALL: pView->MarkAll(); break; - case( MN_DELETE1 ): + case MN_DELETE1: pView->DeleteMarked(); default : diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 6a2d7c063f8d..610ac8eb87f6 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -345,7 +345,7 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId ) { switch( nId ) { - case( MN_ACTUALIZE ): + case MN_ACTUALIZE: { GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this ); @@ -362,14 +362,14 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId ) } break; - case( MN_DELETE ): + case MN_DELETE: { if( ScopedVclPtrInstance<MessageDialog>::Create( nullptr, "QueryDeleteThemeDialog","svx/ui/querydeletethemedialog.ui")->Execute() == RET_YES ) mpGallery->RemoveTheme( mpThemes->GetSelectEntry() ); } break; - case( MN_RENAME ): + case MN_RENAME: { GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this ); const OUString aOldName( pTheme->GetName() ); @@ -402,7 +402,7 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId ) } break; - case( MN_ASSIGN_ID ): + case MN_ASSIGN_ID: { GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this ); @@ -424,7 +424,7 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId ) } break; - case( MN_PROPERTIES ): + case MN_PROPERTIES: { ImplGalleryThemeProperties( GetSelectedTheme(), false ); } @@ -521,43 +521,43 @@ bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow ) switch( rKEvt.GetKeyCode().GetCode() ) { - case( KEY_INSERT ): + case KEY_INSERT: ClickNewThemeHdl( nullptr ); break; - case( KEY_I ): + case KEY_I: { if( bMod1 ) ClickNewThemeHdl( nullptr ); } break; - case( KEY_U ): + case KEY_U: { if( bMod1 ) nExecuteId = MN_ACTUALIZE; } break; - case( KEY_DELETE ): + case KEY_DELETE: nExecuteId = MN_DELETE; break; - case( KEY_D ): + case KEY_D: { if( bMod1 ) nExecuteId = MN_DELETE; } break; - case( KEY_R ): + case KEY_R: { if( bMod1 ) nExecuteId = MN_RENAME; } break; - case( KEY_RETURN ): + case KEY_RETURN: { if( bMod1 ) nExecuteId = MN_PROPERTIES; diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 5f9913852c34..0a4cc54ad4b7 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -349,7 +349,7 @@ IMPL_LINK_TYPED( GalleryThemePopup, MenuSelectHdl, Menu*, pMenu, bool ) sal_uInt16 nId( pMenu->GetCurItemId() ); switch ( nId ) { - case( MN_ADD ): + case MN_ADD: { const CommandInfoMap::const_iterator it = m_aCommandInfo.find( SID_GALLERY_FORMATS ); if ( it != m_aCommandInfo.end() ) @@ -541,9 +541,9 @@ void GalleryBrowser2::Resize() switch( GetMode() ) { - case( GALLERYBROWSERMODE_ICON ): mpIconView->Show(); break; - case( GALLERYBROWSERMODE_LIST ): mpListView->Show(); break; - case( GALLERYBROWSERMODE_PREVIEW ): mpPreview->Show(); break; + case GALLERYBROWSERMODE_ICON: mpIconView->Show(); break; + case GALLERYBROWSERMODE_LIST: mpListView->Show(); break; + case GALLERYBROWSERMODE_PREVIEW: mpPreview->Show(); break; default: break; @@ -685,9 +685,9 @@ bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow ) switch( rKEvt.GetKeyCode().GetCode() ) { - case( KEY_SPACE ): - case( KEY_RETURN ): - case( KEY_P ): + case KEY_SPACE: + case KEY_RETURN: + case KEY_P: { if( bPreview ) { @@ -697,8 +697,8 @@ bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow ) } break; - case( KEY_INSERT ): - case( KEY_I ): + case KEY_INSERT: + case KEY_I: { // Inserting a gallery item in the document must be dispatched if( bValidURL ) @@ -709,15 +709,15 @@ bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow ) } break; - case( KEY_DELETE ): - case( KEY_D ): + case KEY_DELETE: + case KEY_D: { if( bDelete ) nExecuteId = MN_DELETE; } break; - case( KEY_T ): + case KEY_T: { if( bTitle ) nExecuteId = MN_TITLE; @@ -785,7 +785,7 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) switch( eMode ) { - case( GALLERYBROWSERMODE_ICON ): + case GALLERYBROWSERMODE_ICON: { mpListView->Hide(); @@ -803,7 +803,7 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) } break; - case( GALLERYBROWSERMODE_LIST ): + case GALLERYBROWSERMODE_LIST: { mpIconView->Hide(); @@ -821,7 +821,7 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) } break; - case( GALLERYBROWSERMODE_PREVIEW ): + case GALLERYBROWSERMODE_PREVIEW: { Graphic aGraphic; Point aSelPos; @@ -863,8 +863,8 @@ vcl::Window* GalleryBrowser2::GetViewWindow() const switch( GetMode() ) { - case( GALLERYBROWSERMODE_LIST ): pRet = mpListView; break; - case( GALLERYBROWSERMODE_PREVIEW ): pRet = mpPreview; break; + case GALLERYBROWSERMODE_LIST: pRet = mpListView; break; + case GALLERYBROWSERMODE_PREVIEW: pRet = mpPreview; break; default: pRet = mpIconView; @@ -887,10 +887,10 @@ void GalleryBrowser2::Travel( GalleryBrowserTravel eTravel ) switch( eTravel ) { - case( GALLERYBROWSERTRAVEL_FIRST ): nNewItemId = 1; break; - case( GALLERYBROWSERTRAVEL_LAST ): nNewItemId = mpCurTheme->GetObjectCount(); break; - case( GALLERYBROWSERTRAVEL_PREVIOUS ): nNewItemId--; break; - case( GALLERYBROWSERTRAVEL_NEXT ): nNewItemId++; break; + case GALLERYBROWSERTRAVEL_FIRST: nNewItemId = 1; break; + case GALLERYBROWSERTRAVEL_LAST: nNewItemId = mpCurTheme->GetObjectCount(); break; + case GALLERYBROWSERTRAVEL_PREVIOUS: nNewItemId--; break; + case GALLERYBROWSERTRAVEL_NEXT: nNewItemId++; break; default: break; } @@ -945,9 +945,9 @@ void GalleryBrowser2::ImplUpdateViews( sal_uInt16 nSelectionId ) switch( GetMode() ) { - case( GALLERYBROWSERMODE_ICON ): mpIconView->Show(); break; - case( GALLERYBROWSERMODE_LIST ): mpListView->Show(); break; - case( GALLERYBROWSERMODE_PREVIEW ): mpPreview->Show(); break; + case GALLERYBROWSERMODE_ICON: mpIconView->Show(); break; + case GALLERYBROWSERMODE_LIST: mpListView->Show(); break; + case GALLERYBROWSERMODE_PREVIEW: mpPreview->Show(); break; default: break; @@ -1053,7 +1053,7 @@ void GalleryBrowser2::Dispatch( switch( nId ) { - case( MN_ADD ): + case MN_ADD: { css::uno::Reference< css::frame::XDispatch > xDispatch( rxDispatch ); css::util::URL aURL = rURL; @@ -1085,15 +1085,15 @@ void GalleryBrowser2::Dispatch( switch( mpCurTheme->GetObjectKind( mnCurActionPos ) ) { - case( SGA_OBJ_BMP ): - case( SGA_OBJ_ANIM ): - case( SGA_OBJ_INET ): + case SGA_OBJ_BMP: + case SGA_OBJ_ANIM: + case SGA_OBJ_INET: // TODO drawing objects are inserted as drawings only via drag&drop - case( SGA_OBJ_SVDRAW ): + case SGA_OBJ_SVDRAW: nType = css::gallery::GalleryItemType::GRAPHIC; break; - case ( SGA_OBJ_SOUND ) : + case SGA_OBJ_SOUND : nType = css::gallery::GalleryItemType::MEDIA; break; @@ -1152,11 +1152,11 @@ void GalleryBrowser2::Execute( sal_uInt16 nId ) switch( nId ) { - case( MN_PREVIEW ): + case MN_PREVIEW: SetMode( ( GALLERYBROWSERMODE_PREVIEW != GetMode() ) ? GALLERYBROWSERMODE_PREVIEW : meLastMode ); break; - case( MN_DELETE ): + case MN_DELETE: { if( !mpCurTheme->IsReadOnly() && ScopedVclPtrInstance<MessageDialog>::Create(nullptr, "QueryDeleteObjectDialog","svx/ui/querydeleteobjectdialog.ui")->Execute() == RET_YES ) @@ -1166,7 +1166,7 @@ void GalleryBrowser2::Execute( sal_uInt16 nId ) } break; - case( MN_TITLE ): + case MN_TITLE: { SgaObject* pObj = mpCurTheme->AcquireObject( mnCurActionPos ); @@ -1199,15 +1199,15 @@ void GalleryBrowser2::Execute( sal_uInt16 nId ) } break; - case( MN_COPYCLIPBOARD ): + case MN_COPYCLIPBOARD: { vcl::Window* pWindow; switch( GetMode() ) { - case( GALLERYBROWSERMODE_ICON ): pWindow = static_cast<vcl::Window*>(mpIconView); break; - case( GALLERYBROWSERMODE_LIST ): pWindow = static_cast<vcl::Window*>(mpListView); break; - case( GALLERYBROWSERMODE_PREVIEW ): pWindow = static_cast<vcl::Window*>(mpPreview); break; + case GALLERYBROWSERMODE_ICON: pWindow = static_cast<vcl::Window*>(mpIconView); break; + case GALLERYBROWSERMODE_LIST: pWindow = static_cast<vcl::Window*>(mpListView); break; + case GALLERYBROWSERMODE_PREVIEW: pWindow = static_cast<vcl::Window*>(mpPreview); break; default: pWindow = nullptr; @@ -1218,7 +1218,7 @@ void GalleryBrowser2::Execute( sal_uInt16 nId ) } break; - case( MN_PASTECLIPBOARD ): + case MN_PASTECLIPBOARD: { if( !mpCurTheme->IsReadOnly() ) { diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 2de5c1083986..22714c929aa1 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -172,25 +172,25 @@ void GalleryPreview::KeyInput(const KeyEvent& rKEvt) switch( rKEvt.GetKeyCode().GetCode() ) { - case( KEY_BACKSPACE ): + case KEY_BACKSPACE: pBrowser->TogglePreview( this ); break; - case( KEY_HOME ): + case KEY_HOME: pBrowser->Travel( GALLERYBROWSERTRAVEL_FIRST ); break; - case( KEY_END ): + case KEY_END: pBrowser->Travel( GALLERYBROWSERTRAVEL_LAST ); break; - case( KEY_LEFT ): - case( KEY_UP ): + case KEY_LEFT: + case KEY_UP: pBrowser->Travel( GALLERYBROWSERTRAVEL_PREVIOUS ); break; - case( KEY_RIGHT ): - case( KEY_DOWN ): + case KEY_RIGHT: + case KEY_DOWN: pBrowser->Travel( GALLERYBROWSERTRAVEL_NEXT ); break; diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 47b5dab49fa7..7ffa2d0802f3 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -451,37 +451,37 @@ OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const switch( nThemeId ) { - case( GALLERY_THEME_3D ): + case GALLERY_THEME_3D: aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_3D); break; - case( GALLERY_THEME_BULLETS ): + case GALLERY_THEME_BULLETS: aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_BULLETS); break; - case( GALLERY_THEME_HOMEPAGE ): + case GALLERY_THEME_HOMEPAGE: aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_HOMEPAGE); break; - case( GALLERY_THEME_POWERPOINT ): + case GALLERY_THEME_POWERPOINT: aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_POWERPOINT); break; - case( GALLERY_THEME_FONTWORK ): + case GALLERY_THEME_FONTWORK: aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_FONTWORK); break; - case( GALLERY_THEME_FONTWORK_VERTICAL ): + case GALLERY_THEME_FONTWORK_VERTICAL: aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_FONTWORK_VERTICAL); break; - case( GALLERY_THEME_SOUNDS ): + case GALLERY_THEME_SOUNDS: aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_SOUNDS); break; - case( RID_GALLERYSTR_THEME_ARROWS ): - case( RID_GALLERYSTR_THEME_COMPUTERS ): - case( RID_GALLERYSTR_THEME_DIAGRAMS ): - case( RID_GALLERYSTR_THEME_EDUCATION ): - case( RID_GALLERYSTR_THEME_ENVIRONMENT ): - case( RID_GALLERYSTR_THEME_FINANCE ): - case( RID_GALLERYSTR_THEME_PEOPLE ): - case( RID_GALLERYSTR_THEME_SYMBOLS ): - case( RID_GALLERYSTR_THEME_TRANSPORT ): - case( RID_GALLERYSTR_THEME_TXTSHAPES ): + case RID_GALLERYSTR_THEME_ARROWS: + case RID_GALLERYSTR_THEME_COMPUTERS: + case RID_GALLERYSTR_THEME_DIAGRAMS: + case RID_GALLERYSTR_THEME_EDUCATION: + case RID_GALLERYSTR_THEME_ENVIRONMENT: + case RID_GALLERYSTR_THEME_FINANCE: + case RID_GALLERYSTR_THEME_PEOPLE: + case RID_GALLERYSTR_THEME_SYMBOLS: + case RID_GALLERYSTR_THEME_TRANSPORT: + case RID_GALLERYSTR_THEME_TXTSHAPES: aFallback = GAL_RESSTR(static_cast<sal_uInt32>(nThemeId)); break; default: diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index c7b16d64eb67..e9ebccda2bd3 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -418,7 +418,7 @@ void GalleryTransferable::InitData( bool bLazy ) { switch( meObjectKind ) { - case( SGA_OBJ_SVDRAW ): + case SGA_OBJ_SVDRAW: { if( !bLazy ) { @@ -444,10 +444,10 @@ void GalleryTransferable::InitData( bool bLazy ) } break; - case( SGA_OBJ_ANIM ): - case( SGA_OBJ_BMP ): - case( SGA_OBJ_INET ): - case( SGA_OBJ_SOUND ): + case SGA_OBJ_ANIM: + case SGA_OBJ_BMP: + case SGA_OBJ_INET: + case SGA_OBJ_SOUND: { if( !mpURL ) { diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 87bf5ae779a2..81393ea2098d 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -343,13 +343,13 @@ BitmapEx SgaObjectSound::GetThumbBmp() const switch( eSoundType ) { - case( SOUND_COMPUTER ): nId = RID_SVXBMP_GALLERY_SOUND_1; break; - case( SOUND_MISC ): nId = RID_SVXBMP_GALLERY_SOUND_2; break; - case( SOUND_MUSIC ): nId = RID_SVXBMP_GALLERY_SOUND_3; break; - case( SOUND_NATURE ): nId = RID_SVXBMP_GALLERY_SOUND_4; break; - case( SOUND_SPEECH ): nId = RID_SVXBMP_GALLERY_SOUND_5; break; - case( SOUND_TECHNIC ): nId = RID_SVXBMP_GALLERY_SOUND_6; break; - case( SOUND_ANIMAL ): nId = RID_SVXBMP_GALLERY_SOUND_7; break; + case SOUND_COMPUTER: nId = RID_SVXBMP_GALLERY_SOUND_1; break; + case SOUND_MISC: nId = RID_SVXBMP_GALLERY_SOUND_2; break; + case SOUND_MUSIC: nId = RID_SVXBMP_GALLERY_SOUND_3; break; + case SOUND_NATURE: nId = RID_SVXBMP_GALLERY_SOUND_4; break; + case SOUND_SPEECH: nId = RID_SVXBMP_GALLERY_SOUND_5; break; + case SOUND_TECHNIC: nId = RID_SVXBMP_GALLERY_SOUND_6; break; + case SOUND_ANIMAL: nId = RID_SVXBMP_GALLERY_SOUND_7; break; // standard default: diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 0b90af5b9e88..8f1cdb1c6d80 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -167,11 +167,11 @@ SgaObject* GalleryTheme::ImplReadSgaObject( GalleryObject* pEntry ) switch( pEntry->eObjKind ) { - case( SGA_OBJ_BMP ): pSgaObj = new SgaObjectBmp(); break; - case( SGA_OBJ_ANIM ): pSgaObj = new SgaObjectAnim(); break; - case( SGA_OBJ_INET ): pSgaObj = new SgaObjectINet(); break; - case( SGA_OBJ_SVDRAW ): pSgaObj = new SgaObjectSvDraw(); break; - case( SGA_OBJ_SOUND ): pSgaObj = new SgaObjectSound(); break; + case SGA_OBJ_BMP: pSgaObj = new SgaObjectBmp(); break; + case SGA_OBJ_ANIM: pSgaObj = new SgaObjectAnim(); break; + case SGA_OBJ_INET: pSgaObj = new SgaObjectINet(); break; + case SGA_OBJ_SVDRAW: pSgaObj = new SgaObjectSvDraw(); break; + case SGA_OBJ_SOUND: pSgaObj = new SgaObjectSound(); break; default: break; @@ -267,16 +267,16 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ConvertDat { switch( nFormat ) { - case( ConvertDataFormat::BMP ): pExt = ".bmp"; break; - case( ConvertDataFormat::GIF ): pExt = ".gif"; break; - case( ConvertDataFormat::JPG ): pExt = ".jpg"; break; - case( ConvertDataFormat::MET ): pExt = ".met"; break; - case( ConvertDataFormat::PCT ): pExt = ".pct"; break; - case( ConvertDataFormat::PNG ): pExt = ".png"; break; - case( ConvertDataFormat::SVM ): pExt = ".svm"; break; - case( ConvertDataFormat::TIF ): pExt = ".tif"; break; - case( ConvertDataFormat::WMF ): pExt = ".wmf"; break; - case( ConvertDataFormat::EMF ): pExt = ".emf"; break; + case ConvertDataFormat::BMP: pExt = ".bmp"; break; + case ConvertDataFormat::GIF: pExt = ".gif"; break; + case ConvertDataFormat::JPG: pExt = ".jpg"; break; + case ConvertDataFormat::MET: pExt = ".met"; break; + case ConvertDataFormat::PCT: pExt = ".pct"; break; + case ConvertDataFormat::PNG: pExt = ".png"; break; + case ConvertDataFormat::SVM: pExt = ".svm"; break; + case ConvertDataFormat::TIF: pExt = ".tif"; break; + case ConvertDataFormat::WMF: pExt = ".wmf"; break; + case ConvertDataFormat::EMF: pExt = ".emf"; break; default: pExt = ".grf"; @@ -626,11 +626,11 @@ void GalleryTheme::Actualize( const Link<const INetURLObject&, void>& rActualize switch( pEntry->eObjKind ) { - case( SGA_OBJ_BMP ): pObj.reset(new SgaObjectBmp()); break; - case( SGA_OBJ_ANIM ): pObj.reset(new SgaObjectAnim()); break; - case( SGA_OBJ_INET ): pObj.reset(new SgaObjectINet()); break; - case( SGA_OBJ_SVDRAW ): pObj.reset(new SgaObjectSvDraw()); break; - case (SGA_OBJ_SOUND): pObj.reset(new SgaObjectSound()); break; + case SGA_OBJ_BMP: pObj.reset(new SgaObjectBmp()); break; + case SGA_OBJ_ANIM: pObj.reset(new SgaObjectAnim()); break; + case SGA_OBJ_INET: pObj.reset(new SgaObjectINet()); break; + case SGA_OBJ_SVDRAW: pObj.reset(new SgaObjectSvDraw()); break; + case SGA_OBJ_SOUND: pObj.reset(new SgaObjectSound()); break; default: break; @@ -782,16 +782,16 @@ bool GalleryTheme::GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, bool bProgre switch( pObject->eObjKind ) { - case( SGA_OBJ_BMP ): - case( SGA_OBJ_ANIM ): - case( SGA_OBJ_INET ): + case SGA_OBJ_BMP: + case SGA_OBJ_ANIM: + case SGA_OBJ_INET: { OUString aFilterDummy; bRet = ( GalleryGraphicImport( aURL, rGraphic, aFilterDummy, bProgress ) != GalleryGraphicImportRet::IMPORT_NONE ); } break; - case( SGA_OBJ_SVDRAW ): + case SGA_OBJ_SVDRAW: { SvxGalleryDrawModel aModel; @@ -820,7 +820,7 @@ bool GalleryTheme::GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, bool bProgre } break; - case( SGA_OBJ_SOUND ): + case SGA_OBJ_SOUND: { SgaObject* pObj = AcquireObject( nPos ); @@ -857,20 +857,20 @@ bool GalleryTheme::InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPo { switch( aGfxLink.GetType() ) { - case( GFX_LINK_TYPE_EPS_BUFFER ): nExportFormat = ConvertDataFormat::SVM; break; - case( GFX_LINK_TYPE_NATIVE_GIF ): nExportFormat = ConvertDataFormat::GIF; break; + case GFX_LINK_TYPE_EPS_BUFFER: nExportFormat = ConvertDataFormat::SVM; break; + case GFX_LINK_TYPE_NATIVE_GIF: nExportFormat = ConvertDataFormat::GIF; break; // #i15508# added BMP type // could not find/trigger a call to this, but should do no harm - case( GFX_LINK_TYPE_NATIVE_BMP ): nExportFormat = ConvertDataFormat::BMP; break; - - case( GFX_LINK_TYPE_NATIVE_JPG ): nExportFormat = ConvertDataFormat::JPG; break; - case( GFX_LINK_TYPE_NATIVE_PNG ): nExportFormat = ConvertDataFormat::PNG; break; - case( GFX_LINK_TYPE_NATIVE_TIF ): nExportFormat = ConvertDataFormat::TIF; break; - case( GFX_LINK_TYPE_NATIVE_WMF ): nExportFormat = ConvertDataFormat::WMF; break; - case( GFX_LINK_TYPE_NATIVE_MET ): nExportFormat = ConvertDataFormat::MET; break; - case( GFX_LINK_TYPE_NATIVE_PCT ): nExportFormat = ConvertDataFormat::PCT; break; - case( GFX_LINK_TYPE_NATIVE_SVG ): nExportFormat = ConvertDataFormat::SVG; break; + case GFX_LINK_TYPE_NATIVE_BMP: nExportFormat = ConvertDataFormat::BMP; break; + + case GFX_LINK_TYPE_NATIVE_JPG: nExportFormat = ConvertDataFormat::JPG; break; + case GFX_LINK_TYPE_NATIVE_PNG: nExportFormat = ConvertDataFormat::PNG; break; + case GFX_LINK_TYPE_NATIVE_TIF: nExportFormat = ConvertDataFormat::TIF; break; + case GFX_LINK_TYPE_NATIVE_WMF: nExportFormat = ConvertDataFormat::WMF; break; + case GFX_LINK_TYPE_NATIVE_MET: nExportFormat = ConvertDataFormat::MET; break; + case GFX_LINK_TYPE_NATIVE_PCT: nExportFormat = ConvertDataFormat::PCT; break; + case GFX_LINK_TYPE_NATIVE_SVG: nExportFormat = ConvertDataFormat::SVG; break; default: break; } diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index b9736b2e0ede..87bd59ba9cac 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -1132,13 +1132,13 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaHatchAction& rAct ) switch(rHatch.GetStyle()) { - case(HATCH_TRIPLE) : + case HATCH_TRIPLE : { eStyle = css::drawing::HatchStyle_TRIPLE; break; } - case(HATCH_DOUBLE) : + case HATCH_DOUBLE : { eStyle = css::drawing::HatchStyle_DOUBLE; break; diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 26165e854741..fe478d6ea1d4 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -664,7 +664,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) } break; - case( SID_ATTR_GRAF_CROP ): + case SID_ATTR_GRAF_CROP: { const SdrMarkList& rMarkList = rView.GetMarkedObjectList(); @@ -869,7 +869,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) switch( nSlotId ) { - case( SID_ATTR_GRAF_MODE ): + case SID_ATTR_GRAF_MODE: { if( SfxItemState::DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFMODE ) ) { @@ -886,7 +886,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) } break; - case( SID_ATTR_GRAF_RED ): + case SID_ATTR_GRAF_RED: { if( SfxItemState::DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFRED ) ) { @@ -903,7 +903,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) } break; - case( SID_ATTR_GRAF_GREEN ): + case SID_ATTR_GRAF_GREEN: { if( SfxItemState::DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFGREEN ) ) { @@ -920,7 +920,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) } break; - case( SID_ATTR_GRAF_BLUE ): + case SID_ATTR_GRAF_BLUE: { if( SfxItemState::DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFBLUE ) ) { @@ -937,7 +937,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) } break; - case( SID_ATTR_GRAF_LUMINANCE ): + case SID_ATTR_GRAF_LUMINANCE: { if( SfxItemState::DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFLUMINANCE ) ) { @@ -954,7 +954,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) } break; - case( SID_ATTR_GRAF_CONTRAST ): + case SID_ATTR_GRAF_CONTRAST: { if( SfxItemState::DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFCONTRAST ) ) { @@ -971,7 +971,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) } break; - case( SID_ATTR_GRAF_GAMMA ): + case SID_ATTR_GRAF_GAMMA: { if( SfxItemState::DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFGAMMA ) ) { @@ -988,7 +988,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) } break; - case( SID_ATTR_GRAF_TRANSPARENCE ): + case SID_ATTR_GRAF_TRANSPARENCE: { if( SfxItemState::DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFTRANSPARENCE ) ) { @@ -1005,7 +1005,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) } break; - case( SID_ATTR_GRAF_CROP ): + case SID_ATTR_GRAF_CROP: { if( !bEnableCrop ) rSet.DisableItem( nSlotId ); diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index ea4669fc8872..45c34631299a 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -825,7 +825,7 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr } break; - case( OWN_ATTR_MEDIA_LOOP ): + case OWN_ATTR_MEDIA_LOOP: { bool bLoop; @@ -837,7 +837,7 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr } break; - case( OWN_ATTR_MEDIA_MUTE ): + case OWN_ATTR_MEDIA_MUTE: { bool bMute; @@ -849,7 +849,7 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr } break; - case( OWN_ATTR_MEDIA_VOLUMEDB ): + case OWN_ATTR_MEDIA_VOLUMEDB: { sal_Int16 nVolumeDB = sal_Int16(); @@ -861,7 +861,7 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr } break; - case( OWN_ATTR_MEDIA_ZOOM ): + case OWN_ATTR_MEDIA_ZOOM: { css::media::ZoomLevel eLevel; @@ -946,19 +946,19 @@ bool SvxMediaShape::getPropertyValueImpl( const OUString& rName, const SfxItemPr rValue <<= aItem.getURL(); break; - case( OWN_ATTR_MEDIA_LOOP ): + case OWN_ATTR_MEDIA_LOOP: rValue <<= aItem.isLoop(); break; - case( OWN_ATTR_MEDIA_MUTE ): + case OWN_ATTR_MEDIA_MUTE: rValue <<= aItem.isMute(); break; - case( OWN_ATTR_MEDIA_VOLUMEDB ): + case OWN_ATTR_MEDIA_VOLUMEDB: rValue <<= (sal_Int16) aItem.getVolumeDB(); break; - case( OWN_ATTR_MEDIA_ZOOM ): + case OWN_ATTR_MEDIA_ZOOM: rValue <<= aItem.getZoom(); break; diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index 2b4e23d455d7..af4a2507ad7d 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -182,12 +182,12 @@ sal_Int8 SAL_CALL GalleryItem::getType() { switch( implGetObject()->eObjKind ) { - case( SGA_OBJ_SOUND ): - case( SGA_OBJ_VIDEO ): + case SGA_OBJ_SOUND: + case SGA_OBJ_VIDEO: nRet = gallery::GalleryItemType::MEDIA; break; - case( SGA_OBJ_SVDRAW ): + case SGA_OBJ_SVDRAW: nRet = gallery::GalleryItemType::DRAWING; break; @@ -292,13 +292,13 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt { switch( (*ppEntries)->mnHandle ) { - case( UNOGALLERY_GALLERYITEMTYPE ): + case UNOGALLERY_GALLERYITEMTYPE: { *pValue <<= sal_Int8( getType() ); } break; - case( UNOGALLERY_URL ): + case UNOGALLERY_URL: { ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : nullptr ); @@ -307,7 +307,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt } break; - case( UNOGALLERY_TITLE ): + case UNOGALLERY_TITLE: { ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : nullptr ); @@ -324,7 +324,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt } break; - case( UNOGALLERY_THUMBNAIL ): + case UNOGALLERY_THUMBNAIL: { ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : nullptr ); @@ -348,7 +348,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt } break; - case( UNOGALLERY_GRAPHIC ): + case UNOGALLERY_GRAPHIC: { ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : nullptr ); Graphic aGraphic; @@ -358,7 +358,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt } break; - case( UNOGALLERY_DRAWING ): + case UNOGALLERY_DRAWING: { if( gallery::GalleryItemType::DRAWING == getType() ) { diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 9a5ee24952f7..86b2d2f0c5ba 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -674,17 +674,17 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const OUString& rURLStr, sal_uInt { switch( aGfxLink.GetType() ) { - case( GFX_LINK_TYPE_EPS_BUFFER ): aExtension = ".eps"; break; - case( GFX_LINK_TYPE_NATIVE_GIF ): aExtension = ".gif"; break; + case GFX_LINK_TYPE_EPS_BUFFER: aExtension = ".eps"; break; + case GFX_LINK_TYPE_NATIVE_GIF: aExtension = ".gif"; break; // #i15508# added BMP type for better exports (checked, works) - case( GFX_LINK_TYPE_NATIVE_BMP ): aExtension = ".bmp"; break; - case( GFX_LINK_TYPE_NATIVE_JPG ): aExtension = ".jpg"; break; - case( GFX_LINK_TYPE_NATIVE_PNG ): aExtension = ".png"; break; - case( GFX_LINK_TYPE_NATIVE_TIF ): aExtension = ".tif"; break; - case( GFX_LINK_TYPE_NATIVE_WMF ): aExtension = ".wmf"; break; - case( GFX_LINK_TYPE_NATIVE_MET ): aExtension = ".met"; break; - case( GFX_LINK_TYPE_NATIVE_PCT ): aExtension = ".pct"; break; - case( GFX_LINK_TYPE_NATIVE_SVG ): + case GFX_LINK_TYPE_NATIVE_BMP: aExtension = ".bmp"; break; + case GFX_LINK_TYPE_NATIVE_JPG: aExtension = ".jpg"; break; + case GFX_LINK_TYPE_NATIVE_PNG: aExtension = ".png"; break; + case GFX_LINK_TYPE_NATIVE_TIF: aExtension = ".tif"; break; + case GFX_LINK_TYPE_NATIVE_WMF: aExtension = ".wmf"; break; + case GFX_LINK_TYPE_NATIVE_MET: aExtension = ".met"; break; + case GFX_LINK_TYPE_NATIVE_PCT: aExtension = ".pct"; break; + case GFX_LINK_TYPE_NATIVE_SVG: // backward-compat kludge: since no released OOo // version to date can handle svg properly, wrap it up // into an svm. slight catch22 here, since strict ODF diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 90e11b12094b..923d67babfe6 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -184,13 +184,13 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, OUString& rFileNam switch( aGfxLink.GetType() ) { - case( GFX_LINK_TYPE_NATIVE_GIF ): aExt = FORMAT_GIF; break; + case GFX_LINK_TYPE_NATIVE_GIF: aExt = FORMAT_GIF; break; // #i15508# added BMP type for better exports (no call/trigger found, prob used in HTML export) - case( GFX_LINK_TYPE_NATIVE_BMP ): aExt = FORMAT_BMP; break; + case GFX_LINK_TYPE_NATIVE_BMP: aExt = FORMAT_BMP; break; - case( GFX_LINK_TYPE_NATIVE_JPG ): aExt = FORMAT_JPG; break; - case( GFX_LINK_TYPE_NATIVE_PNG ): aExt = FORMAT_PNG; break; + case GFX_LINK_TYPE_NATIVE_JPG: aExt = FORMAT_JPG; break; + case GFX_LINK_TYPE_NATIVE_PNG: aExt = FORMAT_PNG; break; default: break; @@ -336,15 +336,15 @@ bool XOutBitmap::GraphicToBase64(const Graphic& rGraphic, OUString& rOUString) ConvertDataFormat aCvtType; switch( aLink.GetType() ) { - case( GFX_LINK_TYPE_NATIVE_JPG ): + case GFX_LINK_TYPE_NATIVE_JPG: aCvtType = ConvertDataFormat::JPG; aMimeType = "image/jpeg"; break; - case( GFX_LINK_TYPE_NATIVE_PNG ): + case GFX_LINK_TYPE_NATIVE_PNG: aCvtType = ConvertDataFormat::PNG; aMimeType = "image/png"; break; - case( GFX_LINK_TYPE_NATIVE_SVG ): + case GFX_LINK_TYPE_NATIVE_SVG: aCvtType = ConvertDataFormat::SVG; aMimeType = "image/svg+xml"; break; diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx index baba8f187397..59953c73df16 100644 --- a/sw/source/uibase/shells/mediash.cxx +++ b/sw/source/uibase/shells/mediash.cxx @@ -107,7 +107,7 @@ void SwMediaShell::ExecMedia(SfxRequest &rReq) } break; - case( SID_AVMEDIA_TOOLBOX ): + case SID_AVMEDIA_TOOLBOX: { if( pSh->IsObjSelected() ) { 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: |