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 /svx/source/toolbars/fontworkbar.cxx | |
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 'svx/source/toolbars/fontworkbar.cxx')
-rw-r--r-- | svx/source/toolbars/fontworkbar.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 9d32139fafc2..07b688e84b8f 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -275,7 +275,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem SdrTextHorzAdjust eHorzAdjust; switch ( nValue ) { - case 4 : eFTS = SDRTEXTFIT_ALLLINES; // passthrough + case 4 : eFTS = SDRTEXTFIT_ALLLINES; SAL_FALLTHROUGH; case 3 : eHorzAdjust = SDRTEXTHORZADJUST_BLOCK; break; default: eHorzAdjust = SDRTEXTHORZADJUST_LEFT; break; case 1 : eHorzAdjust = SDRTEXTHORZADJUST_CENTER; break; @@ -506,17 +506,20 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi { if ( !nStrResId ) nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT; - } // PASSTROUGH + SAL_FALLTHROUGH; + } case SID_FONTWORK_CHARACTER_SPACING: { if ( !nStrResId ) nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING; - } // PASSTROUGH + SAL_FALLTHROUGH; + } case SID_FONTWORK_KERN_CHARACTER_PAIRS: { if ( !nStrResId ) nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING; - } // PASSTROUGH + SAL_FALLTHROUGH; + } case SID_FONTWORK_SAME_LETTER_HEIGHTS: { if ( !nStrResId ) |