diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-05-10 16:42:16 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-05-10 16:42:16 +0200 |
| commit | 14cd5182c5f64c43581c82db8c958369152226ac (patch) | |
| tree | 57f150ba2707f29214eeb9b1eaad2373780d1b15 /drawinglayer | |
| parent | e4bb2b4f4875c15bd68297b5be716edd6859841e (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 'drawinglayer')
| -rw-r--r-- | drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx | 4 | ||||
| -rw-r--r-- | drawinglayer/source/processor2d/vclprocessor2d.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx index 2a5c1a0686fe..a253c5fbfb85 100644 --- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx @@ -73,7 +73,7 @@ namespace drawinglayer aHatch.appendTransformations(aMatrices); - // fall-through by purpose + SAL_FALLTHROUGH; } case attribute::HATCHSTYLE_DOUBLE: { @@ -86,7 +86,7 @@ namespace drawinglayer aHatch.appendTransformations(aMatrices); - // fall-through by purpose + SAL_FALLTHROUGH; } case attribute::HATCHSTYLE_SINGLE: { diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index ec31b509c456..67625c0b85a4 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -184,7 +184,7 @@ namespace drawinglayer { default: SAL_WARN("drawinglayer", "Unknown EmphasisMark style " << pTCPP->getTextEmphasisMark() ); - // fall through + SAL_FALLTHROUGH; case primitive2d::TEXT_FONT_EMPHASIS_MARK_NONE: eFontEmphasisMark = FontEmphasisMark::NONE; break; case primitive2d::TEXT_FONT_EMPHASIS_MARK_DOT: eFontEmphasisMark = FontEmphasisMark::Dot; break; case primitive2d::TEXT_FONT_EMPHASIS_MARK_CIRCLE: eFontEmphasisMark = FontEmphasisMark::Circle; break; @@ -209,7 +209,7 @@ namespace drawinglayer { default: SAL_WARN( "drawinglayer", "Unknown Relief style " << pTCPP->getTextRelief() ); - // fall through + SAL_FALLTHROUGH; case primitive2d::TEXT_RELIEF_NONE: eFontRelief = RELIEF_NONE; break; case primitive2d::TEXT_RELIEF_EMBOSSED: eFontRelief = RELIEF_EMBOSSED; break; case primitive2d::TEXT_RELIEF_ENGRAVED: eFontRelief = RELIEF_ENGRAVED; break; |