Skip to content

C
core
Kaydet (Commit) dccd1633 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

loplugin:unnecessaryparen include case statements 

Change-Id: I79fb3eec0d5d466e33b2e18621a7169695edf82f
Reviewed-on: https://gerrit.libreoffice.org/41920Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 9c34471f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 180 additions and 181 deletions
avmedia/source/framework/MediaControlBase.cxx
Dosyayı görüntüle @ dccd1633
......@@ -180,19 +180,19 @@ void MediaControlBase::UpdateToolBoxes(MediaItem aMediaItem)
switch( aMediaItem.getZoom() )
{
case( css::media::ZoomLevel_ZOOM_1_TO_2 ):
case css::media::ZoomLevel_ZOOM_1_TO_2:
nSelectEntryPos = AVMEDIA_ZOOMLEVEL_50;
break;
case( css::media::ZoomLevel_ORIGINAL ):
case css::media::ZoomLevel_ORIGINAL:
nSelectEntryPos = AVMEDIA_ZOOMLEVEL_100;
break;
case( css::media::ZoomLevel_ZOOM_2_TO_1 ):
case css::media::ZoomLevel_ZOOM_2_TO_1:
nSelectEntryPos = AVMEDIA_ZOOMLEVEL_200;
break;
case( css::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT ):
case css::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT:
nSelectEntryPos = AVMEDIA_ZOOMLEVEL_FIT;
break;
case( css::media::ZoomLevel_FIT_TO_WINDOW ):
case css::media::ZoomLevel_FIT_TO_WINDOW:
nSelectEntryPos = AVMEDIA_ZOOMLEVEL_SCALED;
break;
......
compilerplugins/clang/test/unnecessaryparen.cxx
Dosyayı görüntüle @ dccd1633
......@@ -23,10 +23,9 @@ int main()
int y = (x); // expected-error {{unnecessary parentheses around identifier [loplugin:unnecessaryparen]}}
(void)y;
// lots of our code uses this style, which I'm loathe to bulk-fix as yet
EFoo foo = EFoo::Bar;
switch (foo) {
case (EFoo::Bar): break;
case (EFoo::Bar): break; // expected-error {{parentheses immediately inside case statement [loplugin:unnecessaryparen]}}
}
// lots of our code uses this style, which I'm loathe to bulk-fix as yet
......
compilerplugins/clang/unnecessaryparen.cxx
Dosyayı görüntüle @ dccd1633
......@@ -55,6 +55,7 @@ public:
bool VisitDoStmt(const DoStmt *);
bool VisitWhileStmt(const WhileStmt *);
bool VisitSwitchStmt(const SwitchStmt *);
bool VisitCaseStmt(const CaseStmt *);
bool VisitReturnStmt(const ReturnStmt* );
bool VisitCallExpr(const CallExpr *);
bool TraverseUnaryExprOrTypeTraitExpr(UnaryExprOrTypeTraitExpr *);
......@@ -175,6 +176,12 @@ bool UnnecessaryParen::VisitSwitchStmt(const SwitchStmt* switchStmt)
return true;
}
bool UnnecessaryParen::VisitCaseStmt(const CaseStmt* caseStmt)
{
VisitSomeStmt(caseStmt, caseStmt->getLHS(), "case");
return true;
}
bool UnnecessaryParen::VisitReturnStmt(const ReturnStmt* returnStmt)
{
if (ignoreLocation(returnStmt))
......
filter/source/flash/swfexporter.cxx
Dosyayı görüntüle @ dccd1633
......@@ -670,19 +670,12 @@ bool FlashExporter::getMetaFile( Reference< XComponent > const &xComponent, GDIM
tools::Rectangle clipRect;
for( size_t i = 0, nCount = rMtf.GetActionSize(); i < nCount; i++ )
{
const MetaAction* pAction = rMtf.GetAction( i );
const MetaActionType nType = pAction->GetType();
switch( nType )
const MetaAction* pAction = rMtf.GetAction( i );
if (pAction->GetType() == MetaActionType::ISECTRECTCLIPREGION)
{
case( MetaActionType::ISECTRECTCLIPREGION ):
{
const MetaISectRectClipRegionAction* pA = static_cast<const MetaISectRectClipRegionAction*>(pAction);
clipRect = pA->GetRect();
i = nCount;
break;
}
default: break;
const MetaISectRectClipRegionAction* pA = static_cast<const MetaISectRectClipRegionAction*>(pAction);
clipRect = pA->GetRect();
break;
}
}
MetaBmpExScaleAction *pmetaAct = new MetaBmpExScaleAction(Point(clipRect.Left(), clipRect.Top()), Size(clipRect.GetWidth(), clipRect.GetHeight()), rBitmapEx);
......
filter/source/svg/svgexport.cxx
Dosyayı görüntüle @ dccd1633
......@@ -401,7 +401,7 @@ BitmapChecksum GetBitmapChecksum( const MetaAction* pAction )
switch( nType )
{
case( MetaActionType::BMPSCALE ):
case MetaActionType::BMPSCALE:
{
const MetaBmpScaleAction* pA = static_cast<const MetaBmpScaleAction*>(pAction);
if( pA )
......@@ -410,7 +410,7 @@ BitmapChecksum GetBitmapChecksum( const MetaAction* pAction )
OSL_FAIL( "GetBitmapChecksum: MetaBmpScaleAction pointer is null." );
}
break;
case( MetaActionType::BMPEXSCALE ):
case MetaActionType::BMPEXSCALE:
{
const MetaBmpExScaleAction* pA = static_cast<const MetaBmpExScaleAction*>(pAction);
if( pA )
......@@ -432,7 +432,7 @@ void MetaBitmapActionGetPoint( const MetaAction* pAction, Point& rPt )
const MetaActionType nType = pAction->GetType();
switch( nType )
{
case( MetaActionType::BMPSCALE ):
case MetaActionType::BMPSCALE:
{
const MetaBmpScaleAction* pA = static_cast<const MetaBmpScaleAction*>(pAction);
if( pA )
......@@ -441,7 +441,7 @@ void MetaBitmapActionGetPoint( const MetaAction* pAction, Point& rPt )
OSL_FAIL( "MetaBitmapActionGetPoint: MetaBmpScaleAction pointer is null." );
}
break;
case( MetaActionType::BMPEXSCALE ):
case MetaActionType::BMPEXSCALE:
{
const MetaBmpExScaleAction* pA = static_cast<const MetaBmpExScaleAction*>(pAction);
if( pA )
......
filter/source/svg/svgfontexport.cxx
Dosyayı görüntüle @ dccd1633
......@@ -92,7 +92,7 @@ void SVGFontExport::implCollectGlyphs()
switch( nType )
{
case( MetaActionType::TEXT ):
case MetaActionType::TEXT:
{
const MetaTextAction* pA = static_cast<const MetaTextAction*>(pAction);
sal_Int32 aLength=std::min( pA->GetText().getLength(), pA->GetLen() );
......@@ -100,14 +100,14 @@ void SVGFontExport::implCollectGlyphs()
}
break;
case( MetaActionType::TEXTRECT ):
case MetaActionType::TEXTRECT:
{
const MetaTextRectAction* pA = static_cast<const MetaTextRectAction*>(pAction);
aText = pA->GetText();
}
break;
case( MetaActionType::TEXTARRAY ):
case MetaActionType::TEXTARRAY:
{
const MetaTextArrayAction* pA = static_cast<const MetaTextArrayAction*>(pAction);
sal_Int32 aLength=std::min( pA->GetText().getLength(), pA->GetLen() );
......@@ -115,7 +115,7 @@ void SVGFontExport::implCollectGlyphs()
}
break;
case( MetaActionType::STRETCHTEXT ):
case MetaActionType::STRETCHTEXT:
{
const MetaStretchTextAction* pA = static_cast<const MetaStretchTextAction*>(pAction);
sal_Int32 aLength=std::min( pA->GetText().getLength(), pA->GetLen() );
......
filter/source/svg/svgwriter.cxx
Dosyayı görüntüle @ dccd1633
This diff is collapsed.
oox/source/drawingml/textbodyproperties.cxx
Dosyayı görüntüle @ dccd1633
......@@ -67,9 +67,9 @@ void TextBodyProperties::pushRotationAdjustments()
switch( moRotation.get(0) )
{
case (90*1*60000): nOff = 3; break;
case (90*2*60000): nOff = 2; break;
case (90*3*60000): nOff = 1; break;
case 90*1*60000: nOff = 3; break;
case 90*2*60000: nOff = 2; break;
case 90*3*60000: nOff = 1; break;
default: break;
}
......
reportdesign/source/filter/xml/xmlHelper.cxx
Dosyayı görüntüle @ dccd1633
......@@ -88,7 +88,7 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32
pHandler = new XMLEnumPropertyHdl( pXML_VerticalAlign_Enum );
}
break;
case (XML_SD_TYPES_START+34):
case XML_SD_TYPES_START+34: // XML_SD_TYPE_IMAGE_SCALE_MODE
pHandler = new xmloff::ImageScaleModeHandler();
break;
default:
......
sd/source/ui/view/drviews7.cxx
Dosyayı görüntüle @ dccd1633
......@@ -1711,7 +1711,7 @@ void DrawViewShell::GetPageProperties( SfxItemSet &rSet )
switch (eXFS)
{
case (drawing::FillStyle_SOLID):
case drawing::FillStyle_SOLID:
{
Color aColor = static_cast<const XFillColorItem*>( rPageAttr.GetItem( XATTR_FILLCOLOR ) )->GetColorValue();
XFillColorItem aFillColorItem( OUString(), aColor );
......@@ -1720,7 +1720,7 @@ void DrawViewShell::GetPageProperties( SfxItemSet &rSet )
}
break;
case (drawing::FillStyle_GRADIENT):
case drawing::FillStyle_GRADIENT:
{
const XFillGradientItem *pGradient = static_cast<const XFillGradientItem*>( rPageAttr.GetItem( XATTR_FILLGRADIENT ) );
XFillGradientItem aFillGradientItem( pGradient->GetName(), pGradient->GetGradientValue(), SID_ATTR_PAGE_GRADIENT );
......@@ -1728,7 +1728,7 @@ void DrawViewShell::GetPageProperties( SfxItemSet &rSet )
}
break;
case (drawing::FillStyle_HATCH):
case drawing::FillStyle_HATCH:
{
const XFillHatchItem *pFillHatchItem( static_cast<const XFillHatchItem*>( rPageAttr.GetItem( XATTR_FILLHATCH ) ) );
XFillHatchItem aFillHatchItem( pFillHatchItem->GetName(), pFillHatchItem->GetHatchValue());
......@@ -1737,7 +1737,7 @@ void DrawViewShell::GetPageProperties( SfxItemSet &rSet )
}
break;
case (drawing::FillStyle_BITMAP):
case drawing::FillStyle_BITMAP:
{
const XFillBitmapItem *pFillBitmapItem = static_cast<const XFillBitmapItem*>( rPageAttr.GetItem( XATTR_FILLBITMAP ) );
XFillBitmapItem aFillBitmapItem( pFillBitmapItem->GetName(), pFillBitmapItem->GetGraphicObject() );
......@@ -1775,7 +1775,7 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq)
switch (nSlotId)
{
case(SID_ATTR_PAGE_FILLSTYLE):
case SID_ATTR_PAGE_FILLSTYLE:
{
XFillStyleItem aFSItem( static_cast<const XFillStyleItem&>(pArgs->Get( XATTR_FILLSTYLE )) );
drawing::FillStyle eXFS = aFSItem.GetValue();
......@@ -1785,7 +1785,7 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq)
}
break;
case(SID_ATTR_PAGE_COLOR):
case SID_ATTR_PAGE_COLOR:
{
XFillColorItem aColorItem( static_cast<const XFillColorItem&>(pArgs->Get( XATTR_FILLCOLOR )) );
rPageProperties.PutItem( XFillStyleItem( drawing::FillStyle_SOLID ) );
......@@ -1793,7 +1793,7 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq)
}
break;
case(SID_ATTR_PAGE_GRADIENT):
case SID_ATTR_PAGE_GRADIENT:
{
XFillGradientItem aGradientItem( static_cast<const XFillGradientItem&>(pArgs->Get( XATTR_FILLGRADIENT )) );
......@@ -1807,7 +1807,7 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq)
}
break;
case(SID_ATTR_PAGE_HATCH):
case SID_ATTR_PAGE_HATCH:
{
XFillHatchItem aHatchItem( static_cast<const XFillHatchItem&>(pArgs->Get( XATTR_FILLHATCH )) );
rPageProperties.PutItem( XFillStyleItem( drawing::FillStyle_HATCH ) );
......@@ -1815,7 +1815,7 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq)
}
break;
case(SID_ATTR_PAGE_BITMAP):
case SID_ATTR_PAGE_BITMAP:
{
XFillBitmapItem aBitmapItem( static_cast<const XFillBitmapItem&>(pArgs->Get( XATTR_FILLBITMAP )) );
rPageProperties.PutItem( XFillStyleItem( drawing::FillStyle_BITMAP ) );
......
svtools/source/graphic/provider.cxx
Dosyayı görüntüle @ dccd1633
......@@ -634,24 +634,24 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal
switch( pAction->GetType() )
{
// only optimizing common bitmap actions:
case( MetaActionType::MAPMODE ):
case MetaActionType::MAPMODE:
{
pAction->Execute( aDummyVDev.get() );
break;
}
case( MetaActionType::PUSH ):
case MetaActionType::PUSH:
{
const MetaPushAction* pA = static_cast<const MetaPushAction*>(pAction);
aDummyVDev->Push( pA->GetFlags() );
break;
}
case( MetaActionType::POP ):
case MetaActionType::POP:
{
aDummyVDev->Pop();
break;
}
case( MetaActionType::BMPSCALE ):
case( MetaActionType::BMPEXSCALE ):
case MetaActionType::BMPSCALE:
case MetaActionType::BMPEXSCALE:
{
BitmapEx aBmpEx;
Point aPos;
......@@ -689,12 +689,12 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal
break;
}
default:
case( MetaActionType::BMP ):
case( MetaActionType::BMPSCALEPART ):
case( MetaActionType::BMPEX ):
case( MetaActionType::BMPEXSCALEPART ):
case( MetaActionType::MASK ):
case( MetaActionType::MASKSCALE ):
case MetaActionType::BMP:
case MetaActionType::BMPSCALEPART:
case MetaActionType::BMPEX:
case MetaActionType::BMPEXSCALEPART:
case MetaActionType::MASK:
case MetaActionType::MASKSCALE:
break;
}
}
......
svtools/source/misc/transfer.cxx
Dosyayı görüntüle @ dccd1633
......@@ -1819,8 +1819,8 @@ bool TransferableDataHelper::GetINetBookmark( const css::datatransfer::DataFlavo
const SotClipboardFormatId nFormat = SotExchange::GetFormat( rFlavor );
switch( nFormat )
{
case( SotClipboardFormatId::SOLK ):
case( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ):
case SotClipboardFormatId::SOLK:
case SotClipboardFormatId::UNIFORMRESOURCELOCATOR:
{
OUString aString;
if( GetString( rFlavor, aString ) )
......@@ -1866,7 +1866,7 @@ bool TransferableDataHelper::GetINetBookmark( const css::datatransfer::DataFlavo
}
break;
case( SotClipboardFormatId::NETSCAPE_BOOKMARK ):
case SotClipboardFormatId::NETSCAPE_BOOKMARK:
{
Sequence<sal_Int8> aSeq = GetSequence(rFlavor, OUString());
......
svx/source/gallery2/galbrws1.cxx
Dosyayı görüntüle @ dccd1633
......@@ -437,11 +437,11 @@ void GalleryBrowser1::Notify( SfxBroadcaster&, const SfxHint& rHint )
switch( rGalleryHint.GetType() )
{
case( GalleryHintType::THEME_CREATED ):
case GalleryHintType::THEME_CREATED:
ImplInsertThemeEntry( mpGallery->GetThemeInfo( rGalleryHint.GetThemeName() ) );
break;
case( GalleryHintType::THEME_RENAMED ):
case GalleryHintType::THEME_RENAMED:
{
const sal_Int32 nCurSelectPos = mpThemes->GetSelectEntryPos();
const sal_Int32 nRenameEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() );
......@@ -457,13 +457,13 @@ void GalleryBrowser1::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
break;
case( GalleryHintType::THEME_REMOVED ):
case GalleryHintType::THEME_REMOVED:
{
mpThemes->RemoveEntry( rGalleryHint.GetThemeName() );
}
break;
case( GalleryHintType::CLOSE_THEME ):
case GalleryHintType::CLOSE_THEME:
{
const sal_Int32 nCurSelectPos = mpThemes->GetSelectEntryPos();
const sal_Int32 nCloseEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() );
......
svx/source/gallery2/galbrws2.cxx
Dosyayı görüntüle @ dccd1633
......@@ -513,7 +513,7 @@ void GalleryBrowser2::Notify( SfxBroadcaster&, const SfxHint& rHint )
switch( rGalleryHint.GetType() )
{
case( GalleryHintType::THEME_UPDATEVIEW ):
case GalleryHintType::THEME_UPDATEVIEW:
{
if( GALLERYBROWSERMODE_PREVIEW == GetMode() )
SetMode( meLastMode );
......
svx/source/unogallery/unogaltheme.cxx
Dosyayı görüntüle @ dccd1633
......@@ -304,7 +304,7 @@ void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint )
switch( rGalleryHint.GetType() )
{
case( GalleryHintType::CLOSE_THEME ):
case GalleryHintType::CLOSE_THEME:
{
DBG_ASSERT( !mpTheme || mpGallery, "Theme is living without Gallery" );
......@@ -318,7 +318,7 @@ void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
break;
case( GalleryHintType::CLOSE_OBJECT ):
case GalleryHintType::CLOSE_OBJECT:
{
GalleryObject* pObj = reinterpret_cast< GalleryObject* >( rGalleryHint.GetData1() );
......
svx/source/xoutdev/xattr2.cxx
Dosyayı görüntüle @ dccd1633
......@@ -262,11 +262,11 @@ bool XLineCapItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCo
pId = RID_SVXSTR_LINECAP_BUTT;
break;
case(css::drawing::LineCap_ROUND):
case css::drawing::LineCap_ROUND:
pId = RID_SVXSTR_LINECAP_ROUND;
break;
case(css::drawing::LineCap_SQUARE):
case css::drawing::LineCap_SQUARE:
pId = RID_SVXSTR_LINECAP_SQUARE;
break;
}
......
sw/source/uibase/uiview/viewtab.cxx
Dosyayı görüntüle @ dccd1633
......@@ -1130,7 +1130,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
SwFrameFormat &rMaster = aDesc.GetMaster();
switch (nSlot)
{
case(SID_ATTR_PAGE_FILLSTYLE):
case SID_ATTR_PAGE_FILLSTYLE:
{
XFillStyleItem aFSItem( static_cast<const XFillStyleItem&>(pReqArgs->Get( XATTR_FILLSTYLE )) );
drawing::FillStyle eXFS = aFSItem.GetValue();
......@@ -1140,7 +1140,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
}
break;
case(SID_ATTR_PAGE_COLOR):
case SID_ATTR_PAGE_COLOR:
{
XFillColorItem aColorItem( static_cast<const XFillColorItem&>(pReqArgs->Get( XATTR_FILLCOLOR )) );
rMaster.SetFormatAttr( XFillStyleItem( drawing::FillStyle_SOLID ) );
......@@ -1148,7 +1148,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
}
break;
case(SID_ATTR_PAGE_GRADIENT):
case SID_ATTR_PAGE_GRADIENT:
{
XFillGradientItem aGradientItem( static_cast<const XFillGradientItem&>(pReqArgs->Get( XATTR_FILLGRADIENT )) );
rMaster.SetFormatAttr( XFillStyleItem( drawing::FillStyle_GRADIENT ) );
......@@ -1156,7 +1156,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
}
break;
case(SID_ATTR_PAGE_HATCH):
case SID_ATTR_PAGE_HATCH:
{
XFillHatchItem aHatchItem( static_cast<const XFillHatchItem&>(pReqArgs->Get( XATTR_FILLHATCH )) );
rMaster.SetFormatAttr( XFillStyleItem( drawing::FillStyle_HATCH ) );
......@@ -1164,7 +1164,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
}
break;
case(SID_ATTR_PAGE_BITMAP):
case SID_ATTR_PAGE_BITMAP:
{
XFillBitmapItem aBitmapItem( static_cast<const XFillBitmapItem&>(pReqArgs->Get( XATTR_FILLBITMAP )) );
rMaster.SetFormatAttr( XFillStyleItem( drawing::FillStyle_BITMAP ) );
......@@ -2316,7 +2316,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
rSet.Put(aFillStyleItem);
switch(eXFS)
{
case (drawing::FillStyle_SOLID):
case drawing::FillStyle_SOLID:
{
Color aColor = aSet.GetItem<XFillColorItem>( XATTR_FILLCOLOR, false )->GetColorValue();
XFillColorItem aFillColorItem( OUString(), aColor );
......@@ -2325,7 +2325,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
}
break;
case (drawing::FillStyle_GRADIENT):
case drawing::FillStyle_GRADIENT:
{
const XGradient& xGradient = aSet.GetItem<XFillGradientItem>( XATTR_FILLGRADIENT )->GetGradientValue();
XFillGradientItem aFillGradientItem( OUString(), xGradient, SID_ATTR_PAGE_GRADIENT );
......@@ -2333,7 +2333,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
}
break;
case (drawing::FillStyle_HATCH):
case drawing::FillStyle_HATCH:
{
const XFillHatchItem *pFillHatchItem( aSet.GetItem<XFillHatchItem>( XATTR_FILLHATCH ) );
XFillHatchItem aFillHatchItem( pFillHatchItem->GetName(), pFillHatchItem->GetHatchValue());
......@@ -2342,7 +2342,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
}
break;
case (drawing::FillStyle_BITMAP):
case drawing::FillStyle_BITMAP:
{
const XFillBitmapItem *pFillBitmapItem = aSet.GetItem<XFillBitmapItem>( XATTR_FILLBITMAP );
XFillBitmapItem aFillBitmapItem( pFillBitmapItem->GetName(), pFillBitmapItem->GetGraphicObject() );
......@@ -2350,7 +2350,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
rSet.Put( aFillBitmapItem );
}
break;
case (drawing::FillStyle_NONE):
case drawing::FillStyle_NONE:
{
}
break;
......
vcl/source/filter/graphicfilter.cxx
Dosyayı görüntüle @ dccd1633
......@@ -2357,17 +2357,17 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData&, rData, bool )
OString aShortName;
switch( rData.mnFormat )
{
case( ConvertDataFormat::BMP ): aShortName = BMP_SHORTNAME; break;
case( ConvertDataFormat::GIF ): aShortName = GIF_SHORTNAME; break;
case( ConvertDataFormat::JPG ): aShortName = JPG_SHORTNAME; break;
case( ConvertDataFormat::MET ): aShortName = MET_SHORTNAME; break;
case( ConvertDataFormat::PCT ): aShortName = PCT_SHORTNAME; break;
case( ConvertDataFormat::PNG ): aShortName = PNG_SHORTNAME; break;
case( ConvertDataFormat::SVM ): aShortName = SVM_SHORTNAME; break;
case( ConvertDataFormat::TIF ): aShortName = TIF_SHORTNAME; break;
case( ConvertDataFormat::WMF ): aShortName = WMF_SHORTNAME; break;
case( ConvertDataFormat::EMF ): aShortName = EMF_SHORTNAME; break;
case( ConvertDataFormat::SVG ): aShortName = SVG_SHORTNAME; break;
case ConvertDataFormat::BMP: aShortName = BMP_SHORTNAME; break;
case ConvertDataFormat::GIF: aShortName = GIF_SHORTNAME; break;
case ConvertDataFormat::JPG: aShortName = JPG_SHORTNAME; break;
case ConvertDataFormat::MET: aShortName = MET_SHORTNAME; break;
case ConvertDataFormat::PCT: aShortName = PCT_SHORTNAME; break;
case ConvertDataFormat::PNG: aShortName = PNG_SHORTNAME; break;
case ConvertDataFormat::SVM: aShortName = SVM_SHORTNAME; break;
case ConvertDataFormat::TIF: aShortName = TIF_SHORTNAME; break;
case ConvertDataFormat::WMF: aShortName = WMF_SHORTNAME; break;
case ConvertDataFormat::EMF: aShortName = EMF_SHORTNAME; break;
case ConvertDataFormat::SVG: aShortName = SVG_SHORTNAME; break;
default:
break;
......
vcl/source/filter/graphicfilter2.cxx
Dosyayı görüntüle @ dccd1633
......@@ -1099,31 +1099,31 @@ OUString GraphicDescriptor::GetImportFormatShortName( GraphicFileFormat nFormat
switch( nFormat )
{
case( GraphicFileFormat::BMP ) : pKeyName = "bmp"; break;
case( GraphicFileFormat::GIF ) : pKeyName = "gif"; break;
case( GraphicFileFormat::JPG ) : pKeyName = "jpg"; break;
case( GraphicFileFormat::PCD ) : pKeyName = "pcd"; break;
case( GraphicFileFormat::PCX ) : pKeyName = "pcx"; break;
case( GraphicFileFormat::PNG ) : pKeyName = "png"; break;
case( GraphicFileFormat::XBM ) : pKeyName = "xbm"; break;
case( GraphicFileFormat::XPM ) : pKeyName = "xpm"; break;
case( GraphicFileFormat::PBM ) : pKeyName = "pbm"; break;
case( GraphicFileFormat::PGM ) : pKeyName = "pgm"; break;
case( GraphicFileFormat::PPM ) : pKeyName = "ppm"; break;
case( GraphicFileFormat::RAS ) : pKeyName = "ras"; break;
case( GraphicFileFormat::TGA ) : pKeyName = "tga"; break;
case( GraphicFileFormat::PSD ) : pKeyName = "psd"; break;
case( GraphicFileFormat::EPS ) : pKeyName = "eps"; break;
case( GraphicFileFormat::TIF ) : pKeyName = "tif"; break;
case( GraphicFileFormat::DXF ) : pKeyName = "dxf"; break;
case( GraphicFileFormat::MET ) : pKeyName = "met"; break;
case( GraphicFileFormat::PCT ) : pKeyName = "pct"; break;
case( GraphicFileFormat::SGF ) : pKeyName = "sgf"; break;
case( GraphicFileFormat::SGV ) : pKeyName = "sgv"; break;
case( GraphicFileFormat::SVM ) : pKeyName = "svm"; break;
case( GraphicFileFormat::WMF ) : pKeyName = "wmf"; break;
case( GraphicFileFormat::EMF ) : pKeyName = "emf"; break;
case( GraphicFileFormat::SVG ) : pKeyName = "svg"; break;
case GraphicFileFormat::BMP : pKeyName = "bmp"; break;
case GraphicFileFormat::GIF : pKeyName = "gif"; break;
case GraphicFileFormat::JPG : pKeyName = "jpg"; break;
case GraphicFileFormat::PCD : pKeyName = "pcd"; break;
case GraphicFileFormat::PCX : pKeyName = "pcx"; break;
case GraphicFileFormat::PNG : pKeyName = "png"; break;
case GraphicFileFormat::XBM : pKeyName = "xbm"; break;
case GraphicFileFormat::XPM : pKeyName = "xpm"; break;
case GraphicFileFormat::PBM : pKeyName = "pbm"; break;
case GraphicFileFormat::PGM : pKeyName = "pgm"; break;
case GraphicFileFormat::PPM : pKeyName = "ppm"; break;
case GraphicFileFormat::RAS : pKeyName = "ras"; break;
case GraphicFileFormat::TGA : pKeyName = "tga"; break;
case GraphicFileFormat::PSD : pKeyName = "psd"; break;
case GraphicFileFormat::EPS : pKeyName = "eps"; break;
case GraphicFileFormat::TIF : pKeyName = "tif"; break;
case GraphicFileFormat::DXF : pKeyName = "dxf"; break;
case GraphicFileFormat::MET : pKeyName = "met"; break;
case GraphicFileFormat::PCT : pKeyName = "pct"; break;
case GraphicFileFormat::SGF : pKeyName = "sgf"; break;
case GraphicFileFormat::SGV : pKeyName = "sgv"; break;
case GraphicFileFormat::SVM : pKeyName = "svm"; break;
case GraphicFileFormat::WMF : pKeyName = "wmf"; break;
case GraphicFileFormat::EMF : pKeyName = "emf"; break;
case GraphicFileFormat::SVG : pKeyName = "svg"; break;
default: assert(false);
}
......
vcl/source/filter/wmf/emfwr.cxx
Dosyayı görüntüle @ dccd1633
......@@ -948,7 +948,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
switch( nType )
{
case( MetaActionType::PIXEL ):
case MetaActionType::PIXEL:
{
const MetaPixelAction* pA = static_cast<const MetaPixelAction*>(pAction);
......@@ -960,7 +960,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
}
break;
case( MetaActionType::POINT ):
case MetaActionType::POINT:
{
if( maVDev->IsLineColor() )
{
......@@ -975,7 +975,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
}
break;
case( MetaActionType::LINE ):
case MetaActionType::LINE:
{
if( maVDev->IsLineColor() )
{
......@@ -1010,7 +1010,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
}
break;
case( MetaActionType::RECT ):
case MetaActionType::RECT:
{
if( maVDev->IsLineColor() || maVDev->IsFillColor() )
{
......@@ -1026,7 +1026,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
}
break;
case( MetaActionType::ROUNDRECT ):
case MetaActionType::ROUNDRECT:
{
if( maVDev->IsLineColor() || maVDev->IsFillColor() )
{
......@@ -1043,7 +1043,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
}
break;
case( MetaActionType::ELLIPSE ):
case MetaActionType::ELLIPSE:
{
if( maVDev->IsLineColor() || maVDev->IsFillColor() )
{
......@@ -1059,10 +1059,10 @@ void EMFWriter::ImplWrite( 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:
{
if( maVDev->IsLineColor() || maVDev->IsFillColor() )
{
......@@ -1070,28 +1070,28 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
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(), PolyStyle::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(), PolyStyle::Pie );
}
break;
case( MetaActionType::CHORD ):
case MetaActionType::CHORD:
{