summaryrefslogtreecommitdiff
path: root/canvas/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-12-07 22:52:29 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-12-08 09:43:46 +0100
commit5eac2e6bcc11c1a30cb29d2f1e0289e15e8f1d05 (patch)
tree98ca16dc52ac731403a09a4be8afee1703c29cd9 /canvas/source
parent8a4d80bc001483e14945d87118e53f1518a434e8 (diff)
Remove misguided FALLTHROUGH comments
...between adjacent switch labels without any intervening statements Change-Id: Ieb8a0d9f71ea4382b5f7d005cdf7111d06aeb5d0 Reviewed-on: https://gerrit.libreoffice.org/64789 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'canvas/source')
-rw-r--r--canvas/source/cairo/cairo_canvashelper_text.cxx1
-rw-r--r--canvas/source/directx/dx_canvashelper.cxx11
-rw-r--r--canvas/source/directx/dx_canvashelper_texturefill.cxx1
-rw-r--r--canvas/source/directx/dx_vcltools.cxx24
-rw-r--r--canvas/source/opengl/ogl_canvashelper.cxx1
-rw-r--r--canvas/source/vcl/canvashelper.cxx1
-rw-r--r--canvas/source/vcl/canvashelper_texturefill.cxx1
7 files changed, 0 insertions, 40 deletions
diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx
index e7ce4131b251..11d429a8801a 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.cxx
@@ -248,7 +248,6 @@ namespace cairocanvas
switch( textDirection )
{
case rendering::TextDirection::WEAK_LEFT_TO_RIGHT:
- // FALLTHROUGH intended
case rendering::TextDirection::STRONG_LEFT_TO_RIGHT:
nLayoutMode |= ComplexTextLayoutFlags::BiDiStrong;
nLayoutMode |= ComplexTextLayoutFlags::TextOriginLeft;
diff --git a/canvas/source/directx/dx_canvashelper.cxx b/canvas/source/directx/dx_canvashelper.cxx
index ecba3af57952..0db0f187d595 100644
--- a/canvas/source/directx/dx_canvashelper.cxx
+++ b/canvas/source/directx/dx_canvashelper.cxx
@@ -664,7 +664,6 @@ namespace dxcanvas
switch( nMode )
{
case rendering::CompositeOperation::OVER:
- // FALLTHROUGH intended
case rendering::CompositeOperation::CLEAR:
aRet = Gdiplus::CompositingModeSourceOver;
break;
@@ -674,25 +673,15 @@ namespace dxcanvas
break;
case rendering::CompositeOperation::DESTINATION:
- // FALLTHROUGH intended
case rendering::CompositeOperation::UNDER:
- // FALLTHROUGH intended
case rendering::CompositeOperation::INSIDE:
- // FALLTHROUGH intended
case rendering::CompositeOperation::INSIDE_REVERSE:
- // FALLTHROUGH intended
case rendering::CompositeOperation::OUTSIDE:
- // FALLTHROUGH intended
case rendering::CompositeOperation::OUTSIDE_REVERSE:
- // FALLTHROUGH intended
case rendering::CompositeOperation::ATOP:
- // FALLTHROUGH intended
case rendering::CompositeOperation::ATOP_REVERSE:
- // FALLTHROUGH intended
case rendering::CompositeOperation::XOR:
- // FALLTHROUGH intended
case rendering::CompositeOperation::ADD:
- // FALLTHROUGH intended
case rendering::CompositeOperation::SATURATE:
// TODO(F2): Problem, because GDI+ only knows about two compositing modes
aRet = Gdiplus::CompositingModeSourceOver;
diff --git a/canvas/source/directx/dx_canvashelper_texturefill.cxx b/canvas/source/directx/dx_canvashelper_texturefill.cxx
index 8782114fbebe..df0d27f154ef 100644
--- a/canvas/source/directx/dx_canvashelper_texturefill.cxx
+++ b/canvas/source/directx/dx_canvashelper_texturefill.cxx
@@ -440,7 +440,6 @@ namespace dxcanvas
break;
case ::canvas::ParametricPolyPolygon::GradientType::Elliptical:
- // FALLTHROUGH intended
case ::canvas::ParametricPolyPolygon::GradientType::Rectangular:
fillPolygonalGradient( rValues,
rColors,
diff --git a/canvas/source/directx/dx_vcltools.cxx b/canvas/source/directx/dx_vcltools.cxx
index 07a71b330ae9..d91e60a99166 100644
--- a/canvas/source/directx/dx_vcltools.cxx
+++ b/canvas/source/directx/dx_vcltools.cxx
@@ -252,11 +252,8 @@ namespace dxcanvas
// to hand-formulate the following
// formats, too.
case ScanlineFormat::N1BitMsbPal:
- // FALLTHROUGH intended
case ScanlineFormat::N4BitMsnPal:
- // FALLTHROUGH intended
case ScanlineFormat::N16BitTcLsbMask:
- // FALLTHROUGH intended
case ScanlineFormat::N32BitTcMask:
{
Scanline pAScan = pAlphaReadAccess->GetScanline( y );
@@ -281,23 +278,14 @@ namespace dxcanvas
break;
case ScanlineFormat::N1BitLsbPal:
- // FALLTHROUGH intended
case ScanlineFormat::N4BitLsnPal:
- // FALLTHROUGH intended
case ScanlineFormat::N8BitTcMask:
- // FALLTHROUGH intended
case ScanlineFormat::N24BitTcRgb:
- // FALLTHROUGH intended
case ScanlineFormat::N16BitTcMsbMask:
- // FALLTHROUGH intended
case ScanlineFormat::N32BitTcAbgr:
- // FALLTHROUGH intended
case ScanlineFormat::N32BitTcArgb:
- // FALLTHROUGH intended
case ScanlineFormat::N32BitTcBgra:
- // FALLTHROUGH intended
case ScanlineFormat::N32BitTcRgba:
- // FALLTHROUGH intended
default:
ENSURE_OR_THROW( false,
"::dxcanvas::tools::bitmapFromVCLBitmapEx(): "
@@ -403,11 +391,8 @@ namespace dxcanvas
// to hand-formulate the following
// formats, too.
case ScanlineFormat::N1BitMsbPal:
- // FALLTHROUGH intended
case ScanlineFormat::N4BitMsnPal:
- // FALLTHROUGH intended
case ScanlineFormat::N16BitTcLsbMask:
- // FALLTHROUGH intended
case ScanlineFormat::N32BitTcMask:
{
Scanline pMScan = pMaskReadAccess->GetScanline( y );
@@ -431,23 +416,14 @@ namespace dxcanvas
break;
case ScanlineFormat::N1BitLsbPal:
- // FALLTHROUGH intended
case ScanlineFormat::N4BitLsnPal:
- // FALLTHROUGH intended
case ScanlineFormat::N8BitTcMask:
- // FALLTHROUGH intended
case ScanlineFormat::N24BitTcRgb:
- // FALLTHROUGH intended
case ScanlineFormat::N16BitTcMsbMask:
- // FALLTHROUGH intended
case ScanlineFormat::N32BitTcAbgr:
- // FALLTHROUGH intended
case ScanlineFormat::N32BitTcArgb:
- // FALLTHROUGH intended
case ScanlineFormat::N32BitTcBgra:
- // FALLTHROUGH intended
case ScanlineFormat::N32BitTcRgba:
- // FALLTHROUGH intended
default:
ENSURE_OR_THROW( false,
"::dxcanvas::tools::bitmapFromVCLBitmapEx(): "
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx
index 41ecfebc31e4..f99047a18ccf 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -875,7 +875,6 @@ namespace oglcanvas
o_action.meDstBlendMode=GL_ZERO;
break;
case rendering::CompositeOperation::UNDER:
- // FALLTHROUGH intended - but correct?!
case rendering::CompositeOperation::DESTINATION:
o_action.meSrcBlendMode=GL_ZERO;
o_action.meDstBlendMode=GL_ONE;
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index 282af010aa96..e913dfa667bf 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -579,7 +579,6 @@ namespace vclcanvas
switch( textDirection )
{
case rendering::TextDirection::WEAK_LEFT_TO_RIGHT:
- // FALLTHROUGH intended
case rendering::TextDirection::STRONG_LEFT_TO_RIGHT:
nLayoutMode |= ComplexTextLayoutFlags::BiDiStrong;
nLayoutMode |= ComplexTextLayoutFlags::TextOriginLeft;
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx
index c29fa6f3f12d..cdbceba7cff2 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -418,7 +418,6 @@ namespace vclcanvas
break;
case ::canvas::ParametricPolyPolygon::GradientType::Elliptical:
- // FALLTHROUGH intended
case ::canvas::ParametricPolyPolygon::GradientType::Rectangular:
fillPolygonalGradient( rOutDev,
rTextureTransform,