summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-12-08 09:46:01 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-12-08 13:28:16 +0100
commitab9b67bbb001f380b3973941443bfbc59fe7141c (patch)
tree4737847b2970d2310932f115935a9454aacff6fe /slideshow
parent3c0cb54b7ca20439e7e5e1e19dc6fcc75709973b (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 'slideshow')
-rw-r--r--slideshow/source/engine/activities/activitiesfactory.cxx4
-rw-r--r--slideshow/source/engine/animationnodes/basenode.cxx4
-rw-r--r--slideshow/source/engine/animationnodes/generateevent.cxx2
-rw-r--r--slideshow/source/engine/shapes/drawshapesubsetting.cxx12
-rw-r--r--slideshow/source/engine/shapes/gdimtftools.cxx2
-rw-r--r--slideshow/source/engine/slide/targetpropertiescreator.cxx2
6 files changed, 13 insertions, 13 deletions
diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx
index 9c7f130c25cd..261a0c6019cb 100644
--- a/slideshow/source/engine/activities/activitiesfactory.cxx
+++ b/slideshow/source/engine/activities/activitiesfactory.cxx
@@ -765,7 +765,7 @@ AnimationActivitySharedPtr createActivity(
default:
OSL_FAIL( "createActivity(): unexpected case" );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case animations::AnimationCalcMode::PACED:
case animations::AnimationCalcMode::SPLINE:
case animations::AnimationCalcMode::LINEAR:
@@ -831,7 +831,7 @@ AnimationActivitySharedPtr createActivity(
default:
OSL_FAIL( "createActivity(): unexpected case" );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case animations::AnimationCalcMode::PACED:
case animations::AnimationCalcMode::SPLINE:
case animations::AnimationCalcMode::LINEAR:
diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx
index bfe066e5b5a9..2bd65ef7eef1 100644
--- a/slideshow/source/engine/animationnodes/basenode.cxx
+++ b/slideshow/source/engine/animationnodes/basenode.cxx
@@ -205,7 +205,7 @@ const int* getStateTransitionTable( sal_Int16 nRestartMode,
// same value: animations::AnimationRestart::INHERIT:
OSL_FAIL(
"getStateTransitionTable(): unexpected case for restart" );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case animations::AnimationRestart::NEVER:
nRestartValue = 0;
break;
@@ -225,7 +225,7 @@ const int* getStateTransitionTable( sal_Int16 nRestartMode,
// same value: animations::AnimationFill::INHERIT:
OSL_FAIL(
"getStateTransitionTable(): unexpected case for fill" );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case animations::AnimationFill::REMOVE:
nFillValue = 0;
break;
diff --git a/slideshow/source/engine/animationnodes/generateevent.cxx b/slideshow/source/engine/animationnodes/generateevent.cxx
index 962b18e161b3..d252100e5bd4 100644
--- a/slideshow/source/engine/animationnodes/generateevent.cxx
+++ b/slideshow/source/engine/animationnodes/generateevent.cxx
@@ -188,7 +188,7 @@ EventSharedPtr generateEvent(
case animations::EventTrigger::ON_PREV:
OSL_FAIL( "event trigger ON_PREV not yet implemented, "
"mapped to ON_NEXT!" );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case animations::EventTrigger::ON_NEXT:
pEvent = makeDelay( rFunctor,
nDelay2 + nAdditionalDelay,
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index 10a5283e3b9c..4b140a36efcb 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -154,7 +154,7 @@ namespace slideshow
SAL_INFO("slideshow.verbose", "Shape text \"" <<
(static_cast<MetaTextAction*>(pCurrAct))->GetText() <<
"\" at action #" << nActionIndex );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
// comment action and all actions not
// explicitly handled here:
@@ -519,7 +519,7 @@ namespace slideshow
}
++nCurrShapeCount;
- SAL_FALLTHROUGH; // shape end also ends lines
+ [[fallthrough]]; // shape end also ends lines
case DrawShapeSubsetting::CLASS_PARAGRAPH_END:
if( !io_rFunctor( DrawShapeSubsetting::CLASS_PARAGRAPH_END,
nCurrParaCount,
@@ -531,7 +531,7 @@ namespace slideshow
++nCurrParaCount;
aLastParaStart = aNext;
- SAL_FALLTHROUGH; // para end also ends line
+ [[fallthrough]]; // para end also ends line
case DrawShapeSubsetting::CLASS_LINE_END:
if( !io_rFunctor( DrawShapeSubsetting::CLASS_LINE_END,
nCurrLineCount,
@@ -558,7 +558,7 @@ namespace slideshow
// character cell, OTOH?
break;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case DrawShapeSubsetting::CLASS_SENTENCE_END:
if( !io_rFunctor( DrawShapeSubsetting::CLASS_SENTENCE_END,
nCurrSentenceCount,
@@ -570,7 +570,7 @@ namespace slideshow
++nCurrSentenceCount;
aLastSentenceStart = aNext;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case DrawShapeSubsetting::CLASS_WORD_END:
if( !io_rFunctor( DrawShapeSubsetting::CLASS_WORD_END,
nCurrWordCount,
@@ -582,7 +582,7 @@ namespace slideshow
++nCurrWordCount;
aLastWordStart = aNext;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case DrawShapeSubsetting::CLASS_CHARACTER_CELL_END:
if( !io_rFunctor( DrawShapeSubsetting::CLASS_CHARACTER_CELL_END,
nCurrCharCount,
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index aa30ac3feaff..3221a1069931 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -87,7 +87,7 @@ static bool hasUnsupportedActions( const GDIMetaFile& rMtf )
{
break;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case MetaActionType::MOVECLIPREGION:
case MetaActionType::REFPOINT:
case MetaActionType::WALLPAPER:
diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx
index 29c28596e132..a50b81f276d9 100644
--- a/slideshow/source/engine/slide/targetpropertiescreator.cxx
+++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx
@@ -169,7 +169,7 @@ namespace internal
return;
}
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case animations::AnimationNodeType::PAR:
case animations::AnimationNodeType::SEQ: