diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-08 09:46:01 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-08 13:28:16 +0100 |
commit | ab9b67bbb001f380b3973941443bfbc59fe7141c (patch) | |
tree | 4737847b2970d2310932f115935a9454aacff6fe /sd | |
parent | 3c0cb54b7ca20439e7e5e1e19dc6fcc75709973b (diff) |
Remove obsolete SAL_FALLTHROUGH completely
...after 7ffdd830d5fb52f2ca25aa80277d22ea6d89970b
"HAVE_CPP_ATTRIBUTE_FALLTHROUGH is always true now"
Change-Id: I54e5ff4e036a6bb3e5774d1c0524158aae18e937
Reviewed-on: https://gerrit.libreoffice.org/64800
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sd')
24 files changed, 66 insertions, 66 deletions
diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx index 7a3cd8238421..1393e8497ce5 100644 --- a/sd/source/core/CustomAnimationCloner.cxx +++ b/sd/source/core/CustomAnimationCloner.cxx @@ -143,7 +143,7 @@ namespace sd { Reference< XIterateContainer > xIter( xNode, UNO_QUERY_THROW ); xIter->setTarget( transformValue( xIter->getTarget() ) ); - SAL_FALLTHROUGH; + [[fallthrough]]; } case AnimationNodeType::PAR: case AnimationNodeType::SEQ: diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 7585480b155c..89c53c25f263 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -1249,7 +1249,7 @@ Any CustomAnimationEffect::getColor( sal_Int32 nIndex ) case AnimationNodeType::ANIMATE: if( !implIsColorAttribute( xAnimate->getAttributeName() ) ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case AnimationNodeType::ANIMATECOLOR: Sequence<Any> aValues( xAnimate->getValues() ); if( aValues.hasElements() ) @@ -1296,7 +1296,7 @@ void CustomAnimationEffect::setColor( sal_Int32 nIndex, const Any& rColor ) case AnimationNodeType::ANIMATE: if( !implIsColorAttribute( xAnimate->getAttributeName() ) ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case AnimationNodeType::ANIMATECOLOR: { Sequence<Any> aValues( xAnimate->getValues() ); diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 1f4a7d9dfabf..83297fce1310 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -1081,7 +1081,7 @@ OUString SdDrawDocument::CreatePageNumValue(sal_uInt16 nNum) const break; case css::style::NumberingType::ROMAN_UPPER: bUpper = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case css::style::NumberingType::ROMAN_LOWER: aPageNumValue += SvxNumberFormat::CreateRomanString(nNum, bUpper); break; diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 5fdbd63e8007..f073d5a8bda3 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2966,7 +2966,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout, break; default: - SAL_FALLTHROUGH; + [[fallthrough]]; case 6: pOffsets = aOffsets[ bLandscape ? 3 : 1 ]; break; diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 3df37e99da6e..aad5dd7e7824 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -666,7 +666,7 @@ OUString SdStyleSheet::GetFamilyString( SfxStyleFamily eFamily ) return OUString( "cell" ); default: OSL_FAIL( "SdStyleSheet::GetFamilyString(), illegal family!" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SfxStyleFamily::Para: return OUString( "graphics" ); } 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 : diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 3ebdc5218bc2..4ab0fdf1032e 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1255,7 +1255,7 @@ bool ImplSdPPTImport::Import() break; case PptViewTypeEnum::TitleMaster: nSelectedPage = 1; - SAL_FALLTHROUGH; + [[fallthrough]]; case PptViewTypeEnum::SlideMaster: { ePageKind = PageKind::Standard; @@ -1264,7 +1264,7 @@ bool ImplSdPPTImport::Import() break; case PptViewTypeEnum::NotesMaster: eEditMode = EditMode::MasterPage; - SAL_FALLTHROUGH; + [[fallthrough]]; case PptViewTypeEnum::Notes: ePageKind = PageKind::Notes; break; @@ -2372,11 +2372,11 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj case PptPlaceholder::NOTESBODY : ePresObjKind = PRESOBJ_NOTES; break; case PptPlaceholder::VERTICALTEXTTITLE : bVertical = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case PptPlaceholder::TITLE : ePresObjKind = PRESOBJ_TITLE; break; case PptPlaceholder::VERTICALTEXTBODY : bVertical = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case PptPlaceholder::BODY : ePresObjKind = PRESOBJ_OUTLINE; break; case PptPlaceholder::CENTEREDTITLE : ePresObjKind = PRESOBJ_TITLE; break; case PptPlaceholder::SUBTITLE : ePresObjKind = PRESOBJ_TEXT; break; // PRESOBJ_OUTLINE diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 3262c9e734e6..fa29ba6bf1f5 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -673,11 +673,11 @@ void AnimationImporter::fillNode( Reference< XAnimationNode > const & xNode, con sal_Int16 nNodeType = css::presentation::EffectNodeType::DEFAULT; switch( nPPTNodeType ) { - case DFF_ANIM_NODE_TYPE_CLICK_PARALLEL: SAL_FALLTHROUGH; + case DFF_ANIM_NODE_TYPE_CLICK_PARALLEL: [[fallthrough]]; case DFF_ANIM_NODE_TYPE_ON_CLICK: nNodeType = css::presentation::EffectNodeType::ON_CLICK; break; - case DFF_ANIM_NODE_TYPE_WITH_GROUP: SAL_FALLTHROUGH; + case DFF_ANIM_NODE_TYPE_WITH_GROUP: [[fallthrough]]; case DFF_ANIM_NODE_TYPE_WITH_PREVIOUS: nNodeType = css::presentation::EffectNodeType::WITH_PREVIOUS; break; - case DFF_ANIM_NODE_TYPE_AFTER_GROUP: SAL_FALLTHROUGH; + case DFF_ANIM_NODE_TYPE_AFTER_GROUP: [[fallthrough]]; case DFF_ANIM_NODE_TYPE_AFTER_PREVIOUS: nNodeType = css::presentation::EffectNodeType::AFTER_PREVIOUS; break; case DFF_ANIM_NODE_TYPE_MAIN_SEQUENCE: nNodeType = css::presentation::EffectNodeType::MAIN_SEQUENCE; break; case DFF_ANIM_NODE_TYPE_TIMING_ROOT: nNodeType = css::presentation::EffectNodeType::TIMING_ROOT; break; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 072d7229ea97..da0a3fdb6104 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -2528,7 +2528,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) aEvent.Repeat = 0; aEnd <<= aEvent; } - SAL_FALLTHROUGH; + [[fallthrough]]; case 7: aRepeatCount <<= Timing_INDEFINITE; break; diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index d69f77188eac..aee762153871 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -350,7 +350,7 @@ IMPL_LINK(CustomAnimationPane,EventMultiplexerListener, break; } } - SAL_FALLTHROUGH; + [[fallthrough]]; case EventMultiplexerEventId::MainViewRemoved: mxView = nullptr; mxCurrentPage = nullptr; diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 93c51087aa28..125a67dd7b8d 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -729,7 +729,7 @@ void SdTPAction::SetEditText( OUString const & rStr ) if( comphelper::string::getTokenCount(rStr, DOCUMENT_TOKEN) == 2 ) aText = rStr.getToken( 0, DOCUMENT_TOKEN ); - SAL_FALLTHROUGH; + [[fallthrough]]; case presentation::ClickAction_SOUND: case presentation::ClickAction_PROGRAM: { diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index a1108cdfb593..01cbb669ca11 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -280,7 +280,7 @@ void FuConstructRectangle::Activate() case SID_LINE_ARROW_SQUARE: case SID_LINE_SQUARE_ARROW: mpView->SetGlueVisible(); - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_DRAW_LINE : case SID_DRAW_XLINE: aObjKind = OBJ_LINE; diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 013b1c5aa829..ba2c64ae2856 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -481,7 +481,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) aServerLst.Remove( DrawDocShell::Factory().GetClassId() ); } - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_INSERT_FLOATINGFRAME : { diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx index 815f851bd33c..d1de6ecca556 100644 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -153,7 +153,7 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) // delete snap object if ( !bCreateNew ) pPV->DeleteHelpLine(nHelpLine); - SAL_FALLTHROUGH; + [[fallthrough]]; default: return; } diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index b58f4b486247..dc9549be6888 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1742,7 +1742,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt) gotoNextSlide(); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case KEY_SPACE: case KEY_RIGHT: case KEY_DOWN: @@ -1788,7 +1788,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt) gotoPreviousSlide(); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case KEY_LEFT: case KEY_UP: case KEY_P: diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index f039c3b66dad..b9094956b4eb 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -1320,7 +1320,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno bOk = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case presentation::ClickAction_SOUND: if( nFound & FoundFlags::SoundUrl ) @@ -1562,7 +1562,7 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName ) pProperties->State = beans::PropertyState_DIRECT_VALUE; pProperties++; - SAL_FALLTHROUGH; + [[fallthrough]]; case presentation::ClickAction_SOUND: if( eClickAction == presentation::ClickAction_SOUND || pInfo->mbSecondSoundOn ) diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 5d9a38aefd0e..57cbcfda0424 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1639,7 +1639,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_CAPTUREPOINT: // negative value to signal call from menu maMousePos = Point(-1,-1); - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_SET_SNAPITEM: { SetCurrentFunction( FuSnapLine::Create(this, GetActiveWindow(), mpDrawView.get(), GetDoc(), rReq) ); diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 33384160e7fa..d7aa739db685 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -1005,7 +1005,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) // AutoLayouts have to be ready. GetDoc()->StopWorkStartupDelay(); - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_DRAWINGMODE: case SID_SLIDE_SORTER_MODE: diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 5b4bc878393a..66ae776d158f 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -749,7 +749,7 @@ bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi break; } } - SAL_FALLTHROUGH; + [[fallthrough]]; case CommandEventId::StartAutoScroll: case CommandEventId::AutoScroll: { |