[Libreoffice-commits] core.git: sc/source

[Stephan Bergmann]

 sc/source/ui/view/output2.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1d54b93670ac2c40661e3890ecea987d334cba31
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu May 12 14:54:31 2016 +0200

    Silence -Werror,-Wimplicit-fallthrough under NDEBUG
    
    Change-Id: If2fc8dd5a3b2dab2f1b3654dbdb42e112ff64347

diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 2cc4f5a..c4df00b 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -67,6 +67,7 @@
 #include <com/sun/star/i18n/DirectionProperty.hpp>
 #include <comphelper/string.hxx>
 
+#include <cstdlib>
 #include <memory>
 #include <vector>
 
@@ -2631,10 +2632,6 @@ void ScOutputData::DrawEditParam::setAlignmentToEngine()
             if (meOrient == SVX_ORIENTATION_STANDARD)
                 switch (meHorJustResult)
                 {
-                    case SVX_HOR_JUSTIFY_REPEAT:            // repeat is not yet implemented
-                    case SVX_HOR_JUSTIFY_STANDARD:
-                        assert(!"meHorJustResult does not match getAlignmentFromContext()");
-                        // fallthru
                     case SVX_HOR_JUSTIFY_LEFT:
                         eSvxAdjust = SVX_ADJUST_LEFT;
                         break;
@@ -2647,6 +2644,9 @@ void ScOutputData::DrawEditParam::setAlignmentToEngine()
                     case SVX_HOR_JUSTIFY_BLOCK:
                         eSvxAdjust = SVX_ADJUST_BLOCK;
                         break;
+                    case SVX_HOR_JUSTIFY_REPEAT: // repeat is not yet implemented
+                    case SVX_HOR_JUSTIFY_STANDARD:
+                        for (;;) std::abort(); // meHorJustResult does not match getAlignmentFromContext()
                 }
             else
                 switch (meVerJust)