diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-08 09:46:01 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-08 13:28:16 +0100 |
| commit | ab9b67bbb001f380b3973941443bfbc59fe7141c (patch) | |
| tree | 4737847b2970d2310932f115935a9454aacff6fe /svx/source/toolbars | |
| parent | 3c0cb54b7ca20439e7e5e1e19dc6fcc75709973b (diff) | |
Remove obsolete SAL_FALLTHROUGH completely
...after 7ffdd830d5fb52f2ca25aa80277d22ea6d89970b
"HAVE_CPP_ATTRIBUTE_FALLTHROUGH is always true now"
Change-Id: I54e5ff4e036a6bb3e5774d1c0524158aae18e937
Reviewed-on: https://gerrit.libreoffice.org/64800
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svx/source/toolbars')
| -rw-r--r-- | svx/source/toolbars/extrusionbar.cxx | 22 | ||||
| -rw-r--r-- | svx/source/toolbars/fontworkbar.cxx | 8 |
2 files changed, 15 insertions, 15 deletions
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 94bb8e326721..4959b44d99a1 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -462,67 +462,67 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest const & rReq, SfxBindi { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ON_OFF; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_TILT_DOWN: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_DOWN; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_TILT_UP: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_UP; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_TILT_LEFT: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_LEFT; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_TILT_RIGHT: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_RIGHT; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_DIRECTION: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ORIENTATION; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_PROJECTION: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_PROJECTION; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_DEPTH: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_DEPTH; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_3D_COLOR: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_SURFACE: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_LIGHTING_INTENSITY: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_BRIGHTNESS; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_LIGHTING_DIRECTION: { diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 290c1f746fe4..1ccc28761a7d 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -262,7 +262,7 @@ static void impl_execute( SfxRequest const & rReq, SdrCustomShapeGeometryItem& r SdrTextHorzAdjust eHorzAdjust; switch ( nValue ) { - case 4 : eFTS = drawing::TextFitToSizeType_ALLLINES; SAL_FALLTHROUGH; + case 4 : eFTS = drawing::TextFitToSizeType_ALLLINES; [[fallthrough]]; case 3 : eHorzAdjust = SDRTEXTHORZADJUST_BLOCK; break; default: eHorzAdjust = SDRTEXTHORZADJUST_LEFT; break; case 1 : eHorzAdjust = SDRTEXTHORZADJUST_CENTER; break; @@ -491,19 +491,19 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest const & rReq, SfxBindin { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_FONTWORK_CHARACTER_SPACING: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_FONTWORK_KERN_CHARACTER_PAIRS: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_FONTWORK_SAME_LETTER_HEIGHTS: { |