Work around two -Werror=implicit-fallthrough=

...that started to crop up with recent GCC 12 trunk (where it expanded
the ENSURE_OR_THROW macro, but apparently didn't take into account that its

>    97 |     if( !(c) ){ \
>       |     ^~

will always be taken in these cases where the c argument is false), and
can easily be avoided by getting rid of those uses of
ENSURE_OR_THROW(false, "...")

(And while at it, move the default case to a more reasonable position in
mtftools.cxx, obsoleting the FALLTHROUGH comment in any case.)

Change-Id: I8189d98b361e6725096d0968f3e0e604fb84e591
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126452
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2021-12-06 19:21:47 +01:00
parent 478dfbd297
commit ea0d55fa45
2 changed files with 5 additions and 6 deletions
+3 -4
View File
@@ -61,10 +61,6 @@ namespace cppcanvas::tools
return ::Size( 0,
aMetric.GetInternalLeading() + aMetric.GetAscent() );
default:
ENSURE_OR_THROW( false,
"tools::getBaselineOffset(): Unexpected TextAlign value" );
// FALLTHROUGH intended (to calm compiler warning - case won't happen)
case ALIGN_BASELINE:
return ::Size( 0, 0 );
@@ -72,6 +68,9 @@ namespace cppcanvas::tools
return ::Size( 0,
-aMetric.GetDescent() );
default:
throw css::uno::RuntimeException(
"tools::getBaselineOffset(): Unexpected TextAlign value" );
}
}
@@ -45,8 +45,8 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const
switch( nTransformType )
{
default:
ENSURE_OR_THROW(
false, "AnimationTransformNode::createTransformActivity(): "
throw css::uno::RuntimeException(
"AnimationTransformNode::createTransformActivity(): "
"Unknown transform type" );
case animations::AnimationTransformType::TRANSLATE: