[Libreoffice-commits] core.git: avmedia/source cui/source extensions/source filter/source oox/source sd/source sfx2/source svtools/source svx/source sw/source vcl/source vcl/unx vcl/win
Noel Grandin
noel at peralex.com
Tue Mar 15 07:38:30 UTC 2016
avmedia/source/framework/mediacontrol.cxx | 24 +--
avmedia/source/win/player.cxx | 2
avmedia/source/win/window.cxx | 26 ++--
cui/source/dialogs/cuigrfflt.cxx | 18 +-
extensions/source/scanner/scanwin.cxx | 34 ++---
filter/source/flash/swfwriter1.cxx | 112 ++++++++---------
oox/source/export/vmlexport.cxx | 2
sd/source/core/drawdoc4.cxx | 6
sd/source/core/sdobjfac.cxx | 4
sd/source/ui/app/sdxfer.cxx | 4
sd/source/ui/view/drviews6.cxx | 4
sfx2/source/appl/workwin.cxx | 16 +-
svtools/source/graphic/descriptor.cxx | 84 ++++++------
svtools/source/graphic/grfcache.cxx | 8 -
svtools/source/graphic/grfmgr2.cxx | 18 +-
svtools/source/graphic/renderer.cxx | 12 -
svtools/source/misc/imap.cxx | 36 ++---
svtools/source/misc/imap2.cxx | 24 +--
svtools/source/svhtml/htmlout.cxx | 6
svx/source/dialog/_bmpmask.cxx | 30 ++--
svx/source/dialog/_contdlg.cxx | 4
svx/source/dialog/graphctl.cxx | 6
svx/source/dialog/grfflt.cxx | 22 +--
svx/source/dialog/imapdlg.cxx | 4
svx/source/dialog/imapwnd.cxx | 48 +++----
svx/source/gallery2/galbrws1.cxx | 24 +--
svx/source/gallery2/galbrws2.cxx | 76 +++++------
svx/source/gallery2/galctrl.cxx | 14 +-
svx/source/gallery2/gallery1.cxx | 34 ++---
svx/source/gallery2/galmisc.cxx | 10 -
svx/source/gallery2/galobj.cxx | 14 +-
svx/source/gallery2/galtheme.cxx | 72 +++++------
svx/source/svdraw/svdfmtf.cxx | 4
svx/source/tbxctrls/grafctrl.cxx | 20 +--
svx/source/unodraw/unoshap4.cxx | 16 +-
svx/source/unogallery/unogalitem.cxx | 18 +-
svx/source/xml/xmlgrhlp.cxx | 20 +--
svx/source/xoutdev/_xoutbmp.cxx | 14 +-
sw/source/uibase/shells/mediash.cxx | 2
vcl/source/control/slider.cxx | 2
vcl/source/filter/igif/gifread.cxx | 18 +-
vcl/source/gdi/bitmap.cxx | 16 +-
vcl/source/gdi/bitmap3.cxx | 20 +--
vcl/source/gdi/bitmap4.cxx | 20 +--
vcl/source/gdi/bmpacc.cxx | 32 ++--
vcl/source/gdi/dibtools.cxx | 36 ++---
vcl/source/gdi/gfxlink.cxx | 20 +--
vcl/source/gdi/impgraph.cxx | 54 ++++----
vcl/source/gdi/print.cxx | 8 -
vcl/source/gdi/svmconverter.cxx | 194 +++++++++++++++---------------
vcl/source/outdev/bitmap.cxx | 14 +-
vcl/unx/generic/gdi/salbmp.cxx | 34 ++---
vcl/win/gdi/salprn.cxx | 194 +++++++++++++++---------------
53 files changed, 777 insertions(+), 777 deletions(-)
New commits:
commit 52e438caafc3cd24b3759b08c1aaee88e5b67877
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 18 08:26:33 2016 +0200
remove unnecessary parentheses in case labels
Change-Id: I987bf68c767709080c67c8b183c036a4109c6caa
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 8728fdf..78ef5fb 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 5bb45e0..c61305d 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 4c13f07..64bd7c4 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 6a6af45..4f0cea0 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 009fec2..027b2ec 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 0bf5aca..48ff561 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 1055b2b..9c069e9 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 47c16c1..f02acee 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 b25c4b8..5d2c7bf 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 aea5e11..52ed60c 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 5480397..d34b08f 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 b5d8267..8a47c30 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 f9e64af..a911317 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 623e7b1..5ef6e87 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 fc9d819..b71c56b 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 f40036c..250be8d 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 c2ad3f1..e1e5c59 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 b9fb6ca..2821175 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 4347544..477c24d 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 a245564..9156d26 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 d948c3a..93e3d91 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 cccbef8..183338e 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 e86e801..eb492a9 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 0d8125e..39e8014 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 397c708..42e2fd4 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 6a2d7c0..610ac8e 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 5f99138..0a4cc54 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 2de5c10..22714c9 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 47b5dab..7ffa2d0 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 c7b16d6..e9ebccd 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 87bf5ae..81393ea 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 0b90af5..8f1cdb1 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 b9736b2..87bd59b 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 26165e8..fe478d6 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;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list