diff options
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/drawingml/color.cxx | 4 | ||||
| -rw-r--r-- | oox/source/drawingml/customshapegeometry.cxx | 38 | ||||
| -rw-r--r-- | oox/source/export/drawingml.cxx | 2 | ||||
| -rw-r--r-- | oox/source/vml/vmlformatting.cxx | 2 |
4 files changed, 23 insertions, 23 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 { diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 96c533d404f1..fea129bfafa4 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -691,7 +691,7 @@ void DrawingML::WriteOutline( const Reference<XPropertySet>& rXPropSet, Referenc SAL_INFO("oox.shape", "dash dots: " << aLineDash.Dots << " dashes: " << aLineDash.Dashes << " dotlen: " << aLineDash.DotLen << " dashlen: " << aLineDash.DashLen << " distance: " << aLineDash.Distance); - SAL_FALLTHROUGH; + [[fallthrough]]; case drawing::LineStyle_SOLID: default: if ( GETA( LineColor ) ) diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx index db9f008a5a99..143ef173b386 100644 --- a/oox/source/vml/vmlformatting.cxx +++ b/oox/source/vml/vmlformatting.cxx @@ -834,7 +834,7 @@ void FillModel::pushToPropMap( ShapePropertyMap& rPropMap, const GraphicHelper& } } } - SAL_FALLTHROUGH; // to XML_solid in case of missing bitmap path intended! + [[fallthrough]]; // to XML_solid in case of missing bitmap path intended! case XML_solid: default: |