From 3eaf7ae663e7dd0fded01dd73bbedda59e8a0af3 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 12 May 2016 11:33:18 +0200
Subject: [PATCH] Massage code to avoid warnings

Change-Id: I847e1a109bd20e64161a7735ee30b2fe1ca507b0
---
 .../source/primitive2d/graphicprimitivehelper2d.cxx      | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index a924b3dd6454..93a5f55133ac 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -378,14 +378,11 @@ namespace drawinglayer
                     aRetval = Primitive2DContainer { aPrimitiveBlackAndWhite };
                     break;
                 }
-                // coverity[dead_error_begin] - intentional dead case
-                case GRAPHICDRAWMODE_WATERMARK:
-                {
-                    assert(false && "OOps, GRAPHICDRAWMODE_WATERMARK should already be handled (see above)");
-                    // fallthrough intended
-                }
                 default: // case GRAPHICDRAWMODE_STANDARD:
                 {
+                    assert(
+                        aGraphicDrawMode != GRAPHICDRAWMODE_WATERMARK
+                        && "OOps, GRAPHICDRAWMODE_WATERMARK should already be handled (see above)");
                     // nothing to do
                     break;
                 }