diff options
Diffstat (limited to 'sd/source/filter/eppt')
-rw-r--r-- | sd/source/filter/eppt/eppt.cxx | 4 | ||||
-rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 10 | ||||
-rw-r--r-- | sd/source/filter/eppt/pptexanimations.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/eppt/pptx-epptbase.cxx | 60 | ||||
-rw-r--r-- | sd/source/filter/eppt/pptx-epptooxml.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/eppt/pptx-text.cxx | 2 |
6 files changed, 40 insertions, 40 deletions
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index ab7c55a30087..65a9413b9441 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -194,7 +194,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ { case 1 : // automatic mnDiaMode++; - SAL_FALLTHROUGH; + [[fallthrough]]; case 2 : // semi-automatic mnDiaMode++; break; @@ -1211,7 +1211,7 @@ void PPTWriter::ImplWriteBackground( css::uno::Reference< css::beans::XPropertyS nFillColor = EscherEx::GetColor( *o3tl::doAccess<sal_uInt32>(mAny) ); nFillBackColor = nFillColor ^ 0xffffff; } - SAL_FALLTHROUGH; + [[fallthrough]]; } case css::drawing::FillStyle_NONE : default: diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 2917b19d787b..0001d90e2bb1 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -1420,16 +1420,16 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, css::presentation::ClickAct { case css::presentation::ClickAction_STOPPRESENTATION : nJump += 2; - SAL_FALLTHROUGH; + [[fallthrough]]; case css::presentation::ClickAction_LASTPAGE : nJump++; - SAL_FALLTHROUGH; + [[fallthrough]]; case css::presentation::ClickAction_FIRSTPAGE : nJump++; - SAL_FALLTHROUGH; + [[fallthrough]]; case css::presentation::ClickAction_PREVPAGE : nJump++; - SAL_FALLTHROUGH; + [[fallthrough]]; case css::presentation::ClickAction_NEXTPAGE : { nJump++; @@ -2749,7 +2749,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { if ( nPlaceHolderAtom < 19 ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; } case EPP_PLACEHOLDER_NOTESBODY : case EPP_PLACEHOLDER_MASTERDATE : diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 7be6a29d4657..9157fd18f93e 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -826,7 +826,7 @@ void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnima { case AnimationNodeType::PAR : aAnim.mnGroupType = mso_Anim_GroupType_PAR; - SAL_FALLTHROUGH; + [[fallthrough]]; case AnimationNodeType::SEQ : { sal_Int16 nType = 0; diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index bceacfac8ca3..178ae1f8c41c 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -854,39 +854,39 @@ sal_Int8 PPTWriterBase::GetTransition( FadeEffect eEffect, sal_uInt8& nDirection case FadeEffect_HORIZONTAL_STRIPES : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_VERTICAL_STRIPES : nPPTTransitionType = PPT_TRANSITION_TYPE_BLINDS; break; case FadeEffect_VERTICAL_CHECKERBOARD : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_HORIZONTAL_CHECKERBOARD : nPPTTransitionType = PPT_TRANSITION_TYPE_CHECKER; break; case FadeEffect_MOVE_FROM_UPPERLEFT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_MOVE_FROM_UPPERRIGHT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_MOVE_FROM_LOWERLEFT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_MOVE_FROM_LOWERRIGHT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_MOVE_FROM_TOP : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_MOVE_FROM_LEFT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_MOVE_FROM_BOTTOM : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_MOVE_FROM_RIGHT : nPPTTransitionType = PPT_TRANSITION_TYPE_COVER; break; @@ -897,33 +897,33 @@ sal_Int8 PPTWriterBase::GetTransition( FadeEffect eEffect, sal_uInt8& nDirection case FadeEffect_VERTICAL_LINES : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_HORIZONTAL_LINES : nPPTTransitionType = PPT_TRANSITION_TYPE_RANDOM_BARS; break; case FadeEffect_CLOSE_HORIZONTAL : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_OPEN_HORIZONTAL : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_CLOSE_VERTICAL : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_OPEN_VERTICAL : nPPTTransitionType = PPT_TRANSITION_TYPE_SPLIT; break; case FadeEffect_FADE_FROM_UPPERLEFT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_FADE_FROM_UPPERRIGHT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_FADE_FROM_LOWERLEFT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_FADE_FROM_LOWERRIGHT : nDirection += 4; nPPTTransitionType = PPT_TRANSITION_TYPE_STRIPS; @@ -931,58 +931,58 @@ sal_Int8 PPTWriterBase::GetTransition( FadeEffect eEffect, sal_uInt8& nDirection case FadeEffect_UNCOVER_TO_LOWERRIGHT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_UNCOVER_TO_LOWERLEFT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_UNCOVER_TO_UPPERRIGHT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_UNCOVER_TO_UPPERLEFT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_UNCOVER_TO_BOTTOM : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_UNCOVER_TO_RIGHT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_UNCOVER_TO_TOP : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_UNCOVER_TO_LEFT : nPPTTransitionType = PPT_TRANSITION_TYPE_PULL; break; case FadeEffect_FADE_FROM_TOP : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_FADE_FROM_LEFT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_FADE_FROM_BOTTOM : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_FADE_FROM_RIGHT : nPPTTransitionType = PPT_TRANSITION_TYPE_WIPE; break; case FadeEffect_ROLL_FROM_TOP : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_ROLL_FROM_LEFT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_ROLL_FROM_BOTTOM : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_ROLL_FROM_RIGHT : nPPTTransitionType = PPT_TRANSITION_TYPE_WIPE; break; case FadeEffect_FADE_TO_CENTER : nDirection++; - SAL_FALLTHROUGH; + [[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 56f85514bcc8..d72cc548d6db 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -610,7 +610,7 @@ void PowerPointExport::WriteTransition(const FSHelperPtr& pFS) break; case animations::TransitionSubType::CORNERSIN: // Inside turning cube pInverted = "true"; - SAL_FALLTHROUGH; + [[fallthrough]]; case animations::TransitionSubType::CORNERSOUT: // Outside turning cube nTransition = XML_fade; nTransition14 = XML_prism; diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index ea4294842be4..4c43f1cf181f 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -913,7 +913,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider* pBuProv, sal_Int1 nParaFlags |= 0x90; // we define the font and charset } - SAL_FALLTHROUGH; + [[fallthrough]]; } case SVX_NUM_CHARS_UPPER_LETTER : // count from a-z, aa - az, ba - bz, ... case SVX_NUM_CHARS_LOWER_LETTER : |