diff options
| author | Eike Rathke <erack@redhat.com> | 2016-05-12 17:54:30 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-05-12 17:54:51 +0200 |
| commit | c0977216d79a15dadbcf1c6805e7d50f83e0265f (patch) | |
| tree | 79599503351289a99f49e58ddc6ddaa4c36ca0d2 /sc | |
| parent | c19e7cf433133929c38a58f1addb1fd544ebe02d (diff) | |
Revert "Silence -Werror,-Wimplicit-fallthrough under NDEBUG"
This reverts commit 1d54b93670ac2c40661e3890ecea987d334cba31.
Calling abort() here was not the intention.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/view/output2.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index c4df00bc39c6..2cc4f5a479e8 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -67,7 +67,6 @@ #include <com/sun/star/i18n/DirectionProperty.hpp> #include <comphelper/string.hxx> -#include <cstdlib> #include <memory> #include <vector> @@ -2632,6 +2631,10 @@ 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; @@ -2644,9 +2647,6 @@ 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) |