diff options
Diffstat (limited to 'oox/source/drawingml')
-rw-r--r-- | oox/source/drawingml/color.cxx | 4 | ||||
-rw-r--r-- | oox/source/drawingml/customshapegeometry.cxx | 38 |
2 files changed, 21 insertions, 21 deletions
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx index 7008328c47ca..53b77c6b01e6 100644 --- a/oox/source/drawingml/color.cxx +++ b/oox/source/drawingml/color.cxx @@ -697,7 +697,7 @@ void Color::toCrgb() const { case COLOR_HSL: toRgb(); - SAL_FALLTHROUGH; + [[fallthrough]]; case COLOR_RGB: meMode = COLOR_CRGB; mnC1 = lclGamma( lclRgbCompToCrgbComp( mnC1 ), DEC_GAMMA ); @@ -718,7 +718,7 @@ void Color::toHsl() const { case COLOR_CRGB: toRgb(); - SAL_FALLTHROUGH; + [[fallthrough]]; case COLOR_RGB: { meMode = COLOR_HSL; diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index deeff8ee4837..5991b0a60322 100644 --- a/oox/source/drawingml/customshapegeometry.cxx +++ b/oox/source/drawingml/customshapegeometry.cxx @@ -228,22 +228,22 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu case XML_hd10 : nIntVal += 2; // */ h 1.0 10.0 - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_hd8 : // */ h 1.0 8.0 nIntVal += 2; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_hd6 : // */ h 1.0 6.0 nIntVal++; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_hd5 : // */ h 1.0 5.0 nIntVal++; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_hd4 : // */ h 1.0 4.0 nIntVal++; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_hd3 : // */ h 1.0 3.0 nIntVal++; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_hd2 : // */ h 1.0 2.0 case XML_vc : // */ h 1.0 2.0 { @@ -288,19 +288,19 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu break; case XML_ssd32 : // */ ss 1.0 32.0 nIntVal += 16; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_ssd16 : // */ ss 1.0 16.0 nIntVal += 8; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_ssd8 : // */ ss 1.0 8.0 nIntVal += 2; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_ssd6 : // */ ss 1.0 6.0 nIntVal += 2; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_ssd4 : // */ ss 1.0 4.0 nIntVal += 2; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_ssd2 : // */ ss 1.0 2.0 { nIntVal += 2; @@ -333,28 +333,28 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu case XML_wd32 : // */ w 1.0 32.0 nIntVal += 20; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_wd12 : // */ w 1.0 12.0 nIntVal += 2; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_wd10 : // */ w 1.0 10.0 nIntVal += 2; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_wd8 : // */ w 1.0 8.0 nIntVal += 2; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_wd6 : // */ w 1.0 6.0 nIntVal++; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_wd5 : // */ w 1.0 5.0 nIntVal++; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_wd4 : // */ w 1.0 4.0 nIntVal++; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_wd3 : // */ w 1.0 3.0 nIntVal++; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_hc : // */ w 1.0 2.0 case XML_wd2 : // */ w 1.0 2.0 { |