summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-02-18 08:26:33 +0200
committerNoel Grandin <noel@peralex.com>2016-03-15 08:52:23 +0200
commit52e438caafc3cd24b3759b08c1aaee88e5b67877 (patch)
treeceb8aef8dd12c2b81caf2138ac194b086d9a77ff /svx
parenta0d5f0896ed7f2de8ceffd664ee469a383ce7d53 (diff)
remove unnecessary parentheses in case labels
Change-Id: I987bf68c767709080c67c8b183c036a4109c6caa
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/_bmpmask.cxx30
-rw-r--r--svx/source/dialog/_contdlg.cxx4
-rw-r--r--svx/source/dialog/graphctl.cxx6
-rw-r--r--svx/source/dialog/grfflt.cxx22
-rw-r--r--svx/source/dialog/imapdlg.cxx4
-rw-r--r--svx/source/dialog/imapwnd.cxx48
-rw-r--r--svx/source/gallery2/galbrws1.cxx24
-rw-r--r--svx/source/gallery2/galbrws2.cxx76
-rw-r--r--svx/source/gallery2/galctrl.cxx14
-rw-r--r--svx/source/gallery2/gallery1.cxx34
-rw-r--r--svx/source/gallery2/galmisc.cxx10
-rw-r--r--svx/source/gallery2/galobj.cxx14
-rw-r--r--svx/source/gallery2/galtheme.cxx72
-rw-r--r--svx/source/svdraw/svdfmtf.cxx4
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx20
-rw-r--r--svx/source/unodraw/unoshap4.cxx16
-rw-r--r--svx/source/unogallery/unogalitem.cxx18
-rw-r--r--svx/source/xml/xmlgrhlp.cxx20
-rw-r--r--svx/source/xoutdev/_xoutbmp.cxx14
19 files changed, 225 insertions, 225 deletions
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;