diff options
Diffstat (limited to 'slideshow/source/engine/shapes/drawshapesubsetting.cxx')
| -rw-r--r-- | slideshow/source/engine/shapes/drawshapesubsetting.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx index 588f6cc47613..d8a1ad127f55 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx @@ -152,7 +152,7 @@ namespace slideshow SAL_INFO("slideshow.verbose", "Shape text \"" << (static_cast<MetaTextAction*>(pCurrAct))->GetText() << "\" at action #" << nActionIndex ); - // fallthrough intended + SAL_FALLTHROUGH; default: // comment action and all actions not // explicitly handled here: @@ -504,8 +504,7 @@ namespace slideshow } ++nCurrShapeCount; - // FALLTHROUGH intended: shape end also - // ends lines + SAL_FALLTHROUGH; // shape end also ends lines case DrawShapeSubsetting::CLASS_PARAGRAPH_END: if( !io_rFunctor( DrawShapeSubsetting::CLASS_PARAGRAPH_END, nCurrParaCount, @@ -517,8 +516,7 @@ namespace slideshow ++nCurrParaCount; aLastParaStart = aNext; - // FALLTHROUGH intended: para end also - // ends line + SAL_FALLTHROUGH; // para end also ends line case DrawShapeSubsetting::CLASS_LINE_END: if( !io_rFunctor( DrawShapeSubsetting::CLASS_LINE_END, nCurrLineCount, @@ -545,7 +543,7 @@ namespace slideshow // character cell, OTOH? break; } - // FALLTHROUGH intended + SAL_FALLTHROUGH; case DrawShapeSubsetting::CLASS_SENTENCE_END: if( !io_rFunctor( DrawShapeSubsetting::CLASS_SENTENCE_END, nCurrSentenceCount, @@ -557,7 +555,7 @@ namespace slideshow ++nCurrSentenceCount; aLastSentenceStart = aNext; - // FALLTHROUGH intended + SAL_FALLTHROUGH; case DrawShapeSubsetting::CLASS_WORD_END: if( !io_rFunctor( DrawShapeSubsetting::CLASS_WORD_END, nCurrWordCount, @@ -569,7 +567,7 @@ namespace slideshow ++nCurrWordCount; aLastWordStart = aNext; - // FALLTHROUGH intended + SAL_FALLTHROUGH; case DrawShapeSubsetting::CLASS_CHARACTER_CELL_END: if( !io_rFunctor( DrawShapeSubsetting::CLASS_CHARACTER_CELL_END, nCurrCharCount, |