summaryrefslogtreecommitdiff
path: root/svtools/source/graphic
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-05-10 16:42:16 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-05-10 16:42:16 +0200
commit14cd5182c5f64c43581c82db8c958369152226ac (patch)
tree57f150ba2707f29214eeb9b1eaad2373780d1b15 /svtools/source/graphic
parente4bb2b4f4875c15bd68297b5be716edd6859841e (diff)
Replace fallthrough comments with new SAL_FALLTHROUGH macro
...which (in LIBO_INTERNAL_ONLY) for Clang expands to [[clang::fallthrough]] in preparation of enabling -Wimplicit-fallthrough. (This is only relevant for C++11, as neither C nor old C++ has a way to annotate intended fallthroughs.) Could use BOOST_FALLTHROUGH instead of introducing our own SAL_FALLTHROUGH, but that would require adding back in dependencies on boost_headers to many libraries where we carefully removed any remaining Boost dependencies only recently. (At least make SAL_FALLTHROUGH strictly LIBO_INTERNAL_ONLY, so its future evolution will not have any impact on the stable URE interface.) C++17 will have a proper [[fallthroug]], eventually removing the need for a macro altogether. Change-Id: I342a7610a107db7d7a344ea9cbddfd9714d7e9ca
Diffstat (limited to 'svtools/source/graphic')
-rw-r--r--svtools/source/graphic/grfcache.cxx66
-rw-r--r--svtools/source/graphic/grfmgr2.cxx92
2 files changed, 79 insertions, 79 deletions
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 10432aff3e6e..18e75d58916a 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -670,79 +670,79 @@ bool GraphicDisplayCacheEntry::IsCacheableAsBitmap( const GDIMetaFile& rMtf,
case MetaActionType::RASTEROP:
if( static_cast<MetaRasterOpAction*>(pAct)->GetRasterOp() == ROP_OVERPAINT )
break;
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::PIXEL:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POINT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::LINE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::RECT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ROUNDRECT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ELLIPSE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ARC:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::PIE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::CHORD:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POLYLINE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POLYGON:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POLYPOLYGON:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTARRAY:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::STRETCHTEXT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTRECT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MASK:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MASKSCALE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MASKSCALEPART:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::GRADIENT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::HATCH:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::WALLPAPER:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::Transparent:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::EPS:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::FLOATTRANSPARENT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::GRADIENTEX:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
// OutDev state changes that _do_ affect bitmap
// output
case MetaActionType::CLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ISECTRECTCLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ISECTREGIONCLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MOVECLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MAPMODE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::REFPOINT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
default:
bNonBitmapActionEncountered = true;
break;
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index dca98660e3bb..145f0facf373 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -1144,35 +1144,35 @@ bool GraphicManager::ImplCreateOutput( OutputDevice* pOut,
aFont.SetAverageFontWidth( aFontMetric.GetAverageFontWidth() );
pModAct = new MetaFontAction( aFont );
}
+ SAL_FALLTHROUGH;
}
- // FALLTHROUGH intended
case MetaActionType::NONE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
// OutDev state changes (which don't affect bitmap
// output)
case MetaActionType::LINECOLOR:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::FILLCOLOR:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTCOLOR:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTFILLCOLOR:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTALIGN:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTLINECOLOR:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTLINE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::PUSH:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POP:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::LAYOUTMODE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTLANGUAGE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::COMMENT:
break;
@@ -1289,79 +1289,79 @@ bool GraphicManager::ImplCreateOutput( OutputDevice* pOut,
case MetaActionType::RASTEROP:
if( static_cast<MetaRasterOpAction*>(pAct)->GetRasterOp() == ROP_OVERPAINT )
break;
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::PIXEL:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POINT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::LINE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::RECT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ROUNDRECT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ELLIPSE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ARC:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::PIE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::CHORD:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POLYLINE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POLYGON:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POLYPOLYGON:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTARRAY:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::STRETCHTEXT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTRECT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MASK:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MASKSCALE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MASKSCALEPART:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::GRADIENT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::HATCH:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::WALLPAPER:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::Transparent:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::EPS:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::FLOATTRANSPARENT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::GRADIENTEX:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
// OutDev state changes that _do_ affect bitmap
// output
case MetaActionType::CLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ISECTRECTCLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ISECTREGIONCLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MOVECLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MAPMODE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::REFPOINT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
default:
bNonBitmapActionEncountered = true;
break;