summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-05-10 17:10:32 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-05-10 17:10:32 +0200
commit8eb8b9c1d27d97c722ecd992521226a7a49d984c (patch)
tree1313b1ff7cc709e132b51c44c6e55ba5c284e596
parent7a8b384271d947248430cfb189165fc64cdbec0c (diff)
Add SAL_FALLTHROUGH, where apparently appropriate
Change-Id: I1f147c4a0ebc6895435722d8385131917f88ecb5
-rw-r--r--sd/source/core/CustomAnimationEffect.cxx2
-rw-r--r--sd/source/core/stlsheet.cxx1
-rw-r--r--sd/source/filter/eppt/pptx-epptbase.cxx30
-rw-r--r--sd/source/filter/eppt/pptx-epptooxml.cxx1
4 files changed, 34 insertions, 0 deletions
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 04b18622b917..0f8545c5d5b0 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -1280,6 +1280,7 @@ Any CustomAnimationEffect::getColor( sal_Int32 nIndex )
case AnimationNodeType::ANIMATE:
if( !implIsColorAttribute( xAnimate->getAttributeName() ) )
break;
+ SAL_FALLTHROUGH;
case AnimationNodeType::ANIMATECOLOR:
Sequence<Any> aValues( xAnimate->getValues() );
if( aValues.hasElements() )
@@ -1326,6 +1327,7 @@ void CustomAnimationEffect::setColor( sal_Int32 nIndex, const Any& rColor )
case AnimationNodeType::ANIMATE:
if( !implIsColorAttribute( xAnimate->getAttributeName() ) )
break;
+ SAL_FALLTHROUGH;
case AnimationNodeType::ANIMATECOLOR:
{
Sequence<Any> aValues( xAnimate->getValues() );
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index e326ba8a652e..22e306097e31 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -685,6 +685,7 @@ OUString SdStyleSheet::GetFamilyString( SfxStyleFamily eFamily )
return OUString( "cell" );
default:
OSL_FAIL( "SdStyleSheet::GetFamilyString(), illegal family!" );
+ SAL_FALLTHROUGH;
case SD_STYLE_FAMILY_GRAPHICS:
return OUString( "graphics" );
}
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index e22fe9dcb375..7bd4b658cc3d 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -849,30 +849,39 @@ sal_Int8 PPTWriterBase::GetTransition( FadeEffect eEffect, sal_uInt8& nDirection
case FadeEffect_HORIZONTAL_STRIPES :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_VERTICAL_STRIPES :
nPPTTransitionType = PPT_TRANSITION_TYPE_BLINDS;
break;
case FadeEffect_VERTICAL_CHECKERBOARD :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_HORIZONTAL_CHECKERBOARD :
nPPTTransitionType = PPT_TRANSITION_TYPE_CHECKER;
break;
case FadeEffect_MOVE_FROM_UPPERLEFT :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_MOVE_FROM_UPPERRIGHT :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_MOVE_FROM_LOWERLEFT :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_MOVE_FROM_LOWERRIGHT :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_MOVE_FROM_TOP :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_MOVE_FROM_LEFT :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_MOVE_FROM_BOTTOM :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_MOVE_FROM_RIGHT :
nPPTTransitionType = PPT_TRANSITION_TYPE_COVER;
break;
@@ -883,26 +892,33 @@ sal_Int8 PPTWriterBase::GetTransition( FadeEffect eEffect, sal_uInt8& nDirection
case FadeEffect_VERTICAL_LINES :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_HORIZONTAL_LINES :
nPPTTransitionType = PPT_TRANSITION_TYPE_RANDOM_BARS;
break;
case FadeEffect_CLOSE_HORIZONTAL :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_OPEN_HORIZONTAL :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_CLOSE_VERTICAL :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_OPEN_VERTICAL :
nPPTTransitionType = PPT_TRANSITION_TYPE_SPLIT;
break;
case FadeEffect_FADE_FROM_UPPERLEFT :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_FADE_FROM_UPPERRIGHT :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_FADE_FROM_LOWERLEFT :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_FADE_FROM_LOWERRIGHT :
nDirection += 4;
nPPTTransitionType = PPT_TRANSITION_TYPE_STRIPS;
@@ -910,44 +926,58 @@ sal_Int8 PPTWriterBase::GetTransition( FadeEffect eEffect, sal_uInt8& nDirection
case FadeEffect_UNCOVER_TO_LOWERRIGHT :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_UNCOVER_TO_LOWERLEFT :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_UNCOVER_TO_UPPERRIGHT :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_UNCOVER_TO_UPPERLEFT :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_UNCOVER_TO_BOTTOM :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_UNCOVER_TO_RIGHT :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_UNCOVER_TO_TOP :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_UNCOVER_TO_LEFT :
nPPTTransitionType = PPT_TRANSITION_TYPE_PULL;
break;
case FadeEffect_FADE_FROM_TOP :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_FADE_FROM_LEFT :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_FADE_FROM_BOTTOM :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_FADE_FROM_RIGHT :
nPPTTransitionType = PPT_TRANSITION_TYPE_WIPE;
break;
case FadeEffect_ROLL_FROM_TOP :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_ROLL_FROM_LEFT :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_ROLL_FROM_BOTTOM :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_ROLL_FROM_RIGHT :
nPPTTransitionType = PPT_TRANSITION_TYPE_WIPE;
break;
case FadeEffect_FADE_TO_CENTER :
nDirection++;
+ SAL_FALLTHROUGH;
case FadeEffect_FADE_FROM_CENTER :
nPPTTransitionType = PPT_TRANSITION_TYPE_ZOOM;
break;
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index dd5c3a94fd2c..32f717196b83 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -586,6 +586,7 @@ void PowerPointExport::WriteTransition( const FSHelperPtr& pFS )
break;
case animations::TransitionSubType::CORNERSIN: // Inside turning cube
pInverted = "true";
+ SAL_FALLTHROUGH;
case animations::TransitionSubType::CORNERSOUT: // Outside turning cube
nTransition = XML_fade;
nTransition14 = XML_prism;