From 0f3ac23d732239b50207cfbb8cf810ef41fa9835 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 10 May 2016 14:49:37 +0200 Subject: Insert explicit "break" when falling through to empty next case ...which itself only contains a "break" (or nothing at all at the end of the "switch"), as otherwise Clang -Wimplicit-fallthrough would warn about these. Change-Id: I25c1cf2ca74dfeba7ca0385ca8f1c1bf30bbf91b --- sd/source/filter/eppt/eppt.cxx | 1 + sd/source/ui/sidebar/LayoutMenu.cxx | 1 + sd/source/ui/sidebar/MasterPageContainerFiller.cxx | 1 + sd/source/ui/sidebar/MasterPagesSelector.cxx | 1 + sd/source/ui/table/tablefunction.cxx | 1 + sd/source/ui/view/drviews2.cxx | 3 ++- sd/source/ui/view/drviews3.cxx | 1 + sd/source/ui/view/sdview3.cxx | 1 + 8 files changed, 9 insertions(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 0e7e34058525..eef315ceebb7 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -201,6 +201,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ // fall-through case 2 : // semi-automatic mnDiaMode++; + break; default : case 0 : // manual break; diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 55a51c25e968..539cee5c083a 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -400,6 +400,7 @@ void LayoutMenu::AssignLayoutToSelectedSlides (AutoLayout aLayout) if (pDrawViewShell != nullptr) if (pDrawViewShell->GetEditMode() == EM_MASTERPAGE) bMasterPageMode = true; + break; } default: break; diff --git a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx index 43e60a1ff9c3..5f591e45695b 100644 --- a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx @@ -90,6 +90,7 @@ void MasterPageContainerFiller::RunNextStep() mrContainerAdapter.FillingDone(); mpScannerTask.reset(); } + break; default: break; } diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index 2f61b25a320a..c547dc3f659b 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -446,6 +446,7 @@ void MasterPagesSelector::NotifyContainerChangeEvent (const MasterPageContainerC { int nIndex (GetIndexForToken(rEvent.maChildToken)); SetItem(nIndex, MasterPageContainer::NIL_TOKEN); + break; } default: diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index fd58cd4e1462..948cdd173f00 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -243,6 +243,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq) Cancel(); rReq.Done (); + break; } default: break; diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index e610c44c0547..b72d9b29b36b 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -3088,9 +3088,10 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) FuText::ChangeFontSize( nSId == SID_GROW_FONT_SIZE, nullptr, pFontList, mpView ); GetViewFrame()->GetBindings().Invalidate( SID_ATTR_CHAR_FONTHEIGHT ); } + break; } default: - ; + break; } mpDrawView->SetAttributes(aNewAttr); diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 6da4626265d7..307ee4f4db9f 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -473,6 +473,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) UpdatePreview( mpActualPage ); rReq.Done(); } + break; default: break; diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index a88e24016679..95badc5a7966 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -229,6 +229,7 @@ bool View::InsertMetaFile( TransferableDataHelper& rDataHelper, const Point& rPo break; default: break; } + break; default: break; } -- cgit