summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
Diffstat (limited to 'sd')
-rw-r--r--sd/source/core/CustomAnimationCloner.cxx2
-rw-r--r--sd/source/core/drawdoc4.cxx2
-rw-r--r--sd/source/filter/eppt/eppt.cxx5
-rw-r--r--sd/source/filter/eppt/epptso.cxx8
-rw-r--r--sd/source/filter/eppt/pptexanimations.cxx2
-rw-r--r--sd/source/filter/ppt/pptin.cxx10
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx2
-rw-r--r--sd/source/ui/dlg/tpaction.cxx2
-rw-r--r--sd/source/ui/func/fuconrec.cxx2
-rw-r--r--sd/source/ui/func/fuinsert.cxx2
-rw-r--r--sd/source/ui/func/fusnapln.cxx2
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx4
-rw-r--r--sd/source/ui/slidesorter/view/SlsTheme.cxx2
-rw-r--r--sd/source/ui/unoidl/unoobj.cxx4
-rw-r--r--sd/source/ui/view/drviews2.cxx2
-rw-r--r--sd/source/ui/view/drviewse.cxx2
-rw-r--r--sd/source/ui/view/viewshel.cxx2
19 files changed, 31 insertions, 28 deletions
diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx
index 79a1636fae12..48d74bcdb17e 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -152,8 +152,8 @@ namespace sd
{
Reference< XIterateContainer > xIter( xNode, UNO_QUERY_THROW );
xIter->setTarget( transformValue( xIter->getTarget() ) );
+ SAL_FALLTHROUGH;
}
- // its intended that here is no break!
case AnimationNodeType::PAR:
case AnimationNodeType::SEQ:
{
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 2f9f8ba7debe..e151b8bcbae7 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -1047,7 +1047,7 @@ OUString SdDrawDocument::CreatePageNumValue(sal_uInt16 nNum) const
break;
case SVX_ROMAN_UPPER:
bUpper = true;
- //fall-through
+ SAL_FALLTHROUGH;
case SVX_ROMAN_LOWER:
aPageNumValue += SvxNumberFormat::CreateRomanString(nNum, bUpper);
break;
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index eef315ceebb7..8c0871494e04 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -198,7 +198,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
{
case 1 : // automatic
mnDiaMode++;
- // fall-through
+ SAL_FALLTHROUGH;
case 2 : // semi-automatic
mnDiaMode++;
break;
@@ -1217,7 +1217,8 @@ void PPTWriter::ImplWriteBackground( css::uno::Reference< css::beans::XPropertyS
nFillColor = EscherEx::GetColor( *static_cast<sal_uInt32 const *>(mAny.getValue()) );
nFillBackColor = nFillColor ^ 0xffffff;
}
- } // PASSTHROUGH INTENDED
+ SAL_FALLTHROUGH;
+ }
case css::drawing::FillStyle_NONE :
default:
aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x120012 );
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index cc1e467b5270..ad80de73a95a 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1935,16 +1935,16 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, css::presentation::ClickAct
{
case css::presentation::ClickAction_STOPPRESENTATION :
nJump += 2;
- //fall-through
+ SAL_FALLTHROUGH;
case css::presentation::ClickAction_LASTPAGE :
nJump++;
- //fall-through
+ SAL_FALLTHROUGH;
case css::presentation::ClickAction_FIRSTPAGE :
nJump++;
- //fall-through
+ SAL_FALLTHROUGH;
case css::presentation::ClickAction_PREVPAGE :
nJump++;
- //fall-through
+ SAL_FALLTHROUGH;
case css::presentation::ClickAction_NEXTPAGE :
{
nJump++;
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 4c18cc23171e..e772714d7bd4 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -829,7 +829,7 @@ void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnima
{
case AnimationNodeType::PAR :
aAnim.mnGroupType = mso_Anim_GroupType_PAR;
- // PASSTROUGH!!! (as it was intended)
+ SAL_FALLTHROUGH;
case AnimationNodeType::SEQ :
{
sal_Int16 nType = 0;
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 4553de0ea378..269ebbba1833 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1254,7 +1254,7 @@ bool ImplSdPPTImport::Import()
break;
case 10 : // titlemaster
nSelectedPage = 1;
- //fall-through
+ SAL_FALLTHROUGH;
case 2 : // master
{
ePageKind = PK_STANDARD;
@@ -1263,7 +1263,7 @@ bool ImplSdPPTImport::Import()
break;
case 5 : // notes master
eEditMode = EM_MASTERPAGE;
- //fall-through
+ SAL_FALLTHROUGH;
case 3 : // notes
ePageKind = PK_NOTES;
break;
@@ -2366,10 +2366,12 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
{
case PptPlaceholder::NOTESBODY : ePresObjKind = PRESOBJ_NOTES; break;
case PptPlaceholder::VERTICALTEXTTITLE :
- bVertical = true; // PASSTHROUGH !!!
+ bVertical = true;
+ SAL_FALLTHROUGH;
case PptPlaceholder::TITLE : ePresObjKind = PRESOBJ_TITLE; break;
case PptPlaceholder::VERTICALTEXTBODY :
- bVertical = true; // PASSTHROUGH !!!
+ bVertical = true;
+ SAL_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/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 686d3e3a1429..bd0db7f58a12 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -677,7 +677,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
nError = ERRCODE_IO_BROKENPACKAGE;
break;
}
- // fall through intended
+ SAL_FALLTHROUGH;
default:
{
// TODO/LATER: this is completely wrong! Filter code should never call ErrorHandler directly!
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:
{
generated by cgit (git 2.34.1) at 2024-08-20 22:18:40 +0000