From 14cd5182c5f64c43581c82db8c958369152226ac Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 10 May 2016 16:42:16 +0200 Subject: 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 --- sd/source/ui/unoidl/unoobj.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sd/source/ui/unoidl') 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 ) -- cgit