mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Silence -Werror,-Wimplicit-fallthrough under NDEBUG"

Browse Source 
This reverts commit 1d54b93670.

Calling abort() here was not the intention.
This commit is contained in:
Eike Rathke
2016-05-12 17:54:30 +02:00
parent c19e7cf433
commit c0977216d7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sc/source/ui/view/output2.cxx
View File

@@ -67,7 +67,6 @@
#include <com/sun/star/i18n/DirectionProperty.hpp> #include <com/sun/star/i18n/DirectionProperty.hpp>
#include <comphelper/string.hxx> #include <comphelper/string.hxx>
#include <cstdlib>
#include <memory> #include <memory>
#include <vector> #include <vector>
@@ -2632,6 +2631,10 @@ void ScOutputData::DrawEditParam::setAlignmentToEngine()
if (meOrient == SVX_ORIENTATION_STANDARD) if (meOrient == SVX_ORIENTATION_STANDARD)
switch (meHorJustResult) 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: case SVX_HOR_JUSTIFY_LEFT:
eSvxAdjust = SVX_ADJUST_LEFT; eSvxAdjust = SVX_ADJUST_LEFT;
break; break;
@@ -2644,9 +2647,6 @@ void ScOutputData::DrawEditParam::setAlignmentToEngine()
case SVX_HOR_JUSTIFY_BLOCK: case SVX_HOR_JUSTIFY_BLOCK:
eSvxAdjust = SVX_ADJUST_BLOCK; eSvxAdjust = SVX_ADJUST_BLOCK;
break; 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 else
switch (meVerJust) switch (meVerJust)