diff options
Diffstat (limited to 'sd/source/ui')
-rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/tpaction.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/func/fuconrec.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/func/fuinsert.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/func/fusnapln.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/view/SlsTheme.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unoobj.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/drviews2.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drviewse.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/viewshel.cxx | 2 |
12 files changed, 14 insertions, 14 deletions
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 7d363f671d75..21f61153feb7 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -1907,7 +1907,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) aEvent.Repeat = 0; aEnd <<= aEvent; } - // ATTENTION: FALL THROUGH INTENDED! + SAL_FALLTHROUGH; case 7: aRepeatCount <<= Timing_INDEFINITE; break; diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 57f632a90169..21572837861d 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -325,7 +325,7 @@ IMPL_LINK_TYPED(CustomAnimationPane,EventMultiplexerListener, break; } } - // fall through intended + SAL_FALLTHROUGH; case tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED: mxView = nullptr; mxCurrentPage = nullptr; diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index c5ea23315a92..dda6c664b8c3 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -730,7 +730,7 @@ void SdTPAction::SetEditText( OUString const & rStr ) if( comphelper::string::getTokenCount(rStr, DOCUMENT_TOKEN) == 2 ) aText = rStr.getToken( 0, DOCUMENT_TOKEN ); - // fallthrough intended + SAL_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 5ad85e42d554..0acc56c3cef4 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -289,7 +289,7 @@ void FuConstructRectangle::Activate() case SID_LINE_ARROW_SQUARE: case SID_LINE_SQUARE_ARROW: mpView->SetGlueVisible(); - // no break ! + SAL_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 01a795a967e2..268336ff9033 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() ); } - // intentionally no break! + SAL_FALLTHROUGH; } case SID_INSERT_FLOATINGFRAME : { diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx index 4269c16e8fa1..63b28edf45d4 100644 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -156,7 +156,7 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) // delete snap object if ( !bCreateNew ) pPV->DeleteHelpLine(nHelpLine); - /*fall-through*/ + SAL_FALLTHROUGH; default: return; } diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index f6c57bb4b07e..b45f1f4f3783 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1841,7 +1841,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt) gotoNextSlide(); break; } - // warning, fall through! + SAL_FALLTHROUGH; case KEY_SPACE: case KEY_RIGHT: case KEY_DOWN: @@ -1887,7 +1887,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt) gotoPreviousSlide(); break; } - // warning, fall through! + SAL_FALLTHROUGH; case KEY_LEFT: case KEY_UP: case KEY_P: diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx index eb75e796ca92..45806df08f0e 100644 --- a/sd/source/ui/slidesorter/view/SlsTheme.cxx +++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx @@ -186,7 +186,7 @@ ColorData Theme::GetGradientColor ( case Border2: return rDescriptor.maBorderColor2; case Fill1: return rDescriptor.maFillColor1; case Fill2: return rDescriptor.maFillColor2; - default: OSL_ASSERT(false); // fall through + default: OSL_ASSERT(false); SAL_FALLTHROUGH; case Base: return rDescriptor.maBaseColor; } } diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index d1d68073cb7b..21657ec06359 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -1386,7 +1386,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno bOk = true; - // NOTE: No break here!!! + SAL_FALLTHROUGH; case presentation::ClickAction_SOUND: if( nFound & FOUND_SOUNDURL ) @@ -1629,7 +1629,7 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName ) pProperties->State = beans::PropertyState_DIRECT_VALUE; pProperties++; - // NOTE: no break here!!! + SAL_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 b72d9b29b36b..2d7faede8e14 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1244,7 +1244,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_CAPTUREPOINT: // negative value to signal call from menu maMousePos = Point(-1,-1); - // fall-through + SAL_FALLTHROUGH; case SID_SET_SNAPITEM: { SetCurrentFunction( FuSnapLine::Create(this, GetActiveWindow(), mpDrawView, GetDoc(), rReq) ); diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index f4216520a528..4bfe80539068 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -971,7 +971,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) // AutoLayouts have to be ready. GetDoc()->StopWorkStartupDelay(); - // Fall through to following case statements. + SAL_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 15de98760b2f..fa9d18925be0 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -771,7 +771,7 @@ bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi break; } } - // fall through when not running slideshow + SAL_FALLTHROUGH; case CommandEventId::StartAutoScroll: case CommandEventId::AutoScroll: { |