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 /canvas | |
| 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 'canvas')
| -rw-r--r-- | canvas/source/cairo/cairo_canvashelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_canvashelper_text.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/vcl/canvashelper.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index dcd752cf6a52..5a442dfc8997 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -945,7 +945,7 @@ namespace cairocanvas { case rendering::PathJoinType::NONE: bNoLineJoin = true; - SAL_FALLTHROUGH; // cairo doesn't have join type NONE so we use MITER as it's pretty close + [[fallthrough]]; // cairo doesn't have join type NONE so we use MITER as it's pretty close case rendering::PathJoinType::MITER: cairo_set_line_join( mpCairo.get(), CAIRO_LINE_JOIN_MITER ); break; diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx index 11d429a8801a..d0704e877677 100644 --- a/canvas/source/cairo/cairo_canvashelper_text.cxx +++ b/canvas/source/cairo/cairo_canvashelper_text.cxx @@ -255,7 +255,7 @@ namespace cairocanvas case rendering::TextDirection::WEAK_RIGHT_TO_LEFT: nLayoutMode |= ComplexTextLayoutFlags::BiDiRtl; - SAL_FALLTHROUGH; + [[fallthrough]]; case rendering::TextDirection::STRONG_RIGHT_TO_LEFT: nLayoutMode |= ComplexTextLayoutFlags::BiDiRtl | ComplexTextLayoutFlags::BiDiStrong; nLayoutMode |= ComplexTextLayoutFlags::TextOriginRight; diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index e913dfa667bf..a03ad7e1c6d3 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -586,7 +586,7 @@ namespace vclcanvas case rendering::TextDirection::WEAK_RIGHT_TO_LEFT: nLayoutMode |= ComplexTextLayoutFlags::BiDiRtl; - SAL_FALLTHROUGH; + [[fallthrough]]; case rendering::TextDirection::STRONG_RIGHT_TO_LEFT: nLayoutMode |= ComplexTextLayoutFlags::BiDiRtl | ComplexTextLayoutFlags::BiDiStrong; nLayoutMode |= ComplexTextLayoutFlags::TextOriginRight; |