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 /oox/source/drawingml/customshapegeometry.cxx | |
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 'oox/source/drawingml/customshapegeometry.cxx')
-rw-r--r-- | oox/source/drawingml/customshapegeometry.cxx | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index d019c9fb8d82..4557a6d30468 100644 --- a/oox/source/drawingml/customshapegeometry.cxx +++ b/oox/source/drawingml/customshapegeometry.cxx @@ -223,18 +223,24 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu } break; - case XML_hd10 : // !!PASSTHROUGH INTENDED + case XML_hd10 : nIntVal += 2; // */ h 1.0 10.0 + SAL_FALLTHROUGH; case XML_hd8 : // */ h 1.0 8.0 nIntVal += 2; + SAL_FALLTHROUGH; case XML_hd6 : // */ h 1.0 6.0 nIntVal++; + SAL_FALLTHROUGH; case XML_hd5 : // */ h 1.0 5.0 nIntVal++; + SAL_FALLTHROUGH; case XML_hd4 : // */ h 1.0 4.0 nIntVal++; + SAL_FALLTHROUGH; case XML_hd3 : // */ h 1.0 3.0 nIntVal++; + SAL_FALLTHROUGH; case XML_hd2 : // */ h 1.0 2.0 case XML_vc : // */ h 1.0 2.0 { @@ -279,14 +285,19 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu break; case XML_ssd32 : // */ ss 1.0 32.0 nIntVal += 16; + SAL_FALLTHROUGH; case XML_ssd16 : // */ ss 1.0 16.0 nIntVal += 8; + SAL_FALLTHROUGH; case XML_ssd8 : // */ ss 1.0 8.0 nIntVal += 2; + SAL_FALLTHROUGH; case XML_ssd6 : // */ ss 1.0 6.0 nIntVal += 2; + SAL_FALLTHROUGH; case XML_ssd4 : // */ ss 1.0 4.0 nIntVal += 2; + SAL_FALLTHROUGH; case XML_ssd2 : // */ ss 1.0 2.0 { nIntVal += 2; @@ -319,20 +330,28 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu case XML_wd32 : // */ w 1.0 32.0 nIntVal += 20; + SAL_FALLTHROUGH; case XML_wd12 : // */ w 1.0 12.0 nIntVal += 2; + SAL_FALLTHROUGH; case XML_wd10 : // */ w 1.0 10.0 nIntVal += 2; + SAL_FALLTHROUGH; case XML_wd8 : // */ w 1.0 8.0 nIntVal += 2; + SAL_FALLTHROUGH; case XML_wd6 : // */ w 1.0 6.0 nIntVal++; + SAL_FALLTHROUGH; case XML_wd5 : // */ w 1.0 5.0 nIntVal++; + SAL_FALLTHROUGH; case XML_wd4 : // */ w 1.0 4.0 nIntVal++; + SAL_FALLTHROUGH; case XML_wd3 : // */ w 1.0 3.0 nIntVal++; + SAL_FALLTHROUGH; case XML_hc : // */ w 1.0 2.0 case XML_wd2 : // */ w 1.0 2.0 { |