diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-07 22:52:29 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-08 09:43:46 +0100 |
commit | 5eac2e6bcc11c1a30cb29d2f1e0289e15e8f1d05 (patch) | |
tree | 98ca16dc52ac731403a09a4be8afee1703c29cd9 /slideshow | |
parent | 8a4d80bc001483e14945d87118e53f1518a434e8 (diff) |
Remove misguided FALLTHROUGH comments
...between adjacent switch labels without any intervening statements
Change-Id: Ieb8a0d9f71ea4382b5f7d005cdf7111d06aeb5d0
Reviewed-on: https://gerrit.libreoffice.org/64789
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'slideshow')
4 files changed, 0 insertions, 111 deletions
diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx index 2451a71bb2dd..38f3eb0825f8 100644 --- a/slideshow/source/engine/animationfactory.cxx +++ b/slideshow/source/engine/animationfactory.cxx @@ -732,18 +732,13 @@ namespace slideshow switch( mapAttributeName( rAttrName ) ) { default: - // FALLTHROUGH intended case AttributeType::Invalid: return CLASS_UNKNOWN_PROPERTY; case AttributeType::CharColor: - // FALLTHROUGH intended case AttributeType::Color: - // FALLTHROUGH intended case AttributeType::DimColor: - // FALLTHROUGH intended case AttributeType::FillColor: - // FALLTHROUGH intended case AttributeType::LineColor: return CLASS_COLOR_PROPERTY; @@ -754,32 +749,20 @@ namespace slideshow return CLASS_BOOL_PROPERTY; case AttributeType::CharHeight: - // FALLTHROUGH intended case AttributeType::CharWeight: - // FALLTHROUGH intended case AttributeType::Height: - // FALLTHROUGH intended case AttributeType::Opacity: - // FALLTHROUGH intended case AttributeType::Rotate: - // FALLTHROUGH intended case AttributeType::SkewX: - // FALLTHROUGH intended case AttributeType::SkewY: - // FALLTHROUGH intended case AttributeType::Width: - // FALLTHROUGH intended case AttributeType::PosX: - // FALLTHROUGH intended case AttributeType::PosY: return CLASS_NUMBER_PROPERTY; case AttributeType::CharUnderline: - // FALLTHROUGH intended case AttributeType::FillStyle: - // FALLTHROUGH intended case AttributeType::LineStyle: - // FALLTHROUGH intended case AttributeType::CharPosture: return CLASS_ENUM_PROPERTY; } @@ -796,32 +779,21 @@ namespace slideshow switch( mapAttributeName( rAttrName ) ) { default: - // FALLTHROUGH intended case AttributeType::Invalid: ENSURE_OR_THROW( false, "AnimationFactory::createNumberPropertyAnimation(): Unknown attribute" ); break; case AttributeType::CharColor: - // FALLTHROUGH intended case AttributeType::CharFontName: - // FALLTHROUGH intended case AttributeType::CharPosture: - // FALLTHROUGH intended case AttributeType::CharUnderline: - // FALLTHROUGH intended case AttributeType::Color: - // FALLTHROUGH intended case AttributeType::DimColor: - // FALLTHROUGH intended case AttributeType::FillColor: - // FALLTHROUGH intended case AttributeType::FillStyle: - // FALLTHROUGH intended case AttributeType::LineColor: - // FALLTHROUGH intended case AttributeType::LineStyle: - // FALLTHROUGH intended case AttributeType::Visibility: ENSURE_OR_THROW( false, "AnimationFactory::createNumberPropertyAnimation(): Attribute type mismatch" ); @@ -952,44 +924,27 @@ namespace slideshow switch( mapAttributeName( rAttrName ) ) { default: - // FALLTHROUGH intended case AttributeType::Invalid: ENSURE_OR_THROW( false, "AnimationFactory::createEnumPropertyAnimation(): Unknown attribute" ); break; case AttributeType::CharColor: - // FALLTHROUGH intended case AttributeType::CharFontName: - // FALLTHROUGH intended case AttributeType::Color: - // FALLTHROUGH intended case AttributeType::DimColor: - // FALLTHROUGH intended case AttributeType::FillColor: - // FALLTHROUGH intended case AttributeType::LineColor: - // FALLTHROUGH intended case AttributeType::Visibility: - // FALLTHROUGH intended case AttributeType::CharHeight: - // FALLTHROUGH intended case AttributeType::CharWeight: - // FALLTHROUGH intended case AttributeType::Height: - // FALLTHROUGH intended case AttributeType::Opacity: - // FALLTHROUGH intended case AttributeType::Rotate: - // FALLTHROUGH intended case AttributeType::SkewX: - // FALLTHROUGH intended case AttributeType::SkewY: - // FALLTHROUGH intended case AttributeType::Width: - // FALLTHROUGH intended case AttributeType::PosX: - // FALLTHROUGH intended case AttributeType::PosY: ENSURE_OR_THROW( false, "AnimationFactory::createEnumPropertyAnimation(): Attribute type mismatch" ); @@ -1046,42 +1001,26 @@ namespace slideshow switch( mapAttributeName( rAttrName ) ) { default: - // FALLTHROUGH intended case AttributeType::Invalid: ENSURE_OR_THROW( false, "AnimationFactory::createColorPropertyAnimation(): Unknown attribute" ); break; case AttributeType::CharFontName: - // FALLTHROUGH intended case AttributeType::CharHeight: - // FALLTHROUGH intended case AttributeType::CharPosture: - // FALLTHROUGH intended case AttributeType::CharUnderline: - // FALLTHROUGH intended case AttributeType::CharWeight: - // FALLTHROUGH intended case AttributeType::FillStyle: - // FALLTHROUGH intended case AttributeType::Height: - // FALLTHROUGH intended case AttributeType::LineStyle: - // FALLTHROUGH intended case AttributeType::Opacity: - // FALLTHROUGH intended case AttributeType::Rotate: - // FALLTHROUGH intended case AttributeType::SkewX: - // FALLTHROUGH intended case AttributeType::SkewY: - // FALLTHROUGH intended case AttributeType::Visibility: - // FALLTHROUGH intended case AttributeType::Width: - // FALLTHROUGH intended case AttributeType::PosX: - // FALLTHROUGH intended case AttributeType::PosY: ENSURE_OR_THROW( false, "AnimationFactory::createColorPropertyAnimation(): Attribute type mismatch" ); @@ -1196,50 +1135,30 @@ namespace slideshow switch( mapAttributeName( rAttrName ) ) { default: - // FALLTHROUGH intended case AttributeType::Invalid: ENSURE_OR_THROW( false, "AnimationFactory::createStringPropertyAnimation(): Unknown attribute" ); break; case AttributeType::CharColor: - // FALLTHROUGH intended case AttributeType::CharHeight: - // FALLTHROUGH intended case AttributeType::CharUnderline: - // FALLTHROUGH intended case AttributeType::Color: - // FALLTHROUGH intended case AttributeType::DimColor: - // FALLTHROUGH intended case AttributeType::FillColor: - // FALLTHROUGH intended case AttributeType::Height: - // FALLTHROUGH intended case AttributeType::LineColor: - // FALLTHROUGH intended case AttributeType::Opacity: - // FALLTHROUGH intended case AttributeType::Rotate: - // FALLTHROUGH intended case AttributeType::SkewX: - // FALLTHROUGH intended case AttributeType::SkewY: - // FALLTHROUGH intended case AttributeType::Visibility: - // FALLTHROUGH intended case AttributeType::Width: - // FALLTHROUGH intended case AttributeType::PosX: - // FALLTHROUGH intended case AttributeType::PosY: - // FALLTHROUGH intended case AttributeType::CharPosture: - // FALLTHROUGH intended case AttributeType::CharWeight: - // FALLTHROUGH intended case AttributeType::FillStyle: - // FALLTHROUGH intended case AttributeType::LineStyle: ENSURE_OR_THROW( false, "AnimationFactory::createStringPropertyAnimation(): Attribute type mismatch" ); @@ -1268,50 +1187,30 @@ namespace slideshow switch( mapAttributeName( rAttrName ) ) { default: - // FALLTHROUGH intended case AttributeType::Invalid: ENSURE_OR_THROW( false, "AnimationFactory::createBoolPropertyAnimation(): Unknown attribute" ); break; case AttributeType::CharColor: - // FALLTHROUGH intended case AttributeType::CharFontName: - // FALLTHROUGH intended case AttributeType::CharHeight: - // FALLTHROUGH intended case AttributeType::CharPosture: - // FALLTHROUGH intended case AttributeType::CharWeight: - // FALLTHROUGH intended case AttributeType::Color: - // FALLTHROUGH intended case AttributeType::DimColor: - // FALLTHROUGH intended case AttributeType::FillColor: - // FALLTHROUGH intended case AttributeType::FillStyle: - // FALLTHROUGH intended case AttributeType::Height: - // FALLTHROUGH intended case AttributeType::LineColor: - // FALLTHROUGH intended case AttributeType::LineStyle: - // FALLTHROUGH intended case AttributeType::Opacity: - // FALLTHROUGH intended case AttributeType::Rotate: - // FALLTHROUGH intended case AttributeType::SkewX: - // FALLTHROUGH intended case AttributeType::SkewY: - // FALLTHROUGH intended case AttributeType::Width: - // FALLTHROUGH intended case AttributeType::PosX: - // FALLTHROUGH intended case AttributeType::PosY: - // FALLTHROUGH intended case AttributeType::CharUnderline: ENSURE_OR_THROW( false, "AnimationFactory::createBoolPropertyAnimation(): Attribute type mismatch" ); diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.cxx b/slideshow/source/engine/animationnodes/animationtransformnode.cxx index 394349f5b707..d40f9400bf7d 100644 --- a/slideshow/source/engine/animationnodes/animationtransformnode.cxx +++ b/slideshow/source/engine/animationnodes/animationtransformnode.cxx @@ -51,7 +51,6 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const "Unknown transform type" ); case animations::AnimationTransformType::TRANSLATE: - // FALLTHROUGH intended case animations::AnimationTransformType::SCALE: return ActivitiesFactory::createAnimateActivity( aParms, diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx index ac10b14d3b3e..29c28596e132 100644 --- a/slideshow/source/engine/slide/targetpropertiescreator.cxx +++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx @@ -188,19 +188,12 @@ namespace internal break; case animations::AnimationNodeType::CUSTOM: - // FALLTHROUGH intended case animations::AnimationNodeType::ANIMATE: - // FALLTHROUGH intended case animations::AnimationNodeType::ANIMATEMOTION: - // FALLTHROUGH intended case animations::AnimationNodeType::ANIMATECOLOR: - // FALLTHROUGH intended case animations::AnimationNodeType::ANIMATETRANSFORM: - // FALLTHROUGH intended case animations::AnimationNodeType::TRANSITIONFILTER: - // FALLTHROUGH intended case animations::AnimationNodeType::AUDIO: - // FALLTHROUGH intended /*default: // ignore this node, no valuable content for now. break;*/ diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx index db39e543b4a1..0492ce0761bd 100644 --- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx @@ -1063,9 +1063,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( // TODO(F1): Implement toColor/fromColor fades case animations::TransitionSubType::FADETOCOLOR: - // FALLTHROUGH intended case animations::TransitionSubType::FADEFROMCOLOR: - // FALLTHROUGH intended case animations::TransitionSubType::FADEOVERCOLOR: if (pLeavingSlide) { // only generate, if fade |