diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-05-10 16:42:16 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-05-10 16:42:16 +0200 |
commit | 14cd5182c5f64c43581c82db8c958369152226ac (patch) | |
tree | 57f150ba2707f29214eeb9b1eaad2373780d1b15 /xmloff/source/draw | |
parent | e4bb2b4f4875c15bd68297b5be716edd6859841e (diff) |
Replace fallthrough comments with new SAL_FALLTHROUGH macro
...which (in LIBO_INTERNAL_ONLY) for Clang expands to [[clang::fallthrough]] in
preparation of enabling -Wimplicit-fallthrough. (This is only relevant for
C++11, as neither C nor old C++ has a way to annotate intended fallthroughs.)
Could use BOOST_FALLTHROUGH instead of introducing our own SAL_FALLTHROUGH, but
that would require adding back in dependencies on boost_headers to many
libraries where we carefully removed any remaining Boost dependencies only
recently. (At least make SAL_FALLTHROUGH strictly LIBO_INTERNAL_ONLY, so its
future evolution will not have any impact on the stable URE interface.) C++17
will have a proper [[fallthroug]], eventually removing the need for a macro
altogether.
Change-Id: I342a7610a107db7d7a344ea9cbddfd9714d7e9ca
Diffstat (limited to 'xmloff/source/draw')
-rw-r--r-- | xmloff/source/draw/animationexport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/animationimport.cxx | 3 | ||||
-rw-r--r-- | xmloff/source/draw/eventimp.cxx | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index 7bc5521e770d..97ae81c7b97a 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -694,8 +694,8 @@ void AnimationsExporterImpl::prepareNode( const Reference< XAnimationNode >& xNo { Reference< XIterateContainer > xIter( xNode, UNO_QUERY_THROW ); prepareValue( xIter->getTarget() ); + SAL_FALLTHROUGH; } - // its intended that here is no break! case AnimationNodeType::PAR: case AnimationNodeType::SEQ: { diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index f6cb2e759919..a9dd0f778a35 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -875,9 +875,8 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax: xAudio->setSource( makeAny( GetImport().GetAbsoluteReference( rValue ) ) ); break; } - + SAL_FALLTHROUGH; } - // fall through intended! case ANA_Target: { { diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index 8e6b65bd3a60..21c0085ed7d4 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -422,7 +422,7 @@ void SdXMLEventContext::EndElement() case ClickAction_BOOKMARK: msBookmark = msBookmark.copy(1); - // Note: no break here!!! + SAL_FALLTHROUGH; case ClickAction_DOCUMENT: case ClickAction_PROGRAM: @@ -445,7 +445,7 @@ void SdXMLEventContext::EndElement() pProperties->State = beans::PropertyState_DIRECT_VALUE; pProperties++; - // NOTE: no break here!!! + SAL_FALLTHROUGH; case ClickAction_SOUND: pProperties->Name = "SoundURL"; |