diff options
427 files changed, 891 insertions, 895 deletions
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx index e1fc533d1201..9d3e9a2bbce8 100644 --- a/accessibility/source/standard/vclxaccessibletoolbox.cxx +++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx @@ -629,7 +629,7 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow } m_aAccessibleChildren.clear(); - SAL_FALLTHROUGH; // call base class + [[fallthrough]]; // call base class } default: diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 2bb3aacd395a..d6611bc764ef 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -1071,7 +1071,7 @@ void Shell::GetState(SfxItemSet &rSet) } } } - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_BASICIDE_NEWMODULE: case SID_BASICIDE_NEWDIALOG: diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx index 6d3a70cff637..359f6b3a7f5c 100644 --- a/basctl/source/basicide/bastype3.cxx +++ b/basctl/source/basicide/bastype3.cxx @@ -333,7 +333,7 @@ SbxVariable* SbTreeListBox::FindVariable(weld::TreeIter* pEntry) break; case OBJ_TYPE_DOCUMENT_OBJECTS: bDocumentObjects = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case OBJ_TYPE_USERFORMS: case OBJ_TYPE_NORMAL_MODULES: case OBJ_TYPE_CLASS_MODULES: diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx b/basegfx/source/polygon/b2dlinegeometry.cxx index 78f569970df3..1567d5b34ecb 100644 --- a/basegfx/source/polygon/b2dlinegeometry.cxx +++ b/basegfx/source/polygon/b2dlinegeometry.cxx @@ -812,7 +812,7 @@ namespace basegfx } else { - SAL_FALLTHROUGH; // wanted fall-through to default + [[fallthrough]]; // wanted fall-through to default } } default: // B2DLineJoin::Bevel diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx index 7906704e76e3..2936c9f54ac2 100644 --- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx +++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx @@ -141,7 +141,7 @@ namespace basegfx o_rPolyPolygon.append(aCurrPoly); aCurrPoly.clear(); } - SAL_FALLTHROUGH; // to add coordinate data as 1st point of new polygon + [[fallthrough]]; // to add coordinate data as 1st point of new polygon } case 'l' : case 'L' : @@ -181,7 +181,7 @@ namespace basegfx case 'h' : { bRelative = true; - SAL_FALLTHROUGH; + [[fallthrough]]; } case 'H' : { @@ -211,7 +211,7 @@ namespace basegfx case 'v' : { bRelative = true; - SAL_FALLTHROUGH; + [[fallthrough]]; } case 'V' : { @@ -241,7 +241,7 @@ namespace basegfx case 's' : { bRelative = true; - SAL_FALLTHROUGH; + [[fallthrough]]; } case 'S' : { @@ -300,7 +300,7 @@ namespace basegfx case 'c' : { bRelative = true; - SAL_FALLTHROUGH; + [[fallthrough]]; } case 'C' : { @@ -350,7 +350,7 @@ namespace basegfx case 'q' : { bRelative = true; - SAL_FALLTHROUGH; + [[fallthrough]]; } case 'Q' : { @@ -401,7 +401,7 @@ namespace basegfx case 't' : { bRelative = true; - SAL_FALLTHROUGH; + [[fallthrough]]; } case 'T' : { @@ -475,7 +475,7 @@ namespace basegfx case 'a' : { bRelative = true; - SAL_FALLTHROUGH; + [[fallthrough]]; } case 'A' : { diff --git a/basic/source/comp/loops.cxx b/basic/source/comp/loops.cxx index ec20b76e71a7..40ac10bad9fc 100644 --- a/basic/source/comp/loops.cxx +++ b/basic/source/comp/loops.cxx @@ -547,7 +547,7 @@ void SbiParser::Resume() aGen.Gen( SbiOpcode::RESUME_, 0 ); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case SYMBOL: if( MayBeLabel() ) { @@ -556,7 +556,7 @@ void SbiParser::Resume() Next(); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: Error( ERRCODE_BASIC_LABEL_EXPECTED ); } diff --git a/basic/source/sbx/sbxbool.cxx b/basic/source/sbx/sbxbool.cxx index 720c63378384..a8b4df040673 100644 --- a/basic/source/sbx/sbxbool.cxx +++ b/basic/source/sbx/sbxbool.cxx @@ -30,7 +30,7 @@ enum SbxBOOL ImpGetBool( const SbxValues* p ) { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = SbxFALSE; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxbyte.cxx b/basic/source/sbx/sbxbyte.cxx index df85f5f7f1e0..b518782d4c1f 100644 --- a/basic/source/sbx/sbxbyte.cxx +++ b/basic/source/sbx/sbxbyte.cxx @@ -33,7 +33,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxchar.cxx b/basic/source/sbx/sbxchar.cxx index d5f34e63d297..aba2d47cb48f 100644 --- a/basic/source/sbx/sbxchar.cxx +++ b/basic/source/sbx/sbxchar.cxx @@ -33,7 +33,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx index 1880ba40df78..9d9a56d2d359 100644 --- a/basic/source/sbx/sbxdate.cxx +++ b/basic/source/sbx/sbxdate.cxx @@ -42,7 +42,7 @@ double ImpGetDate( const SbxValues* p ) { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; diff --git a/basic/source/sbx/sbxdbl.cxx b/basic/source/sbx/sbxdbl.cxx index 9ea70832a8e0..823693c3a149 100644 --- a/basic/source/sbx/sbxdbl.cxx +++ b/basic/source/sbx/sbxdbl.cxx @@ -31,7 +31,7 @@ double ImpGetDouble( const SbxValues* p ) { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx index c71b031df2be..b1f9b0dd00c0 100644 --- a/basic/source/sbx/sbxdec.cxx +++ b/basic/source/sbx/sbxdec.cxx @@ -413,7 +413,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: pnDecRes->setShort( 0 ); break; case SbxCHAR: diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx index 7f16ef7e0013..40bc75f82d5c 100644 --- a/basic/source/sbx/sbxint.cxx +++ b/basic/source/sbx/sbxint.cxx @@ -33,7 +33,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; case SbxCHAR: @@ -389,7 +389,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; case SbxCHAR: @@ -649,7 +649,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxlng.cxx b/basic/source/sbx/sbxlng.cxx index e9398a47553e..cc832e8ed054 100644 --- a/basic/source/sbx/sbxlng.cxx +++ b/basic/source/sbx/sbxlng.cxx @@ -33,7 +33,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxsng.cxx b/basic/source/sbx/sbxsng.cxx index f687c930e32a..b204d25827c4 100644 --- a/basic/source/sbx/sbxsng.cxx +++ b/basic/source/sbx/sbxsng.cxx @@ -31,7 +31,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxstr.cxx b/basic/source/sbx/sbxstr.cxx index 96ea1fc40507..196faaea558c 100644 --- a/basic/source/sbx/sbxstr.cxx +++ b/basic/source/sbx/sbxstr.cxx @@ -40,7 +40,7 @@ OUString ImpGetString( const SbxValues* p ) { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: break; case SbxCHAR: diff --git a/basic/source/sbx/sbxuint.cxx b/basic/source/sbx/sbxuint.cxx index c69931d8368b..59c421715a99 100644 --- a/basic/source/sbx/sbxuint.cxx +++ b/basic/source/sbx/sbxuint.cxx @@ -31,7 +31,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxulng.cxx b/basic/source/sbx/sbxulng.cxx index 3e182842515e..b78f0407af51 100644 --- a/basic/source/sbx/sbxulng.cxx +++ b/basic/source/sbx/sbxulng.cxx @@ -31,7 +31,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/binaryurp/source/incomingrequest.cxx b/binaryurp/source/incomingrequest.cxx index c54493d6e32a..63ecf649d0ba 100644 --- a/binaryurp/source/incomingrequest.cxx +++ b/binaryurp/source/incomingrequest.cxx @@ -169,7 +169,7 @@ bool IncomingRequest::execute_throw( } break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: { assert(object_.is()); diff --git a/binaryurp/source/marshal.cxx b/binaryurp/source/marshal.cxx index 009cd06968e7..7003759e3d14 100644 --- a/binaryurp/source/marshal.cxx +++ b/binaryurp/source/marshal.cxx @@ -194,7 +194,7 @@ void Marshal::writeValue( break; case typelib_TypeClass_BOOLEAN: assert(*static_cast< sal_uInt8 const * >(value) <= 1); - SAL_FALLTHROUGH; + [[fallthrough]]; case typelib_TypeClass_BYTE: write8(buffer, *static_cast< sal_uInt8 const * >(value)); break; diff --git a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx index 40b7d918a9b2..cc1528f53d89 100644 --- a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx @@ -394,7 +394,7 @@ namespace TYPELIB_DANGER_RELEASE( pTD ); } } // else perform queryInterface() - SAL_FALLTHROUGH; + [[fallthrough]]; default: eRet = cpp2uno_call( pCppI, aMemberDescr.get(), diff --git a/bridges/source/cpp_uno/gcc3_ios/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_ios/uno2cpp.cxx index 916961c69caf..30ae398816c7 100644 --- a/bridges/source/cpp_uno/gcc3_ios/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_ios/uno2cpp.cxx @@ -84,7 +84,7 @@ void MapReturn(sal_uInt64 x0, sal_uInt64 x1, typelib_TypeDescriptionReference *p case typelib_TypeClass_HYPER: case typelib_TypeClass_UNSIGNED_HYPER: pRegisterReturn[1] = x1; - SAL_FALLTHROUGH; + [[fallthrough]]; case typelib_TypeClass_LONG: case typelib_TypeClass_UNSIGNED_LONG: case typelib_TypeClass_ENUM: @@ -542,7 +542,7 @@ void unoInterfaceProxyDispatch( TYPELIB_DANGER_RELEASE( pTD ); } } // else perform queryInterface() - SAL_FALLTHROUGH; + [[fallthrough]]; default: // dependent dispatch cpp_call( diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx index b695cabcf4df..4ef17b8542e1 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx @@ -402,7 +402,7 @@ namespace } TYPELIB_DANGER_RELEASE( pTD ); } - } SAL_FALLTHROUGH; // else perform queryInterface() + } [[fallthrough]]; // else perform queryInterface() default: eRet = cpp2uno_call( pCppI, aMemberDescr.get(), diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx index 852252969b37..97dbd9976fa1 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx @@ -172,7 +172,7 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference * case typelib_TypeClass_HYPER: case typelib_TypeClass_UNSIGNED_HYPER: pRegisterReturn[1] = r1; - SAL_FALLTHROUGH; + [[fallthrough]]; case typelib_TypeClass_LONG: case typelib_TypeClass_UNSIGNED_LONG: case typelib_TypeClass_ENUM: @@ -714,7 +714,7 @@ void unoInterfaceProxyDispatch( } TYPELIB_DANGER_RELEASE( pTD ); } - } SAL_FALLTHROUGH; // else perform queryInterface() + } [[fallthrough]]; // else perform queryInterface() default: // dependent dispatch cpp_call( diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx index 288aeea1e0ce..b0b160b24bf2 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx @@ -107,7 +107,7 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod( case typelib_TypeClass_HYPER: case typelib_TypeClass_UNSIGNED_HYPER: static_cast<long*>(pRegisterReturn)[1] = edx; - SAL_FALLTHROUGH; + [[fallthrough]]; case typelib_TypeClass_LONG: case typelib_TypeClass_UNSIGNED_LONG: case typelib_TypeClass_CHAR: diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx index 5fb2c013959c..70c6091ec207 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx @@ -323,7 +323,7 @@ extern "C" void cpp_vtable_call( } TYPELIB_DANGER_RELEASE( pTD ); } - SAL_FALLTHROUGH; // else perform queryInterface() + [[fallthrough]]; // else perform queryInterface() } default: cpp2uno_call( diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx index 1061a00c76c0..c61a77baf07e 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx @@ -361,7 +361,7 @@ void unoInterfaceProxyDispatch( } TYPELIB_DANGER_RELEASE( pTD ); } - SAL_FALLTHROUGH; // else perform queryInterface() + [[fallthrough]]; // else perform queryInterface() } default: // dependent dispatch diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx index 1f47f4c9b2dc..29212988f78d 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx @@ -363,7 +363,7 @@ typelib_TypeClass cpp_vtable_call( } TYPELIB_DANGER_RELEASE( pTD ); } - SAL_FALLTHROUGH; // else perform queryInterface() + [[fallthrough]]; // else perform queryInterface() } default: { diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx index a56f9f255d26..7ccf487ee9bd 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx @@ -406,7 +406,7 @@ void unoInterfaceProxyDispatch( } TYPELIB_DANGER_RELEASE( pTD ); } - SAL_FALLTHROUGH; // else perform queryInterface() + [[fallthrough]]; // else perform queryInterface() } default: // dependent dispatch diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx index 8f453e4aeb53..e371b15ce90e 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx @@ -364,7 +364,7 @@ typelib_TypeClass cpp_vtable_call( } TYPELIB_DANGER_RELEASE( pTD ); } - SAL_FALLTHROUGH; // else perform queryInterface() + [[fallthrough]]; // else perform queryInterface() } default: { diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx index 13002709436d..75cf8861c332 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx @@ -411,7 +411,7 @@ void unoInterfaceProxyDispatch( } TYPELIB_DANGER_RELEASE( pTD ); } - SAL_FALLTHROUGH; // else perform queryInterface() + [[fallthrough]]; // else perform queryInterface() } default: // dependent dispatch diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx index 3abbfaf9b7dd..cf266de14873 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx @@ -347,7 +347,7 @@ extern "C" typelib_TypeClass cpp_vtable_call( } TYPELIB_DANGER_RELEASE( pTD2 ); } - SAL_FALLTHROUGH; + [[fallthrough]]; } default: { diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx index 524228ad3bc4..4415d525b0db 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx @@ -423,7 +423,7 @@ void unoInterfaceProxyDispatch( } TYPELIB_DANGER_RELEASE( pTD ); } - SAL_FALLTHROUGH; // else perform queryInterface() + [[fallthrough]]; // else perform queryInterface() } default: if ( ! cpp_call( diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx index bb26749cadaf..feb9674563c5 100644 --- a/bridges/source/jni_uno/jni_data.cxx +++ b/bridges/source/jni_uno/jni_data.cxx @@ -1738,7 +1738,7 @@ void Bridge::map_to_java( jni.ensure_no_exception(); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; } default: { diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index dcd752cf6a52..5a442dfc8997 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -945,7 +945,7 @@ namespace cairocanvas { case rendering::PathJoinType::NONE: bNoLineJoin = true; - SAL_FALLTHROUGH; // cairo doesn't have join type NONE so we use MITER as it's pretty close + [[fallthrough]]; // cairo doesn't have join type NONE so we use MITER as it's pretty close case rendering::PathJoinType::MITER: cairo_set_line_join( mpCairo.get(), CAIRO_LINE_JOIN_MITER ); break; diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx index 11d429a8801a..d0704e877677 100644 --- a/canvas/source/cairo/cairo_canvashelper_text.cxx +++ b/canvas/source/cairo/cairo_canvashelper_text.cxx @@ -255,7 +255,7 @@ namespace cairocanvas case rendering::TextDirection::WEAK_RIGHT_TO_LEFT: nLayoutMode |= ComplexTextLayoutFlags::BiDiRtl; - SAL_FALLTHROUGH; + [[fallthrough]]; case rendering::TextDirection::STRONG_RIGHT_TO_LEFT: nLayoutMode |= ComplexTextLayoutFlags::BiDiRtl | ComplexTextLayoutFlags::BiDiStrong; nLayoutMode |= ComplexTextLayoutFlags::TextOriginRight; diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index e913dfa667bf..a03ad7e1c6d3 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -586,7 +586,7 @@ namespace vclcanvas case rendering::TextDirection::WEAK_RIGHT_TO_LEFT: nLayoutMode |= ComplexTextLayoutFlags::BiDiRtl; - SAL_FALLTHROUGH; + [[fallthrough]]; case rendering::TextDirection::STRONG_RIGHT_TO_LEFT: nLayoutMode |= ComplexTextLayoutFlags::BiDiRtl | ComplexTextLayoutFlags::BiDiStrong; nLayoutMode |= ComplexTextLayoutFlags::TextOriginRight; diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index c1ea174c43d3..5d3296953370 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -551,7 +551,7 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs) case SvxChartIndicate::NONE : // no longer used, use both as default m_eIndicate = SvxChartIndicate::Both; - SAL_FALLTHROUGH; // to BOTH + [[fallthrough]]; // to BOTH case SvxChartIndicate::Both : m_xRbBoth->set_active(true); break; case SvxChartIndicate::Up : diff --git a/codemaker/source/codemaker/typemanager.cxx b/codemaker/source/codemaker/typemanager.cxx index 2b54a4092772..cf638f0ca4eb 100644 --- a/codemaker/source/codemaker/typemanager.cxx +++ b/codemaker/source/codemaker/typemanager.cxx @@ -185,7 +185,7 @@ codemaker::UnoType::Sort TypeManager::decompose( } break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case codemaker::UnoType::Sort::Void: case codemaker::UnoType::Sort::Boolean: case codemaker::UnoType::Sort::Byte: diff --git a/codemaker/source/cppumaker/dependencies.cxx b/codemaker/source/cppumaker/dependencies.cxx index d32ac98396a0..71855e2a9e47 100644 --- a/codemaker/source/cppumaker/dependencies.cxx +++ b/codemaker/source/cppumaker/dependencies.cxx @@ -268,7 +268,7 @@ void Dependencies::insert(OUString const & name, Kind kind) { { insert(b2u(arg), KIND_NORMAL); } - SAL_FALLTHROUGH; + [[fallthrough]]; case UnoType::Sort::Sequence: case UnoType::Sort::Enum: case UnoType::Sort::PlainStruct: diff --git a/codemaker/source/cppumaker/includes.cxx b/codemaker/source/cppumaker/includes.cxx index 53ca16afcd4d..732f5065c191 100644 --- a/codemaker/source/cppumaker/includes.cxx +++ b/codemaker/source/cppumaker/includes.cxx @@ -104,7 +104,7 @@ void Includes::add(OString const & entityName) { { add(arg); } - SAL_FALLTHROUGH; + [[fallthrough]]; case codemaker::UnoType::Sort::Sequence: case codemaker::UnoType::Sort::Enum: case codemaker::UnoType::Sort::PlainStruct: diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx index 4cd5b50050b0..3130389e916b 100644 --- a/codemaker/source/javamaker/javatype.cxx +++ b/codemaker/source/javamaker/javatype.cxx @@ -233,7 +233,7 @@ SpecialType translateUnoTypeToDescriptor( } return SPECIAL_TYPE_INTERFACE; } - SAL_FALLTHROUGH; + [[fallthrough]]; case codemaker::UnoType::Sort::Sequence: case codemaker::UnoType::Sort::Enum: case codemaker::UnoType::Sort::PlainStruct: diff --git a/compilerplugins/clang/test/dodgyswitch.cxx b/compilerplugins/clang/test/dodgyswitch.cxx index 3a61ed388c2b..826971d27811 100644 --- a/compilerplugins/clang/test/dodgyswitch.cxx +++ b/compilerplugins/clang/test/dodgyswitch.cxx @@ -16,7 +16,7 @@ int main() { { case 1: { break; } case 2: { - SAL_FALLTHROUGH; + [[fallthrough]]; { case 3: // expected-error {{case statement not directly under switch [loplugin:dodgyswitch]}} break; diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx index 26c8e7e5c516..7bbd1b05e287 100644 --- a/configmgr/source/access.cxx +++ b/configmgr/source/access.cxx @@ -665,7 +665,7 @@ void Access::setName(OUString const & aName) } } } - SAL_FALLTHROUGH; + [[fallthrough]]; case Node::KIND_LOCALIZED_PROPERTY: // renaming a property could only work for an extension property, // but a localized property is never an extension property diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index af666ba2b719..e584a3c98589 100644 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -681,7 +681,7 @@ void Components::parseFiles( if (!recursive) { return; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: throw css::uno::RuntimeException( "cannot open directory " + url); @@ -846,7 +846,7 @@ void Components::parseXcsXcuIniLayer( case ':': case '\\': prefix.append('\\'); - SAL_FALLTHROUGH; + [[fallthrough]]; default: prefix.append(c); } diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx index 628640c43974..b049299c1fea 100644 --- a/configmgr/source/configurationregistry.cxx +++ b/configmgr/source/configurationregistry.cxx @@ -407,7 +407,7 @@ css::registry::RegistryValueType RegistryKey::getValueType() { return css::registry::RegistryValueType_STRINGLIST; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: return css::registry::RegistryValueType_NOT_DEFINED; } diff --git a/configmgr/source/type.cxx b/configmgr/source/type.cxx index f0d109d74fcc..ab84fcb9c3bb 100644 --- a/configmgr/source/type.cxx +++ b/configmgr/source/type.cxx @@ -155,7 +155,7 @@ Type getDynamicType(css::uno::Any const & value) { return TYPE_HEXBINARY_LIST; } } - SAL_FALLTHROUGH; + [[fallthrough]]; default: return TYPE_ERROR; } diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx index 10860628e491..4dda54c410e4 100644 --- a/configmgr/source/valueparser.cxx +++ b/configmgr/source/valueparser.cxx @@ -260,7 +260,7 @@ xmlreader::XmlReader::Text ValueParser::getTextMode() const { if (!items_.empty()) { break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case State::IT: return (type_ == TYPE_STRING || type_ == TYPE_STRING_LIST || @@ -291,7 +291,7 @@ bool ValueParser::startElement( state_ = State::IT; return true; } - SAL_FALLTHROUGH; + [[fallthrough]]; case State::IT: if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals("unicode") && diff --git a/configmgr/source/xcdparser.cxx b/configmgr/source/xcdparser.cxx index 553087a38c4a..c5e8a9b017db 100644 --- a/configmgr/source/xcdparser.cxx +++ b/configmgr/source/xcdparser.cxx @@ -116,7 +116,7 @@ bool XcdParser::startElement( return true; } state_ = STATE_COMPONENTS; - SAL_FALLTHROUGH; + [[fallthrough]]; case STATE_COMPONENTS: if (nsId == ParseManager::NAMESPACE_OOR && name.equals("component-schema")) diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx index 271d617e5019..411da6ca7915 100644 --- a/configmgr/source/xcsparser.cxx +++ b/configmgr/source/xcsparser.cxx @@ -158,7 +158,7 @@ bool XcsParser::startElement( state_ = STATE_TEMPLATES; return true; } - SAL_FALLTHROUGH; + [[fallthrough]]; case STATE_TEMPLATES_DONE: if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals("component")) @@ -188,7 +188,7 @@ bool XcsParser::startElement( } break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case STATE_COMPONENT: assert(!elements_.empty()); switch (elements_.top().node->kind()) { diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx index 7db53e3e77fb..8a165cb1be02 100644 --- a/configmgr/source/xcuparser.cxx +++ b/configmgr/source/xcuparser.cxx @@ -642,7 +642,7 @@ void XcuParser::handleUnknownGroupProp( recordModification(false); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: SAL_WARN( "configmgr", diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx index f4562c2d38ed..eb06c5551b67 100644 --- a/connectivity/source/commontools/CommonTools.cxx +++ b/connectivity/source/commontools/CommonTools.cxx @@ -77,7 +77,7 @@ namespace connectivity break; // WARNING/TODO: in certain circumstances it will run into // the next 'case'! - SAL_FALLTHROUGH; + [[fallthrough]]; case CHAR_WILD: while ( *pWild == CHAR_WILD ) pWild++; diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index b12170775213..a33fdbebea6f 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -1033,7 +1033,7 @@ bool ORowSetValue::getBool() const break; } } - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::DECIMAL: case DataType::NUMERIC: @@ -1931,7 +1931,7 @@ css::util::Date ORowSetValue::getDate() const case DataType::OBJECT: default: OSL_ENSURE( false, "ORowSetValue::getDate: cannot retrieve the data!" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::BINARY: case DataType::VARBINARY: diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 757e4fa37fb1..b2788d134e0a 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -1489,7 +1489,7 @@ bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject, _rxUpdatedObject->updateBinaryStream(_nColumnIndex, *xStream, (*xStream)->available()); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: bSuccessfullyReRouted = false; } @@ -1594,7 +1594,7 @@ bool implSetObject( const Reference< XParameters >& _rxParameters, _rxParameters->setBinaryStream(_nColumnIndex, xStream, xStream->available()); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: bSuccessfullyReRouted = false; diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx index 9a2950f4d2d8..08489cf8024a 100644 --- a/connectivity/source/commontools/filtermanager.cxx +++ b/connectivity/source/commontools/filtermanager.cxx @@ -106,14 +106,14 @@ namespace dbtools { case FilterComponent::PublicFilter: propagate = propagate && m_bApplyPublicFilter; - SAL_FALLTHROUGH; + [[fallthrough]]; case FilterComponent::LinkFilter: if (propagate) m_xComponentAggregate->setPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FILTER), makeAny( getComposedFilter() ) ); break; case FilterComponent::PublicHaving: propagate = propagate && m_bApplyPublicFilter; - SAL_FALLTHROUGH; + [[fallthrough]]; case FilterComponent::LinkHaving: if (propagate) m_xComponentAggregate->setPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HAVINGCLAUSE), makeAny( getComposedHaving() ) ); diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 871545f55d9b..b24603d7b79d 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -1252,7 +1252,7 @@ bool ODbaseTable::CreateFile(const INetURLObject& aFile, bool& bCreateMemo) break; case DataType::LONGVARBINARY: bBinary = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::LONGVARCHAR: cTyp = 'M'; break; @@ -1730,7 +1730,7 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo case DataType::DOUBLE: case DataType::TIMESTAMP: bSetZero = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::LONGVARBINARY: case DataType::DATE: case DataType::BIT: diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx index 1f44f23f1fe4..ac234f608016 100644 --- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx +++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx @@ -241,7 +241,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( break; case -1: bKnowCaseSensivity = false; - SAL_FALLTHROUGH; + [[fallthrough]]; case 0: bCaseSensitiveDir = false; } diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 49e9d99d2528..0a3d56216811 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -724,7 +724,7 @@ bool OFlatTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 n { case IResultSetHelper::FIRST: m_nRowPos = 0; - SAL_FALLTHROUGH; + [[fallthrough]]; case IResultSetHelper::NEXT: { assert(m_nRowPos >= 0); diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx index c88583f95a3b..39d4604e098b 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -1219,7 +1219,7 @@ bool implSetObject( const Reference< XParameters >& _rxParameters, _rxParameters->setBinaryStream(_nColumnIndex, xStream, xStream->available()); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; } default: bSuccessfullyReRouted = false; diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 14b271a61ee7..f9acc655347f 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -2487,7 +2487,7 @@ void OSQLParseNode::parseLeaf(OUStringBuffer& rString, const SQLParseNodeParamet rString.append(m_aNodeValue); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: if (!rString.isEmpty() && m_aNodeValue.toChar() != '.' && m_aNodeValue.toChar() != ':' ) { diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 90cd77e57ee3..53dd020c97c6 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -1285,7 +1285,7 @@ static void typelib_typedescription_destructExtendedMembers( case typelib_TypeClass_STRUCT: delete[] reinterpret_cast< typelib_StructTypeDescription * >(pTD)-> pParameterizedTypes; - SAL_FALLTHROUGH; + [[fallthrough]]; case typelib_TypeClass_EXCEPTION: { typelib_CompoundTypeDescription * pCTD = reinterpret_cast<typelib_CompoundTypeDescription*>(pTD); diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx index a9c06fa1bce9..d38e636d2fa9 100644 --- a/cppuhelper/source/servicemanager.cxx +++ b/cppuhelper/source/servicemanager.cxx @@ -188,7 +188,7 @@ Parser::Parser( state = STATE_COMPONENTS; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case STATE_COMPONENT_INITIAL: if (res == xmlreader::XmlReader::Result::Begin && nsId == ucNsId && name.equals(RTL_CONSTASCII_STRINGPARAM("implementation"))) @@ -1341,7 +1341,7 @@ void cppuhelper::ServiceManager::readRdbDirectory( SAL_INFO("cppuhelper", "Ignored optional " << uri); return; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: throw css::uno::DeploymentException( "Cannot open directory " + uri, @@ -1403,7 +1403,7 @@ bool cppuhelper::ServiceManager::readLegacyRdbFile(OUString const & uri) { } } } - SAL_FALLTHROUGH; + [[fallthrough]]; default: return false; } diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx index 15702e624e59..a3153b7d6606 100644 --- a/cppuhelper/source/typemanager.cxx +++ b/cppuhelper/source/typemanager.cxx @@ -2035,7 +2035,7 @@ void cppuhelper::TypeManager::readRdbDirectory( SAL_INFO("cppuhelper", "Ignored optional " << uri); return; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: throw css::uno::DeploymentException( "Cannot open directory " + uri, diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 2f3c9af13d13..6882dde07c4a 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -728,7 +728,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress, std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Warning, VclButtonsType::Ok, CuiResId(pErrorId))); xBox->run(); - SAL_FALLTHROUGH; + [[fallthrough]]; } case FmSearchProgress::State::Canceled: EnableSearchUI(true); diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 15e8dc084392..02e93b287074 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -435,7 +435,7 @@ Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, double switch (maCtlLight.GetActualRP()) { default: OSL_FAIL("svx::GraphicFilterEmboss::GetFilteredGraphic(), unknown Reference Point!" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case RectPoint::LT: nAzim = 4500; nElev = 4500; break; case RectPoint::MT: nAzim = 9000; nElev = 4500; break; case RectPoint::RT: nAzim = 13500; nElev = 4500; break; diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index 286e6ce0e3b1..98a46c8272f2 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -206,12 +206,12 @@ void SvxConnectionPage::Reset( const SfxItemSet* rAttrs ) m_xFtLine1->set_sensitive(false); m_xMtrFldLine1->set_sensitive(false); m_xMtrFldLine1->set_text(""); - SAL_FALLTHROUGH; + [[fallthrough]]; case 1: m_xFtLine2->set_sensitive(false); m_xMtrFldLine2->set_sensitive(false); m_xMtrFldLine2->set_text(""); - SAL_FALLTHROUGH; + [[fallthrough]]; case 2: m_xFtLine3->set_sensitive(false); m_xMtrFldLine3->set_sensitive(false); diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 69b25330c98e..46b3279b3a18 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -916,7 +916,7 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( bool bCheckCatChange /*= sal_Fa m_xBtnEngineering->set_sensitive(true); m_xBtnEngineering->set_active( bThousand ); } - SAL_FALLTHROUGH; + [[fallthrough]]; case CAT_NUMBER: case CAT_PERCENT: case CAT_CURRENCY: diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index fde0bffd9804..b1f8c2895d62 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -2012,7 +2012,7 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, WidowHdl_Impl, weld::ToggleButton&, void case TRISTATE_FALSE: if (m_xOrphanBox->get_state() == TRISTATE_FALSE) m_xKeepTogetherBox->set_sensitive(true); - SAL_FALLTHROUGH; + [[fallthrough]]; case TRISTATE_INDET: m_xWidowRowNo->set_sensitive(false); m_xWidowRowLabel->set_sensitive(false); @@ -2033,7 +2033,7 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, OrphanHdl_Impl, weld::ToggleButton&, voi case TRISTATE_FALSE: if (m_xWidowBox->get_state() == TRISTATE_FALSE) m_xKeepTogetherBox->set_sensitive(true); - SAL_FALLTHROUGH; + [[fallthrough]]; case TRISTATE_INDET: m_xOrphanRowNo->set_sensitive(false); m_xOrphanRowLabel->set_sensitive(false); diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 0a6d3696ebc0..03bf5caf2b5c 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -364,7 +364,7 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet* rAttrs) { default: ; //prevent warning OSL_FAIL( "svx::SvxTextAttrPage::FillItemSet(), unhandled state!" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case TRISTATE_FALSE: eFTS = drawing::TextFitToSizeType_AUTOFIT; break; case TRISTATE_TRUE: eFTS = drawing::TextFitToSizeType_PROPORTIONAL; break; } diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index dad85068f793..c71f5de04910 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -132,7 +132,7 @@ SvxLineTabPage::SvxLineTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs case FieldUnit::M: case FieldUnit::KM: eFUnit = FieldUnit::MM; - SAL_FALLTHROUGH; // we now have mm + [[fallthrough]]; // we now have mm case FieldUnit::MM: m_xMtrLineWidth->set_increments(50, 500, FieldUnit::NONE); m_xMtrStartWidth->set_increments(50, 500, FieldUnit::NONE); diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index b3b3f82d74ef..265193ee9e8a 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -434,7 +434,7 @@ static sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, std:: { default: SAL_WARN("dbaccess", "OTableContainer::getAllTableTypeFilter: unknown TableTypeFilterMode!" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case FILTER_MODE_MIX_ALL: _rFilter.realloc( 3 ); _rFilter[0] = sView; diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index a8d1a5721274..dd5bd93d5e80 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -286,7 +286,7 @@ void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const case PROPERTY_ID_FETCHDIRECTION: if( m_nResultSetType == ResultSetType::FORWARD_ONLY) throw Exception("resultsettype is FORWARD_ONLY", nullptr); - SAL_FALLTHROUGH; + [[fallthrough]]; default: OPropertyStateContainer::setFastPropertyValue_NoBroadcast(nHandle,rValue); } diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index 06d453d645bb..67ec15d880e1 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -1838,7 +1838,7 @@ OUString OSingleSelectQueryComposer::getKeyword( SQLPart _ePart ) { default: SAL_WARN("dbaccess", "OSingleSelectQueryComposer::getKeyWord: Invalid enum value!" ); - SAL_FALLTHROUGH; // fallback to WHERE + [[fallthrough]]; // fallback to WHERE case Where: sKeyword = STR_WHERE; break; diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index 69a8169c86ac..bb9bf49629ef 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -148,7 +148,7 @@ void ODBTableDecorator::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, con { case PROPERTY_ID_PRIVILEGES: SAL_WARN("dbaccess", "Property is readonly!"); - SAL_FALLTHROUGH; + [[fallthrough]]; case PROPERTY_ID_FILTER: case PROPERTY_ID_ORDER: case PROPERTY_ID_APPLYFILTER: @@ -227,7 +227,7 @@ void ODBTableDecorator::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) c break; } } - SAL_FALLTHROUGH; + [[fallthrough]]; case PROPERTY_ID_FILTER: case PROPERTY_ID_ORDER: diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx index fcfb56d3e5ef..da572744727a 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx @@ -434,7 +434,7 @@ namespace dbaccess m_aCompDesc.bForEditing = true; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case FORM: m_aCompDesc.bForEditing = !lcl_determineReadOnly( m_xComponent ); diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 5c92afaa74d1..0f49fdd4cb9f 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -1177,14 +1177,14 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa case SID_DB_FORM_NEW_PILOT: case SID_FORM_CREATE_REPWIZ_PRE_SEL: bAutoPilot = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_APP_NEW_FORM: eType = E_FORM; break; case ID_DOCUMENT_CREATE_REPWIZ: case SID_REPORT_CREATE_REPWIZ_PRE_SEL: bAutoPilot = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_APP_NEW_REPORT: case SID_APP_NEW_REPORT_PRE_SEL: eType = E_REPORT; @@ -1195,13 +1195,13 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa break; case ID_NEW_QUERY_DESIGN: aCreationArgs.put( OUString(PROPERTY_GRAPHICAL_DESIGN), true ); - SAL_FALLTHROUGH; + [[fallthrough]]; case ID_NEW_QUERY_SQL: eType = E_QUERY; break; case ID_NEW_TABLE_DESIGN_AUTO_PILOT: bAutoPilot = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case ID_NEW_TABLE_DESIGN: break; default: @@ -1776,7 +1776,7 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const // component, but standalone documents. isStandaloneDocument = true; } - SAL_FALLTHROUGH; + [[fallthrough]]; case E_FORM: { if ( isStandaloneDocument || !m_pSubComponentManager->activateSubFrame( _sName, _eType, _eOpenMode, xRet ) ) @@ -2057,7 +2057,7 @@ void OApplicationController::renameEntry() ensureConnection(); if ( !getConnection().is() ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case E_QUERY: if ( xContainer->hasByName(*aList.begin()) ) { diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 6d4dd7a9650d..18756710ff04 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -776,7 +776,7 @@ void OApplicationController::getSupportedFormats(ElementType _eType,std::vector< _rFormatIds.push_back(SotClipboardFormatId::DBACCESS_TABLE); _rFormatIds.push_back(SotClipboardFormatId::RTF); _rFormatIds.push_back(SotClipboardFormatId::HTML); - SAL_FALLTHROUGH; + [[fallthrough]]; case E_QUERY: _rFormatIds.push_back(SotClipboardFormatId::DBACCESS_QUERY); break; diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 5db15ad643a6..ef1ba183e2ed 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -1461,7 +1461,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const aReturn.bEnabled = m_aCurrentFrame.isActive(); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case ID_BROWSER_PASTE: case ID_BROWSER_CUT: { @@ -1517,7 +1517,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const aReturn.bEnabled = true; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case ID_BROWSER_ORDERCRIT: { const Reference< XPropertySet > xFormSet(getRowSet(), UNO_QUERY); @@ -1931,7 +1931,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property getBrowserView()->getVclControl()->CopySelectedRowsToClipboard(); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case ID_BROWSER_CUT: case ID_BROWSER_PASTE: { @@ -1959,7 +1959,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property case ID_BROWSER_SORTDOWN: bSortUp = false; - SAL_FALLTHROUGH; + [[fallthrough]]; case ID_BROWSER_SORTUP: { if (!SaveModified()) diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index d5ce5952b3a9..041315775a61 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -117,7 +117,7 @@ namespace dbaui if ( m_pAccel.get() && m_pAccel->execute( aKeyCode ) ) // the accelerator consumed the event return true; - SAL_FALLTHROUGH; + [[fallthrough]]; } case MouseNotifyEvent::KEYUP: case MouseNotifyEvent::MOUSEBUTTONDOWN: diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 581a655cd9d2..0e421beddc24 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -698,7 +698,7 @@ void SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm case DataType::LONGVARCHAR: case DataType::CLOB: aInitialValues.emplace_back( "MultiLine", makeAny( true ) ); - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::BINARY: case DataType::VARBINARY: case DataType::LONGVARBINARY: @@ -709,7 +709,7 @@ void SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm case DataType::VARCHAR: case DataType::CHAR: bFormattedIsNumeric = false; - SAL_FALLTHROUGH; + [[fallthrough]]; default: aCurrentModelType = "FormattedField"; sDefaultProperty = PROPERTY_EFFECTIVEDEFAULT; @@ -1639,7 +1639,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const if ( !m_pTreeView->HasChildPathFocus() ) // handled below break; - SAL_FALLTHROUGH; + [[fallthrough]]; case ID_TREE_CLOSE_CONN: case ID_TREE_EDIT_DATABASE: { @@ -1788,7 +1788,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const aReturn.bEnabled = pControl->canCopyCellText(pControl->GetCurRow(), pControl->GetCurColumnId()); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: return SbaXDataBrowserController::GetState(nId); } @@ -1847,7 +1847,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue SbaXDataBrowserController::Execute(nId,aArgs); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; } case ID_BROWSER_REFRESH_REBUILD: diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index d8c44c71b5b5..4e6acd9f851d 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -1184,7 +1184,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) DeactivateAggregate( tpBoolDefault ); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::BOOLEAN: DeactivateAggregate( tpTextLen ); DeactivateAggregate( tpFormat ); diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 8153a2faab18..1925a2247c8a 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -526,7 +526,7 @@ VclPtr<PopupMenu> DBTreeListBox::CreateContextMenu() default: OSL_FAIL( "DBTreeListBox::CreateContextMenu: unexpected return value of the interceptor call!" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case ContextMenuInterceptorAction_IGNORED: break; } diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 74b4f115e6ec..d19e94e6925d 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -538,7 +538,7 @@ void OSQLMessageBox::Construct(weld::Window* pParent, MessBoxStyle _nStyle, Mess { default: OSL_FAIL( "OSQLMessageBox::impl_initImage: unsupported image type!" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case Info: eMessageType = VclMessageType::Info; break; diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index 246d666ebd42..709556dbbe1d 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -136,7 +136,7 @@ void OHTMLReader::NextToken( HtmlTokenId nToken ) } } } - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlTokenId::THEAD_ON: case HtmlTokenId::TBODY_ON: { diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 78ef021ca8b9..ae2c46f8ee55 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -556,7 +556,7 @@ void fillTypeInfo( const Reference< css::sdbc::XConnection>& _rxConnection, aName = _rsTypeNames.getToken(TYPE_BIT, ';'); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::BOOLEAN: aName = _rsTypeNames.getToken(TYPE_BOOL, ';'); break; @@ -1131,19 +1131,19 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType case DataType::TINYINT: if( (pTypeInfo = queryTypeInfoByType(DataType::SMALLINT,_rTypeInfo) ) ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::SMALLINT: if( (pTypeInfo = queryTypeInfoByType(DataType::INTEGER,_rTypeInfo) ) ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::INTEGER: if( (pTypeInfo = queryTypeInfoByType(DataType::FLOAT,_rTypeInfo) ) ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::FLOAT: if( (pTypeInfo = queryTypeInfoByType(DataType::REAL,_rTypeInfo) ) ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::DATE: case DataType::TIME: if( DataType::DATE == _nDataType || DataType::TIME == _nDataType ) @@ -1151,17 +1151,17 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType if( (pTypeInfo = queryTypeInfoByType(DataType::TIMESTAMP,_rTypeInfo) ) ) break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::TIMESTAMP: case DataType::REAL: case DataType::BIGINT: if ( (pTypeInfo = queryTypeInfoByType(DataType::DOUBLE,_rTypeInfo) ) ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::DOUBLE: if ( (pTypeInfo = queryTypeInfoByType(DataType::NUMERIC,_rTypeInfo) ) ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::NUMERIC: pTypeInfo = queryTypeInfoByType(DataType::DECIMAL,_rTypeInfo); break; diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 092714bd514a..d68357b21dc4 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -1430,19 +1430,19 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType, bool& _bN case DataType::TINYINT: if(supportsType(DataType::SMALLINT,nDefaultType)) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::SMALLINT: if(supportsType(DataType::INTEGER,nDefaultType)) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::INTEGER: if(supportsType(DataType::FLOAT,nDefaultType)) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::FLOAT: if(supportsType(DataType::REAL,nDefaultType)) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::DATE: case DataType::TIME: if( DataType::DATE == _pType->nType || DataType::TIME == _pType->nType ) @@ -1450,17 +1450,17 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType, bool& _bN if(supportsType(DataType::TIMESTAMP,nDefaultType)) break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::TIMESTAMP: case DataType::REAL: case DataType::BIGINT: if ( supportsType(DataType::DOUBLE,nDefaultType) ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::DOUBLE: if ( supportsType(DataType::NUMERIC,nDefaultType) ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::NUMERIC: supportsType(DataType::DECIMAL,nDefaultType); break; diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index c3bd6fa4deaf..e7fcd53ecb11 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -136,7 +136,7 @@ namespace dbaui case E_OPEN_FOR_MAIL: aArguments.put( "Hidden", true ); - SAL_FALLTHROUGH; + [[fallthrough]]; case E_OPEN_DESIGN: sOpenMode = "openDesign"; diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index e611e5977c1c..1d2ad3a6a67d 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -1990,7 +1990,7 @@ void OSelectionBrowseBox::Command(const CommandEvent& rEvt) return; } - SAL_FALLTHROUGH; + [[fallthrough]]; } default: EditBrowseBox::Command(rEvt); diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index 4a242f909691..f0145fe14301 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -66,7 +66,7 @@ bool LimitBoxImpl::EventNotify( NotifyEvent& rNEvt ) { case KEY_ESCAPE: Undo(); - SAL_FALLTHROUGH; + [[fallthrough]]; case KEY_RETURN: GrabFocusToDocument(); bHandled = true; diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 9a42963ffdfa..640297409998 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -449,7 +449,7 @@ FeatureState OQueryController::GetState(sal_uInt16 _nId) const aReturn.bEnabled = false; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: aReturn = OJoinController::GetState(_nId); break; diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 841935648226..f72ba4fa319b 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -142,7 +142,7 @@ void OTableRowView::Command(const CommandEvent& rEvt) return; } - SAL_FALLTHROUGH; + [[fallthrough]]; } default: EditBrowseBox::Command(rEvt); diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index fe18ac32a139..ccda8f1a501b 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -1248,7 +1248,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou aTransfer.transferComplexValue( &XRow::getBytes, &XParameters::setBytes ); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::BOOLEAN: aTransfer.transferValue( &XRow::getBoolean, &XParameters::setBoolean ); break; @@ -1332,7 +1332,7 @@ void CopyTableWizard::impl_doCopy_nothrow() if( CopyTableOperation::CopyDefinitionOnly == rWizard.getOperation() ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; } case CopyTableOperation::AppendData: diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index d748a948c585..2fa7f5befa69 100644 --- a/desktop/source/app/userinstall.cxx +++ b/desktop/source/app/userinstall.cxx @@ -161,7 +161,7 @@ Status finalize() { if (isCreated()) { return EXISTED; } - SAL_FALLTHROUGH; + [[fallthrough]]; case utl::Bootstrap::PATH_VALID: return create(uri); default: diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx index 77e53a42cdc1..fdcc7c1cd90b 100644 --- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx @@ -71,7 +71,7 @@ namespace drawinglayer aHatch.appendTransformations(aMatrices); - SAL_FALLTHROUGH; + [[fallthrough]]; } case attribute::HatchStyle::Double: { @@ -84,7 +84,7 @@ namespace drawinglayer aHatch.appendTransformations(aMatrices); - SAL_FALLTHROUGH; + [[fallthrough]]; } case attribute::HatchStyle::Single: { diff --git a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx index 3e81d31dc66f..f27a8cfe4f62 100644 --- a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx @@ -151,7 +151,7 @@ namespace drawinglayer aHatch.appendTransformations(aMatrices); - SAL_FALLTHROUGH; + [[fallthrough]]; } case attribute::HatchStyle::Double: { @@ -164,7 +164,7 @@ namespace drawinglayer aHatch.appendTransformations(aMatrices); - SAL_FALLTHROUGH; + [[fallthrough]]; } case attribute::HatchStyle::Single: { diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index e5b77c1c86d3..c5ae3c970735 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -188,7 +188,7 @@ namespace drawinglayer { default: SAL_WARN("drawinglayer", "Unknown EmphasisMark style " << pTCPP->getTextEmphasisMark() ); - SAL_FALLTHROUGH; + [[fallthrough]]; case primitive2d::TEXT_FONT_EMPHASIS_MARK_NONE: eFontEmphasisMark = FontEmphasisMark::NONE; break; case primitive2d::TEXT_FONT_EMPHASIS_MARK_DOT: eFontEmphasisMark = FontEmphasisMark::Dot; break; case primitive2d::TEXT_FONT_EMPHASIS_MARK_CIRCLE: eFontEmphasisMark = FontEmphasisMark::Circle; break; @@ -213,7 +213,7 @@ namespace drawinglayer { default: SAL_WARN( "drawinglayer", "Unknown Relief style " << pTCPP->getTextRelief() ); - SAL_FALLTHROUGH; + [[fallthrough]]; case primitive2d::TEXT_RELIEF_NONE: eFontRelief = FontRelief::NONE; break; case primitive2d::TEXT_RELIEF_EMBOSSED: eFontRelief = FontRelief::Embossed; break; case primitive2d::TEXT_RELIEF_ENGRAVED: eFontRelief = FontRelief::Engraved; break; diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index c9f16b6772df..36a186c3df71 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -287,7 +287,7 @@ void EditHTMLParser::NextToken( HtmlTokenId nToken ) case HtmlTokenId::TABLEHEADER_ON: case HtmlTokenId::TABLEDATA_ON: nInCell++; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlTokenId::BLOCKQUOTE_ON: case HtmlTokenId::BLOCKQUOTE_OFF: case HtmlTokenId::BLOCKQUOTE30_ON: @@ -311,7 +311,7 @@ void EditHTMLParser::NextToken( HtmlTokenId nToken ) { if ( nInCell ) nInCell--; - SAL_FALLTHROUGH; + [[fallthrough]]; } case HtmlTokenId::LISTHEADER_OFF: case HtmlTokenId::LI_OFF: diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index f21950827dd7..622e557a0517 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -1649,28 +1649,28 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } case LEFT_BORDER_DISTANCE: bDistMember = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case LEFT_BORDER: case MID_LEFT_BORDER: nLine = SvxBoxItemLine::LEFT; break; case RIGHT_BORDER_DISTANCE: bDistMember = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case RIGHT_BORDER: case MID_RIGHT_BORDER: nLine = SvxBoxItemLine::RIGHT; break; case BOTTOM_BORDER_DISTANCE: bDistMember = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case BOTTOM_BORDER: case MID_BOTTOM_BORDER: nLine = SvxBoxItemLine::BOTTOM; break; case TOP_BORDER_DISTANCE: bDistMember = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case TOP_BORDER: case MID_TOP_BORDER: nLine = SvxBoxItemLine::TOP; diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index f50d98d5522a..e9598a33aabc 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -525,8 +525,8 @@ OUString SvxNumberFormat::CreateRomanString( sal_uLong nNo, bool bUpper ) } switch( nNumber ) { - case 3: { sRet.append(*cRomanArr); SAL_FALLTHROUGH; } - case 2: { sRet.append(*cRomanArr); SAL_FALLTHROUGH; } + case 3: { sRet.append(*cRomanArr); [[fallthrough]]; } + case 2: { sRet.append(*cRomanArr); [[fallthrough]]; } case 1: { sRet.append(*cRomanArr); } break; diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 69246c19d3aa..902b26bc66aa 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -2925,7 +2925,7 @@ void SvxScriptSetItem::GetSlotIds( sal_uInt16 nSlotId, sal_uInt16& rLatin, { default: SAL_WARN( "editeng.items", "wrong SlotId for class SvxScriptSetItem" ); - SAL_FALLTHROUGH; // default to font - Id Range !! + [[fallthrough]]; // default to font - Id Range !! case SID_ATTR_CHAR_FONT: rLatin = SID_ATTR_CHAR_FONT; diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index bf1f40585bf3..8685259b2753 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -1348,17 +1348,17 @@ static void SetBorderLine( int nBorderTyp, SvxBoxItem& rItem, rItem.SetLine( &rBorder, SvxBoxItemLine::TOP ); if( RTF_BOX != nBorderTyp ) return; - SAL_FALLTHROUGH; + [[fallthrough]]; case RTF_BRDRB: rItem.SetLine( &rBorder, SvxBoxItemLine::BOTTOM ); if( RTF_BOX != nBorderTyp ) return; - SAL_FALLTHROUGH; + [[fallthrough]]; case RTF_BRDRL: rItem.SetLine( &rBorder, SvxBoxItemLine::LEFT ); if( RTF_BOX != nBorderTyp ) return; - SAL_FALLTHROUGH; + [[fallthrough]]; case RTF_BRDRR: rItem.SetLine( &rBorder, SvxBoxItemLine::RIGHT ); if( RTF_BOX != nBorderTyp ) @@ -1799,7 +1799,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue ) { case RTF_ADEFF: bIsLeftToRightDef = false; - SAL_FALLTHROUGH; + [[fallthrough]]; case RTF_DEFF: { if( -1 == nValue ) @@ -1815,7 +1815,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue ) case RTF_ADEFLANG: bIsLeftToRightDef = false; - SAL_FALLTHROUGH; + [[fallthrough]]; case RTF_DEFLANG: // store default Language if( -1 != nValue ) diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index 78d726b86d51..c3bafbf24db8 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -170,7 +170,7 @@ void SvxRTFParser::NextToken( int nToken ) case RTF_RDBLQUOTE: cCh = 0x201D; goto INSINGLECHAR; INSINGLECHAR: aToken = OUString(cCh); - SAL_FALLTHROUGH; // aToken is set as Text + [[fallthrough]]; // aToken is set as Text case RTF_TEXTTOKEN: { InsertText(); @@ -412,7 +412,7 @@ void SvxRTFParser::ReadColorTable() : -1 == aToken.indexOf( ";" ) ) break; // At least the ';' must be found - SAL_FALLTHROUGH; + [[fallthrough]]; case ';': if( IsParserWorking() ) @@ -503,7 +503,7 @@ void SvxRTFParser::ReadFontTable() // for technical/symbolic font of the rtl_TextEncoding is changed! case RTF_FTECH: pFont->SetCharSet( RTL_TEXTENCODING_SYMBOL ); - SAL_FALLTHROUGH; + [[fallthrough]]; case RTF_FNIL: pFont->SetFamily( FAMILY_DONTKNOW ); break; diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 68858043cca3..0449957b127c 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -1838,7 +1838,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text return; } - SAL_FALLTHROUGH; + [[fallthrough]]; } default: throw lang::IllegalArgumentException(); diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index 72fb031d84a1..beeae8ab2469 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -395,7 +395,7 @@ bool OleEmbeddedObject::TryToConvertToOOo( const uno::Reference< io::XStream >& throw css::lang::WrappedTargetRuntimeException( ex.Message, nullptr, anyEx ); // the repairing is not possible } - SAL_FALLTHROUGH; + [[fallthrough]]; case 2: try { @@ -412,7 +412,7 @@ bool OleEmbeddedObject::TryToConvertToOOo( const uno::Reference< io::XStream >& throw css::lang::WrappedTargetRuntimeException( ex.Message, nullptr, anyEx ); // the repairing is not possible } - SAL_FALLTHROUGH; + [[fallthrough]]; case 1: case 0: diff --git a/embedserv/source/embed/ed_ioleobject.cxx b/embedserv/source/embed/ed_ioleobject.cxx index b5821b3546a4..19438dbe3e40 100644 --- a/embedserv/source/embed/ed_ioleobject.cxx +++ b/embedserv/source/embed/ed_ioleobject.cxx @@ -181,7 +181,7 @@ STDMETHODIMP EmbedDocument_Impl::DoVerb( pActiveSite,TRUE))) return NOERROR; - SAL_FALLTHROUGH; + [[fallthrough]]; case OLEIVERB_OPEN: OSL_ENSURE(m_pDocHolder,"no document to open"); diff --git a/embedserv/source/embed/tracker.cxx b/embedserv/source/embed/tracker.cxx index 99022f653db4..233ff0bb21ab 100644 --- a/embedserv/source/embed/tracker.cxx +++ b/embedserv/source/embed/tracker.cxx @@ -444,7 +444,7 @@ BOOL Tracker::TrackHandle(int nHandle,HWND hWnd,POINT point,HWND hWndClipTo) case WM_KEYDOWN: if (msg.wParam != VK_ESCAPE) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case WM_RBUTTONDOWN: if (bMoved) { diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx index 6fbccbe107bc..d2c002da0900 100644 --- a/emfio/source/reader/emfreader.cxx +++ b/emfio/source/reader/emfreader.cxx @@ -976,14 +976,14 @@ namespace emfio aLineInfo.SetLineCap( css::drawing::LineCap_ROUND ); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case PS_ENDCAP_SQUARE : if ( aSize.Width() ) { aLineInfo.SetLineCap( css::drawing::LineCap_SQUARE ); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case PS_ENDCAP_FLAT : default : aLineInfo.SetLineCap( css::drawing::LineCap_BUTT ); @@ -1066,14 +1066,14 @@ namespace emfio aLineInfo.SetLineCap( css::drawing::LineCap_ROUND ); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case PS_ENDCAP_SQUARE : if ( aLineInfo.GetWidth() ) { aLineInfo.SetLineCap( css::drawing::LineCap_SQUARE ); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case PS_ENDCAP_FLAT : default : aLineInfo.SetLineCap( css::drawing::LineCap_BUTT ); @@ -1194,7 +1194,7 @@ namespace emfio case EMR_ABORTPATH : ClearPath(); - SAL_FALLTHROUGH; + [[fallthrough]]; case EMR_ENDPATH : mbRecordPath = false; break; @@ -1573,7 +1573,7 @@ namespace emfio case EMR_EXTTEXTOUTA : bFlag = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case EMR_EXTTEXTOUTW : { sal_Int32 nLeft, nTop, nRight, nBottom, ptlReferenceX, ptlReferenceY, nGfxMode, nXScale, nYScale; diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index ebe654a81a27..faf99e5184da 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -248,7 +248,7 @@ namespace abp implCreateDataSource(); if ( needAdminInvokationPage() ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case STATE_INVOKE_ADMIN_DIALOG: if ( !connectToDataSource( false ) ) diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index e7de2bc9ab79..b2e8119cf257 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -681,7 +681,7 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid) case DataType::CHAR: case DataType::CLOB: bFormattedIsNumeric = false; - SAL_FALLTHROUGH; + [[fallthrough]]; default: sCurrentModelType = "FormattedField"; bIsFormatted = true; diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index 7516656d1c60..f83d4574899e 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -164,7 +164,7 @@ namespace pcr break; } } - SAL_FALLTHROUGH; + [[fallthrough]]; } case FormComponentType::LISTBOX: case FormComponentType::COMBOBOX: diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index b099b3250822..328c8bf025b7 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -575,7 +575,7 @@ namespace pcr bool bBoundToSomeModel = !sDataModelName.isEmpty(); _rxInspectorUI->rebuildPropertyUI( PROPERTY_BINDING_NAME ); _rxInspectorUI->enablePropertyUI( PROPERTY_BINDING_NAME, bBoundToSomeModel ); - SAL_FALLTHROUGH; + [[fallthrough]]; } case PROPERTY_ID_BINDING_NAME: diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index f8db077f5efc..99ef87995ebc 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -1483,7 +1483,7 @@ namespace pcr // Command also depends on DataSource aDependentProperties.push_back( PROPERTY_ID_COMMAND ); - SAL_FALLTHROUGH; + [[fallthrough]]; // ----- Command ----- case PROPERTY_ID_COMMAND: @@ -1501,7 +1501,7 @@ namespace pcr aDependentProperties.push_back( PROPERTY_ID_STRINGITEMLIST ); aDependentProperties.push_back( PROPERTY_ID_TYPEDITEMLIST ); aDependentProperties.push_back( PROPERTY_ID_BOUNDCOLUMN ); - SAL_FALLTHROUGH; + [[fallthrough]]; // ----- StringItemList ----- case PROPERTY_ID_STRINGITEMLIST: @@ -1608,7 +1608,7 @@ namespace pcr FormButtonType eButtonType( FormButtonType_PUSH ); OSL_VERIFY( _rNewValue >>= eButtonType ); _rxInspectorUI->enablePropertyUI( PROPERTY_TARGET_URL, FormButtonType_URL == eButtonType ); - SAL_FALLTHROUGH; + [[fallthrough]]; } // ----- TargetURL ----- diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx index bbe8c5fa09c1..1edeacbf230b 100644 --- a/extensions/source/propctrlr/formgeometryhandler.cxx +++ b/extensions/source/propctrlr/formgeometryhandler.cxx @@ -452,7 +452,7 @@ namespace pcr case PROPERTY_ID_WIDTH: case PROPERTY_ID_HEIGHT: bIsSize = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case PROPERTY_ID_POSITIONX: case PROPERTY_ID_POSITIONY: { diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index cdbefa2b994c..29076595a312 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -96,7 +96,7 @@ namespace pcr default: OSL_FAIL( "PropertyHandlerHelper::describePropertyLine: don't know how to represent this at the UI!" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case TypeClass_STRING: nControlType = PropertyControlType::TextField; diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index 7f51c6ddc9db..44d40c9453df 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -1695,7 +1695,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) { const MetaISectRectClipRegionAction* pA = static_cast<const MetaISectRectClipRegionAction*>(pAction); clipRect = pA->GetRect(); - SAL_FALLTHROUGH; + [[fallthrough]]; } case MetaActionType::CLIPREGION: case MetaActionType::ISECTREGIONCLIPREGION: @@ -1708,7 +1708,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) case MetaActionType::MAPMODE: { bMap++; - SAL_FALLTHROUGH; + [[fallthrough]]; } case MetaActionType::REFPOINT: case MetaActionType::LINECOLOR: diff --git a/filter/source/graphicfilter/idxf/dxfentrd.cxx b/filter/source/graphicfilter/idxf/dxfentrd.cxx index 0f30ba60f1bc..a830ce0c8fee 100644 --- a/filter/source/graphicfilter/idxf/dxfentrd.cxx +++ b/filter/source/graphicfilter/idxf/dxfentrd.cxx @@ -695,7 +695,7 @@ void DXFHatchEntity::EvaluateGroup( DXFGroupReader & rDGR ) case 92: nCurrentBoundaryPathIndex++; - SAL_FALLTHROUGH; + [[fallthrough]]; default: { bool bExecutingGroupCode = false; diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 182c948a8cf0..61c6bde360ec 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -731,11 +731,11 @@ void OS2METReader::SetPen( const Color& rColor, sal_uInt16 nLineWidth, PenStyle break; case PEN_DASHDOT : nDashCount++; - SAL_FALLTHROUGH; + [[fallthrough]]; case PEN_DOT : nDotCount++; nDashCount--; - SAL_FALLTHROUGH; + [[fallthrough]]; case PEN_DASH : nDashCount++; aLineInfo.SetDotCount( nDotCount ); @@ -1706,7 +1706,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) case GOrdStkPop: PopAttr(); break; case GOrdPIvAtr: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSIvAtr: { sal_uInt8 nA, nP, nFlags, nMix; Color aCol; @@ -1781,7 +1781,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; } case GOrdPIxCol: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSIxCol: { sal_uInt8 nFlags; Color aCol; @@ -1808,7 +1808,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) case GOrdPColor: case GOrdPXtCol: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSColor: case GOrdSXtCol: { sal_uInt8 nbyte; @@ -1837,7 +1837,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) } case GOrdPBgCol: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSBgCol: { sal_uInt16 nVal; Color aCol; @@ -1860,7 +1860,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; } case GOrdPBxCol: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSBxCol: { sal_uInt8 nFlags; Color aCol; @@ -1886,7 +1886,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) } case GOrdPMixMd: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSMixMd: { sal_uInt8 nMix; pOS2MET->ReadUChar( nMix ); @@ -1904,7 +1904,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; } case GOrdPBgMix: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSBgMix: { sal_uInt8 nMix; pOS2MET->ReadUChar( nMix ); @@ -1922,12 +1922,12 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; } case GOrdPPtSet: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSPtSet: SAL_INFO("filter.os2met","GOrdSPtSet"); break; case GOrdPPtSym: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSPtSym: { sal_uInt8 nPatt; pOS2MET->ReadUChar( nPatt ); @@ -1936,22 +1936,22 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) } case GOrdPPtRef: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSPtRef: SAL_INFO("filter.os2met","GOrdSPtRef"); break; case GOrdPLnEnd: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSLnEnd: break; case GOrdPLnJoi: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSLnJoi: break; case GOrdPLnTyp: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSLnTyp: { sal_uInt8 nType; pOS2MET->ReadUChar( nType ); @@ -1966,7 +1966,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; } case GOrdPLnWdt: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSLnWdt: { sal_uInt8 nbyte; pOS2MET->ReadUChar( nbyte ); @@ -1975,12 +1975,12 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; } case GOrdPFrLWd: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSFrLWd: break; case GOrdPStLWd: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSStLWd : { sal_uInt8 nFlags; @@ -1999,24 +1999,24 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; } case GOrdPChDir: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSChDir: break; case GOrdPChPrc: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSChPrc: break; case GOrdPChSet: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSChSet: { sal_uInt8 nbyte; pOS2MET->ReadUChar( nbyte ); aAttr.nChrSet=static_cast<sal_uInt32>(nbyte)&0xff; break; } case GOrdPChAng: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSChAng: { sal_Int32 nX = ReadCoord(bCoord32); sal_Int32 nY = ReadCoord(bCoord32); @@ -2029,12 +2029,12 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; } case GOrdPChBrx: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSChBrx: break; case GOrdPChCel: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSChCel: { sal_uInt8 nbyte; sal_uInt16 nLen=nOrderLen; @@ -2056,22 +2056,22 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; } case GOrdPChXtr: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSChXtr: break; case GOrdPChShr: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSChShr: break; case GOrdPTxAlg: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSTxAlg: SAL_INFO("filter.os2met","GOrdSTxAlg"); break; case GOrdPMkPrc: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSMkPrc: { sal_uInt8 nbyte; pOS2MET->ReadUChar( nbyte ); @@ -2081,7 +2081,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) } case GOrdPMkSet: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSMkSet: { sal_uInt8 nbyte; pOS2MET->ReadUChar( nbyte ); @@ -2091,7 +2091,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) } case GOrdPMkSym: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSMkSym: { sal_uInt8 nbyte; pOS2MET->ReadUChar( nbyte ); @@ -2101,7 +2101,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) } case GOrdPMkCel: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSMkCel: { sal_uInt8 nbyte; sal_uInt16 nLen=nOrderLen; @@ -2117,7 +2117,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) } case GOrdPArcPa: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSArcPa: aAttr.nArcP=ReadCoord(bCoord32); aAttr.nArcQ=ReadCoord(bCoord32); @@ -2126,18 +2126,18 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; case GOrdPCrPos: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSCrPos: aAttr.aCurPos=ReadPoint(); break; case GOrdPMdTrn: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSMdTrn: SAL_INFO("filter.os2met","GOrdSMdTrn"); break; case GOrdPPkIdn: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSPkIdn: SAL_INFO("filter.os2met","GOrdSPkIdn"); break; @@ -2145,7 +2145,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; case GOrdPVwWin: PushAttr(nOrderID); - SAL_FALLTHROUGH; + [[fallthrough]]; case GOrdSVwWin: SAL_INFO("filter.os2met","GOrdSVwWin"); break; default: SAL_INFO("filter.os2met","Unknown order: " << nOrderID); diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index 00d641aebb9b..f192c847ab5e 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -147,7 +147,7 @@ bool PBMReader::ImplReadHeader() { case '1' : mbRaw = false; - SAL_FALLTHROUGH; + [[fallthrough]]; case '4' : mnMode = 0; nMax = 2; // number of parameters in Header @@ -155,14 +155,14 @@ bool PBMReader::ImplReadHeader() break; case '2' : mbRaw = false; - SAL_FALLTHROUGH; + [[fallthrough]]; case '5' : mnMode = 1; nMax = 3; break; case '3' : mbRaw = false; - SAL_FALLTHROUGH; + [[fallthrough]]; case '6' : mnMode = 2; nMax = 3; diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index 6decd58d4cb4..44a765fe569d 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -181,7 +181,7 @@ bool PSDReader::ImplReadHeader() { case 5 : mbTransparent = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case 4 : mnDestBitDepth = 24; break; @@ -198,7 +198,7 @@ bool PSDReader::ImplReadHeader() break; case 4 : mbTransparent = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case 3 : mnDestBitDepth = 24; break; @@ -227,7 +227,7 @@ bool PSDReader::ImplReadHeader() case PSD_DUOTONE : // we'll handle the duotone color like a normal grayscale picture m_rPSD.SeekRel( nColorLength ); nColorLength = 0; - SAL_FALLTHROUGH; + [[fallthrough]]; case PSD_GRAYSCALE : { if ( nColorLength ) diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index f3dc9d2b697b..9cf10f14acbf 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -1085,7 +1085,7 @@ void EscherPropertyContainer::CreateLineProperties( AddOpt( ESCHER_Prop_lineDashing, eDash ); } } - SAL_FALLTHROUGH; + [[fallthrough]]; case drawing::LineStyle_SOLID : default: { diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 42807c8585bc..99430c9abc0f 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -774,11 +774,11 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, Svx switch ( aPlaceholderAtom.nPlaceholderId ) { case PptPlaceholder::MASTERSLIDENUMBER : nHeaderFooterInstance++; - SAL_FALLTHROUGH; + [[fallthrough]]; case PptPlaceholder::MASTERFOOTER : nHeaderFooterInstance++; - SAL_FALLTHROUGH; + [[fallthrough]]; case PptPlaceholder::MASTERHEADER : nHeaderFooterInstance++; - SAL_FALLTHROUGH; + [[fallthrough]]; case PptPlaceholder::MASTERDATE : nHeaderFooterInstance++; break; default: break; @@ -6426,13 +6426,13 @@ void PPTFieldEntry::GetDateTime( const sal_uInt32 nVal, SvxDateFormat& eDateForm break; case 7: eDateFormat = SvxDateFormat::A; - SAL_FALLTHROUGH; + [[fallthrough]]; case 9: eTimeFormat = SvxTimeFormat::HH24_MM; break; case 8: eDateFormat = SvxDateFormat::A; - SAL_FALLTHROUGH; + [[fallthrough]]; case 11: eTimeFormat = SvxTimeFormat::HH12_MM; break; @@ -6539,7 +6539,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport { case PPT_NOTEPAGE : nInstance++; - SAL_FALLTHROUGH; + [[fallthrough]]; case PPT_MASTERPAGE : nInstance++; break; diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index cab2424a2083..0b7b1bcc5c3c 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -469,7 +469,7 @@ static EquationResult Read_SubF_Combined(WW8ReadFieldParams& rReadParam) break; } (void)rReadParam.SkipToNextToken(); - SAL_FALLTHROUGH; + [[fallthrough]]; case -2: { if ( rReadParam.GetResult().startsWithIgnoreAsciiCase("(") ) diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 2f788b9b3539..ff5141792526 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -674,7 +674,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& default: case 2: aContext.Encryption.CanPrintFull = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case 1: aContext.Encryption.CanPrintTheDocument = true; break; diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index d54de1a52b17..babf682a024f 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -2246,7 +2246,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo, void ) aDate.SetDay( i ); sDate.append( SvxDateField::GetFormatted( aDate, eDateFormat, *pNumberFormatter, eLang ) ); } - SAL_FALLTHROUGH; // We need months too! + [[fallthrough]]; // We need months too! case SvxDateFormat::C: // 13.Feb 1996 case SvxDateFormat::D: // 13.February 1996 for( sal_uInt16 i = 1; i <= 12; ++i ) // we get all months in a year diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index dd3c4f989e6f..d15df8535313 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -208,13 +208,13 @@ namespace frm { Reference< XListBox > xListBox( getPeer(), UNO_QUERY_THROW ); xListBox->addItemListener( this ); - SAL_FALLTHROUGH; + [[fallthrough]]; } case FormComponentType::COMBOBOX: { xVclWindow->setProperty(PROPERTY_AUTOCOMPLETE, makeAny( true ) ); - SAL_FALLTHROUGH; + [[fallthrough]]; } default: diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 1e2e742eaba9..53592c52ee8f 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -913,7 +913,7 @@ Any OFormattedModel::translateControlValueToExternalValue( ) const aExternalValue <<= sString; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; } case TypeClass_BOOLEAN: { diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index 8eaca59166d8..0ff115326e09 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -445,7 +445,7 @@ namespace frm { case RET_NO: shouldCommit = false; - SAL_FALLTHROUGH; // don't ask again! + [[fallthrough]]; // don't ask again! case RET_YES: needConfirmation = false; return true; diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index f0051df277ba..4028996e41c3 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -302,7 +302,7 @@ bool Model::setSimpleContent( const XNode_t& xConstNode, OSL_ENSURE( xNode.is() && xNode->getNodeType() == NodeType_TEXT_NODE, "text node creation failed?" ); - SAL_FALLTHROUGH; // continue as with text node: + [[fallthrough]]; // continue as with text node: } case NodeType_TEXT_NODE: diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index e98d34a549e1..da1769d13b17 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -646,7 +646,7 @@ void FormulaCompiler::OpCodeMap::putOpCode( const OUString & rStr, const OpCode case ocGetDiffDate360: if (rStr == mpTable[eOp]) return; - SAL_FALLTHROUGH; + [[fallthrough]]; // These OpCodes are known to be added to an existing mapping, // but only for the OOXML external API mapping. This is *not* // FormulaLanguage::OOXML. Keep the first @@ -664,7 +664,7 @@ void FormulaCompiler::OpCodeMap::putOpCode( const OUString & rStr, const OpCode // Both bPutOp and bRemoveFromMap stay false. break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: SAL_WARN("formula.core", "OpCodeMap::putOpCode: reusing OpCode " << static_cast<sal_uInt16>(eOp) diff --git a/hwpfilter/source/hcode.cxx b/hwpfilter/source/hcode.cxx index ed654cc097d2..37d7045353d8 100644 --- a/hwpfilter/source/hcode.cxx +++ b/hwpfilter/source/hcode.cxx @@ -473,7 +473,7 @@ static hchar lineCharConv(hchar ch) case 0x3060 + '\'' - 31: case 0x3060 + '\"' - 31: ch--; - SAL_FALLTHROUGH; + [[fallthrough]]; case 0x3060 + '\'' - 32: case 0x3060 + '\"' - 32: case 0x3060 + '{' - 32: diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index 71ee7fd40689..642a8df18707 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -1815,7 +1815,7 @@ void HwpReader::makeColumns(ColumnDef const *coldef) { case 1: /* thin line */ padd("style:width", sXML_CDATA, "0.02mm"); - SAL_FALLTHROUGH; + [[fallthrough]]; case 3: /* dotted line */ padd("style:style", sXML_CDATA, "dotted"); padd("style:width", sXML_CDATA, "0.02mm"); @@ -3401,7 +3401,7 @@ void HwpReader::makeDateFormat(DateCode * hbox) break; case '_': padd("number:style", sXML_CDATA, "long"); - SAL_FALLTHROUGH; + [[fallthrough]]; case '6': case '^': rstartEl("number:day-of-week", mxList.get()); diff --git a/hwpfilter/source/lexer.cxx b/hwpfilter/source/lexer.cxx index 4ee3c4c4a47a..d70d81a92923 100644 --- a/hwpfilter/source/lexer.cxx +++ b/hwpfilter/source/lexer.cxx @@ -1251,7 +1251,7 @@ case 23: YY_RULE_SETUP { token_debug(" ==>Ignore[\\rm]\n"); } //YY_BREAK -SAL_FALLTHROUGH; +[[fallthrough]]; case 24: YY_RULE_SETUP { yylval.str = yytext+1; token_debug(" ==>General_Iden[%s]\n",yytext+1); return GENERAL_IDEN; } @@ -1296,12 +1296,12 @@ case 34: YY_RULE_SETUP { yylval.str = yytext+1; token_debug(" ==>Space_Symbol[%s]\n",yytext+1); /*return SPACE_SYMBOL;*/ } //YY_BREAK -SAL_FALLTHROUGH; +[[fallthrough]]; case 35: YY_RULE_SETUP { yylval.str = strdup("quad"); token_debug(" ==>Space_Symbol[quad]\n"); /* return SPACE_SYMBOL;*/ } //YY_BREAK -SAL_FALLTHROUGH; +[[fallthrough]]; case 36: YY_RULE_SETUP { yylval.dval = yytext; token_debug(" ==>Digit[%s]\n",yytext); return DIGIT; } diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index b8f1d15ee66f..4e4a14dc0079 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -642,7 +642,7 @@ static sal_Int16 NatNumForCalendar(const css::lang::Locale& aLocale, case NativeNumberMode::NATNUM4: if (isKorean) return isShort ? NativeNumberMode::NATNUM9 : NativeNumberMode::NATNUM11; - SAL_FALLTHROUGH; + [[fallthrough]]; default: return 0; } } @@ -863,7 +863,7 @@ Calendar_gregorian::getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, sal_In switch( nCalendarDisplayCode ) { case CalendarDisplayCode::SHORT_MONTH: value += 1; // month is zero based - SAL_FALLTHROUGH; + [[fallthrough]]; case CalendarDisplayCode::SHORT_DAY: sprintf(aStr, "%d", value); // #100211# - checked break; diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx b/i18npool/source/characterclassification/cclass_unicode_parser.cxx index 7af1dd8baf45..cc7107e355a2 100644 --- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx +++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx @@ -355,7 +355,7 @@ sal_Int32 cclass_Unicode::getParseTokensType(sal_uInt32 const c, bool const isFi case U_OTHER_LETTER : // Non_Spacing_Mark could not be as leading character if (isFirst) break; - SAL_FALLTHROUGH; // treat it as Other_Letter. + [[fallthrough]]; // treat it as Other_Letter. case U_NON_SPACING_MARK : return KParseTokens::UNI_OTHER_LETTER; case U_DECIMAL_DIGIT_NUMBER : @@ -630,7 +630,7 @@ ParserFlags cclass_Unicode::getFlagsExtended(sal_uInt32 const c) // nor can a spacing combining mark. if (bStart) return ParserFlags::ILLEGAL; - SAL_FALLTHROUGH; // treat it as Other_Letter. + [[fallthrough]]; // treat it as Other_Letter. case U_OTHER_LETTER : return (nTypes & KParseTokens::UNI_OTHER_LETTER) ? (bStart ? ParserFlags::CHAR_WORD : ParserFlags::WORD) : @@ -891,7 +891,7 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32 break; case ssGetWordFirstChar : eState = ssGetWord; - SAL_FALLTHROUGH; + [[fallthrough]]; case ssGetWord : { if ( nMask & ParserFlags::WORD ) diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index 899ea58457d3..98f52939bcbe 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -334,8 +334,8 @@ static OUString toRoman( sal_Int32 n ) } switch( nNumber ) { - case 3: sTmp.append(*cRomanStr); SAL_FALLTHROUGH; - case 2: sTmp.append(*cRomanStr); SAL_FALLTHROUGH; + case 3: sTmp.append(*cRomanStr); [[fallthrough]]; + case 2: sTmp.append(*cRomanStr); [[fallthrough]]; case 1: sTmp.append(*cRomanStr); break; case 4: sTmp.append(*cRomanStr).append(*(cRomanStr-nDiff)); break; case 5: sTmp.append(*(cRomanStr-nDiff)); break; diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx index 85533ae37e4c..2a4d9c37e5ee 100644 --- a/i18npool/source/indexentry/indexentrysupplier_default.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx @@ -213,7 +213,7 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm break; case u'{': close = '}'; - SAL_FALLTHROUGH; + [[fallthrough]]; case u'(': { if (key_count <= 0) throw RuntimeException(); diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx index a3d2595022f0..6944059729e4 100644 --- a/i18npool/source/localedata/LocaleNode.cxx +++ b/i18npool/source/localedata/LocaleNode.cxx @@ -699,7 +699,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const sTheCompatibleCurrency = aCode.copy( nStart + 2, nHyphen - nStart - 2); } } - SAL_FALLTHROUGH; + [[fallthrough]]; case cssi::NumberFormatIndex::CURRENCY_1000INT : case cssi::NumberFormatIndex::CURRENCY_1000INT_RED : case cssi::NumberFormatIndex::CURRENCY_1000DEC2_RED : @@ -1050,7 +1050,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const // separators and generate a second pattern with the // format's separator at the current position. cDateSep2 = cChar; - SAL_FALLTHROUGH; + [[fallthrough]]; default: handleDefault: if (!cDateSep) diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index a72d364244f9..374244eefbe6 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -686,7 +686,7 @@ Sequence< CalendarItem2 > &LocaleDataImpl::getCalendarItemByName(const OUString& return ref_cal.PartitiveMonths; default: OSL_FAIL( "LocaleDataImpl::getCalendarItemByName: unhandled REF_* case"); - SAL_FALLTHROUGH; + [[fallthrough]]; case REF_ERAS: return ref_cal.Eras; } diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index 1ae68f02d870..4e6f176edbb2 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -837,7 +837,7 @@ sal_Bool SAL_CALL NativeNumberSupplierService::isValidNatNum( const Locale& rLoc case NativeNumberMode::NATNUM2: // Char, Upper if (langnum == 4) // Hebrew numbering return true; - SAL_FALLTHROUGH; + [[fallthrough]]; case NativeNumberMode::NATNUM4: // Text, Lower, Long case NativeNumberMode::NATNUM5: // Text, Upper, Long case NativeNumberMode::NATNUM6: // Text, FullWidth diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index 906dd12c5263..10b58ba3ea6c 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -241,7 +241,7 @@ void TextSearch::setOptions2( const SearchOptions2& rOptions ) default: SAL_WARN("i18npool","TextSearch::setOptions2 - default what?"); - SAL_FALLTHROUGH; + [[fallthrough]]; case SearchAlgorithms2::ABSOLUTE: fnForward = &TextSearch::NSrchFrwrd; fnBackward = &TextSearch::NSrchBkwrd; @@ -264,7 +264,7 @@ void TextSearch::setOptions( const SearchOptions& rOptions ) break; default: SAL_WARN("i18npool","TextSearch::setOptions - default what?"); - SAL_FALLTHROUGH; + [[fallthrough]]; case SearchAlgorithms_ABSOLUTE: nAlgorithmType2 = SearchAlgorithms2::ABSOLUTE; break; diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx index 3d9f472f2c4a..f3e82bda03a0 100644 --- a/idlc/source/astdump.cxx +++ b/idlc/source/astdump.cxx @@ -197,7 +197,7 @@ bool AstService::dump(RegistryKey& rKey) getRealService()->getRelativName(); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case NT_interface_member: case NT_observes: case NT_needs: diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx index b4b7584af060..d1dbe1a8680c 100644 --- a/idlc/source/options.cxx +++ b/idlc/source/options.cxx @@ -144,7 +144,7 @@ bool Options::checkCommandFile (std::vector< std::string > & rArgs, char const * } break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: buffer.push_back(sal::static_int_cast<char>(c)); break; diff --git a/include/sal/types.h b/include/sal/types.h index c4e472cc4210..74d5c8886203 100644 --- a/include/sal/types.h +++ b/include/sal/types.h @@ -409,10 +409,6 @@ namespace css = ::com::sun::star; #define SAL_OVERRIDE #endif -#if defined LIBO_INTERNAL_ONLY -#define SAL_FALLTHROUGH [[fallthrough]] -#endif - #endif /* __cplusplus */ #ifdef __cplusplus diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 36dd03877c0d..3563e4ccb3b0 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -265,7 +265,7 @@ FileHandleReader::readLine(OString * pLine) { case osl_File_E_PIPE: //HACK! for windows nRead = 0; - SAL_FALLTHROUGH; + [[fallthrough]]; case osl_File_E_None: if (nRead == 0) { @@ -293,7 +293,7 @@ FileHandleReader::readLine(OString * pLine) { case 0x0D: m_bLf = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case 0x0A: *pLine += OString(m_aBuffer + nStart, m_nIndex - 1 - nStart); @@ -352,7 +352,7 @@ void AsynchReader::execute() { case osl_File_E_PIPE: //HACK! for windows nRead = 0; - SAL_FALLTHROUGH; + [[fallthrough]]; case osl_File_E_None: break; default: diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx index 7d288a449651..247e13c2450e 100644 --- a/libreofficekit/source/gtk/lokdocview.cxx +++ b/libreofficekit/source/gtk/lokdocview.cxx @@ -1017,7 +1017,7 @@ globalCallback (gpointer pData) break; case LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY: bModify = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case LOK_CALLBACK_DOCUMENT_PASSWORD: { char const*const pURL(pCallback->m_aPayload.c_str()); diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx b/lotuswordpro/source/filter/lwpobjstrm.cxx index 4ac9fd11d6a5..86444146818b 100644 --- a/lotuswordpro/source/filter/lwpobjstrm.cxx +++ b/lotuswordpro/source/filter/lwpobjstrm.cxx @@ -334,7 +334,7 @@ sal_uInt16 LwpObjectStream::DecompressBuffer(sal_uInt8* pDst, sal_uInt8* pSrc, s *pDst++ = 0; DstSize++; - SAL_FALLTHROUGH; + [[fallthrough]]; case 0xC0: // 1 - 64 bytes of non-zero 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: diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx index 9d9bbe30bb70..8c02c4fa29a2 100644 --- a/package/source/zipapi/Deflater.cxx +++ b/package/source/zipapi/Deflater.cxx @@ -83,7 +83,7 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence < sal_Int8 > &rBuffer, sal_Int { case Z_STREAM_END: bFinished = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case Z_OK: nOffset += nLength - pStream->avail_in; nLength = pStream->avail_in; diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx index 9abea5bfe977..408467ce59a1 100644 --- a/package/source/zipapi/Inflater.cxx +++ b/package/source/zipapi/Inflater.cxx @@ -113,7 +113,7 @@ sal_Int32 Inflater::doInflateBytes (Sequence < sal_Int8 > &rBuffer, sal_Int32 n { case Z_STREAM_END: bFinished = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case Z_OK: nOffset += nLength - pStream->avail_in; nLength = pStream->avail_in; diff --git a/registry/tools/options.cxx b/registry/tools/options.cxx index b229bb989a51..0f929b4230aa 100644 --- a/registry/tools/options.cxx +++ b/registry/tools/options.cxx @@ -116,7 +116,7 @@ bool Options::checkCommandFile(std::vector< std::string > & rArgs, char const * } break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: buffer.push_back(sal::static_int_cast<char>(c)); break; diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index bac0c4dbae50..e933b6218752 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -717,7 +717,7 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt) m_nDeleteEvent = Application::PostUserEvent( LINK(this, OFieldExpressionControl, DelayedDelete), nullptr, true ); } } - SAL_FALLTHROUGH; + [[fallthrough]]; } default: EditBrowseBox::Command(rEvt); diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 90a6ec84213a..a90e1bd2b7f5 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -975,7 +975,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope aPropertyValue <<= COL_TRANSPARENT; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case PROPERTY_ID_KEEPTOGETHER: if ( uno::Reference< report::XGroup>(m_xReportComponent,uno::UNO_QUERY).is()) @@ -983,7 +983,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope aPropertyValue = getConstantValue(false,RID_STR_KEEPTOGETHER_CONST,_rControlValue,"com.sun.star.report.KeepTogether",PropertyName); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case PROPERTY_ID_VISIBLE: case PROPERTY_ID_CANGROW: @@ -1167,7 +1167,7 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & Proper aControlValue = getConstantValue(true,RID_STR_KEEPTOGETHER_CONST,aPropertyValue,"com.sun.star.report.KeepTogether",PropertyName); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case PROPERTY_ID_VISIBLE: case PROPERTY_ID_CANGROW: case PROPERTY_ID_CANSHRINK: @@ -1267,7 +1267,7 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & Proper if ( (aPropertyValue >>= nColor) && COL_TRANSPARENT == nColor ) aPropertyValue.clear(); } - SAL_FALLTHROUGH; + [[fallthrough]]; default: aControlValue = m_xFormComponentHandler->convertToControlValue(PropertyName, aPropertyValue, _rControlValueType); } diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index f37bce178528..6e9c2e21a027 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -867,7 +867,7 @@ void OViewsWindow::alignMarkedObjects(ControlModification _nControlModification, else if ( _nControlModification == ControlModification::WIDTH_GREATEST ) nYMov = aObjRect.getHeight(); lcl_getNewRectSize(aObjRect,nXMov,nYMov,pObj,pView,_nControlModification); - SAL_FALLTHROUGH; + [[fallthrough]]; case ControlModification::WIDTH_SMALLEST: case ControlModification::HEIGHT_SMALLEST: pView->AddUndo( pView->GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 58a71a4bddcd..d66ce42d381e 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -358,7 +358,7 @@ bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent) bReturn = true; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: { bReturn = m_rView.KeyInput(_rEvent, m_pParent); diff --git a/sal/osl/unx/security.cxx b/sal/osl/unx/security.cxx index e545842290dc..16f3b0ee561d 100644 --- a/sal/osl/unx/security.cxx +++ b/sal/osl/unx/security.cxx @@ -132,7 +132,7 @@ oslSecurity SAL_CALL osl_getCurrentSecurity() if (found != nullptr) { return p; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: deleteSecurityImpl(p); return nullptr; diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx index e4a70b5083a1..dd84afc0ccc4 100644 --- a/sal/osl/unx/socket.cxx +++ b/sal/osl/unx/socket.cxx @@ -412,7 +412,7 @@ sal_Bool SAL_CALL osl_isEqualSocketAddr ( (pInetAddr1->sin_addr.s_addr == pInetAddr2->sin_addr.s_addr) && (pInetAddr1->sin_port == pInetAddr2->sin_port)) return true; - SAL_FALLTHROUGH; + [[fallthrough]]; } default: diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx index 28955cce4f3a..bf8111d39f42 100644 --- a/sal/osl/w32/file_url.cxx +++ b/sal/osl/w32/file_url.cxx @@ -82,7 +82,7 @@ static bool IsValidFilePathComponent( break; } } - SAL_FALLTHROUGH; + [[fallthrough]]; case 0: case ' ': if ( dwFlags & VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD ) @@ -577,7 +577,7 @@ static void osl_encodeURL_( rtl_uString *strURL, rtl_String **pstrEncodedURL ) pURLDest += 3; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case '!': case '\'': case '(': diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx index f3cf5016a14b..592103e630d6 100644 --- a/sal/osl/w32/socket.cxx +++ b/sal/osl/w32/socket.cxx @@ -338,7 +338,7 @@ sal_Bool SAL_CALL osl_isEqualSocketAddr(oslSocketAddr Addr1, oslSocketAddr Addr2 (pInetAddr1->sin_addr.s_addr == pInetAddr2->sin_addr.s_addr) && (pInetAddr1->sin_port == pInetAddr2->sin_port)) return true; - SAL_FALLTHROUGH; + [[fallthrough]]; } default: diff --git a/sal/rtl/cipher.cxx b/sal/rtl/cipher.cxx index 70a26cd3fe62..5077119babe9 100644 --- a/sal/rtl/cipher.cxx +++ b/sal/rtl/cipher.cxx @@ -51,19 +51,19 @@ switch ((n)) \ { \ case 8: (xr) = (static_cast<sal_uInt32>(*(--(c)))); \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 7: (xr) |= (static_cast<sal_uInt32>(*(--(c)))) << 8; \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 6: (xr) |= (static_cast<sal_uInt32>(*(--(c)))) << 16; \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 5: (xr) |= (static_cast<sal_uInt32>(*(--(c)))) << 24; \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 4: (xl) = (static_cast<sal_uInt32>(*(--(c)))); \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 3: (xl) |= (static_cast<sal_uInt32>(*(--(c)))) << 8; \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 2: (xl) |= (static_cast<sal_uInt32>(*(--(c)))) << 16; \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 1: (xl) |= (static_cast<sal_uInt32>(*(--(c)))) << 24; \ } \ } @@ -74,19 +74,19 @@ switch ((n)) \ { \ case 8: *(--(c)) = static_cast<sal_uInt8>(((xr) ) & 0xff); \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 7: *(--(c)) = static_cast<sal_uInt8>(((xr) >> 8) & 0xff); \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 6: *(--(c)) = static_cast<sal_uInt8>(((xr) >> 16) & 0xff); \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 5: *(--(c)) = static_cast<sal_uInt8>(((xr) >> 24) & 0xff); \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 4: *(--(c)) = static_cast<sal_uInt8>(((xl) ) & 0xff); \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 3: *(--(c)) = static_cast<sal_uInt8>(((xl) >> 8) & 0xff); \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 2: *(--(c)) = static_cast<sal_uInt8>(((xl) >> 16) & 0xff); \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 1: *(--(c)) = static_cast<sal_uInt8>(((xl) >> 24) & 0xff); \ } \ } diff --git a/sal/rtl/digest.cxx b/sal/rtl/digest.cxx index 3ec357a2cb34..1000fc0aed02 100644 --- a/sal/rtl/digest.cxx +++ b/sal/rtl/digest.cxx @@ -613,11 +613,11 @@ static void endMD5(DigestContextMD5 *ctx) switch (ctx->m_nDatLen & 0x03) { case 0: X[i] = static_cast<sal_uInt32>(*(p++)) << 0; - SAL_FALLTHROUGH; + [[fallthrough]]; case 1: X[i] |= static_cast<sal_uInt32>(*(p++)) << 8; - SAL_FALLTHROUGH; + [[fallthrough]]; case 2: X[i] |= static_cast<sal_uInt32>(*(p++)) << 16; - SAL_FALLTHROUGH; + [[fallthrough]]; case 3: X[i] |= static_cast<sal_uInt32>(*p) << 24; } @@ -1034,11 +1034,11 @@ static void endSHA(DigestContextSHA *ctx) switch (ctx->m_nDatLen & 0x03) { case 0: X[i] = static_cast<sal_uInt32>(*(p++)) << 0; - SAL_FALLTHROUGH; + [[fallthrough]]; case 1: X[i] |= static_cast<sal_uInt32>(*(p++)) << 8; - SAL_FALLTHROUGH; + [[fallthrough]]; case 2: X[i] |= static_cast<sal_uInt32>(*(p++)) << 16; - SAL_FALLTHROUGH; + [[fallthrough]]; case 3: X[i] |= static_cast<sal_uInt32>(*(p++)) << 24; } diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx index 3bf0e1d34c2f..baa806928238 100644 --- a/sal/rtl/uri.cxx +++ b/sal/rtl/uri.cxx @@ -704,7 +704,7 @@ void SAL_CALL rtl_uriDecode(rtl_uString * pText, case rtl_UriDecodeToIuri: eCharset = RTL_TEXTENCODING_UTF8; - SAL_FALLTHROUGH; + [[fallthrough]]; default: // rtl_UriDecodeWithCharset, rtl_UriDecodeStrict { sal_Unicode const * p = pText->buffer; @@ -724,7 +724,7 @@ void SAL_CALL rtl_uriDecode(rtl_uString * pText, writeEscapeOctet(pResult, &nCapacity, nUtf32); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case EscapeNo: writeUcs4(pResult, &nCapacity, nUtf32); diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 215bef0f27f0..ff2d0080794b 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -1002,7 +1002,7 @@ bool FastSaxParserImpl::consume(EventList& rEventList) return false; case CallbackType::EXCEPTION: rEntity.throwException( mxDocumentLocator, false ); - SAL_FALLTHROUGH; // avoid unreachable code warning with some compilers + [[fallthrough]]; // avoid unreachable code warning with some compilers default: assert(false); return false; diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index 27ffbdde8c77..e1dbac1355e5 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -302,7 +302,7 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer, case MeasureUnit::MM_100TH: case MeasureUnit::MM_10TH: OSL_ENSURE( MeasureUnit::INCH == nTargetUnit,"output unit not supported for twip values" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case MeasureUnit::MM: // 0.01mm = 0.57twip (exactly) nMul = 25400; // 25.4 * 1000 @@ -359,7 +359,7 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer, case MeasureUnit::MM_10TH: OSL_ENSURE( MeasureUnit::INCH == nTargetUnit, "output unit not supported for 1/100mm values" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case MeasureUnit::MM: // 0.01mm = 1 mm/100 (exactly) nMul = 10; diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index 2f96cab2ab58..43cb67ecd91d 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -532,7 +532,7 @@ bool ScViewObjectModeItem::GetPresentation default: break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case SfxItemPresentation::Nameless: if (GetValue() == VOBJ_MODE_SHOW) rText += ScResId(STR_VOBJ_MODE_SHOW); diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 92d5041c2b33..cb00a2329924 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -87,7 +87,7 @@ static bool lcl_HasRelRef( ScDocument* pDoc, const ScTokenArray* pFormula, sal_u ScSingleRefData& rRef2 = t->GetDoubleRef()->Ref2; if ( rRef2.IsColRel() || rRef2.IsRowRel() || rRef2.IsTabRel() ) return true; - SAL_FALLTHROUGH; + [[fallthrough]]; } case svSingleRef: diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index 20dc149c2abc..2b053d5e3d43 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -2063,7 +2063,7 @@ template<typename T > static void lcl_Format( T& r, SCTAB nTab, SCROW nRow, SCCO r.append("!"); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case formula::FormulaGrammar::CONV_XL_A1: case formula::FormulaGrammar::CONV_XL_R1C1: if (!aDocName.isEmpty()) @@ -2165,7 +2165,7 @@ static void lcl_ScRange_Format_XL_Header( OUStringBuffer& rString, const ScRange } break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: if (!aDocName.isEmpty()) { diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index b47fe824f004..63eaf937e2e4 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -2455,7 +2455,7 @@ Label_MaskStateMachine: SetError( FormulaError::StringOverflow); eState = ssSkipReference; } - SAL_FALLTHROUGH; + [[fallthrough]]; case ssSkipReference: // ODF reference: ['External'#$'Sheet'.A1:.B2] with dots being // mandatory also if no sheet name. 'External'# is optional, @@ -2580,7 +2580,7 @@ Label_MaskStateMachine: case SC_COMPILER_FILE_TAB_SEP: // sheet name should follow nRefInName |= kFileSep; - SAL_FALLTHROUGH; + [[fallthrough]]; default: // quote not followed by quote => close nRefInName |= kClose; @@ -3302,7 +3302,7 @@ bool ScCompiler::IsReference( const OUString& rName, const OUString* pErrRef ) // operator as it is within a quoted name. if (rName[0] != '\'') return false; // Document name has to be single quoted. - SAL_FALLTHROUGH; + [[fallthrough]]; case FormulaGrammar::CONV_XL_R1C1: // C2 or C[1] are valid entire column references. if (IsDoubleReference( rName, pErrRef)) @@ -5552,7 +5552,7 @@ bool ScCompiler::HandleTableRef() if (pDBData->HasHeader()) aRange.aStart.IncRow(); } - SAL_FALLTHROUGH; + [[fallthrough]]; case ScTableRefToken::HEADERS_DATA: { if (pDBData->HasTotals()) diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 6d47e20f5d8f..127a8c622a4c 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -2745,7 +2745,7 @@ void ScInterpreter::ScIsFormula() PushMatrix( pResMat); return; } - SAL_FALLTHROUGH; + [[fallthrough]]; case svSingleRef : { ScAddress aAdr; @@ -2815,7 +2815,7 @@ void ScInterpreter::ScFormula() PushMatrix( pResMat); return; } - SAL_FALLTHROUGH; + [[fallthrough]]; case svSingleRef : { ScAddress aAdr; @@ -3325,7 +3325,7 @@ void ScInterpreter::ScValue() { case ScMatValType::Empty: fVal = 0.0; - SAL_FALLTHROUGH; + [[fallthrough]]; case ScMatValType::Value: case ScMatValType::Boolean: PushDouble( fVal); @@ -3676,7 +3676,7 @@ void ScInterpreter::ScMin( bool bTextAsZero ) nRefArrayPos = nRefInList; } } - SAL_FALLTHROUGH; + [[fallthrough]]; case svDoubleRef : { FormulaError nErr = FormulaError::NONE; @@ -3834,7 +3834,7 @@ void ScInterpreter::ScMax( bool bTextAsZero ) nRefArrayPos = nRefInList; } } - SAL_FALLTHROUGH; + [[fallthrough]]; case svDoubleRef : { FormulaError nErr = FormulaError::NONE; @@ -4035,7 +4035,7 @@ void ScInterpreter::GetStVarParams( bool bTextAsZero, double(*VarResult)( double break; } } - SAL_FALLTHROUGH; + [[fallthrough]]; case svDoubleRef : { FormulaError nErr = FormulaError::NONE; @@ -5708,7 +5708,7 @@ void ScInterpreter::ScCountIf() { case svRefList : nRefListArrayPos = nRefInList; - SAL_FALLTHROUGH; + [[fallthrough]]; case svDoubleRef : { ScRange aRange; @@ -6786,7 +6786,7 @@ void ScInterpreter::ScLookup() break; case svDoubleRef: aResAdr.Set( nResCol1, nResRow1, nResTab); - SAL_FALLTHROUGH; + [[fallthrough]]; case svSingleRef: PushCellResultToken( true, aResAdr, nullptr, nullptr); break; diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx index 466cbb307f12..cbeaa8a2443a 100644 --- a/sc/source/core/tool/interpr6.cxx +++ b/sc/source/core/tool/interpr6.cxx @@ -784,7 +784,7 @@ void ScInterpreter::IterateParameters( ScIterFunc eFunc, bool bTextAsZero ) nCount = 0; } } - SAL_FALLTHROUGH; + [[fallthrough]]; case svDoubleRef : { PopDoubleRef( aRange, nParamCount, nRefInList); diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 6cd50a560050..59231e7fcb62 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -655,7 +655,7 @@ svl::SharedString ScMatrixImpl::GetString(SCSIZE nC, SCSIZE nR) const case mdds::mtm::element_numeric: case mdds::mtm::element_boolean: fErr = maMat.get_numeric(aPos); - SAL_FALLTHROUGH; + [[fallthrough]]; default: OSL_FAIL("ScMatrixImpl::GetString: access error, no string"); } diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 12e692825b07..250500b10693 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1093,7 +1093,7 @@ void ScMatrixFormulaCellToken::SetUpperLeftDouble( double f ) xUpperLeft = new FormulaDoubleToken( f); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: { OSL_FAIL("ScMatrixFormulaCellToken::SetUpperLeftDouble: not modifying unhandled token type"); @@ -2044,7 +2044,7 @@ FormulaToken* ScTokenArray::MergeArray( ) case ocArrayOpen : nStart = i; // stop iteration - SAL_FALLTHROUGH; // to ArrayRowSep + [[fallthrough]]; // to ArrayRowSep case ocArrayRowSep : if( checkArraySep( bPrevWasSep, true ) ) @@ -2418,7 +2418,7 @@ bool SkipReference(formula::FormulaToken* pToken, const ScAddress& rPos, const S if (rRef.IsColRel() || rRef.IsRowRel()) return true; } - SAL_FALLTHROUGH; + [[fallthrough]]; case svSingleRef: { ScSingleRefData& rRef = *pToken->GetSingleRef(); @@ -4486,7 +4486,7 @@ void ScTokenArray::AdjustReferenceOnMovedOriginIfOtherSheet( const ScAddress& rO { case svExternalSingleRef: bAdjust = true; // always - SAL_FALLTHROUGH; + [[fallthrough]]; case svSingleRef: { ScSingleRefData& rRef = *p->GetSingleRef(); @@ -4499,7 +4499,7 @@ void ScTokenArray::AdjustReferenceOnMovedOriginIfOtherSheet( const ScAddress& rO break; case svExternalDoubleRef: bAdjust = true; // always - SAL_FALLTHROUGH; + [[fallthrough]]; case svDoubleRef: { ScComplexRefData& rRef = *p->GetDoubleRef(); diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index 8f759b0ba076..86036728258e 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -372,7 +372,7 @@ TOPIC DifParser::GetNextTopic() case S_UNKNOWN: // skip 2 lines ReadNextLine( aLine ); - SAL_FALLTHROUGH; + [[fallthrough]]; case S_ERROR_L2: // error happened in line 2 // skip 1 line ReadNextLine( aLine ); diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index 7989d2610012..9c20a8a7257b 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -408,7 +408,7 @@ ConvErr ExcelToSc::Convert( std::unique_ptr<ScTokenArray>& pResult, XclImpStream case EXC_BIFF4: aIn.Ignore( 10 ); break; case EXC_BIFF5: SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1A does not exist in Biff5!" ); - SAL_FALLTHROUGH; + [[fallthrough]]; default: SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" ); } @@ -421,7 +421,7 @@ ConvErr ExcelToSc::Convert( std::unique_ptr<ScTokenArray>& pResult, XclImpStream case EXC_BIFF4: aIn.Ignore( 4 ); break; case EXC_BIFF5: SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1B does not exist in Biff5!" ); - SAL_FALLTHROUGH; + [[fallthrough]]; default: SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" ); } @@ -619,7 +619,7 @@ ConvErr ExcelToSc::Convert( std::unique_ptr<ScTokenArray>& pResult, XclImpStream case 0x66: case 0x26: // Constant Reference Subexpression [321 271] aExtensions.push_back( EXTENSION_MEMAREA ); - SAL_FALLTHROUGH; + [[fallthrough]]; case 0x47: case 0x67: @@ -990,7 +990,7 @@ ConvErr ExcelToSc::Convert( ScRangeListTabs& rRangeList, XclImpStream& aIn, std: case EXC_BIFF3: case EXC_BIFF4: nIgnore = 10; break; case EXC_BIFF5: SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1A does not exist in Biff5!" ); - SAL_FALLTHROUGH; + [[fallthrough]]; default: SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" ); } break; @@ -1001,7 +1001,7 @@ ConvErr ExcelToSc::Convert( ScRangeListTabs& rRangeList, XclImpStream& aIn, std: case EXC_BIFF3: case EXC_BIFF4: nIgnore = 4; break; case EXC_BIFF5: SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1B does not exist in Biff5!" ); - SAL_FALLTHROUGH; + [[fallthrough]]; default: SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" ); } break; diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index 150e104a8269..7933d75f5601 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -905,7 +905,7 @@ ErrCode ImportExcel8::Read() break; case Biff8W: // workbook OSL_FAIL( "ImportExcel8::Read - double workbook globals" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case Biff8V: // VB module default: // TODO: do not create a sheet in the Calc document diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx index a85d12a03081..a94d23f370d7 100644 --- a/sc/source/filter/excel/xeformula.cxx +++ b/sc/source/filter/excel/xeformula.cxx @@ -1755,7 +1755,7 @@ void XclExpFmlaCompImpl::AppendTrailingParam( XclExpFuncData& rFuncData ) PrepareParam( rFuncData ); AppendIntToken( 0 ); FinishParam( rFuncData ); - SAL_FALLTHROUGH; // add next default parameter + [[fallthrough]]; // add next default parameter case 2: PrepareParam( rFuncData ); AppendIntToken( 1 ); diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 3002523be642..0f8916e23394 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -1502,7 +1502,7 @@ bool XclExpCellAlign::FillFromItemSet( SetScFrameDir( rItemSet.Get( ATTR_WRITINGDIR ).GetValue() ); bUsed |= ScfTools::CheckItem( rItemSet, ATTR_WRITINGDIR, bStyle ); - SAL_FALLTHROUGH; + [[fallthrough]]; } case EXC_BIFF5: // attributes new in BIFF5 @@ -1528,7 +1528,7 @@ bool XclExpCellAlign::FillFromItemSet( } mnOrient = XclTools::GetXclOrientFromRot( mnRotation ); - SAL_FALLTHROUGH; + [[fallthrough]]; } case EXC_BIFF3: // attributes new in BIFF3 @@ -1537,7 +1537,7 @@ bool XclExpCellAlign::FillFromItemSet( mbLineBreak = bForceLineBreak || rItemSet.Get( ATTR_LINEBREAK ).GetValue(); bUsed |= bForceLineBreak || ScfTools::CheckItem( rItemSet, ATTR_LINEBREAK, bStyle ); - SAL_FALLTHROUGH; + [[fallthrough]]; } case EXC_BIFF2: // attributes new in BIFF2 @@ -1769,7 +1769,7 @@ bool XclExpCellBorder::FillFromItemSet( bUsed |= ScfTools::CheckItem( rItemSet, ATTR_BORDER_TLBR, bStyle ) || ScfTools::CheckItem( rItemSet, ATTR_BORDER_BLTR, bStyle ); - SAL_FALLTHROUGH; + [[fallthrough]]; } case EXC_BIFF5: diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 7ab2bd2b7809..f3f34a141641 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -2582,7 +2582,7 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) : default: OSL_FAIL( "XclExpCellTable::XclExpCellTable - unknown cell type" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case CELLTYPE_NONE: { xCell.reset( new XclExpBlankCell( diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 5d9b7b04ffc9..179af25f84b1 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -1564,7 +1564,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& case EXC_OBJ_ORIENT_STACKED: { // sj: STACKED is not supported, maybe it can be optimized here a bit - SAL_FALLTHROUGH; + [[fallthrough]]; } case EXC_OBJ_ORIENT_90CW: { diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index 260a5fd59db4..2382dc5cfec8 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -407,7 +407,7 @@ void XclImpHFConverter::ParseString( const OUString& rHFString ) { case '\"': --pChar; - SAL_FALLTHROUGH; + [[fallthrough]]; case ',': eState = xlPSFontStyle; break; @@ -685,7 +685,7 @@ void XclImpUrlHelper::DecodeUrl( lclAppendUrlChar( rUrl, cCurrDrive ); rUrl += ":"; } - SAL_FALLTHROUGH; + [[fallthrough]]; case EXC_URL_SUBDIR: if( bEncoded ) rUrl += "\\"; diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 359e0154d60f..ce6fd53b399e 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -1144,7 +1144,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) bFieldText = WriteFieldText(aCell.mpEditText); if ( bFieldText ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; default: ScCellFormat::GetString(aCell, nFormat, aStrOut, &pColor, *pFormatter, pDoc); } diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 183e63f6ae29..16b0325e45be 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -1530,7 +1530,7 @@ void ScHTMLLayoutParser::ProcToken( HtmlImportInfo* pInfo ) // Do not set bInCell to true, TableDataOn does that mxActEntry->aItemSet.Put( SvxWeightItem( WEIGHT_BOLD, ATTR_FONT_WEIGHT) ); - SAL_FALLTHROUGH; + [[fallthrough]]; } case HtmlTokenId::TABLEDATA_ON: // Opens cell { diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index 91bddc80ec76..d9e94483fc1e 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -173,7 +173,7 @@ void applySharedFormulas( pCell->SetChanged(false); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: // Mark it for re-calculation. pCell->SetDirty(); diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx index e0ff875fe1fb..944affa28348 100644 --- a/sc/source/filter/oox/worksheetfragment.cxx +++ b/sc/source/filter/oox/worksheetfragment.cxx @@ -230,7 +230,7 @@ OUString NormalizeOoxList(const OUString& aList) aResult.append("\",\""); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: aResult.append(ch); break; diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx index d50b6206c951..f1ee6d7fdc02 100644 --- a/sc/source/filter/xml/xmlcondformat.cxx +++ b/sc/source/filter/xml/xmlcondformat.cxx @@ -153,7 +153,7 @@ static bool HasRelRefIgnoringSheet0Relative( ScDocument* pDoc, const ScTokenArra ScSingleRefData& rRef2 = t->GetDoubleRef()->Ref2; if ( rRef2.IsColRel() || rRef2.IsRowRel() || (rRef2.IsFlag3D() && rRef2.IsTabRel()) ) return true; - SAL_FALLTHROUGH; + [[fallthrough]]; } case formula::svSingleRef: diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 08998266c7f2..bfb881e0f066 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -655,7 +655,7 @@ IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl, ListBox&, void) case SC_VALIDDLG_DATA_VALIDRANGE: case SC_VALIDDLG_DATA_INVALIDRANGE: bShowMax = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case SC_VALIDDLG_DATA_GREATER: case SC_VALIDDLG_DATA_EQGREATER: m_pFtMin->SetText( maStrMin ); break; diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index d3622d2c6f1e..f9c24d171cd3 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -1466,7 +1466,7 @@ bool canInsertCellsByPivot(const ScRange& rRange, const ScMarkData& rMarkData, I { aRange.aStart.SetCol(0); aRange.aEnd.SetCol(MAXCOL); - SAL_FALLTHROUGH; + [[fallthrough]]; } case INS_CELLSDOWN: { @@ -1502,7 +1502,7 @@ bool canInsertCellsByPivot(const ScRange& rRange, const ScMarkData& rMarkData, I { aRange.aStart.SetRow(0); aRange.aEnd.SetRow(MAXROW); - SAL_FALLTHROUGH; + [[fallthrough]]; } case INS_CELLSRIGHT: { @@ -1564,7 +1564,7 @@ bool canDeleteCellsByPivot(const ScRange& rRange, const ScMarkData& rMarkData, D { aRange.aStart.SetCol(0); aRange.aEnd.SetCol(MAXCOL); - SAL_FALLTHROUGH; + [[fallthrough]]; } case DelCellCmd::CellsUp: { @@ -1589,7 +1589,7 @@ bool canDeleteCellsByPivot(const ScRange& rRange, const ScMarkData& rMarkData, D { aRange.aStart.SetRow(0); aRange.aEnd.SetRow(MAXROW); - SAL_FALLTHROUGH; + [[fallthrough]]; } case DelCellCmd::CellsLeft: { diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index fabc04732a5d..adcc96feeae9 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -1009,7 +1009,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) SetError(ERRCODE_IO_ABORT); // this error code will produce no error message, but will break the further saving process } } - SAL_FALLTHROUGH; + [[fallthrough]]; } case SfxEventHintId::SaveToDoc: // #i108978# If no event is sent before saving, there will also be no "...DONE" event, @@ -1023,7 +1023,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) { // new positions are used after "save" and "save as", but not "save to" UseSheetSaveEntries(); // use positions from saved file for next saving - SAL_FALLTHROUGH; + [[fallthrough]]; } case SfxEventHintId::SaveToDocDone: // only reset the flag, don't use the new positions diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index dc01065c8942..66d935a5c9e7 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -261,7 +261,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* aServerLst.FillInsertObjects(); aServerLst.Remove( ScDocShell::Factory().GetClassId() ); // Do not show Starcalc //TODO/LATER: currently no inserting of ClassId into SfxRequest! - SAL_FALLTHROUGH; //TODO ??? + [[fallthrough]]; //TODO ??? case SID_INSERT_FLOATINGFRAME : { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index e2862e5b3294..5d66cc393150 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -246,7 +246,7 @@ void ScUndoInsertCells::DoChange( const bool bUndo ) case INS_INSCOLS_BEFORE: case INS_INSCOLS_AFTER: nPaint |= PaintPartFlags::Top; // top bar - SAL_FALLTHROUGH; + [[fallthrough]]; case INS_CELLSRIGHT: for( i=0; i<nCount; i++ ) { @@ -504,7 +504,7 @@ void ScUndoDeleteCells::DoChange( const bool bUndo ) break; case DelCellCmd::Cols: nPaint |= PaintPartFlags::Top; // top bar - SAL_FALLTHROUGH; + [[fallthrough]]; case DelCellCmd::CellsLeft: for( i=0; i<nCount; i++ ) { diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index a5a1bca2ffe9..41186b65c4aa 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -461,7 +461,7 @@ void ScTokenConversion::ConvertToTokenSequence( const ScDocument& rDoc, break; default: SAL_WARN("sc", "ScTokenConversion::ConvertToTokenSequence: unhandled token type " << StackVarEnumToString(rToken.GetType())); - SAL_FALLTHROUGH; + [[fallthrough]]; case svJump: // occurs with ocIf, ocChoose case svError: // seems to be fairly common, and probably not exceptional and not worth a warning? case svMissing: // occurs with ocMissing diff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxx index 4966e7efd6b3..cf2ff15f8761 100644 --- a/sc/source/ui/vba/vbacondition.cxx +++ b/sc/source/ui/vba/vbacondition.cxx @@ -132,7 +132,7 @@ ScVbaCondition< Ifc... >::Operator(bool _bIncludeFormulaValue) retvalue = ISFORMULA; break; } - SAL_FALLTHROUGH; //TODO ??? + [[fallthrough]]; //TODO ??? case sheet::ConditionOperator_NONE: default: DebugHelper::basicexception(ERRCODE_BASIC_METHOD_FAILED, "Operator not supported"); diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index cf4e19e68487..1f32f959981b 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -5502,7 +5502,7 @@ ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) } case excel::XlCellType::xlCellTypeLastCell: xRange = Cells( uno::makeAny( getCount() ), uno::Any() ); - SAL_FALLTHROUGH; //TODO ??? + [[fallthrough]]; //TODO ??? case excel::XlCellType::xlCellTypeVisible: xLocSheetCellRanges = xQuery->queryVisibleCells(); break; diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index f62eecd2b881..fb5c81ac9c35 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -75,7 +75,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) //! cannot always be switched ???? if (!pTabViewShell->GetViewFrame()->GetFrame().IsInPlace()) pTabViewShell->SetDontSwitch(true); // do not switch off EditShell - SAL_FALLTHROUGH; + [[fallthrough]]; case FID_CELL_FORMAT: case SID_ENABLE_HYPHENATION: diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 46bce0e4251f..37b2c863751d 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -421,7 +421,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) { } } - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_STYLE_EDIT: case SID_STYLE_DELETE: diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index ddf6e6020caf..9a1652834d9c 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -2619,7 +2619,7 @@ void ScOutputData::DrawEditParam::setAlignmentToEngine() case SvxCellHorJustify::Repeat: // repeat is not yet implemented case SvxCellHorJustify::Standard: SAL_WARN("sc.ui","meHorJustResult does not match getAlignmentFromContext()"); - SAL_FALLTHROUGH; + [[fallthrough]]; case SvxCellHorJustify::Left: eSvxAdjust = SvxAdjust::Left; break; diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx index 5cfcff798131..4174848fdc80 100644 --- a/sc/source/ui/view/viewfun6.cxx +++ b/sc/source/ui/view/viewfun6.cxx @@ -295,7 +295,7 @@ void ScViewFunc::InsertCurrentTime(SvNumFormatType nReqFmt, const OUString& rUnd default: SAL_WARN("sc.ui","unhandled current date/time request"); nReqFmt = SvNumFormatType::DATETIME; - SAL_FALLTHROUGH; + [[fallthrough]]; case SvNumFormatType::DATETIME: { DateTime aActDateTime( DateTime::SYSTEM ); @@ -391,7 +391,7 @@ void ScViewFunc::InsertCurrentTime(SvNumFormatType nReqFmt, const OUString& rUnd default: SAL_WARN("sc.ui","unhandled current date/time request"); nReqFmt = SvNumFormatType::DATETIME; - SAL_FALLTHROUGH; + [[fallthrough]]; case SvNumFormatType::DATETIME: break; } diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx index 7a3cd8238421..1393e8497ce5 100644 --- a/sd/source/core/CustomAnimationCloner.cxx +++ b/sd/source/core/CustomAnimationCloner.cxx @@ -143,7 +143,7 @@ namespace sd { Reference< XIterateContainer > xIter( xNode, UNO_QUERY_THROW ); xIter->setTarget( transformValue( xIter->getTarget() ) ); - SAL_FALLTHROUGH; + [[fallthrough]]; } case AnimationNodeType::PAR: case AnimationNodeType::SEQ: diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 7585480b155c..89c53c25f263 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -1249,7 +1249,7 @@ Any CustomAnimationEffect::getColor( sal_Int32 nIndex ) case AnimationNodeType::ANIMATE: if( !implIsColorAttribute( xAnimate->getAttributeName() ) ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case AnimationNodeType::ANIMATECOLOR: Sequence<Any> aValues( xAnimate->getValues() ); if( aValues.hasElements() ) @@ -1296,7 +1296,7 @@ void CustomAnimationEffect::setColor( sal_Int32 nIndex, const Any& rColor ) case AnimationNodeType::ANIMATE: if( !implIsColorAttribute( xAnimate->getAttributeName() ) ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case AnimationNodeType::ANIMATECOLOR: { Sequence<Any> aValues( xAnimate->getValues() ); diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 1f4a7d9dfabf..83297fce1310 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -1081,7 +1081,7 @@ OUString SdDrawDocument::CreatePageNumValue(sal_uInt16 nNum) const break; case css::style::NumberingType::ROMAN_UPPER: bUpper = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case css::style::NumberingType::ROMAN_LOWER: aPageNumValue += SvxNumberFormat::CreateRomanString(nNum, bUpper); break; diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 5fdbd63e8007..f073d5a8bda3 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2966,7 +2966,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout, break; default: - SAL_FALLTHROUGH; + [[fallthrough]]; case 6: pOffsets = aOffsets[ bLandscape ? 3 : 1 ]; break; diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 3df37e99da6e..aad5dd7e7824 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -666,7 +666,7 @@ OUString SdStyleSheet::GetFamilyString( SfxStyleFamily eFamily ) return OUString( "cell" ); default: OSL_FAIL( "SdStyleSheet::GetFamilyString(), illegal family!" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SfxStyleFamily::Para: return OUString( "graphics" ); } diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index ab7c55a30087..65a9413b9441 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -194,7 +194,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ { case 1 : // automatic mnDiaMode++; - SAL_FALLTHROUGH; + [[fallthrough]]; case 2 : // semi-automatic mnDiaMode++; break; @@ -1211,7 +1211,7 @@ void PPTWriter::ImplWriteBackground( css::uno::Reference< css::beans::XPropertyS nFillColor = EscherEx::GetColor( *o3tl::doAccess<sal_uInt32>(mAny) ); nFillBackColor = nFillColor ^ 0xffffff; } - SAL_FALLTHROUGH; + [[fallthrough]]; } case css::drawing::FillStyle_NONE : default: diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 2917b19d787b..0001d90e2bb1 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -1420,16 +1420,16 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, css::presentation::ClickAct { case css::presentation::ClickAction_STOPPRESENTATION : nJump += 2; - SAL_FALLTHROUGH; + [[fallthrough]]; case css::presentation::ClickAction_LASTPAGE : nJump++; - SAL_FALLTHROUGH; + [[fallthrough]]; case css::presentation::ClickAction_FIRSTPAGE : nJump++; - SAL_FALLTHROUGH; + [[fallthrough]]; case css::presentation::ClickAction_PREVPAGE : nJump++; - SAL_FALLTHROUGH; + [[fallthrough]]; case css::presentation::ClickAction_NEXTPAGE : { nJump++; @@ -2749,7 +2749,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { if ( nPlaceHolderAtom < 19 ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; } case EPP_PLACEHOLDER_NOTESBODY : case EPP_PLACEHOLDER_MASTERDATE : diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 7be6a29d4657..9157fd18f93e 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -826,7 +826,7 @@ void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnima { case AnimationNodeType::PAR : aAnim.mnGroupType = mso_Anim_GroupType_PAR; - SAL_FALLTHROUGH; + [[fallthrough]]; case AnimationNodeType::SEQ : { sal_Int16 nType = 0; diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index bceacfac8ca3..178ae1f8c41c 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -854,39 +854,39 @@ sal_Int8 PPTWriterBase::GetTransition( FadeEffect eEffect, sal_uInt8& nDirection case FadeEffect_HORIZONTAL_STRIPES : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_VERTICAL_STRIPES : nPPTTransitionType = PPT_TRANSITION_TYPE_BLINDS; break; case FadeEffect_VERTICAL_CHECKERBOARD : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_HORIZONTAL_CHECKERBOARD : nPPTTransitionType = PPT_TRANSITION_TYPE_CHECKER; break; case FadeEffect_MOVE_FROM_UPPERLEFT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_MOVE_FROM_UPPERRIGHT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_MOVE_FROM_LOWERLEFT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_MOVE_FROM_LOWERRIGHT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_MOVE_FROM_TOP : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_MOVE_FROM_LEFT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_MOVE_FROM_BOTTOM : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_MOVE_FROM_RIGHT : nPPTTransitionType = PPT_TRANSITION_TYPE_COVER; break; @@ -897,33 +897,33 @@ sal_Int8 PPTWriterBase::GetTransition( FadeEffect eEffect, sal_uInt8& nDirection case FadeEffect_VERTICAL_LINES : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_HORIZONTAL_LINES : nPPTTransitionType = PPT_TRANSITION_TYPE_RANDOM_BARS; break; case FadeEffect_CLOSE_HORIZONTAL : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_OPEN_HORIZONTAL : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_CLOSE_VERTICAL : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_OPEN_VERTICAL : nPPTTransitionType = PPT_TRANSITION_TYPE_SPLIT; break; case FadeEffect_FADE_FROM_UPPERLEFT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_FADE_FROM_UPPERRIGHT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_FADE_FROM_LOWERLEFT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_FADE_FROM_LOWERRIGHT : nDirection += 4; nPPTTransitionType = PPT_TRANSITION_TYPE_STRIPS; @@ -931,58 +931,58 @@ sal_Int8 PPTWriterBase::GetTransition( FadeEffect eEffect, sal_uInt8& nDirection case FadeEffect_UNCOVER_TO_LOWERRIGHT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_UNCOVER_TO_LOWERLEFT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_UNCOVER_TO_UPPERRIGHT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_UNCOVER_TO_UPPERLEFT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_UNCOVER_TO_BOTTOM : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_UNCOVER_TO_RIGHT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_UNCOVER_TO_TOP : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_UNCOVER_TO_LEFT : nPPTTransitionType = PPT_TRANSITION_TYPE_PULL; break; case FadeEffect_FADE_FROM_TOP : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_FADE_FROM_LEFT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_FADE_FROM_BOTTOM : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_FADE_FROM_RIGHT : nPPTTransitionType = PPT_TRANSITION_TYPE_WIPE; break; case FadeEffect_ROLL_FROM_TOP : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_ROLL_FROM_LEFT : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_ROLL_FROM_BOTTOM : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_ROLL_FROM_RIGHT : nPPTTransitionType = PPT_TRANSITION_TYPE_WIPE; break; case FadeEffect_FADE_TO_CENTER : nDirection++; - SAL_FALLTHROUGH; + [[fallthrough]]; case FadeEffect_FADE_FROM_CENTER : nPPTTransitionType = PPT_TRANSITION_TYPE_ZOOM; break; diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 56f85514bcc8..d72cc548d6db 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -610,7 +610,7 @@ void PowerPointExport::WriteTransition(const FSHelperPtr& pFS) break; case animations::TransitionSubType::CORNERSIN: // Inside turning cube pInverted = "true"; - SAL_FALLTHROUGH; + [[fallthrough]]; case animations::TransitionSubType::CORNERSOUT: // Outside turning cube nTransition = XML_fade; nTransition14 = XML_prism; diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index ea4294842be4..4c43f1cf181f 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -913,7 +913,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider* pBuProv, sal_Int1 nParaFlags |= 0x90; // we define the font and charset } - SAL_FALLTHROUGH; + [[fallthrough]]; } case SVX_NUM_CHARS_UPPER_LETTER : // count from a-z, aa - az, ba - bz, ... case SVX_NUM_CHARS_LOWER_LETTER : diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 3ebdc5218bc2..4ab0fdf1032e 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1255,7 +1255,7 @@ bool ImplSdPPTImport::Import() break; case PptViewTypeEnum::TitleMaster: nSelectedPage = 1; - SAL_FALLTHROUGH; + [[fallthrough]]; case PptViewTypeEnum::SlideMaster: { ePageKind = PageKind::Standard; @@ -1264,7 +1264,7 @@ bool ImplSdPPTImport::Import() break; case PptViewTypeEnum::NotesMaster: eEditMode = EditMode::MasterPage; - SAL_FALLTHROUGH; + [[fallthrough]]; case PptViewTypeEnum::Notes: ePageKind = PageKind::Notes; break; @@ -2372,11 +2372,11 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj case PptPlaceholder::NOTESBODY : ePresObjKind = PRESOBJ_NOTES; break; case PptPlaceholder::VERTICALTEXTTITLE : bVertical = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case PptPlaceholder::TITLE : ePresObjKind = PRESOBJ_TITLE; break; case PptPlaceholder::VERTICALTEXTBODY : bVertical = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case PptPlaceholder::BODY : ePresObjKind = PRESOBJ_OUTLINE; break; case PptPlaceholder::CENTEREDTITLE : ePresObjKind = PRESOBJ_TITLE; break; case PptPlaceholder::SUBTITLE : ePresObjKind = PRESOBJ_TEXT; break; // PRESOBJ_OUTLINE diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 3262c9e734e6..fa29ba6bf1f5 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -673,11 +673,11 @@ void AnimationImporter::fillNode( Reference< XAnimationNode > const & xNode, con sal_Int16 nNodeType = css::presentation::EffectNodeType::DEFAULT; switch( nPPTNodeType ) { - case DFF_ANIM_NODE_TYPE_CLICK_PARALLEL: SAL_FALLTHROUGH; + case DFF_ANIM_NODE_TYPE_CLICK_PARALLEL: [[fallthrough]]; case DFF_ANIM_NODE_TYPE_ON_CLICK: nNodeType = css::presentation::EffectNodeType::ON_CLICK; break; - case DFF_ANIM_NODE_TYPE_WITH_GROUP: SAL_FALLTHROUGH; + case DFF_ANIM_NODE_TYPE_WITH_GROUP: [[fallthrough]]; case DFF_ANIM_NODE_TYPE_WITH_PREVIOUS: nNodeType = css::presentation::EffectNodeType::WITH_PREVIOUS; break; - case DFF_ANIM_NODE_TYPE_AFTER_GROUP: SAL_FALLTHROUGH; + case DFF_ANIM_NODE_TYPE_AFTER_GROUP: [[fallthrough]]; case DFF_ANIM_NODE_TYPE_AFTER_PREVIOUS: nNodeType = css::presentation::EffectNodeType::AFTER_PREVIOUS; break; case DFF_ANIM_NODE_TYPE_MAIN_SEQUENCE: nNodeType = css::presentation::EffectNodeType::MAIN_SEQUENCE; break; case DFF_ANIM_NODE_TYPE_TIMING_ROOT: nNodeType = css::presentation::EffectNodeType::TIMING_ROOT; break; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 072d7229ea97..da0a3fdb6104 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -2528,7 +2528,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) aEvent.Repeat = 0; aEnd <<= aEvent; } - SAL_FALLTHROUGH; + [[fallthrough]]; case 7: aRepeatCount <<= Timing_INDEFINITE; break; diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index d69f77188eac..aee762153871 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -350,7 +350,7 @@ IMPL_LINK(CustomAnimationPane,EventMultiplexerListener, break; } } - SAL_FALLTHROUGH; + [[fallthrough]]; case EventMultiplexerEventId::MainViewRemoved: mxView = nullptr; mxCurrentPage = nullptr; diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 93c51087aa28..125a67dd7b8d 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -729,7 +729,7 @@ void SdTPAction::SetEditText( OUString const & rStr ) if( comphelper::string::getTokenCount(rStr, DOCUMENT_TOKEN) == 2 ) aText = rStr.getToken( 0, DOCUMENT_TOKEN ); - SAL_FALLTHROUGH; + [[fallthrough]]; case presentation::ClickAction_SOUND: case presentation::ClickAction_PROGRAM: { diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index a1108cdfb593..01cbb669ca11 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -280,7 +280,7 @@ void FuConstructRectangle::Activate() case SID_LINE_ARROW_SQUARE: case SID_LINE_SQUARE_ARROW: mpView->SetGlueVisible(); - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_DRAW_LINE : case SID_DRAW_XLINE: aObjKind = OBJ_LINE; diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 013b1c5aa829..ba2c64ae2856 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -481,7 +481,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) aServerLst.Remove( DrawDocShell::Factory().GetClassId() ); } - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_INSERT_FLOATINGFRAME : { diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx index 815f851bd33c..d1de6ecca556 100644 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -153,7 +153,7 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) // delete snap object if ( !bCreateNew ) pPV->DeleteHelpLine(nHelpLine); - SAL_FALLTHROUGH; + [[fallthrough]]; default: return; } diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index b58f4b486247..dc9549be6888 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1742,7 +1742,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt) gotoNextSlide(); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case KEY_SPACE: case KEY_RIGHT: case KEY_DOWN: @@ -1788,7 +1788,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt) gotoPreviousSlide(); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case KEY_LEFT: case KEY_UP: case KEY_P: diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index f039c3b66dad..b9094956b4eb 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -1320,7 +1320,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno bOk = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case presentation::ClickAction_SOUND: if( nFound & FoundFlags::SoundUrl ) @@ -1562,7 +1562,7 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName ) pProperties->State = beans::PropertyState_DIRECT_VALUE; pProperties++; - SAL_FALLTHROUGH; + [[fallthrough]]; case presentation::ClickAction_SOUND: if( eClickAction == presentation::ClickAction_SOUND || pInfo->mbSecondSoundOn ) diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 5d9a38aefd0e..57cbcfda0424 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1639,7 +1639,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_CAPTUREPOINT: // negative value to signal call from menu maMousePos = Point(-1,-1); - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_SET_SNAPITEM: { SetCurrentFunction( FuSnapLine::Create(this, GetActiveWindow(), mpDrawView.get(), GetDoc(), rReq) ); diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 33384160e7fa..d7aa739db685 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -1005,7 +1005,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) // AutoLayouts have to be ready. GetDoc()->StopWorkStartupDelay(); - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_DRAWINGMODE: case SID_SLIDE_SORTER_MODE: diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 5b4bc878393a..66ae776d158f 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -749,7 +749,7 @@ bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi break; } } - SAL_FALLTHROUGH; + [[fallthrough]]; case CommandEventId::StartAutoScroll: case CommandEventId::AutoScroll: { diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index f91bd5e59de2..3fa9fe0b1cd0 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -144,14 +144,14 @@ bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const OUString& rBase case HtmlOptionId::ONMOUSEOVER: eScrpType = JAVASCRIPT; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::SDONMOUSEOVER: nEvent = nEventMouseOver; goto IMAPOBJ_SETEVENT; case HtmlOptionId::ONMOUSEOUT: eScrpType = JAVASCRIPT; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::SDONMOUSEOUT: nEvent = nEventMouseOut; goto IMAPOBJ_SETEVENT; diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 5ae456bec36b..beeadd44ebfe 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -593,7 +593,7 @@ void ThumbnailView::KeyInput( const KeyEvent& rKEvt ) if ( bFoundLast ) OnItemDblClicked( mFilteredItemList[nLastPos] ); } - SAL_FALLTHROUGH; + [[fallthrough]]; default: Control::KeyInput( rKEvt ); } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 4e9ffe77520d..d7a3ad778d89 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -2322,7 +2322,7 @@ void SfxTemplateDialog_Impl::EnableItem(sal_uInt16 nMesId, bool bCheck) case SID_STYLE_WATERCAN : if(!bCheck && IsCheckedItem(SID_STYLE_WATERCAN)) Execute_Impl(SID_STYLE_WATERCAN, "", "", 0); - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_STYLE_NEW_BY_EXAMPLE: case SID_STYLE_UPDATE_BY_EXAMPLE: m_aActionTbR->EnableItem(nMesId,bCheck); diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 3c5effaae2ba..575b4253a56c 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -262,7 +262,7 @@ namespace sfx2 case DataChangedEventType::SETTINGS: if ( !( i_rDataChangedEvent.GetFlags() & AllSettingsFlags::STYLE ) ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataChangedEventType::FONTS: case DataChangedEventType::FONTSUBSTITUTION: { diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index f1ee0f9a3464..2c2617e9a111 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -524,7 +524,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) case SID_EXPORTDOCASPDF: case SID_DIRECTEXPORTDOCASPDF: bIsPDFExport = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_EXPORTDOCASEPUB: case SID_DIRECTEXPORTDOCASEPUB: case SID_EXPORTDOC: diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 79fad18c8048..67bfb2d00610 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -546,7 +546,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) rReq.AppendItem( SfxBoolItem( SID_FORCERELOAD, true) ); rReq.AppendItem( SfxBoolItem( SID_SILENT, true )); - SAL_FALLTHROUGH; //TODO ??? + [[fallthrough]]; //TODO ??? } case SID_RELOAD: diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index ec2d499974d7..0fad3be55591 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -350,7 +350,7 @@ void SfxPrinterController::jobFinished( css::view::PrintableState nState ) aMsg)); xBox->run(); } - SAL_FALLTHROUGH; + [[fallthrough]]; } case view::PrintableState_JOB_ABORTED : { diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx index 9c7f130c25cd..261a0c6019cb 100644 --- a/slideshow/source/engine/activities/activitiesfactory.cxx +++ b/slideshow/source/engine/activities/activitiesfactory.cxx @@ -765,7 +765,7 @@ AnimationActivitySharedPtr createActivity( default: OSL_FAIL( "createActivity(): unexpected case" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case animations::AnimationCalcMode::PACED: case animations::AnimationCalcMode::SPLINE: case animations::AnimationCalcMode::LINEAR: @@ -831,7 +831,7 @@ AnimationActivitySharedPtr createActivity( default: OSL_FAIL( "createActivity(): unexpected case" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case animations::AnimationCalcMode::PACED: case animations::AnimationCalcMode::SPLINE: case animations::AnimationCalcMode::LINEAR: diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index bfe066e5b5a9..2bd65ef7eef1 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -205,7 +205,7 @@ const int* getStateTransitionTable( sal_Int16 nRestartMode, // same value: animations::AnimationRestart::INHERIT: OSL_FAIL( "getStateTransitionTable(): unexpected case for restart" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case animations::AnimationRestart::NEVER: nRestartValue = 0; break; @@ -225,7 +225,7 @@ const int* getStateTransitionTable( sal_Int16 nRestartMode, // same value: animations::AnimationFill::INHERIT: OSL_FAIL( "getStateTransitionTable(): unexpected case for fill" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case animations::AnimationFill::REMOVE: nFillValue = 0; break; diff --git a/slideshow/source/engine/animationnodes/generateevent.cxx b/slideshow/source/engine/animationnodes/generateevent.cxx index 962b18e161b3..d252100e5bd4 100644 --- a/slideshow/source/engine/animationnodes/generateevent.cxx +++ b/slideshow/source/engine/animationnodes/generateevent.cxx @@ -188,7 +188,7 @@ EventSharedPtr generateEvent( case animations::EventTrigger::ON_PREV: OSL_FAIL( "event trigger ON_PREV not yet implemented, " "mapped to ON_NEXT!" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case animations::EventTrigger::ON_NEXT: pEvent = makeDelay( rFunctor, nDelay2 + nAdditionalDelay, diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx index 10a5283e3b9c..4b140a36efcb 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx @@ -154,7 +154,7 @@ namespace slideshow SAL_INFO("slideshow.verbose", "Shape text \"" << (static_cast<MetaTextAction*>(pCurrAct))->GetText() << "\" at action #" << nActionIndex ); - SAL_FALLTHROUGH; + [[fallthrough]]; default: // comment action and all actions not // explicitly handled here: @@ -519,7 +519,7 @@ namespace slideshow } ++nCurrShapeCount; - SAL_FALLTHROUGH; // shape end also ends lines + [[fallthrough]]; // shape end also ends lines case DrawShapeSubsetting::CLASS_PARAGRAPH_END: if( !io_rFunctor( DrawShapeSubsetting::CLASS_PARAGRAPH_END, nCurrParaCount, @@ -531,7 +531,7 @@ namespace slideshow ++nCurrParaCount; aLastParaStart = aNext; - SAL_FALLTHROUGH; // para end also ends line + [[fallthrough]]; // para end also ends line case DrawShapeSubsetting::CLASS_LINE_END: if( !io_rFunctor( DrawShapeSubsetting::CLASS_LINE_END, nCurrLineCount, @@ -558,7 +558,7 @@ namespace slideshow // character cell, OTOH? break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case DrawShapeSubsetting::CLASS_SENTENCE_END: if( !io_rFunctor( DrawShapeSubsetting::CLASS_SENTENCE_END, nCurrSentenceCount, @@ -570,7 +570,7 @@ namespace slideshow ++nCurrSentenceCount; aLastSentenceStart = aNext; - SAL_FALLTHROUGH; + [[fallthrough]]; case DrawShapeSubsetting::CLASS_WORD_END: if( !io_rFunctor( DrawShapeSubsetting::CLASS_WORD_END, nCurrWordCount, @@ -582,7 +582,7 @@ namespace slideshow ++nCurrWordCount; aLastWordStart = aNext; - SAL_FALLTHROUGH; + [[fallthrough]]; case DrawShapeSubsetting::CLASS_CHARACTER_CELL_END: if( !io_rFunctor( DrawShapeSubsetting::CLASS_CHARACTER_CELL_END, nCurrCharCount, diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index aa30ac3feaff..3221a1069931 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -87,7 +87,7 @@ static bool hasUnsupportedActions( const GDIMetaFile& rMtf ) { break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case MetaActionType::MOVECLIPREGION: case MetaActionType::REFPOINT: case MetaActionType::WALLPAPER: diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx index 29c28596e132..a50b81f276d9 100644 --- a/slideshow/source/engine/slide/targetpropertiescreator.cxx +++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx @@ -169,7 +169,7 @@ namespace internal return; } } - SAL_FALLTHROUGH; + [[fallthrough]]; } case animations::AnimationNodeType::PAR: case animations::AnimationNodeType::SEQ: diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index 69c57f80b503..63ff86fe9ef4 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -2599,13 +2599,13 @@ void MathType::HandleOperator(SmNode *pNode,int nLevel) pS->WriteUChar( CHAR ); pS->WriteUChar( 0x86 ); pS->WriteUInt16( 0x222B ); - SAL_FALLTHROUGH; + [[fallthrough]]; case TIINT: case TLLINT: pS->WriteUChar( CHAR ); pS->WriteUChar( 0x86 ); pS->WriteUInt16( 0x222B ); - SAL_FALLTHROUGH; + [[fallthrough]]; case TINT: case TINTD: case TLINT: diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 3c1fc94f7a8f..b033a1dbb47c 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -2124,7 +2124,7 @@ std::unique_ptr<SmTextNode> SmParser::DoFunction() { case TFUNC: NextToken(); // skip "FUNC"-statement - SAL_FALLTHROUGH; + [[fallthrough]]; case TSIN : case TCOS : diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 5d59faa78b96..c4d2a91316ad 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -1843,7 +1843,7 @@ void SmViewShell::GetState(SfxItemSet &rSet) case SID_ATTR_ZOOM: rSet.Put(SvxZoomItem( SvxZoomType::PERCENT, mpGraphic->GetZoom())); - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_ZOOMIN: case SID_ZOOMOUT: case SID_ZOOM_OPTIMAL: diff --git a/starmath/source/wordexportbase.cxx b/starmath/source/wordexportbase.cxx index c660cf2b282d..1f802e2e6e92 100644 --- a/starmath/source/wordexportbase.cxx +++ b/starmath/source/wordexportbase.cxx @@ -164,7 +164,7 @@ void SmWordExportBase::HandleMath(const SmNode* pNode, int nLevel) case TDIVIDEBY: case TACUTE: OSL_ASSERT(false); - SAL_FALLTHROUGH; // the above are handled elsewhere, e.g. when handling BINHOR + [[fallthrough]]; // the above are handled elsewhere, e.g. when handling BINHOR default: HandleText(pNode, nLevel); break; diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx index 989f25880377..4d21848bfe32 100644 --- a/store/source/lockbyte.cxx +++ b/store/source/lockbyte.cxx @@ -200,10 +200,10 @@ struct FileHandle { case storeAccessMode::Create: nFlags |= osl_File_OpenFlag_Create; - SAL_FALLTHROUGH; + [[fallthrough]]; case storeAccessMode::ReadWrite: nFlags |= osl_File_OpenFlag_Write; - SAL_FALLTHROUGH; + [[fallthrough]]; case storeAccessMode::ReadOnly: nFlags |= osl_File_OpenFlag_Read; break; diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx index 342cca90cace..fd17e3ee3241 100644 --- a/svgio/source/svgreader/svgstyleattributes.cxx +++ b/svgio/source/svgreader/svgstyleattributes.cxx @@ -2568,7 +2568,7 @@ namespace svgio const SvgNumber aParentNumber = pSvgStyleAttributes->getFontSizeNumber(); return SvgNumber(aParentNumber.getNumber() / 1.2, aParentNumber.getUnit()); } - SAL_FALLTHROUGH; + [[fallthrough]]; } case FontSize_medium: case FontSize_initial: @@ -2587,7 +2587,7 @@ namespace svgio const SvgNumber aParentNumber = pSvgStyleAttributes->getFontSizeNumber(); return SvgNumber(aParentNumber.getNumber() * 1.2, aParentNumber.getUnit()); } - SAL_FALLTHROUGH; + [[fallthrough]]; } case FontSize_x_large: { diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index ba72b005f12c..bff0e3efa449 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -885,7 +885,7 @@ int ImpSvNumberInputScan::GetSign( const OUString& rString, sal_Int32& nPos ) return 1; case '(': // '(' similar to '-' ?!? bNegCheck = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case '-': nPos++; return -1; diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 955a3a593f24..747996c8d564 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -2231,7 +2231,7 @@ void SvNumberFormatter::ImpAdjustFormatCodeDefault( case i18n::KNumberFormatType::LONG : if ( nMedium == -1 ) nDef = nElem; - SAL_FALLTHROUGH; + [[fallthrough]]; default: if ( nDef == -1 ) nDef = nElem; diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index d9b2afc23b6e..191024238308 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -698,7 +698,7 @@ OUString SvNumberformat::ImpObtainCalendarAndNumerals( OUStringBuffer& rString, nLang = maLocale.meLanguage = nReferenceLanguage; } } - SAL_FALLTHROUGH; + [[fallthrough]]; case 0x1E : // simple Asian numerals, Chinese-PRC case 0x1F : // financial Asian numerals, Chinese-PRC case 0x20 : // Arabic fullwidth numerals, Chinese-PRC @@ -2591,7 +2591,7 @@ bool SvNumberformat::ImpGetScientificOutput(double fNumber, { case '-' : nExpSign = -1; - SAL_FALLTHROUGH; + [[fallthrough]]; case '+' : ++nExpStart; break; @@ -4469,7 +4469,7 @@ bool SvNumberformat::ImpNumberFillWithThousands( OUStringBuffer& sBuff, // numb { case NF_SYMBOLTYPE_DECSEP: aGrouping.reset(); - SAL_FALLTHROUGH; + [[fallthrough]]; case NF_SYMBOLTYPE_STRING: case NF_SYMBOLTYPE_CURRENCY: case NF_SYMBOLTYPE_PERCENT: diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index 1838408d0e63..9b1378673a46 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -1287,12 +1287,12 @@ sal_Int32 ImpSvNumberformatScan::ScanType() case NF_KEY_H: // H case NF_KEY_HH: // HH bIsTimeDetected = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case NF_KEY_S: // S case NF_KEY_SS: // SS if ( !bHaveMinute ) bIsTimeDetected = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case NF_KEY_AMPM: // AM,A,PM,P case NF_KEY_AP: eNewType = SvNumFormatType::TIME; @@ -2483,7 +2483,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString ) break; case NF_KEY_THAI_T : bThaiT = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case NF_KEY_M: // M case NF_KEY_MM: // MM case NF_KEY_MMM: // MMM @@ -2669,7 +2669,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString ) break; case NF_KEY_THAI_T : bThaiT = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case NF_KEY_MI: // M case NF_KEY_MMI: // MM case NF_KEY_H: // H diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx index f5f30412c747..dfc57aea54d7 100644 --- a/svl/source/svdde/ddecli.cxx +++ b/svl/source/svdde/ddecli.cxx @@ -122,7 +122,7 @@ HDDEDATA CALLBACK DdeInternal::CliCallback( UINT nCode, UINT nCbType, nRet = reinterpret_cast<HDDEDATA>(DDE_FACK); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case XTYP_REQUEST: DdeData d; diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index e06e3746a55e..b599a701f679 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -1642,7 +1642,7 @@ bool BrowseBox::ProcessKey( const KeyEvent& rEvt ) case KEY_TAB: if ( !bColumnCursor ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case KEY_RIGHT: nId = BROWSER_CURSORRIGHT; break; case KEY_LEFT: nId = BROWSER_CURSORLEFT; break; case KEY_SPACE: nId = BROWSER_SELECT; break; @@ -1777,7 +1777,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) nNewId != HandleColumnId && GoToColumnId( nNewId ); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case BROWSER_CURSORENDOFFILE: GoToRow( nRowCount - 1, false ); break; @@ -1817,7 +1817,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) } break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case BROWSER_CURSORTOPOFFILE: GoToRow( 0, false ); break; diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index 7aad65c5d480..aafa43cf8bdf 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -103,13 +103,13 @@ namespace svt // drop down the list box else if (rEvt.GetKeyCode().IsMod2() && rEvt.GetKeyCode().GetCode() == KEY_DOWN) return false; - SAL_FALLTHROUGH; + [[fallthrough]]; case KEY_PAGEUP: case KEY_PAGEDOWN: case KEY_RETURN: if (rBox.IsInDropDown()) return false; - SAL_FALLTHROUGH; + [[fallthrough]]; default: return true; } @@ -184,12 +184,12 @@ namespace svt else if (rEvt.GetKeyCode().IsMod2() && rEvt.GetKeyCode().GetCode() == KEY_DOWN) return false; - SAL_FALLTHROUGH; + [[fallthrough]]; case KEY_PAGEUP: case KEY_PAGEDOWN: if (rBox.IsTravelSelect()) return false; - SAL_FALLTHROUGH; + [[fallthrough]]; default: return true; } diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index f0004b05d190..43d1aad6516e 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -416,7 +416,7 @@ namespace svt Control::KeyInput(rEvt); return; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: BrowseBox::KeyInput(rEvt); } diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 14d4a0b2e5b2..ad4816518f06 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -1044,7 +1044,7 @@ FileViewResult SvtFileView::Initialize( case eStillRunning: OSL_ENSURE( pAsyncDescriptor, "SvtFileView::Initialize: we told it to read synchronously!" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case eSuccess: return eResult; } diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 7d89298a2e6e..a02c8258c6c4 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -1202,7 +1202,7 @@ void ValueSet::KeyInput( const KeyEvent& rKeyEvent ) return; } nVStep *= mnVisLines; - SAL_FALLTHROUGH; + [[fallthrough]]; case KEY_UP: if (nCurPos != VALUESET_ITEM_NONEITEM) { @@ -1239,7 +1239,7 @@ void ValueSet::KeyInput( const KeyEvent& rKeyEvent ) return; } nVStep *= mnVisLines; - SAL_FALLTHROUGH; + [[fallthrough]]; case KEY_DOWN: if (nCurPos != nLastItem) { @@ -1264,7 +1264,7 @@ void ValueSet::KeyInput( const KeyEvent& rKeyEvent ) Select(); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: Control::KeyInput( rKeyEvent ); return; @@ -2478,7 +2478,7 @@ bool SvtValueSet::KeyInput( const KeyEvent& rKeyEvent ) return CustomWidgetController::KeyInput(rKeyEvent); } nVStep *= mnVisLines; - SAL_FALLTHROUGH; + [[fallthrough]]; case KEY_UP: if (nCurPos != VALUESET_ITEM_NONEITEM) { @@ -2514,7 +2514,7 @@ bool SvtValueSet::KeyInput( const KeyEvent& rKeyEvent ) return CustomWidgetController::KeyInput(rKeyEvent); } nVStep *= mnVisLines; - SAL_FALLTHROUGH; + [[fallthrough]]; case KEY_DOWN: if (nCurPos != nLastItem) { @@ -2539,7 +2539,7 @@ bool SvtValueSet::KeyInput( const KeyEvent& rKeyEvent ) Select(); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: return CustomWidgetController::KeyInput(rKeyEvent); } diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index ab174dd713a2..1274be0c06ee 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -700,7 +700,7 @@ HtmlTokenId HTMLParser::ScanText( const sal_Unicode cBreak ) break; } // Reduce sequence of CR/LF/BLANK/TAB to a single blank - SAL_FALLTHROUGH; + [[fallthrough]]; case '\t': if( '\t'==nNextCh && bReadPRE && '>'!=cBreak ) { @@ -708,7 +708,7 @@ HtmlTokenId HTMLParser::ScanText( const sal_Unicode cBreak ) bContinue = false; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case '\x0b': if( '\x0b'==nNextCh && (bReadPRE || bReadXMP ||bReadListing) && '>'!=cBreak ) @@ -716,7 +716,7 @@ HtmlTokenId HTMLParser::ScanText( const sal_Unicode cBreak ) break; } nNextCh = ' '; - SAL_FALLTHROUGH; + [[fallthrough]]; case ' ': sTmpBuffer.appendUtf32( nNextCh ); if( '>'!=cBreak && (!bReadListing && !bReadXMP && @@ -987,7 +987,7 @@ HtmlTokenId HTMLParser::GetNextRawToken() } break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: // all remaining characters are appended to the buffer sTmpBuffer.appendUtf32( nNextCh ); @@ -1355,16 +1355,16 @@ HtmlTokenId HTMLParser::GetNextToken_() nRet = HtmlTokenId::NEWPARA; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case '\t': if( bReadPRE ) { nRet = HtmlTokenId::TABCHAR; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case ' ': - SAL_FALLTHROUGH; + [[fallthrough]]; default: scan_text: @@ -1605,7 +1605,7 @@ HtmlTokenId HTMLParser::FilterPRE( HtmlTokenId nToken ) // in Netscape they only have impact in not empty paragraphs case HtmlTokenId::PARABREAK_ON: nToken = HtmlTokenId::LINEBREAK; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlTokenId::LINEBREAK: case HtmlTokenId::NEWPARA: nPre_LinePos = 0; @@ -1786,7 +1786,7 @@ HtmlTokenId HTMLParser::FilterXMP( HtmlTokenId nToken ) case HtmlTokenId::NEWPARA: if( bPre_IgnoreNewPara ) nToken = HtmlTokenId::NONE; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlTokenId::TEXTTOKEN: case HtmlTokenId::NONBREAKSPACE: case HtmlTokenId::SOFTHYPH: @@ -1827,7 +1827,7 @@ HtmlTokenId HTMLParser::FilterListing( HtmlTokenId nToken ) case HtmlTokenId::NEWPARA: if( bPre_IgnoreNewPara ) nToken = HtmlTokenId::NONE; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlTokenId::TEXTTOKEN: case HtmlTokenId::NONBREAKSPACE: case HtmlTokenId::SOFTHYPH: diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx index bd8568b1194c..c97625d67d58 100644 --- a/svtools/source/svrtf/parrtf.cxx +++ b/svtools/source/svrtf/parrtf.cxx @@ -488,7 +488,7 @@ void SvRTFParser::ScanText() case sal_Unicode(EOF): eState = SvParserState::Error; - SAL_FALLTHROUGH; + [[fallthrough]]; case '{': case '}': bContinue = false; diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index eefe226838d4..9dda651250c9 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -2240,7 +2240,7 @@ namespace svt { namespace table m_aSelectedRows[0] = i_rowIndex; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case SelectionMode::Multiple: m_aSelectedRows.push_back( i_rowIndex ); diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index eed455440237..1b1312aff615 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -1574,7 +1574,7 @@ void EnhancedCustomShape2d::CreateSubPath( } aNewB2DPolygon.clear(); } - SAL_FALLTHROUGH; + [[fallthrough]]; } case ANGLEELLIPSETO : { @@ -1756,7 +1756,7 @@ void EnhancedCustomShape2d::CreateSubPath( aNewB2DPolygon.clear(); - SAL_FALLTHROUGH; + [[fallthrough]]; } case ARCTO : case CLOCKWISEARCTO : @@ -2059,7 +2059,7 @@ static void CorrectCalloutArrows( case mso_sptAccentCallout2 : case mso_sptAccentBorderCallout2 : bAccent = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case mso_sptCallout2 : case mso_sptBorderCallout2 : { diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 8c8daa71a1ec..452ae7fc3dcc 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -879,7 +879,7 @@ void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang nLeftStart += nCharWidth; nRightEnd -= nCharWidth; } - SAL_FALLTHROUGH; + [[fallthrough]]; } case RubyAdjust_BLOCK: { @@ -896,7 +896,7 @@ void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang } break; } - SAL_FALLTHROUGH; + [[fallthrough]]; } case RubyAdjust_CENTER: rRenderContext.DrawText(Point(nCenter - nOutTextWidth / 2 , nYOutput), sOutputText); diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index cea75dc33fe8..22c4ea7c25ec 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -1796,7 +1796,7 @@ ADD_DEBUG_TEXT("lLastLMargin: ", OUString::number(mxRulerImpl->lLastLMargin)) { default: ;//prevent warning OSL_FAIL("svx::SvxRuler::DragBorders(), unknown drag type!" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case RulerType::Border: if(mxRulerImpl->bIsTableRows) { diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index cad58eaea61d..0ff3ff4df8e6 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -2841,7 +2841,7 @@ void DbGridControl::Command(const CommandEvent& rEvt) return; } - SAL_FALLTHROUGH; + [[fallthrough]]; } default: EditBrowseBox::Command(rEvt); @@ -3253,7 +3253,7 @@ bool DbGridControl::PreNotify(NotifyEvent& rEvt) } } - SAL_FALLTHROUGH; + [[fallthrough]]; } default: return EditBrowseBox::PreNotify(rEvt); diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 3404c091c21c..e24ca7ca09ea 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -251,7 +251,7 @@ bool FmFormShell::PrepareClose(bool bUI) { case RET_YES: bResult = rController->commitCurrentRecord( ); - SAL_FALLTHROUGH; + [[fallthrough]]; case RET_NO: GetImpl()->didPrepareClose_Lock(true); break; @@ -848,7 +848,7 @@ void FmFormShell::GetState(SfxItemSet &rSet) rSet.Put( SfxVisibilityItem( nWhich, false ) ); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_FM_SCROLLBAR: case SID_FM_IMAGECONTROL: diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index 4aaf9dc6d2dd..dd06a9a4b1db 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -490,7 +490,7 @@ FmSearchEngine::SearchResult FmSearchEngine::SearchRegularApprox(const OUString& bFound = false; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case MATCHING_BEGINNING : if (nStart != 0) bFound = false; diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 59a497d34e46..a2ae47c50013 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1283,7 +1283,7 @@ SdrObjectUniquePtr FmXFormView::implCreateFieldControl( const svx::ODataAccessDe case DataType::TIMESTAMP: bDateNTimeField = true; sLabelPostfix = SvxResId(RID_STR_POSTFIX_DATE); - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::DATE: nOBJID = OBJ_FM_DATEFIELD; break; diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index cef44279d9df..817dedefb4e6 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -400,7 +400,7 @@ namespace svxform { case FormComponentType::SCROLLBAR: _rxControlModel->setPropertyValue("LiveScroll", makeAny( true ) ); - SAL_FALLTHROUGH; + [[fallthrough]]; case FormComponentType::SPINBUTTON: { sal_Int32 eOrientation = ScrollBarOrientation::HORIZONTAL; diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index cb68b9be56b7..1fb809379a6c 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -105,7 +105,7 @@ SvxNumberFormatShell::SvxNumberFormatShell(SvNumberFormatter* pNumFormatter, sal { nValNum = GetDefaultValNum(pFormatter->GetType(nCurFormatKey)); } - SAL_FALLTHROUGH; + [[fallthrough]]; case SvxNumberValueType::Undefined: default: aValStr.clear(); diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index b1f21a131517..bf147b2aa2d6 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -74,7 +74,7 @@ bool SvxRotateModeItem::GetPresentation( { case SfxItemPresentation::Complete: rText += "...: "; - SAL_FALLTHROUGH; // break; // FALL THROUGH!!! + [[fallthrough]]; // break; // FALL THROUGH!!! case SfxItemPresentation::Nameless: rText += OUStringLiteral1( GetValue() ); diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 0a51a0a580ef..4e0854ceac8d 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -130,7 +130,7 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal default: { OSL_FAIL( "Unknown kind of marker." ); - SAL_FALLTHROUGH; // return Rect_9x9 as default + [[fallthrough]]; // return Rect_9x9 as default } case BitmapMarkerKind::Rect_9x9: { diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 72373d9c98e3..5aaa8ca3a442 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -2710,7 +2710,7 @@ void SdrObject::SendUserCall(SdrUserCallType eUserCall, const tools::Rectangle& { case SdrUserCallType::Resize: notifyShapePropertyChange( svx::ShapeProperty::Size ); - SAL_FALLTHROUGH; // RESIZE might also imply a change of the position + [[fallthrough]]; // RESIZE might also imply a change of the position case SdrUserCallType::MoveOnly: notifyShapePropertyChange( svx::ShapeProperty::Position ); break; diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 63481a141248..68bb5e40e542 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -1265,7 +1265,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) case OBJ_CCUT: case OBJ_SECT: eNewKind=OBJ_CARC; - SAL_FALLTHROUGH; + [[fallthrough]]; case OBJ_RECT: case OBJ_LINE: case OBJ_PLIN: diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 94bb8e326721..4959b44d99a1 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -462,67 +462,67 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest const & rReq, SfxBindi { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ON_OFF; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_TILT_DOWN: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_DOWN; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_TILT_UP: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_UP; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_TILT_LEFT: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_LEFT; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_TILT_RIGHT: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_RIGHT; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_DIRECTION: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ORIENTATION; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_PROJECTION: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_PROJECTION; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_DEPTH: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_DEPTH; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_3D_COLOR: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_SURFACE: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_LIGHTING_INTENSITY: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_BRIGHTNESS; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_EXTRUSION_LIGHTING_DIRECTION: { diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 290c1f746fe4..1ccc28761a7d 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -262,7 +262,7 @@ static void impl_execute( SfxRequest const & rReq, SdrCustomShapeGeometryItem& r SdrTextHorzAdjust eHorzAdjust; switch ( nValue ) { - case 4 : eFTS = drawing::TextFitToSizeType_ALLLINES; SAL_FALLTHROUGH; + case 4 : eFTS = drawing::TextFitToSizeType_ALLLINES; [[fallthrough]]; case 3 : eHorzAdjust = SDRTEXTHORZADJUST_BLOCK; break; default: eHorzAdjust = SDRTEXTHORZADJUST_LEFT; break; case 1 : eHorzAdjust = SDRTEXTHORZADJUST_CENTER; break; @@ -491,19 +491,19 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest const & rReq, SfxBindin { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_FONTWORK_CHARACTER_SPACING: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_FONTWORK_KERN_CHARACTER_PAIRS: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_FONTWORK_SAME_LETTER_HEIGHTS: { diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 64367526b458..eba66ba8af83 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -346,7 +346,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) break; case css::style::NumberingType::ROMAN_UPPER: bUpper = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case css::style::NumberingType::ROMAN_LOWER: aPageNumValue += SvxNumberFormat::CreateRomanString(mnPageNumber, bUpper); break; diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index f81f42eaf6e0..54fad1415071 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -60,7 +60,7 @@ bool XLineTransparenceItem::GetPresentation { case SfxItemPresentation::Complete: rText = SvxResId(RID_SVXSTR_TRANSPARENCE) + ": "; - SAL_FALLTHROUGH; + [[fallthrough]]; case SfxItemPresentation::Nameless: rText += unicode::formatPercent(GetValue(), Application::GetSettings().GetUILanguageTag()); @@ -348,7 +348,7 @@ bool XFillTransparenceItem::GetPresentation { case SfxItemPresentation::Complete: rText = SvxResId(RID_SVXSTR_TRANSPARENCE) + ": "; - SAL_FALLTHROUGH; + [[fallthrough]]; case SfxItemPresentation::Nameless: rText += unicode::formatPercent(GetValue(), Application::GetSettings().GetUILanguageTag()); diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx index 395f23110a10..fbe78a96d170 100644 --- a/sw/source/core/access/accnotextframe.cxx +++ b/sw/source/core/access/accnotextframe.cxx @@ -132,7 +132,7 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem { break; } - SAL_FALLTHROUGH; + [[fallthrough]]; } case RES_DESCRIPTION_CHANGED: { diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index 422e95b2be5b..11a4043c314d 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -103,7 +103,7 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * { break; } - SAL_FALLTHROUGH; + [[fallthrough]]; } case RES_DESCRIPTION_CHANGED: { diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx index 62ce749b8223..6301d10cf4a6 100644 --- a/sw/source/core/attr/calbck.cxx +++ b/sw/source/core/attr/calbck.cxx @@ -307,7 +307,7 @@ void SwModify::CheckCaching( const sal_uInt16 nWhich ) case RES_FMT_CHG: case RES_ATTRSET_CHG: SetInSwFntCache( false ); - SAL_FALLTHROUGH; + [[fallthrough]]; case RES_UL_SPACE: case RES_LR_SPACE: case RES_BOX: diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx index 0f76a1808990..ac99ac2fc9ff 100644 --- a/sw/source/core/attr/cellatr.cxx +++ b/sw/source/core/attr/cellatr.cxx @@ -158,7 +158,7 @@ void SwTableBoxFormula::ChangeState( const SfxPoolItem* pItem ) } else pUpdateField->m_bBehindSplitLine = false; - SAL_FALLTHROUGH; + [[fallthrough]]; case TBL_MERGETBL: if( pUpdateField->m_pHistory ) { diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx index 7746058a7e1e..64d6d00639c8 100644 --- a/sw/source/core/attr/hints.cxx +++ b/sw/source/core/attr/hints.cxx @@ -248,10 +248,10 @@ sal_uInt16 GetWhichOfScript( sal_uInt16 nWhich, sal_uInt16 nScript ) { case i18n::ScriptType::COMPLEX: ++pM; - SAL_FALLTHROUGH; + [[fallthrough]]; case i18n::ScriptType::ASIAN: ++pM; - SAL_FALLTHROUGH; + [[fallthrough]]; default: nRet = *pM; } diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index f9665474a1a7..d678e0b87965 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -703,7 +703,7 @@ SwCalcOper SwCalc::GetToken() m_eCurrOper = m_eCurrListOper; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case '\n': m_eCurrOper = CALC_PRINT; break; diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index a4c774aa30df..3c9613b9f63d 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -2141,7 +2141,7 @@ bool SwCursorShell::SetShadowCursorPos( const Point& rPt, SwFillMode eFillMode ) if (!sInsert.isEmpty()) GetDoc()->getIDocumentContentOperations().InsertString( *m_pCurrentCursor, sInsert.makeStringAndClear()); } - SAL_FALLTHROUGH; // still need to set orientation + [[fallthrough]]; // still need to set orientation case FILL_MARGIN: if( text::HoriOrientation::NONE != aFPos.eOrient ) { diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx index 25beaac622d5..53bc3e2344ce 100644 --- a/sw/source/core/doc/DocumentFieldsManager.cxx +++ b/sw/source/core/doc/DocumentFieldsManager.cxx @@ -219,7 +219,7 @@ SwFieldType* DocumentFieldsManager::InsertFieldType(const SwFieldType &rFieldTyp //constructing string pools and when reading SetExp fields if( nsSwGetSetExpType::GSE_SEQ & static_cast<const SwSetExpFieldType&>(rFieldTyp).GetType() ) i -= INIT_SEQ_FLDTYPES; - SAL_FALLTHROUGH; + [[fallthrough]]; case SwFieldIds::Database: case SwFieldIds::User: case SwFieldIds::Dde: @@ -355,7 +355,7 @@ void DocumentFieldsManager::RemoveFieldType(size_t nField) case SwFieldIds::SetExp: case SwFieldIds::User: mpUpdateFields->RemoveFieldType( *pTmp ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SwFieldIds::Dde: if( pTmp->HasWriterListeners() && !m_rDoc.IsUsed( *pTmp ) ) { @@ -596,7 +596,7 @@ bool DocumentFieldsManager::UpdateField(SwTextField * pDstTextField, SwField & r pDBField->InitContent(); } #endif - SAL_FALLTHROUGH; + [[fallthrough]]; default: pDstFormatField->ModifyNotification( nullptr, pMsgHint ); diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx b/sw/source/core/doc/DocumentLayoutManager.cxx index 867bb5d62555..8fc63bfeb2a3 100644 --- a/sw/source/core/doc/DocumentLayoutManager.cxx +++ b/sw/source/core/doc/DocumentLayoutManager.cxx @@ -122,7 +122,7 @@ SwFrameFormat *DocumentLayoutManager::MakeLayoutFormat( RndStdIds eRequest, cons case RndStdIds::HEADERR: { bHeader = true; - SAL_FALLTHROUGH; + [[fallthrough]]; } case RndStdIds::FOOTER: { diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx index 5da8c16f1877..c9afd6673093 100644 --- a/sw/source/core/doc/DocumentRedlineManager.cxx +++ b/sw/source/core/doc/DocumentRedlineManager.cxx @@ -1378,7 +1378,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* pNewRedl, bool const bCall bCompress = true; mpRedlineTable->DeleteAndDestroy( n ); bDec = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case SwComparePosition::Inside: if( bCallDelete ) diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 86a8e4cfe76d..d61775dc8f1e 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -1982,7 +1982,7 @@ sal_uInt16 SaveMergeRedline::InsertRedline(SwPaM* pLastDestRedline) case SwComparePosition::Equal: delete pDestRedl; pDestRedl = nullptr; - SAL_FALLTHROUGH; + [[fallthrough]]; case SwComparePosition::CollideEnd: case SwComparePosition::Before: diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index 42d47a4cc0e6..46b2891035fb 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -472,7 +472,7 @@ void SwDoc::GetAllUsedDB( std::vector<OUString>& rDBNameList, case SwFieldIds::DbNextSet: AddUsedDBToList( rDBNameList, lcl_DBDataToString(static_cast<const SwDBNameInfField*>(pField)->GetRealDBData() )); - SAL_FALLTHROUGH; // JP: is that right like that? + [[fallthrough]]; // JP: is that right like that? case SwFieldIds::HiddenText: case SwFieldIds::HiddenPara: @@ -653,7 +653,7 @@ void SwDoc::ChangeDBFields( const std::vector<OUString>& rOldNames, { static_cast<SwDBNameInfField*>(pField)->SetDBData(aNewDBData); } - SAL_FALLTHROUGH; + [[fallthrough]]; case SwFieldIds::HiddenText: case SwFieldIds::HiddenPara: pField->SetPar1( ReplaceUsedDBs(rOldNames, rNewName, pField->GetPar1()) ); diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx index 1d8048619ca0..cdd65c77f6e5 100644 --- a/sw/source/core/doc/docfly.cxx +++ b/sw/source/core/doc/docfly.cxx @@ -459,14 +459,14 @@ lcl_SetFlyFrameAttr(SwDoc & rDoc, case RES_CNTNT: case RES_FOOTER: OSL_FAIL( "Unknown Fly attribute." ); - SAL_FALLTHROUGH; + [[fallthrough]]; case RES_CHAIN: rSet.ClearItem( nWhich ); break; case RES_ANCHOR: if( DONTMAKEFRMS != nMakeFrames ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; default: if( !IsInvalidItem( aIter.GetCurItem() ) && ( SfxItemState::SET != rFlyFormat.GetAttrSet().GetItemState( nWhich, true, &pItem ) || @@ -841,7 +841,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList, } aNewAnch.SetType( RndStdIds::FLY_AT_PAGE ); - SAL_FALLTHROUGH; + [[fallthrough]]; } case RndStdIds::FLY_AT_PAGE: { diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index e964255f7add..da2225d1b9f7 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -681,7 +681,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTextFormatColls *const pTextFormatCollTable, { case LTYPE_TABLE: bTable = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case LTYPE_FLY: // At the FlySection's Beginning/End insert the corresponding Node with its Field. // The Frame is created automatically. diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx index 65ba2090dfd3..6cd984599a04 100644 --- a/sw/source/core/doc/docruby.cxx +++ b/sw/source/core/doc/docruby.cxx @@ -281,7 +281,7 @@ bool SwDoc::SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry ) case UnicodeType::OTHER_LETTER: bChkNxtWrd = true; - SAL_FALLTHROUGH; + [[fallthrough]]; default: bIsAlphaNum = false; break; diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 52652fbab564..1c90d05ee8b3 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -270,7 +270,7 @@ const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark, case TOX_SAME_PRV: if( pTOXMark->GetText() != rCurTOXMark.GetText() ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case TOX_PRV: if ( (aAbsNew < aAbsIdx && aAbsNew > aPrevPos) || (aAbsIdx == aAbsNew && @@ -292,7 +292,7 @@ const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark, case TOX_SAME_NXT: if( pTOXMark->GetText() != rCurTOXMark.GetText() ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case TOX_NXT: if ( (aAbsNew > aAbsIdx && aAbsNew < aNextPos) || (aAbsIdx == aAbsNew && diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 31a189c47470..c64c0388b2c1 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -750,7 +750,7 @@ void SwNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) if (GetNode()->GetNodeType() != SwNodeType::Grf) { break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case RES_FMT_CHG: ClearCache(); break; diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 0ed10597c2e7..0092e585359d 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -3018,7 +3018,7 @@ bool SwTable::SetRowHeight( SwTableBox& rCurrentBox, TableChgWidthHeightType eTy pLines = &pLine->GetUpper()->GetTabLines(); nBaseLinePos = pLines->GetPos( pLine ); pBaseLine = pLine; - SAL_FALLTHROUGH; + [[fallthrough]]; case TableChgWidthHeightType::RowBottom: { diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx index 40532b94ec51..405d9c19d4ce 100644 --- a/sw/source/core/docnode/nodes.cxx +++ b/sw/source/core/docnode/nodes.cxx @@ -690,7 +690,7 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, --aIdx; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case SwNodeType::Table: case SwNodeType::Start: { diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index bf052828f906..e2f2dbc63999 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -778,7 +778,7 @@ void SwSectionFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) case RES_FTN_AT_TXTEND: case RES_END_AT_TXTEND : bClients = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case RES_SECTION_HIDDEN: case RES_SECTION_NOT_HIDDEN: { diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index b7b6c2630314..958f159493f6 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -1173,7 +1173,7 @@ void SwDrawContact::Changed_( const SdrObject& rObj, } } } - SAL_FALLTHROUGH; + [[fallthrough]]; } case SdrUserCallType::MoveOnly: case SdrUserCallType::Resize: diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index dcfe450037a1..65c5450a43d8 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -2115,7 +2115,7 @@ void SwAutoFormat::AutoCorrect(TextFrameIndex nPos) case '?': if( m_aFlags.bCapitalStartSentence ) bFirstSent = true; - SAL_FALLTHROUGH; + [[fallthrough]]; default: if (!(rAppCC.isLetterNumeric(*pText, sal_Int32(nPos)) || '/' == cChar )) // '/' should not be a word separator (e.g. '1/2' needs to be handled as one word for replacement) diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index dadce67ae675..c62300e8ece9 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -560,7 +560,7 @@ void SwGetRefField::UpdateField( const SwTextField* pFieldTextAttr ) default: assert(false); // fall through to appease MSVC C4701 #ifdef NDEBUG - SAL_FALLTHROUGH; + [[fallthrough]]; #endif // "Reference" (whole Text) case REF_CONTENT: @@ -604,7 +604,7 @@ void SwGetRefField::UpdateField( const SwTextField* pFieldTextAttr ) default: assert(false); // fall through to appease MSVC C4701 #ifdef NDEBUG - SAL_FALLTHROUGH; + [[fallthrough]]; #endif case REF_SETREFATTR: nStart = nNumStart; diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 107bb3feac55..2af6a32efbce 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -195,7 +195,7 @@ static bool lcl_FindAnchorPos( nNew = RndStdIds::FLY_AT_PAGE; aNewAnch.SetType( nNew ); - SAL_FALLTHROUGH; + [[fallthrough]]; case RndStdIds::FLY_AT_PAGE: pNewAnch = rFrame.FindPageFrame(); diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index b05698242f55..57e61b18aee1 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -440,7 +440,7 @@ bool SwFEShell::MoveAnchor( SwMove nDir ) if( pos != *aAnch.GetContentAnchor()) aAnch.SetAnchor( &pos ); } - SAL_FALLTHROUGH; + [[fallthrough]]; } case RndStdIds::FLY_AT_PARA: { diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx index 29cb93402a7b..00b5a0a12512 100644 --- a/sw/source/core/frmedt/fews.cxx +++ b/sw/source/core/frmedt/fews.cxx @@ -114,7 +114,7 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt, switch ( eType ) { case CurRectType::PagePrt: bFrame = false; - SAL_FALLTHROUGH; + [[fallthrough]]; case CurRectType::Page : pFrame = pFrame->FindPageFrame(); break; @@ -129,7 +129,7 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt, case CurRectType::FlyEmbeddedPrt: bFrame = false; - SAL_FALLTHROUGH; + [[fallthrough]]; case CurRectType::FlyEmbedded: { const SwFrame *pFlyFrame = xObj.is() ? FindFlyFrame(xObj) : nullptr; @@ -145,7 +145,7 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt, else { OSL_FAIL( "Missing Table" ); } - SAL_FALLTHROUGH; + [[fallthrough]]; case CurRectType::SectionPrt: case CurRectType::Section: if( pFrame->IsInSct() ) @@ -786,7 +786,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect, { case text::RelOrientation::PAGE_RIGHT: case text::RelOrientation::FRAME_RIGHT: aPos.AdjustY(pFrame->getFramePrintArea().Height() ); - SAL_FALLTHROUGH; + [[fallthrough]]; case text::RelOrientation::PRINT_AREA: case text::RelOrientation::PAGE_PRINT_AREA: aPos.AdjustY(pFrame->getFramePrintArea().Top() ); break; default: break; @@ -798,7 +798,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect, { case text::RelOrientation::PRINT_AREA: case text::RelOrientation::PAGE_PRINT_AREA: aPos.AdjustX(pFrame->getFramePrintArea().Width() ); - SAL_FALLTHROUGH; + [[fallthrough]]; case text::RelOrientation::PAGE_RIGHT: case text::RelOrientation::FRAME_RIGHT: aPos.AdjustX(pFrame->getFramePrintArea().Left() ); break; default: aPos.AdjustX(pFrame->getFrameArea().Width() ); @@ -810,7 +810,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect, { case text::RelOrientation::PRINT_AREA: case text::RelOrientation::PAGE_PRINT_AREA: aPos.AdjustX(pFrame->getFramePrintArea().Width() ); - SAL_FALLTHROUGH; + [[fallthrough]]; case text::RelOrientation::PAGE_LEFT: case text::RelOrientation::FRAME_LEFT: aPos.AdjustX(pFrame->getFramePrintArea().Left() - pFrame->getFrameArea().Width() ); break; @@ -823,7 +823,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect, { case text::RelOrientation::PAGE_RIGHT: case text::RelOrientation::FRAME_RIGHT: aPos.AdjustX(pFrame->getFramePrintArea().Width() ); - SAL_FALLTHROUGH; + [[fallthrough]]; case text::RelOrientation::PRINT_AREA: case text::RelOrientation::PAGE_PRINT_AREA: aPos.AdjustX(pFrame->getFramePrintArea().Left() ); break; default:break; diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index 3ca7d588a161..00df02d2f5f5 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -638,7 +638,7 @@ void SwImplProtocol::Record_( const SwFrame* pFrame, PROT nFunction, DbgAction n lcl_Flags( aOut, pFrame ); break; case PROT::MoveFwd: bTmp = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case PROT::MoveBack: if (nFunction == (bTmp ? PROT::Init : PROT::FileInit)) aOut.append("SwFlowFrame::MoveFwd"); @@ -661,7 +661,7 @@ void SwImplProtocol::Record_( const SwFrame* pFrame, PROT nFunction, DbgAction n break; case PROT::AdjustN : case PROT::Shrink: bTmp = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case PROT::Grow: if (!bTmp) aOut.append("SwFrame::Grow"); @@ -702,7 +702,7 @@ void SwImplProtocol::Record_( const SwFrame* pFrame, PROT nFunction, DbgAction n case PROT::Section: SectFunc(aOut, nAct, pParam); break; case PROT::Cut: bTmp = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case PROT::Paste: if (bTmp) aOut.append("PROT::Cut from "); @@ -808,7 +808,7 @@ void SwImplProtocol::SectFunc(OStringBuffer &rOut, DbgAction nAct, void const * rOut.append(static_cast<sal_Int64>(lcl_GetFrameId(static_cast<SwFrame const *>(pParam)))); break; case DbgAction::CreateMaster: bTmp = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case DbgAction::CreateFollow: rOut.append("Create Section "); if (bTmp) rOut.append("Master to "); @@ -817,7 +817,7 @@ void SwImplProtocol::SectFunc(OStringBuffer &rOut, DbgAction nAct, void const * rOut.append(static_cast<sal_Int64>(lcl_GetFrameId(static_cast<SwFrame const *>(pParam)))); break; case DbgAction::DelMaster: bTmp = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case DbgAction::DelFollow: rOut.append("Delete Section "); if (bTmp) rOut.append("Master to "); diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index f81a62266a5e..c4b2732b4413 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -993,7 +993,7 @@ void SwFlyFrame::UpdateAttr_( const SfxPoolItem *pOld, const SfxPoolItem *pNew, else if ( GetPrevLink() ) SwFlyFrame::UnchainFrames( GetPrevLink(), this ); } - SAL_FALLTHROUGH; + [[fallthrough]]; default: bClear = false; } diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index b9f88938c409..f179080e1985 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -619,7 +619,7 @@ void SwPageFrame::UpdateAttr_( const SfxPoolItem *pOld, const SfxPoolItem *pNew, rInvFlags |= 0x10; CheckDirChange(); - SAL_FALLTHROUGH; + [[fallthrough]]; } case RES_FRM_SIZE: { diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 74188bb66954..a7c7edf21a2c 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -3258,7 +3258,7 @@ void SwTabFrame::UpdateAttr_( const SfxPoolItem *pOld, const SfxPoolItem *pNew, break; case RES_UL_SPACE: rInvFlags |= 0x1C; - SAL_FALLTHROUGH; + [[fallthrough]]; default: bClear = false; diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 914df003d2b1..41f643eb9d94 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -512,7 +512,7 @@ void SwFrame::UpdateAttrFrame( const SfxPoolItem *pOld, const SfxPoolItem *pNew, case RES_BOX: case RES_SHADOW: Prepare( PREP_FIXSIZE_CHG ); - SAL_FALLTHROUGH; + [[fallthrough]]; case RES_LR_SPACE: case RES_UL_SPACE: rInvFlags |= 0x0B; @@ -2367,7 +2367,7 @@ void SwContentFrame::UpdateAttr_( const SfxPoolItem* pOld, const SfxPoolItem* pN { case RES_FMT_CHG: rInvFlags = 0xFF; - SAL_FALLTHROUGH; + [[fallthrough]]; case RES_PAGEDESC: //attribute changes (on/off) if ( IsInDocBody() && !IsInTab() ) @@ -2417,7 +2417,7 @@ void SwContentFrame::UpdateAttr_( const SfxPoolItem* pOld, const SfxPoolItem* pN } Prepare( PREP_UL_SPACE ); //TextFrame has to correct line spacing. rInvFlags |= 0x80; - SAL_FALLTHROUGH; + [[fallthrough]]; } case RES_LR_SPACE: case RES_BOX: @@ -2487,7 +2487,7 @@ void SwContentFrame::UpdateAttr_( const SfxPoolItem* pOld, const SfxPoolItem* pN case RES_FRM_SIZE: rInvFlags |= 0x01; - SAL_FALLTHROUGH; + [[fallthrough]]; default: bClear = false; diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx index f9fa2c8d11cd..2ddd1a61efb5 100644 --- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx @@ -674,7 +674,7 @@ void SwAnchoredObjectPosition::GetHoriAlignmentValues( const SwFrame& _rHoriOri aRectFnSet.GetLeft(ToCharOrientFrame()->getFrameArea()) ); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; } case text::RelOrientation::PAGE_PRINT_AREA: { diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx index 43070b3547f1..b065c3068607 100644 --- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx @@ -278,7 +278,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition() } break; } - SAL_FALLTHROUGH; + [[fallthrough]]; } case text::VertOrientation::TOP: { diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 7f56b1216d6c..25d2b4a60b3d 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -1593,7 +1593,7 @@ TextFrameIndex SwTextFormatInfo::ScanPortionEnd(TextFrameIndex const nStart, case CH_TXTATR_INWORD: if( !HasHint( i )) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case CHAR_SOFTHYPHEN: case CHAR_HARDHYPHEN: diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 473ed0ad5c63..45741df205f6 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -1329,7 +1329,7 @@ SwLinePortion *SwTextFormatter::NewPortion( SwTextFormatInfo &rInf ) pPor = NewExtraPortion( rInf ); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default : { SwTabPortion* pLastTabPortion = rInf.GetLastTab(); diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx index 53c1c7c91b2b..0f7e796f1565 100644 --- a/sw/source/core/text/itrtxt.cxx +++ b/sw/source/core/text/itrtxt.cxx @@ -280,7 +280,7 @@ sal_uInt16 SwTextCursor::AdjustBaseLine( const SwLineLayout& rLine, nOfst += ( rLine.Height() - nPorHeight ) / 2 + nPorAscent; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case SvxParaVertAlignItem::Align::Baseline : // base line nOfst = nOfst + rLine.GetAscent(); diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index be4bf770dd59..5e6cc5e5d338 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -380,7 +380,7 @@ bool SwFieldPortion::Format( SwTextFormatInfo &rInf ) switch (nNew) { case CH_BREAK : bFull = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case ' ' : case CH_TAB : case CHAR_HARDHYPHEN: // non-breaking hyphen @@ -1267,19 +1267,19 @@ bool SwCombinedPortion::Format( SwTextFormatInfo &rInf ) switch( nTop) { case 3: aPos[1] = aPos[0] + nTopDiff; - SAL_FALLTHROUGH; + [[fallthrough]]; case 2: aPos[nTop-1] = Width() - aPos[nTop-1]; } aPos[0] = 0; switch( nCount ) { case 5: aPos[4] = aPos[3] + nBotDiff; - SAL_FALLTHROUGH; + [[fallthrough]]; case 3: aPos[nTop] = nBotDiff; break; case 6: aPos[4] = aPos[3] + nBotDiff; - SAL_FALLTHROUGH; + [[fallthrough]]; case 4: aPos[nTop] = 0; - SAL_FALLTHROUGH; + [[fallthrough]]; case 2: aPos[nCount-1] = Width() - aPos[nCount-1]; } diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index 44d7f26f4ff9..b8c742410a4f 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -659,10 +659,10 @@ void SwRubyPortion::Adjust_( SwTextFormatInfo &rInf ) switch ( nAdjustment ) { case css::text::RubyAdjust_CENTER: nRight = static_cast<sal_uInt16>(nLineDiff / 2); - SAL_FALLTHROUGH; + [[fallthrough]]; case css::text::RubyAdjust_RIGHT: nLeft = static_cast<sal_uInt16>(nLineDiff - nRight); break; case css::text::RubyAdjust_BLOCK: nSub = TextFrameIndex(1); - SAL_FALLTHROUGH; + [[fallthrough]]; case css::text::RubyAdjust_INDENT_BLOCK: { TextFrameIndex nCharCnt(0); diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index db6b3d3b28df..dd78d36ca3ba 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -2620,7 +2620,7 @@ bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid, { case PREP_BOSS_CHGD: SetInvalidVert( true ); // Test - SAL_FALLTHROUGH; + [[fallthrough]]; case PREP_WIDOWS_ORPHANS: case PREP_WIDOWS: case PREP_FTN_GONE : return bParaPossiblyInvalid; @@ -2692,7 +2692,7 @@ bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid, InvalidatePrt_(); InvalidateSize_(); - SAL_FALLTHROUGH; + [[fallthrough]]; case PREP_ADJUST_FRM : pPara->SetPrepAdjust(); if( IsFootnoteNumFrame() != pPara->IsFootnoteNum() || @@ -2705,7 +2705,7 @@ bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid, break; case PREP_MUST_FIT : pPara->SetPrepMustFit(true); - SAL_FALLTHROUGH; + [[fallthrough]]; case PREP_WIDOWS_ORPHANS : pPara->SetPrepAdjust(); break; @@ -2949,7 +2949,7 @@ bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid, InvalidateRange(SwCharRange(nWhere, TextFrameIndex(1))); return bParaPossiblyInvalid; } - SAL_FALLTHROUGH; // else: continue with default case block + [[fallthrough]]; // else: continue with default case block } case PREP_CLEAR: default: diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index 808cdb6db9e7..3feaa1ea6e6f 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -280,7 +280,7 @@ void SwFormatField::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) case SwFieldIds::HiddenPara: if( !pOld || RES_HIDDENPARA_PRINT != pOld->Which() ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case SwFieldIds::DbSetNumber: case SwFieldIds::DbNumSet: case SwFieldIds::DbNextSet: diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 71b046aa9225..07750ffbf9be 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -187,7 +187,7 @@ SwTextNode *SwNodes::MakeTextNode( const SwNodeIndex & rWhere, aTmp = *pNd->StartOfSectionNode(); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: if( rWhere == aTmp ) aTmp -= 2; diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index d5e368c8fe77..929faa9905e0 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1387,7 +1387,7 @@ SwRect SwTextFrame::AutoSpell_(SwTextNode & rNode, sal_Int32 nActPos) break; case SwWrongList::FreshState::CURSOR: bPending = true; - SAL_FALLTHROUGH; // to mark as invalid + [[fallthrough]]; // to mark as invalid case SwWrongList::FreshState::NOTHING: nInvStart = nBegin; nInvEnd = nBegin + nLen; diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx index 17e50d14ee69..90850dedf90c 100644 --- a/sw/source/core/undo/unattr.cxx +++ b/sw/source/core/undo/unattr.cxx @@ -255,7 +255,7 @@ bool SwUndoFormatAttr::IsFormatInDoc( SwDoc* pDoc ) } } } - SAL_FALLTHROUGH; + [[fallthrough]]; case RES_DRAWFRMFMT: case RES_FLYFRMFMT: if (pDoc->GetSpzFrameFormats()->IsAlive(static_cast<const SwFrameFormat *>(m_pFormat)) @@ -381,7 +381,7 @@ void SwUndoFormatAttr::SaveFlyAnchor( bool bSvDrwPt ) case RndStdIds::FLY_AS_CHAR: case RndStdIds::FLY_AT_CHAR: nContent = rAnchor.GetContentAnchor()->nContent.GetIndex(); - SAL_FALLTHROUGH; + [[fallthrough]]; case RndStdIds::FLY_AT_PARA: case RndStdIds::FLY_AT_FLY: m_nNodeIndex = rAnchor.GetContentAnchor()->nNode.GetIndex(); diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx index 763b2ed5b221..af2acaebde1f 100644 --- a/sw/source/core/undo/undobj1.cxx +++ b/sw/source/core/undo/undobj1.cxx @@ -642,7 +642,7 @@ void SwUndoSetFlyFormat::PutAttr( sal_uInt16 nWhich, const SfxPoolItem* pItem ) case RndStdIds::FLY_AS_CHAR: case RndStdIds::FLY_AT_CHAR: nOldContent = pAnchor->GetContentAnchor()->nContent.GetIndex(); - SAL_FALLTHROUGH; + [[fallthrough]]; case RndStdIds::FLY_AT_PARA: case RndStdIds::FLY_AT_FLY: nOldNode = pAnchor->GetContentAnchor()->nNode.GetIndex(); @@ -659,7 +659,7 @@ void SwUndoSetFlyFormat::PutAttr( sal_uInt16 nWhich, const SfxPoolItem* pItem ) case RndStdIds::FLY_AS_CHAR: case RndStdIds::FLY_AT_CHAR: nNewContent = pAnchor->GetContentAnchor()->nContent.GetIndex(); - SAL_FALLTHROUGH; + [[fallthrough]]; case RndStdIds::FLY_AT_PARA: case RndStdIds::FLY_AT_FLY: nNewNode = pAnchor->GetContentAnchor()->nNode.GetIndex(); diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 798909f7335b..7b88f1d8d93d 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -2841,7 +2841,7 @@ SwUndoSplitTable::SwUndoSplitTable( const SwTableNode& rTableNd, { case SplitTable_HeadlineOption::BoxAttrAllCopy: pHistory.reset(new SwHistory); - SAL_FALLTHROUGH; + [[fallthrough]]; case SplitTable_HeadlineOption::BorderCopy: case SplitTable_HeadlineOption::BoxAttrCopy: pSavTable.reset(new SaveTable( rTableNd.GetTable(), 1, false )); @@ -2893,7 +2893,7 @@ void SwUndoSplitTable::UndoImpl(::sw::UndoRedoContext & rContext) case SplitTable_HeadlineOption::BoxAttrAllCopy: if( pHistory ) pHistory->TmpRollback( pDoc, nFormulaEnd ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SplitTable_HeadlineOption::BoxAttrCopy: case SplitTable_HeadlineOption::BorderCopy: { diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index e9c6af23e09a..7dc44e6d23f0 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -371,7 +371,7 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal, { case FieldUnit::MM_100TH: OSL_ENSURE( FieldUnit::MM == eUnit, "Measuring unit not supported" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case FieldUnit::MM: // 0.01mm = 0.57twip nMul = 25400; // 25.4 * 1000 @@ -383,7 +383,7 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal, case FieldUnit::M: case FieldUnit::KM: OSL_ENSURE( FieldUnit::CM == eUnit, "Measuring unit not supported" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case FieldUnit::CM: // 0.01cm = 5.7twip (not exact, but the UI is also not exact) nMul = 2540; // 2.54 * 1000 @@ -394,7 +394,7 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal, case FieldUnit::TWIP: OSL_ENSURE( FieldUnit::POINT == eUnit, "Measuring unit not supported" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case FieldUnit::POINT: // 0.1pt = 2.0twip (not exact, but the UI is also not exact) nMul = 100; @@ -1916,7 +1916,7 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat } break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case RndStdIds::FLY_AT_PAGE: case RndStdIds::FLY_AT_FLY: diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 43873b2d94ad..08989acfa370 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -1257,7 +1257,7 @@ void SwHTMLParser::NewForm( bool bAppend ) case HtmlOptionId::SDONSUBMIT: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONSUBMIT: nEvent = SvMacroItemId::HtmlOnSubmitForm; bSetEvent = true; @@ -1265,7 +1265,7 @@ void SwHTMLParser::NewForm( bool bAppend ) case HtmlOptionId::SDONRESET: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONRESET: nEvent = SvMacroItemId::HtmlOnResetForm; bSetEvent = true; @@ -1467,7 +1467,7 @@ void SwHTMLParser::InsertInput() case HtmlOptionId::SDONFOCUS: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONFOCUS: nEvent = SvMacroItemId::HtmlOnGetFocus; bSetEvent = true; @@ -1475,7 +1475,7 @@ void SwHTMLParser::InsertInput() case HtmlOptionId::SDONBLUR: // actually only EDIT eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONBLUR: nEvent = SvMacroItemId::HtmlOnLoseFocus; bSetEvent = true; @@ -1483,7 +1483,7 @@ void SwHTMLParser::InsertInput() case HtmlOptionId::SDONCLICK: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONCLICK: nEvent = SvMacroItemId::HtmlOnClick; bSetEvent = true; @@ -1491,7 +1491,7 @@ void SwHTMLParser::InsertInput() case HtmlOptionId::SDONCHANGE: // actually only EDIT eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONCHANGE: nEvent = SvMacroItemId::HtmlOnChange; bSetEvent = true; @@ -1499,7 +1499,7 @@ void SwHTMLParser::InsertInput() case HtmlOptionId::SDONSELECT: // actually only EDIT eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONSELECT: nEvent = SvMacroItemId::HtmlOnSelect; bSetEvent = true; @@ -1561,7 +1561,7 @@ void SwHTMLParser::InsertInput() case HTMLInputType::Button: bKeepCRLFInValue = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case HTMLInputType::Submit: case HTMLInputType::Reset: pType = "CommandButton"; @@ -1915,7 +1915,7 @@ void SwHTMLParser::NewTextArea() case HtmlOptionId::SDONFOCUS: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONFOCUS: nEvent = SvMacroItemId::HtmlOnGetFocus; bSetEvent = true; @@ -1923,7 +1923,7 @@ void SwHTMLParser::NewTextArea() case HtmlOptionId::SDONBLUR: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONBLUR: nEvent = SvMacroItemId::HtmlOnLoseFocus; bSetEvent = true; @@ -1931,7 +1931,7 @@ void SwHTMLParser::NewTextArea() case HtmlOptionId::SDONCLICK: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONCLICK: nEvent = SvMacroItemId::HtmlOnClick; bSetEvent = true; @@ -1939,7 +1939,7 @@ void SwHTMLParser::NewTextArea() case HtmlOptionId::SDONCHANGE: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONCHANGE: nEvent = SvMacroItemId::HtmlOnChange; bSetEvent = true; @@ -1947,7 +1947,7 @@ void SwHTMLParser::NewTextArea() case HtmlOptionId::SDONSELECT: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONSELECT: nEvent = SvMacroItemId::HtmlOnSelect; bSetEvent = true; @@ -2190,7 +2190,7 @@ void SwHTMLParser::NewSelect() case HtmlOptionId::SDONFOCUS: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONFOCUS: nEvent = SvMacroItemId::HtmlOnGetFocus; bSetEvent = true; @@ -2198,7 +2198,7 @@ void SwHTMLParser::NewSelect() case HtmlOptionId::SDONBLUR: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONBLUR: nEvent = SvMacroItemId::HtmlOnLoseFocus; bSetEvent = true; @@ -2206,7 +2206,7 @@ void SwHTMLParser::NewSelect() case HtmlOptionId::SDONCLICK: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONCLICK: nEvent = SvMacroItemId::HtmlOnClick; bSetEvent = true; @@ -2214,7 +2214,7 @@ void SwHTMLParser::NewSelect() case HtmlOptionId::SDONCHANGE: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONCHANGE: nEvent = SvMacroItemId::HtmlOnChange; bSetEvent = true; diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 2972d1bc9e59..04ad57da0013 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -420,21 +420,21 @@ void SwHTMLParser::InsertImage() case HtmlOptionId::SDONLOAD: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONLOAD: nEvent = SvMacroItemId::OnImageLoadDone; goto IMAGE_SETEVENT; case HtmlOptionId::SDONABORT: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONABORT: nEvent = SvMacroItemId::OnImageLoadCancel; goto IMAGE_SETEVENT; case HtmlOptionId::SDONERROR: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONERROR: nEvent = SvMacroItemId::OnImageLoadError; goto IMAGE_SETEVENT; @@ -938,7 +938,7 @@ void SwHTMLParser::InsertBodyOptions() case HtmlOptionId::SDONLOAD: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONLOAD: aEvent = GlobalEventConfig::GetEventName( GlobalEventId::OPENDOC ); bSetEvent = true; @@ -946,7 +946,7 @@ void SwHTMLParser::InsertBodyOptions() case HtmlOptionId::SDONUNLOAD: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONUNLOAD: aEvent = GlobalEventConfig::GetEventName( GlobalEventId::PREPARECLOSEDOC ); bSetEvent = true; @@ -954,7 +954,7 @@ void SwHTMLParser::InsertBodyOptions() case HtmlOptionId::SDONFOCUS: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONFOCUS: aEvent = GlobalEventConfig::GetEventName( GlobalEventId::ACTIVATEDOC ); bSetEvent = true; @@ -962,7 +962,7 @@ void SwHTMLParser::InsertBodyOptions() case HtmlOptionId::SDONBLUR: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONBLUR: aEvent = GlobalEventConfig::GetEventName( GlobalEventId::DEACTIVATEDOC ); bSetEvent = true; @@ -1181,21 +1181,21 @@ void SwHTMLParser::NewAnchor() case HtmlOptionId::SDONCLICK: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONCLICK: nEvent = SvMacroItemId::OnClick; goto ANCHOR_SETEVENT; case HtmlOptionId::SDONMOUSEOVER: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONMOUSEOVER: nEvent = SvMacroItemId::OnMouseOver; goto ANCHOR_SETEVENT; case HtmlOptionId::SDONMOUSEOUT: eScriptType2 = STARBASIC; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::ONMOUSEOUT: nEvent = SvMacroItemId::OnMouseOut; goto ANCHOR_SETEVENT; diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 0ec5a972e556..28f1e5d3cac1 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -3424,7 +3424,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, break; case SvxAdjust::Left: eSurround = css::text::WrapTextMode_RIGHT; - SAL_FALLTHROUGH; + [[fallthrough]]; default: eHori = text::HoriOrientation::LEFT; break; @@ -3604,7 +3604,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, case HtmlTokenId::TBODY_OFF: case HtmlTokenId::TABLE_OFF: SkipToken(); - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlTokenId::TABLEHEADER_OFF: case HtmlTokenId::TABLEDATA_OFF: bDone = true; @@ -3753,7 +3753,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, if( !xSaveStruct->IsInSection() && 1==aToken.getLength() && ' '==aToken[0] ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; default: if( !xSaveStruct->IsInSection() ) { @@ -4008,7 +4008,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, bool bReadOptions, case HtmlTokenId::TFOOT_OFF: case HtmlTokenId::TABLE_OFF: SkipToken(); - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlTokenId::TABLEROW_OFF: bDone = true; break; @@ -4056,7 +4056,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, bool bReadOptions, !pCurTable->HasParentSection()) && 1==aToken.getLength() && ' '==aToken[0] ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; default: pCurTable->MakeParentContents(); NextToken( nToken ); @@ -4176,7 +4176,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable, case HtmlTokenId::TBODY_ON: case HtmlTokenId::TABLE_OFF: SkipToken(); - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlTokenId::THEAD_OFF: case HtmlTokenId::TBODY_OFF: case HtmlTokenId::TFOOT_OFF: @@ -4215,7 +4215,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable, !pCurTable->HasParentSection()) && 1==aToken.getLength() && ' ' == aToken[0] ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; default: pCurTable->MakeParentContents(); NextToken( nToken ); @@ -4375,7 +4375,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable, case HtmlTokenId::TABLEROW_ON: case HtmlTokenId::TABLE_OFF: SkipToken(); - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlTokenId::COLGROUP_OFF: bDone = true; break; @@ -4436,7 +4436,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable, !pCurTable->HasParentSection()) && 1==aToken.getLength() && ' '==aToken[0] ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; default: pCurTable->MakeParentContents(); NextToken( nToken ); @@ -5105,7 +5105,7 @@ std::shared_ptr<HTMLTable> SwHTMLParser::BuildTable(SvxAdjust eParentAdjust, !xCurTable->HasParentSection()) && 1==aToken.getLength() && ' '==aToken[0] ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; default: xCurTable->MakeParentContents(); NextToken( nToken ); diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 13dd69cbd34f..42ae818282cb 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -960,7 +960,7 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode, case text::HoriOrientation::LEFT_AND_WIDTH: eTabHoriOri = text::HoriOrientation::LEFT; bCheckDefList = true; - SAL_FALLTHROUGH; + [[fallthrough]]; default: // In all other case it's possible to use directly an absolute // or relative width. diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx index 49dbbd40a3b7..1b9ec7ff55e2 100644 --- a/sw/source/filter/html/parcss1.cxx +++ b/sw/source/filter/html/parcss1.cxx @@ -577,7 +577,7 @@ CSS1Token CSS1Parser::GetNextToken() bNextCh = false; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: // IDENT | syntax error if (rtl::isAsciiAlpha(cNextCh)) @@ -1042,7 +1042,7 @@ CSS1Expression *CSS1Parser::ParseDeclaration( OUString& rProperty ) case CSS1_EMX: if( '-'==cSign ) nValue = -nValue; - SAL_FALLTHROUGH; + [[fallthrough]]; case CSS1_STRING: case CSS1_PERCENTAGE: case CSS1_IDENT: @@ -1307,7 +1307,7 @@ bool CSS1Expression::GetColor( Color &rColor ) const if( bRet || CSS1_STRING != eType || aValue.isEmpty() || aValue[0] != '#' ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case CSS1_HEXCOLOR: { // MS-IE hack: colour can also be a string diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index e0d787fe0ab3..4d7905a203f3 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -1256,7 +1256,7 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken ) case HtmlTokenId::UNKNOWNCONTROL_OFF: if( m_aUnknownToken != sSaveToken ) return; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlTokenId::FRAMESET_ON: case HtmlTokenId::HEAD_OFF: case HtmlTokenId::BODY_ON: @@ -1447,7 +1447,7 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken ) else bGetIDOption = true; // <BR>s in <PRE> resemble true LFs, hence no break - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlTokenId::NEWPARA: // CR in PRE/LISTING/XMP @@ -2069,7 +2069,7 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken ) !sSaveToken.isEmpty() && '!' != sSaveToken[0] && '%' != sSaveToken[0] ) m_aUnknownToken = sSaveToken; - SAL_FALLTHROUGH; + [[fallthrough]]; default: bInsertUnknown = m_bKeepUnknown; @@ -2901,7 +2901,7 @@ void SwHTMLParser::SetAttr_( bool bChkEnd, bool bBeforeTable, } OSL_ENSURE( false, "LRSpace set over multiple paragraphs!" ); - SAL_FALLTHROUGH; // (shouldn't reach this point anyway) + [[fallthrough]]; // (shouldn't reach this point anyway) // tdf#94088 expand RES_BACKGROUND to the new fill attribute // definitions in the range [XATTR_FILL_FIRST .. XATTR_FILL_LAST]. @@ -4167,7 +4167,7 @@ void SwHTMLParser::NewTextFormatColl( HtmlTokenId nToken, sal_uInt16 nColl ) // a CLASS exists we will delete it so that we don't get the CLASS of // the PRE style. aClass = aEmptyOUStr; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlTokenId::BLOCKQUOTE_ON: case HtmlTokenId::BLOCKQUOTE30_ON: case HtmlTokenId::PREFORMTXT_ON: diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 4f455cdb1921..4bbd6e3f1bd0 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -2871,7 +2871,7 @@ sal_Int32 SwEscherEx::WriteTextFlyFrame(const DrawObj &rObj, sal_uInt32 nShapeId { default: OSL_ENSURE(false, "unknown direction type"); - SAL_FALLTHROUGH; + [[fallthrough]]; case SvxFrameDirection::Horizontal_LR_TB: nFlow=mso_txflHorzN; break; diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 6f87279690f0..b5b1eccfe2dc 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -1253,7 +1253,7 @@ void AttributeOutputBase::TOXMark( const SwTextNode& rNode, const SwTOXMark& rAt case TOX_USER: sText += "\" \\f \"" + OUString(static_cast<sal_Char>( 'A' + GetExport( ).GetId( *rAttr.GetTOXType() ) )); - SAL_FALLTHROUGH; + [[fallthrough]]; case TOX_CONTENT: { eType = ww::eTC; diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 76de5be7b2ec..6e41f51a8677 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -2579,7 +2579,7 @@ void AttributeOutputBase::GetNumberPara( OUString& rStr, const SwField& rField ) default: OSL_ENSURE(rField.GetFormat() == SVX_NUM_ARABIC, "Unknown numbering type exported as default of Arabic"); - SAL_FALLTHROUGH; + [[fallthrough]]; case SVX_NUM_ARABIC: rStr += "\\* ARABIC "; break; @@ -3821,7 +3821,7 @@ void AttributeOutputBase::FormatBreak( const SvxFormatBreakItem& rBreak ) case SvxBreak::ColumnBefore: // ColumnBreak bBefore = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case SvxBreak::ColumnAfter: case SvxBreak::ColumnBoth: if ( GetExport().Sections().CurrentNumberOfColumns( *GetExport().m_pDoc ) > 1 || GetExport().SupportsOneColumnBreak() ) @@ -3841,7 +3841,7 @@ void AttributeOutputBase::FormatBreak( const SvxFormatBreakItem& rBreak ) PageBreakBefore(true); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case SvxBreak::PageAfter: case SvxBreak::PageBoth: nC = msword::PageBreak; @@ -3922,7 +3922,7 @@ void WW8AttributeOutput::FormatTextGrid( const SwTextGridItem& rGrid ) { default: OSL_FAIL("Unknown grid type"); - SAL_FALLTHROUGH; + [[fallthrough]]; case GRID_NONE: nGridType = 0; break; @@ -4811,7 +4811,7 @@ void WW8AttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDir default: //Can't get an unknown type here OSL_FAIL("Unknown frame direction"); - SAL_FALLTHROUGH; + [[fallthrough]]; case SvxFrameDirection::Horizontal_LR_TB: nTextFlow = 0; break; diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index f123fb2d207f..1a6080f70b6b 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -3111,7 +3111,7 @@ static SvxFrameDirection MakeDirection(sal_uInt16 nCode, bool bIsBiDi) { default: OSL_ENSURE(eDir == SvxFrameDirection::Environment, "unknown direction code, maybe it's a bitfield"); - SAL_FALLTHROUGH; + [[fallthrough]]; case 3: eDir = bIsBiDi ? SvxFrameDirection::Horizontal_RL_TB : SvxFrameDirection::Horizontal_LR_TB; // #i38158# - Consider RTL tables break; diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index c77292333300..4ff133dca23a 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -3503,7 +3503,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, OUString& rStr case 'h': case 'm': OSL_ENSURE( false, "Analysis still missing - unknown data" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case 's': //worthless fake anchor option bOptions = true; break; diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 671bbb944786..c16fdc6f7953 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -169,7 +169,7 @@ void wwSection::SetDirection() { default: OSL_ENSURE(false, "Unknown layout type"); - SAL_FALLTHROUGH; + [[fallthrough]]; case 0: meDir=SvxFrameDirection::Horizontal_LR_TB; break; @@ -242,7 +242,7 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrameFormat &rFormat, const wwSection &r break; default: OSL_ENSURE(false, "Unknown grid type"); - SAL_FALLTHROUGH; + [[fallthrough]]; case 3: eType = GRID_LINES_CHARS; aGrid.SetSnapToChars(true); @@ -3407,7 +3407,7 @@ void SwWW8ImplReader::Read_Underline( sal_uInt16, const sal_uInt8* pData, short switch( *pData ) { case 2: bWordLine = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case 1: eUnderline = LINESTYLE_SINGLE; break; case 3: eUnderline = LINESTYLE_DOUBLE; break; case 4: eUnderline = LINESTYLE_DOTTED; break; diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 643601e144e3..b497c6dbbfd9 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -5669,19 +5669,19 @@ bool WW8Fib::GetBaseCp(ManTypes nType, WW8_CP * cp) const return false; } nOffset = m_ccpTxbx; - SAL_FALLTHROUGH; + [[fallthrough]]; case MAN_TXBX: if (m_ccpEdn < 0 || m_ccpEdn > std::numeric_limits<WW8_CP>::max() - nOffset) { return false; } nOffset += m_ccpEdn; - SAL_FALLTHROUGH; + [[fallthrough]]; case MAN_EDN: if (m_ccpAtn < 0 || m_ccpAtn > std::numeric_limits<WW8_CP>::max() - nOffset) { return false; } nOffset += m_ccpAtn; - SAL_FALLTHROUGH; + [[fallthrough]]; case MAN_AND: if (m_ccpMcr < 0 || m_ccpMcr > std::numeric_limits<WW8_CP>::max() - nOffset) { return false; @@ -5700,19 +5700,19 @@ bool WW8Fib::GetBaseCp(ManTypes nType, WW8_CP * cp) const return false; } nOffset += m_ccpHdr; - SAL_FALLTHROUGH; + [[fallthrough]]; case MAN_HDFT: if (m_ccpFootnote < 0 || m_ccpFootnote > std::numeric_limits<WW8_CP>::max() - nOffset) { return false; } nOffset += m_ccpFootnote; - SAL_FALLTHROUGH; + [[fallthrough]]; case MAN_FTN: if (m_ccpText < 0 || m_ccpText > std::numeric_limits<WW8_CP>::max() - nOffset) { return false; } nOffset += m_ccpText; - SAL_FALLTHROUGH; + [[fallthrough]]; case MAN_MAINTEXT: break; } diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 1932006ea8ba..6bd8bc3e68fe 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -1438,7 +1438,7 @@ SvXMLImportContextRef SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, break; case XML_TOK_TABLE_HEADER_ROWS: bHeader = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_TOK_TABLE_ROWS: pContext = new SwXMLTableRowsContext_Impl( GetSwImport(), nPrefix, rLocalName, diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index 977690a82729..d20f484c1b6e 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -371,7 +371,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( } if( '\'' == c || '\\' == c ) aBuffer.append( '\\' ); - SAL_FALLTHROUGH; + [[fallthrough]]; default: if( !aBuffer.isEmpty() ) aBuffer.append( c ); diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx index 8e247d052efb..a8ae8c16f73a 100644 --- a/sw/source/ui/dialog/macassgn.cxx +++ b/sw/source/ui/dialog/macassgn.cxx @@ -65,7 +65,7 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType ) aItem.AddEvent( SwResId(STR_EVENT_IMAGE_LOAD), OUString(), SvMacroItemId::OnImageLoadDone); } - SAL_FALLTHROUGH; + [[fallthrough]]; case MACASSGN_FRMURL: // Frame - URL-Attributes { if( !bHtmlMode && @@ -81,14 +81,14 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType ) SvMacroItemId::SwFrmMove ); } } - SAL_FALLTHROUGH; + [[fallthrough]]; case MACASSGN_OLE: // OLE { if( !bHtmlMode ) aItem.AddEvent( SwResId(STR_EVENT_OBJECT_SELECT), OUString(), SvMacroItemId::SwObjectSelect ); } - SAL_FALLTHROUGH; + [[fallthrough]]; case MACASSGN_INETFMT: // INetFormat-Attributes { aItem.AddEvent( SwResId(STR_EVENT_MOUSEOVER_OBJECT), OUString(), diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index e41cd8237137..9bd79a7db39d 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1868,7 +1868,7 @@ bool SwSectionFootnoteEndTabPage::FillItemSet( SfxItemSet* rSet ) aFootnote.SetNumType( m_xFootnoteNumViewBox->GetSelectedNumberingType() ); aFootnote.SetPrefix( m_xFootnotePrefixED->get_text().replaceAll("\\t", "\t") ); // fdo#65666 aFootnote.SetSuffix( m_xFootnoteSuffixED->get_text().replaceAll("\\t", "\t") ); - SAL_FALLTHROUGH; + [[fallthrough]]; case FTNEND_ATTXTEND_OWNNUMSEQ: aFootnote.SetOffset( static_cast< sal_uInt16 >( m_xFootnoteOffsetField->get_value()-1 ) ); @@ -1890,7 +1890,7 @@ bool SwSectionFootnoteEndTabPage::FillItemSet( SfxItemSet* rSet ) aEnd.SetNumType( m_xEndNumViewBox->GetSelectedNumberingType() ); aEnd.SetPrefix( m_xEndPrefixED->get_text().replaceAll("\\t", "\t") ); aEnd.SetSuffix( m_xEndSuffixED->get_text().replaceAll("\\t", "\t") ); - SAL_FALLTHROUGH; + [[fallthrough]]; case FTNEND_ATTXTEND_OWNNUMSEQ: aEnd.SetOffset( static_cast< sal_uInt16 >( m_xEndOffsetField->get_value()-1 ) ); @@ -1946,11 +1946,11 @@ void SwSectionFootnoteEndTabPage::ResetState( bool bFootnote, { case FTNEND_ATTXTEND_OWNNUMANDFMT: pNtNumFormatCB->set_state( TRISTATE_TRUE ); - SAL_FALLTHROUGH; + [[fallthrough]]; case FTNEND_ATTXTEND_OWNNUMSEQ: pNtNumCB->set_state( TRISTATE_TRUE ); - SAL_FALLTHROUGH; + [[fallthrough]]; case FTNEND_ATTXTEND: pNtAtTextEndCB->set_state( TRISTATE_TRUE ); @@ -1966,13 +1966,13 @@ void SwSectionFootnoteEndTabPage::ResetState( bool bFootnote, { case FTNEND_ATPGORDOCEND: pNtNumCB->set_sensitive( false ); - SAL_FALLTHROUGH; + [[fallthrough]]; case FTNEND_ATTXTEND: pNtNumFormatCB->set_sensitive( false ); pOffsetField->set_sensitive( false ); pOffsetText->set_sensitive( false ); - SAL_FALLTHROUGH; + [[fallthrough]]; case FTNEND_ATTXTEND_OWNNUMSEQ: pNumViewBox->Enable( false ); diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 3feac5488241..166dcddec941 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -362,7 +362,7 @@ void SwFieldDBPage::TypeHdl( ListBox const * pBox ) case TYP_DBNUMSETFLD: bSetNo = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case TYP_DBNEXTSETFLD: bCond = true; if (IsFieldEdit()) diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 3b756a692136..74f41938e8b3 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -589,7 +589,7 @@ bool SwFieldDokPage::FillItemSet(SfxItemSet* ) case TYP_AUTHORFLD: nFormat = nSubType; nSubType = 0; - SAL_FALLTHROUGH; + [[fallthrough]]; case TYP_EXTUSERFLD: nFormat |= m_pFixedCB->IsChecked() ? AF_FIXED : 0; break; diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 71afb52f2277..bc9790a6aefb 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -422,7 +422,7 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, ListBox&, void) case REFFLDFLAG_BOOKMARK: bName = true; - SAL_FALLTHROUGH; + [[fallthrough]]; default: if( REFFLDFLAG & nTypeId ) { @@ -807,7 +807,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId) case REFFLDFLAG_HEADING: case REFFLDFLAG_NUMITEM: bAddCrossRefFormats = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case TYP_GETREFFLD: case REFFLDFLAG_BOOKMARK: diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index b65724370016..0935481a27d7 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -840,7 +840,7 @@ void SwColumnPage::UpdateCols() switch(m_nCols) { case 3: bEnable3 = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case 2: bEnable12= true; break; default: /* do nothing */; } diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 807b9b18799e..651f04e899fc 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -331,7 +331,7 @@ bool SwDocShell::Save() case SfxObjectCreateMode::EMBEDDED: // Suppress SfxProgress, if we are Embedded SW_MOD()->SetEmbeddedLoadSave( true ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SfxObjectCreateMode::STANDARD: default: @@ -1060,7 +1060,7 @@ void SwDocShell::GetState(SfxItemSet& rSet) if ( !aMOpt.IsImpress() ) rSet.DisableItem( nWhich ); } - SAL_FALLTHROUGH; + [[fallthrough]]; case FN_ABSTRACT_NEWDOC: case FN_OUTLINE_TO_CLIPBOARD: { diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index 76a2acdba069..e0b5204db7d9 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -535,7 +535,7 @@ bool SwDocShell::Load( SfxMedium& rMedium ) } // suppress SfxProgress, when we are Embedded SW_MOD()->SetEmbeddedLoadSave( true ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SfxObjectCreateMode::STANDARD: { diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index d9bc6d2f0cd9..5f1b42cc7f66 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -358,7 +358,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) } } - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_STYLE_EDIT: case SID_STYLE_DELETE: diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index 9a094d2068ed..184ca24c2d85 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -982,7 +982,7 @@ OUString SwDocStyleSheet::GetDescription(MapUnit eUnit) aItemPresentation = SwResId(STR_WESTERN_FONT) + aItemPresentation; bHasWesternFontPrefix = true; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: bIsDefault = true; } diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index d968221694a4..b7956cc7ec11 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -453,7 +453,7 @@ bool SwDBManager::Merge( const SwMergeDescriptor& rMergeDesc ) WorkingDocType::SOURCE, rMergeDesc.rSh, nullptr, &pWorkDocOrigDBManager, nullptr, &pWorkShell, &pWorkDoc ); } - SAL_FALLTHROUGH; + [[fallthrough]]; } default: diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx index 20a658499103..5502faa34954 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -676,7 +676,7 @@ void SwSpellDialogChildWindow::MakeTextSelection_Impl(SwWrtShell& rShell, ShellM rView.AttrChangedNotify(&rShell); break; } - SAL_FALLTHROUGH; // to deselect the object + [[fallthrough]]; // to deselect the object case ShellMode::Graphic: case ShellMode::Object: { diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 9c370a51ff8d..a3e7872eb030 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -1680,7 +1680,7 @@ bool SwTransferable::PasteFileContent( TransferableDataHelper& rData, break; } } - SAL_FALLTHROUGH; // because then test if we get a stream + [[fallthrough]]; // because then test if we get a stream default: if( rData.GetSotStorageStream( nFormat, xStrm ) ) diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 1dcf34f2d88e..c398ad90f804 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -1086,7 +1086,7 @@ void SwEditWin::ChangeFly( sal_uInt8 nDir, bool bWeb ) if( aTmp.Width() < aSnap.Width() + MINFLY ) break; nRight = aSnap.Width(); - SAL_FALLTHROUGH; + [[fallthrough]]; case MOVE_RIGHT_HUGE: case MOVE_RIGHT_BIG: aTmp.Left( aTmp.Left() + nRight ); break; @@ -1095,7 +1095,7 @@ void SwEditWin::ChangeFly( sal_uInt8 nDir, bool bWeb ) if( aTmp.Height() < aSnap.Height() + MINFLY ) break; nDown = aSnap.Height(); - SAL_FALLTHROUGH; + [[fallthrough]]; case MOVE_DOWN_HUGE: case MOVE_DOWN_BIG: aTmp.Top( aTmp.Top() + nDown ); break; @@ -2354,7 +2354,7 @@ KEYINPUT_CHECKTABLE_INSDEL: break; } aCh = '\t'; - SAL_FALLTHROUGH; + [[fallthrough]]; case SwKeyState::InsChar: if (rSh.GetChar(false)==CH_TXT_ATR_FORMELEMENT) { @@ -3388,7 +3388,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) return; } - SAL_FALLTHROUGH; + [[fallthrough]]; } case MOUSE_LEFT + KEY_SHIFT: case MOUSE_LEFT + KEY_SHIFT + KEY_MOD1: @@ -3938,13 +3938,13 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt) if (pWrdCnt) pWrdCnt->UpdateCounts(); } - SAL_FALLTHROUGH; + [[fallthrough]]; case MOUSE_LEFT + KEY_SHIFT: case MOUSE_LEFT + KEY_SHIFT + KEY_MOD1: if ( !m_bMBPressed ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case MOUSE_LEFT + KEY_MOD1: if ( g_bFrameDrag && rSh.IsSelFrameMode() ) { @@ -4120,7 +4120,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt) } else m_rView.GetPostItMgr()->SetShadowState(nullptr,false); - SAL_FALLTHROUGH; + [[fallthrough]]; } case KEY_SHIFT: case KEY_MOD2: @@ -4386,7 +4386,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt) bCallBase = false; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case MOUSE_LEFT + KEY_MOD1: case MOUSE_LEFT + KEY_MOD2: case MOUSE_LEFT + KEY_SHIFT + KEY_MOD1: @@ -4476,7 +4476,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt) break; } bPopMode = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case MOUSE_LEFT + KEY_SHIFT: if (rSh.IsSelFrameMode()) { diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx index aeca6373f718..616f7c120ee4 100644 --- a/sw/source/uibase/docvw/edtwin2.cxx +++ b/sw/source/uibase/docvw/edtwin2.cxx @@ -312,7 +312,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) } case SwFieldIds::Input: // BubbleHelp, because the suggestion could be quite long bBalloon = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case SwFieldIds::Dropdown: case SwFieldIds::JumpEdit: sText = pField->GetPar2(); diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index 5ada2a617ae4..892fae5561e0 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -594,7 +594,7 @@ void SwFieldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill) case TYP_INPUTFLD: { rToFill.push_back(SwResId(aSwFields[nPos].pSubTypeResIds[0])); - SAL_FALLTHROUGH; // move on at generic types + [[fallthrough]]; // move on at generic types } case TYP_DDEFLD: case TYP_SEQFLD: diff --git a/sw/source/uibase/ribbar/conrect.cxx b/sw/source/uibase/ribbar/conrect.cxx index 8c6da3502144..5e1b5e39173f 100644 --- a/sw/source/uibase/ribbar/conrect.cxx +++ b/sw/source/uibase/ribbar/conrect.cxx @@ -199,7 +199,7 @@ void ConstRectangle::Activate(const sal_uInt16 nSlotId) case SID_DRAW_CAPTION_VERTICAL: bCapVertical = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_DRAW_CAPTION: m_pWin->SetSdrDrawMode(OBJ_CAPTION); break; diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 84cce3758271..e6ad091274d2 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -229,7 +229,7 @@ void SwBaseShell::ExecDelete(SfxRequest &rReq) break; } - SAL_FALLTHROUGH; // otherwise call DelLeft + [[fallthrough]]; // otherwise call DelLeft case FN_SHIFT_BACKSPACE: rSh.DelLeft(); break; @@ -426,7 +426,7 @@ void SwBaseShell::StateClpbrd(SfxItemSet &rSet) rSet.DisableItem( nWhich ); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_COPY: if( !bCopy ) rSet.DisableItem( nWhich ); @@ -1880,7 +1880,7 @@ void SwBaseShell::SetWrapMode( sal_uInt16 nSlot ) case FN_FRAME_WRAPTHRU_TOGGLE: if (aWrap.IsContour()) aWrap.SetContour(false); - SAL_FALLTHROUGH; + [[fallthrough]]; case FN_FRAME_WRAPTHRU: nSurround = css::text::WrapTextMode_THROUGH; break; @@ -2011,7 +2011,7 @@ void SwBaseShell::ExecTextCtrl( SfxRequest& rReq ) if(nInputLang != LANGUAGE_DONTKNOW && nInputLang != LANGUAGE_SYSTEM) nScripts = SvtLanguageOptions::GetScriptTypeOfLanguage( nInputLang ); } - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_ATTR_CHAR_POSTURE: case SID_ATTR_CHAR_WEIGHT: diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx index aa1b2b4c48d6..073474ffb498 100644 --- a/sw/source/uibase/shells/drawsh.cxx +++ b/sw/source/uibase/shells/drawsh.cxx @@ -270,7 +270,7 @@ void SwDrawShell::Execute(SfxRequest &rReq) case SID_FLIP_VERTICAL: bMirror = false; - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_FLIP_HORIZONTAL: rSh.MirrorSelection( bMirror ); break; diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx index 6c77a0dc1eab..c5319f7ac065 100644 --- a/sw/source/uibase/shells/drwbassh.cxx +++ b/sw/source/uibase/shells/drwbassh.cxx @@ -501,14 +501,14 @@ void SwDrawBaseShell::Execute(SfxRequest const &rReq) case FN_FRAME_UP: bTopParam = false; - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_FRAME_TO_TOP: pSh->SelectionToTop( bTopParam ); break; case FN_FRAME_DOWN: bBottomParam = false; - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_FRAME_TO_BOTTOM: pSh->SelectionToBottom( bBottomParam ); break; diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index 4b3c3dc78f41..aa0500031969 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -744,7 +744,7 @@ void SwTableShell::Execute(SfxRequest &rReq) { case TableMergeErr::Ok: bCallDone = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case TableMergeErr::NoSelection: break; case TableMergeErr::TooComplex: @@ -937,7 +937,7 @@ void SwTableShell::Execute(SfxRequest &rReq) nSlot = bColumn ? FN_TABLE_INSERT_COL_DLG : FN_TABLE_INSERT_ROW_DLG; - SAL_FALLTHROUGH; // on Count = 0 appears the dialog + [[fallthrough]]; // on Count = 0 appears the dialog } case FN_TABLE_INSERT_COL_DLG: case FN_TABLE_INSERT_ROW_DLG: diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 5a77cbefec63..8fa74feee88e 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -902,7 +902,7 @@ void SwTextShell::Execute(SfxRequest &rReq) const sal_uInt16 nWhich = GetPool().GetWhich( nSlot ); if ( pArgs && pArgs->GetItemState( nWhich ) == SfxItemState::SET ) bUseDialog = false; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_CHAR_DLG: case SID_CHAR_DLG_EFFECT: @@ -935,7 +935,7 @@ void SwTextShell::Execute(SfxRequest &rReq) const sal_uInt16 nWhich = GetPool().GetWhich( nSlot ); if ( pArgs && pArgs->GetItemState( nWhich ) == SfxItemState::SET ) bUseDialog = false; - SAL_FALLTHROUGH; + [[fallthrough]]; } case SID_PARA_DLG: { diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 1747f01e4c6e..466f05770c12 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -864,7 +864,7 @@ void SwPagePreview::Execute( SfxRequest &rReq ) case FN_START_OF_LINE: case FN_START_OF_DOCUMENT: eMvMode = SwPagePreviewWin::MV_DOC_STT; - SAL_FALLTHROUGH; + [[fallthrough]]; case FN_END_OF_LINE: case FN_END_OF_DOCUMENT: m_pViewWin->SetSelectedPage(eMvMode == SwPagePreviewWin::MV_DOC_STT ? 1 : mnPageCount); diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index a66e6f165bdf..d36fa59347e7 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -584,7 +584,7 @@ void SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem, break; case SvxSearchCmd::REPLACE_ALL: bAll = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case SvxSearchCmd::REPLACE: nFound = pTextView->Replace( aSearchOpt, bAll, bForward ); break; diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 153e33f6bad6..eefb9ed9ee9c 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -1643,7 +1643,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) m_pVRuler->SetActive( !bModal ); } - SAL_FALLTHROUGH; + [[fallthrough]]; case SfxHintId::TitleChanged: if ( GetDocShell()->IsReadOnly() != GetWrtShell().GetViewOptions()->IsReadonly() ) diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index dfd9cceeeddc..69094de12fbb 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -1157,7 +1157,7 @@ void SwView::Execute(SfxRequest &rReq) xDictionary->clear(); // put cursor to the start of the document m_pWrtShell->StartOfSection(); - SAL_FALLTHROUGH; // call spell/grammar dialog + [[fallthrough]]; // call spell/grammar dialog } case FN_SPELL_GRAMMAR_DIALOG: { diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index c1fe9085ddc0..bd27ee2035ec 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -366,7 +366,7 @@ uno::Any SwXTextView::getSelection() aRef.set(xCursor, uno::UNO_QUERY); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; // without a table selection the text will be delivered } case ShellMode::ListText : diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index be0816cad53f..bd0277316b02 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -1892,14 +1892,14 @@ bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer, break; case ContentTypeId::URLFIELD: sUrl = static_cast<SwURLFieldContent*>(pCnt)->GetURL(); - SAL_FALLTHROUGH; + [[fallthrough]]; case ContentTypeId::OLE: case ContentTypeId::GRAPHIC: if(GetParentWindow()->GetRegionDropMode() != RegionMode::NONE) break; else rDragMode &= ~( DND_ACTION_MOVE | DND_ACTION_LINK ); - SAL_FALLTHROUGH; + [[fallthrough]]; default: sEntry = GetEntryText(pEntry); } diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 2d7685cfd3ae..57fb431a5cc5 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -362,7 +362,7 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName { aServerList.FillInsertObjects(); aServerList.Remove( SwDocShell::Factory().GetClassId() ); - SAL_FALLTHROUGH; + [[fallthrough]]; } // TODO/LATER: recording! Convert properties to items diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 108f6b36f7bc..a29e445582f4 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -1776,7 +1776,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const css::uno::Any& case WindowType::CANCELBUTTON: case WindowType::HELPBUTTON: nAlign = PROPERTY_ALIGN_CENTER; - SAL_FALLTHROUGH; + [[fallthrough]]; case WindowType::FIXEDTEXT: case WindowType::EDIT: case WindowType::MULTILINEEDIT: diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index f50c8ffb55ec..2673c418f79d 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -2883,7 +2883,7 @@ void VCLXFixedHyperlink::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve } } } - SAL_FALLTHROUGH; + [[fallthrough]]; } default: VCLXWindow::ProcessWindowEvent( rVclWindowEvent ); diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index d5b2df68803a..e280a7f84abe 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -1185,7 +1185,7 @@ bool INetURLObject::setAbsURIRef(OUString const & rTheAbsURIRef, break; } } - SAL_FALLTHROUGH; + [[fallthrough]]; default: { // For INetProtocol::File, allow an empty authority ("//") to be @@ -4632,7 +4632,7 @@ void INetURLObject::appendUCS4(OUStringBuffer& rTheText, sal_uInt32 nUCS4, { default: OSL_FAIL("INetURLObject::appendUCS4(): Unsupported charset"); - SAL_FALLTHROUGH; + [[fallthrough]]; case RTL_TEXTENCODING_ASCII_US: case RTL_TEXTENCODING_ISO_8859_1: appendEscape(rTheText, nUCS4); @@ -4676,7 +4676,7 @@ sal_uInt32 INetURLObject::getUTF32(sal_Unicode const *& rBegin, default: OSL_FAIL( "INetURLObject::getUTF32(): Unsupported charset"); - SAL_FALLTHROUGH; + [[fallthrough]]; case RTL_TEXTENCODING_ASCII_US: rEscapeType = rtl::isAscii(nUTF32) ? EscapeType::Utf32 : EscapeType::Octet; diff --git a/tools/source/fsys/wldcrd.cxx b/tools/source/fsys/wldcrd.cxx index 2ea29eedddeb..1cdf20c30046 100644 --- a/tools/source/fsys/wldcrd.cxx +++ b/tools/source/fsys/wldcrd.cxx @@ -51,7 +51,7 @@ bool WildCard::ImpMatch( const char *pWild, const char *pStr ) break; // WARNING/TODO: may cause execution of next case in some // circumstances! - SAL_FALLTHROUGH; + [[fallthrough]]; case '*': while ( *pWild == '*' ) pWild++; diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx index 1fd8f877350b..8df2f9f94b1c 100644 --- a/ucb/source/core/ucbcmds.cxx +++ b/ucb/source/core/ucbcmds.cxx @@ -1347,7 +1347,7 @@ void globalTransfer_( rContext.xProcessor, rContext.aArg.NameClash ) ), rContext.xOrigEnv ); - SAL_FALLTHROUGH; // Unreachable + [[fallthrough]]; // Unreachable } case ucb::NameClash::ERROR: @@ -1381,7 +1381,7 @@ void globalTransfer_( case NOT_HANDLED: // Not handled. cppu::throwException( aExc ); - SAL_FALLTHROUGH; // break; + [[fallthrough]]; // break; case UNKNOWN: // Handled, but not clear, how... @@ -1743,7 +1743,7 @@ void UniversalContentBroker::globalTransfer( case NOT_HANDLED: // Not handled. cppu::throwException( aExc ); - SAL_FALLTHROUGH; // break; + [[fallthrough]]; // break; case UNKNOWN: // Handled, but not clear, how... diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx index 49e86bfeec2e..f28c2e58ce06 100644 --- a/ucb/source/inc/regexpmap.hxx +++ b/ucb/source/inc/regexpmap.hxx @@ -180,13 +180,13 @@ RegexpMapConstIter< Val > & RegexpMapConstIter< Val >::operator ++() case Regexp::KIND_DOMAIN: if (m_aIndex == m_pMap->m_aList[m_nList].end()) return *this; - SAL_FALLTHROUGH; + [[fallthrough]]; default: ++m_aIndex; if (m_nList == Regexp::KIND_DOMAIN || m_aIndex != m_pMap->m_aList[m_nList].end()) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case -1: do { diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx index 05260df637b3..979fb3819406 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx @@ -1920,7 +1920,7 @@ void NeonSession::HandleError( int nError, default: // set 400 error, if not one of others code = SC_BAD_REQUEST; - SAL_FALLTHROUGH; + [[fallthrough]]; case SC_FORBIDDEN: case SC_NOT_FOUND: case SC_METHOD_NOT_ALLOWED: @@ -1948,7 +1948,7 @@ void NeonSession::HandleError( int nError, // set 500 error, if not one of others // expand the error code code = SC_INTERNAL_SERVER_ERROR; - SAL_FALLTHROUGH; + [[fallthrough]]; case SC_INTERNAL_SERVER_ERROR: case SC_NOT_IMPLEMENTED: throw DAVException( DAVException::DAV_HTTP_ERROR, aText, code ); diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index 4616957b0725..7a376f48fcfa 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -2902,7 +2902,7 @@ void Content::transfer( task::InteractionClassification_ERROR, aTargetURI ) ), Environment ); - SAL_FALLTHROUGH; // Unreachable + [[fallthrough]]; // Unreachable } case ucb::NameClash::OVERWRITE: diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index 72913059c5e3..2e70cef80bc8 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -2724,7 +2724,7 @@ void Content::transfer( Environment ); // Unreachable } - SAL_FALLTHROUGH; + [[fallthrough]]; case ucb::NameClash::OVERWRITE: break; diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx index 3e38ac91561f..b03a392d5cbb 100644 --- a/ucb/source/ucp/webdav/webdavresponseparser.cxx +++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx @@ -710,7 +710,7 @@ namespace maLock.Scope = maLockScope; maResult_Lock.push_back(maLock); } - SAL_FALLTHROUGH; // I hope intentional? + [[fallthrough]]; // I hope intentional? case WebDAVName_propstat: { // propstat end, check status diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index 31e26055ffcf..0e290006e94a 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -186,7 +186,7 @@ bool WildCard::Matches( const OUString& rString ) const else break; - SAL_FALLTHROUGH; + [[fallthrough]]; case '*': while ( *pWild == '*' ) diff --git a/unoidl/source/legacyprovider.cxx b/unoidl/source/legacyprovider.cxx index 1cd6ffa4b0f4..5dc418196cfd 100644 --- a/unoidl/source/legacyprovider.cxx +++ b/unoidl/source/legacyprovider.cxx @@ -219,7 +219,7 @@ rtl::Reference< Entity > readEntity( if (probe) { return rtl::Reference< Entity >(); } - SAL_FALLTHROUGH; + [[fallthrough]]; default: throw FileFormatException( key.getRegistryName(), diff --git a/unoidl/source/sourceprovider-parser.y b/unoidl/source/sourceprovider-parser.y index 747437660fdc..af8d0ec193bd 100644 --- a/unoidl/source/sourceprovider-parser.y +++ b/unoidl/source/sourceprovider-parser.y @@ -334,7 +334,7 @@ Found findEntity( break; } assert(e->entity.is()); - SAL_FALLTHROUGH; + [[fallthrough]]; case unoidl::detail::SourceProviderEntity::KIND_EXTERNAL: if (e->entity->getSort() == unoidl::Entity::SORT_TYPEDEF) { if (typedefed != nullptr) { @@ -449,7 +449,7 @@ Found findEntity( return FOUND_ERROR; } assert(e->entity.is()); - SAL_FALLTHROUGH; + [[fallthrough]]; case unoidl::detail::SourceProviderEntity::KIND_EXTERNAL: switch (e->entity->getSort()) { case unoidl::Entity::SORT_ENUM_TYPE: @@ -679,7 +679,7 @@ Found findEntity( break; } assert(e->entity.is()); - SAL_FALLTHROUGH; + [[fallthrough]]; case unoidl::detail::SourceProviderEntity::KIND_EXTERNAL: switch (e->entity->getSort()) { case unoidl::Entity::SORT_ENUM_TYPE: @@ -745,7 +745,7 @@ Found findEntity( return FOUND_ERROR; } assert(e->entity.is()); - SAL_FALLTHROUGH; + [[fallthrough]]; case unoidl::detail::SourceProviderEntity::KIND_EXTERNAL: if (e->entity->getSort() == unoidl::Entity::SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE) @@ -776,7 +776,7 @@ Found findEntity( t = unoidl::detail::SourceProviderType(n, e, args); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case unoidl::detail::SourceProviderEntity::KIND_INTERFACE_DECL: case unoidl::detail::SourceProviderEntity::KIND_PUBLISHED_INTERFACE_DECL: error( @@ -1911,7 +1911,7 @@ typedefDefn: break; case unoidl::detail::SourceProviderEntity::KIND_MODULE: assert(false && "this cannot happen"); - SAL_FALLTHROUGH; + [[fallthrough]]; default: assert(t.entity->entity.is() || t.entity->pad.is()); unpub @@ -1931,7 +1931,7 @@ typedefDefn: break; case unoidl::detail::SourceProviderType::TYPE_PARAMETER: assert(false && "this cannot happen"); - SAL_FALLTHROUGH; + [[fallthrough]]; default: break; } @@ -3796,7 +3796,7 @@ type: break; } assert(ent->entity.is()); - SAL_FALLTHROUGH; + [[fallthrough]]; case unoidl::detail::SourceProviderEntity::KIND_EXTERNAL: if (data->publishedContext && ent->entity->getSort() != unoidl::Entity::SORT_MODULE @@ -3843,7 +3843,7 @@ type: break; case unoidl::Entity::SORT_TYPEDEF: assert(false && "this cannot happen"); - SAL_FALLTHROUGH; + [[fallthrough]]; default: break; } @@ -3856,7 +3856,7 @@ type: + " used in published context")); YYERROR; } - SAL_FALLTHROUGH; + [[fallthrough]]; case unoidl::detail::SourceProviderEntity::KIND_PUBLISHED_INTERFACE_DECL: $$ = new unoidl::detail::SourceProviderType( unoidl::detail::SourceProviderType::TYPE_INTERFACE, name, @@ -3908,7 +3908,7 @@ type: break; } assert(ent->entity.is()); - SAL_FALLTHROUGH; + [[fallthrough]]; case unoidl::detail::SourceProviderEntity::KIND_EXTERNAL: if (ent->entity->getSort() == unoidl::Entity::SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE) @@ -4428,7 +4428,7 @@ bool parse(OUString const & uri, SourceProviderScannerData * data) { break; default: assert(false); - SAL_FALLTHROUGH; + [[fallthrough]]; case 1: throw FileFormatException( uri, diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 69f530ae240c..03c849655f3f 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -482,7 +482,7 @@ static Bootstrap::FailureCode describeError(OUStringBuffer& _rBuf, Bootstrap::Im eErrCode = Bootstrap::INVALID_VERSION_FILE_ENTRY; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case Bootstrap::DATA_MISSING: switch (_rData.aVersionINI_.status) @@ -509,7 +509,7 @@ static Bootstrap::FailureCode describeError(OUStringBuffer& _rBuf, Bootstrap::Im eErrCode = Bootstrap::INVALID_BOOTSTRAP_FILE_ENTRY; break; - case Bootstrap::DATA_INVALID: OSL_ASSERT(false); SAL_FALLTHROUGH; + case Bootstrap::DATA_INVALID: OSL_ASSERT(false); [[fallthrough]]; case Bootstrap::PATH_VALID: addFileError(_rBuf, _rData.aBootstrapINI_.path, IS_MISSING); eErrCode = Bootstrap::MISSING_BOOTSTRAP_FILE; diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index 1194c7a24e75..25e70207da1d 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -981,7 +981,7 @@ bool SvtSecurityOptions::isSecureMacroUri( // is considered safe: return true; } - SAL_FALLTHROUGH; + [[fallthrough]]; case INetProtocol::Slot: return referer.equalsIgnoreAsciiCase("private:user") || isTrustedLocationUri(referer); diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx index 824fb847a732..093298ca1c4c 100644 --- a/vcl/headless/svpbmp.cxx +++ b/vcl/headless/svpbmp.cxx @@ -102,7 +102,7 @@ static std::unique_ptr<BitmapBuffer> ImplCreateDIB( break; default: nBitCount = 32; - SAL_FALLTHROUGH; + [[fallthrough]]; case 32: pDIB->mnFormat = SVP_CAIRO_FORMAT; break; diff --git a/vcl/osx/a11yfocustracker.cxx b/vcl/osx/a11yfocustracker.cxx index 49fa08ec4eee..a84b27d38d66 100644 --- a/vcl/osx/a11yfocustracker.cxx +++ b/vcl/osx/a11yfocustracker.cxx @@ -57,7 +57,7 @@ void AquaA11yFocusTracker::WindowEventHandler(void * pThis, VclSimpleEvent& rEve break; case VclEventId::ObjectDying: pFocusTracker->m_aDocumentWindowList.erase( getWindow(&rEvent) ); - SAL_FALLTHROUGH; + [[fallthrough]]; case VclEventId::ToolboxHighlightOff: pFocusTracker->toolbox_highlight_off( getWindow(&rEvent) ); break; diff --git a/vcl/qt5/Qt5Font.cxx b/vcl/qt5/Qt5Font.cxx index be00f7a9ec5f..ee9d339266b2 100644 --- a/vcl/qt5/Qt5Font.cxx +++ b/vcl/qt5/Qt5Font.cxx @@ -34,9 +34,9 @@ static QFont::Weight GetQFontWeight(FontWeight eWeight) case WEIGHT_LIGHT: return QFont::Light; case WEIGHT_SEMILIGHT: - SAL_FALLTHROUGH; + [[fallthrough]]; case WEIGHT_DONTKNOW: - SAL_FALLTHROUGH; + [[fallthrough]]; case WEIGHT_NORMAL: return QFont::Normal; case WEIGHT_MEDIUM: diff --git a/vcl/qt5/Qt5Graphics_Controls.cxx b/vcl/qt5/Qt5Graphics_Controls.cxx index d98cdafe0137..8763752c0615 100644 --- a/vcl/qt5/Qt5Graphics_Controls.cxx +++ b/vcl/qt5/Qt5Graphics_Controls.cxx @@ -194,7 +194,7 @@ bool Qt5Graphics_Controls::drawNativeControl(ControlType type, ControlPart part, m_image->fill(Qt::transparent); break; } - SAL_FALLTHROUGH; // QPalette::Window + [[fallthrough]]; // QPalette::Window case ControlType::Menubar: case ControlType::WindowBackground: m_image->fill(QApplication::palette().color(QPalette::Window).rgb()); @@ -209,7 +209,7 @@ bool Qt5Graphics_Controls::drawNativeControl(ControlType type, ControlPart part, m_image->fill(QApplication::palette().color(QPalette::Window).rgb()); break; } - SAL_FALLTHROUGH; // Qt::transparent + [[fallthrough]]; // Qt::transparent default: m_image->fill(Qt::transparent); break; diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index 314756391664..d15fb1376784 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -182,7 +182,7 @@ static void MyCGPathApplierFunc( void* pData, const CGPathElement* pElement ) { break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case kCGPathElementAddLineToPoint: rPolygon.append( basegfx::B2DPoint( +pElement->points[0].x, -pElement->points[0].y ) ); break; diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 6e2667258190..be35941fe775 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -1534,7 +1534,7 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) case css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: case css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: bSelect = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case css::awt::Key::MOVE_TO_BEGIN_OF_LINE: case css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: case css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: @@ -1543,7 +1543,7 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) case css::awt::Key::SELECT_TO_END_OF_PARAGRAPH: case css::awt::Key::SELECT_TO_END_OF_DOCUMENT: bSelect = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case css::awt::Key::MOVE_TO_END_OF_LINE: case css::awt::Key::MOVE_TO_END_OF_PARAGRAPH: case css::awt::Key::MOVE_TO_END_OF_DOCUMENT: diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index 6857089945eb..3ccae7706092 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -1167,49 +1167,49 @@ TextSelection const & TextView::ImpMoveCursor( const KeyEvent& rKeyEvent ) break; case css::awt::Key::SELECT_WORD_FORWARD: bSelect = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case css::awt::Key::MOVE_WORD_FORWARD: aPaM = CursorWordRight( aPaM ); break; case css::awt::Key::SELECT_WORD_BACKWARD: bSelect = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case css::awt::Key::MOVE_WORD_BACKWARD: aPaM = CursorWordLeft( aPaM ); break; case css::awt::Key::SELECT_TO_BEGIN_OF_LINE: bSelect = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case css::awt::Key::MOVE_TO_BEGIN_OF_LINE: aPaM = CursorStartOfLine( aPaM ); break; case css::awt::Key::SELECT_TO_END_OF_LINE: bSelect = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case css::awt::Key::MOVE_TO_END_OF_LINE: aPaM = CursorEndOfLine( aPaM ); break; case css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: bSelect = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: aPaM = CursorStartOfParagraph( aPaM ); break; case css::awt::Key::SELECT_TO_END_OF_PARAGRAPH: bSelect = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case css::awt::Key::MOVE_TO_END_OF_PARAGRAPH: aPaM = CursorEndOfParagraph( aPaM ); break; case css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: bSelect = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: aPaM = CursorStartOfDoc(); break; case css::awt::Key::SELECT_TO_END_OF_DOCUMENT: bSelect = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case css::awt::Key::MOVE_TO_END_OF_DOCUMENT: aPaM = CursorEndOfDoc(); break; diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx index b79d4afa425c..27dd780b57c8 100644 --- a/vcl/source/filter/graphicfilter2.cxx +++ b/vcl/source/filter/graphicfilter2.cxx @@ -873,7 +873,7 @@ bool GraphicDescriptor::ImpDetectPSD( SvStream& rStm, bool bExtendedInfo ) case 4 : case 3 : nBitsPerPixel = 24; - SAL_FALLTHROUGH; + [[fallthrough]]; case 2 : case 1 : aPixSize.setWidth( nColumns ); diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index fb4bb52ee719..ef230704cd66 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -903,7 +903,7 @@ void CffSubsetterContext::convertOneTypeEsc() assert( mnStackIdx >= 1 ); if( pTop[0] >= 0) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case TYPE2OP::NEG: assert( mnStackIdx >= 1 ); pTop[0] = -pTop[0]; diff --git a/vcl/source/fontsubset/xlat.cxx b/vcl/source/fontsubset/xlat.cxx index 042d8e79517d..239b1bf0b454 100644 --- a/vcl/source/fontsubset/xlat.cxx +++ b/vcl/source/fontsubset/xlat.cxx @@ -66,7 +66,7 @@ void ConverterCache::ensureConverter( int nSelect ) rtl_TextEncoding eRecodeFrom = RTL_TEXTENCODING_UNICODE; switch( nSelect ) { - default: nSelect = 1; SAL_FALLTHROUGH; // to unicode recoding + default: nSelect = 1; [[fallthrough]]; // to unicode recoding case 1: eRecodeFrom = RTL_TEXTENCODING_UNICODE; break; case 2: eRecodeFrom = RTL_TEXTENCODING_SHIFT_JIS; break; case 3: eRecodeFrom = RTL_TEXTENCODING_GB_2312; break; diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index b6ffa8fd9908..2c44af9ccc71 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -1378,7 +1378,7 @@ bool ImplWriteDIBBits(SvStream& rOStm, BitmapReadAccess const & rAcc, BitmapRead size_t nUnusedBytes = nAlignedWidth - nWidth * 3; memset(aBuf.data() + nAlignedWidth - nUnusedBytes, 0, nUnusedBytes); } - SAL_FALLTHROUGH; + [[fallthrough]]; // #i59239# fallback to 24 bit format, if bitcount is non-default default: { diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 3ebe2ce38673..af08ca7a3e6c 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -4617,7 +4617,7 @@ bool PDFWriterImpl::emitWidgetAnnotations() else appendName( rWidget.m_aValue, aValue ); } - SAL_FALLTHROUGH; + [[fallthrough]]; case PDFWriter::PushButton: aLine.append( "Btn" ); break; @@ -8681,7 +8681,7 @@ bool PDFWriterImpl::writeGradientFunction( GradientEmit const & rObject ) aCol[1] = rObject.m_aGradient.GetEndColor().GetGreen(); aCol[2] = rObject.m_aGradient.GetEndColor().GetBlue(); CHECK_RETURN( writeBuffer( aCol, 3 ) ); - SAL_FALLTHROUGH; + [[fallthrough]]; case GradientStyle::Linear: { aCol[0] = rObject.m_aGradient.GetStartColor().GetRed(); diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index cfd9391f69b5..ba9d9afc5507 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -501,7 +501,7 @@ bool PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint ) break; case 16 : mnTargetDepth = 8; // we have to reduce the bitmap - SAL_FALLTHROUGH; + [[fallthrough]]; case 1 : case 4 : case 8 : @@ -556,7 +556,7 @@ bool PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint ) { case 16 : mnTargetDepth = 8; // we have to reduce the bitmap - SAL_FALLTHROUGH; + [[fallthrough]]; case 8 : mbGrayScale = true; break; diff --git a/vcl/source/outdev/nativecontrols.cxx b/vcl/source/outdev/nativecontrols.cxx index c848ec2d0b53..ef2295808a6d 100644 --- a/vcl/source/outdev/nativecontrols.cxx +++ b/vcl/source/outdev/nativecontrols.cxx @@ -52,7 +52,7 @@ static bool EnableNativeWidget( const OutputDevice& i_rDevice ) } case OUTDEV_PDF: - SAL_FALLTHROUGH; + [[fallthrough]]; case OUTDEV_VIRDEV: { const vcl::ExtOutDevData* pOutDevData( i_rDevice.GetExtOutDevData() ); diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index c8cfb1d70f3f..c1fb51df019e 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -293,7 +293,7 @@ void ImplDrawSymbol( OutputDevice* pDev, tools::Rectangle nRect, const SymbolTyp Point( nRect.Right(), nRect.Bottom() ) ); pDev->DrawLine( Point( nRect.Left(), nRect.Bottom() ), Point( nRect.Right(), nRect.Bottom() ) ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SymbolType::ROLLUP: pDev->DrawRect( tools::Rectangle( nRect.Left(), nRect.Top(), nRect.Right(), nRect.Top()+n8 ) ); diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 91de02405af6..bace88d1d59c 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -780,7 +780,7 @@ void VclButtonBox::setAllocation(const Size &rAllocation) break; default: SAL_WARN("vcl.layout", "todo unimplemented layout style"); - SAL_FALLTHROUGH; + [[fallthrough]]; case VclButtonBoxStyle::Default: case VclButtonBoxStyle::End: if (!aReq.m_aMainGroupDimensions.empty()) diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index a4cce43051c7..f58ea591b922 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -2518,7 +2518,7 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalEvent nEvent, const void* pE ImplHandleSurroundingTextSelectionChange( pWindow, pEvt->mnStart, pEvt->mnEnd ); - SAL_FALLTHROUGH; // TODO: Fallthrough really intended? + [[fallthrough]]; // TODO: Fallthrough really intended? } case SalEvent::StartReconversion: ImplHandleStartReconversion( pWindow ); diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index 8dfd446c4cd6..b7cea507df7e 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -180,7 +180,7 @@ std::unique_ptr<BitmapBuffer> X11SalBitmap::ImplCreateDIB( #endif default: nBitCount = 24; - SAL_FALLTHROUGH; + [[fallthrough]]; case 24: pDIB->mnFormat |= ScanlineFormat::N24BitTcBgr; break; diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index face14778fd0..0d4c309adc8b 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -3911,7 +3911,7 @@ bool X11SalFrame::Dispatch( XEvent *pEvent ) XSetInputFocus( GetXDisplay(), GetShellWindow(), RevertToNone, CurrentTime ); } - SAL_FALLTHROUGH; + [[fallthrough]]; case ButtonRelease: case MotionNotify: case EnterNotify: diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index ed99ba392bba..cf623025df68 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -670,7 +670,7 @@ static void WindowEventHandler(void *, VclSimpleEvent& rEvent) case VclEventId::ObjectDying: g_aWindowList.list.erase( static_cast< ::VclWindowEvent const * >(&rEvent)->GetWindow() ); - SAL_FALLTHROUGH; + [[fallthrough]]; case VclEventId::ToolboxHighlightOff: handle_toolbox_highlightoff(static_cast< ::VclWindowEvent const * >(&rEvent)->GetWindow()); break; diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx index 7cbcfeab3ed6..b36e8abd4762 100644 --- a/vcl/unx/kde4/KDESalGraphics.cxx +++ b/vcl/unx/kde4/KDESalGraphics.cxx @@ -234,7 +234,7 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, m_image->fill( Qt::transparent ); break; } - SAL_FALLTHROUGH; // QPalette::Window + [[fallthrough]]; // QPalette::Window case ControlType::Menubar: case ControlType::WindowBackground: m_image->fill( KApplication::palette().color(QPalette::Window).rgb() ); @@ -252,7 +252,7 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, m_image->fill( KApplication::palette().color(QPalette::Window).rgb() ); break; } - SAL_FALLTHROUGH; // Qt::transparent + [[fallthrough]]; // Qt::transparent default: m_image->fill( Qt::transparent ); break; diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 99f86049c71e..c28ac2f66601 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -5656,7 +5656,7 @@ static LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LP case WM_KILLFOCUS: DestroyCaret(); - SAL_FALLTHROUGH; + [[fallthrough]]; case WM_SETFOCUS: case SAL_MSG_POSTFOCUS: ImplHandleFocusMsg( hWnd ); diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx index 8abdff2ac1cc..9c8f5e5d3a58 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.cxx +++ b/winaccessibility/source/UAccCOM/MAccessible.cxx @@ -2988,7 +2988,7 @@ void CMAccessible::ConvertAnyToVariant(const css::uno::Any &rAnyVal, VARIANT *pv } } } - SAL_FALLTHROUGH; + [[fallthrough]]; } case TypeClass_SERVICE: case TypeClass_MODULE: diff --git a/winaccessibility/source/service/AccContainerEventListener.cxx b/winaccessibility/source/service/AccContainerEventListener.cxx index fefdd50827a6..c2af19c9b696 100644 --- a/winaccessibility/source/service/AccContainerEventListener.cxx +++ b/winaccessibility/source/service/AccContainerEventListener.cxx @@ -63,7 +63,7 @@ void AccContainerEventListener::notifyEvent( const css::accessibility::Accessib break; case AccessibleEventId::TEXT_CHANGED: HandleTextChangedEvent(aEvent.OldValue, aEvent.NewValue); - SAL_FALLTHROUGH; //TODO ??? + [[fallthrough]]; //TODO ??? case AccessibleEventId::VISIBLE_DATA_CHANGED: HandleVisibleDataChangedEvent(); break; diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 56a03ec877c8..aa3588cde860 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -2258,7 +2258,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) break; case NS_ooxml::LN_paratrackchange: m_pImpl->StartParaMarkerChange( ); - SAL_FALLTHROUGH; + [[fallthrough]]; case NS_ooxml::LN_CT_PPr_pPrChange: case NS_ooxml::LN_trackchange: case NS_ooxml::LN_EG_RPrContent_rPrChange: @@ -3469,7 +3469,7 @@ void DomainMapper::handleUnderlineType(const Id nId, const ::tools::SvRef<Proper break; case NS_ooxml::LN_Value_ST_Underline_words: rContext->Insert(PROP_CHAR_WORD_MODE, uno::makeAny(true)); - SAL_FALLTHROUGH; + [[fallthrough]]; case NS_ooxml::LN_Value_ST_Underline_single: nUnderline = awt::FontUnderline::SINGLE; break; @@ -3540,7 +3540,7 @@ void DomainMapper::handleParaJustification(const sal_Int32 nIntValue, const ::to break; case 4: nLastLineAdjust = style::ParagraphAdjust_BLOCK; - SAL_FALLTHROUGH; + [[fallthrough]]; case NS_ooxml::LN_Value_ST_Jc_both: nAdjust = style::ParagraphAdjust_BLOCK; aStringValue = "both"; diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 957cdbedf356..a8304c088f92 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -446,7 +446,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val) break; default: SAL_WARN("writerfilter", "unknown LN_CT_Style_type " << nType); - SAL_FALLTHROUGH; + [[fallthrough]]; case 0: // explicit unknown set by tokenizer break; diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index ff3da8a3ba5a..1c3448f59660 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -1725,7 +1725,7 @@ OOXMLFastContextHandlerShape::lcl_createFastChildContext case NMSP_vmlOffice: if (!bGroupShape) xContextHandler.set(OOXMLFactory::createFastChildContextFromStart(this, Element)); - SAL_FALLTHROUGH; + [[fallthrough]]; default: if (!xContextHandler.is()) { diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx b/writerfilter/source/rtftok/rtfdispatchflag.cxx index 833b38d16876..f6f4a2268843 100644 --- a/writerfilter/source/rtftok/rtfdispatchflag.cxx +++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx @@ -1069,7 +1069,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) auto pValue = new RTFValue(NS_ooxml::LN_Value_ST_PageOrientation_landscape); putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_orient, pValue); - SAL_FALLTHROUGH; // set the default + current value + [[fallthrough]]; // set the default + current value } case RTF_LNDSCPSXN: { diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx index 5f37d62b9d79..a83d35701020 100644 --- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx +++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx @@ -965,7 +965,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) case RTF_PAPERH: putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_h, pIntValue); - SAL_FALLTHROUGH; // set the default + current value + [[fallthrough]]; // set the default + current value case RTF_PGHSXN: putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_h, pIntValue); @@ -973,7 +973,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) case RTF_PAPERW: putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_w, pIntValue); - SAL_FALLTHROUGH; // set the default + current value + [[fallthrough]]; // set the default + current value case RTF_PGWSXN: putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_w, pIntValue); @@ -981,7 +981,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) case RTF_MARGL: putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_left, pIntValue); - SAL_FALLTHROUGH; // set the default + current value + [[fallthrough]]; // set the default + current value case RTF_MARGLSXN: putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_left, pIntValue); @@ -989,7 +989,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) case RTF_MARGR: putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_right, pIntValue); - SAL_FALLTHROUGH; // set the default + current value + [[fallthrough]]; // set the default + current value case RTF_MARGRSXN: putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_right, pIntValue); @@ -997,7 +997,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) case RTF_MARGT: putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_top, pIntValue); - SAL_FALLTHROUGH; // set the default + current value + [[fallthrough]]; // set the default + current value case RTF_MARGTSXN: putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_top, pIntValue); @@ -1005,7 +1005,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) case RTF_MARGB: putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_bottom, pIntValue); - SAL_FALLTHROUGH; // set the default + current value + [[fallthrough]]; // set the default + current value case RTF_MARGBSXN: putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_bottom, pIntValue); diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 67121203c7d8..7960f12eea15 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -331,7 +331,7 @@ int RTFSdrImport::initShape(uno::Reference<drawing::XShape>& o_xShape, o_xPropSet->setPropertyValue(i.Name, i.Value); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: createShape("com.sun.star.drawing.CustomShape", o_xShape, o_xPropSet); o_rIsCustomShape = true; diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx index a4f3b81be211..9acc19675bb1 100644 --- a/writerfilter/source/rtftok/rtfsprm.cxx +++ b/writerfilter/source/rtftok/rtfsprm.cxx @@ -199,10 +199,10 @@ static bool isSPRMChildrenExpected(Id nId) case NS_ooxml::LN_CT_PBdr_bottom: case NS_ooxml::LN_CT_PBdr_right: // Expected children are NS_ooxml::LN_CT_Border_*. - SAL_FALLTHROUGH; + [[fallthrough]]; case NS_ooxml::LN_CT_PrBase_shd: // Expected children are NS_ooxml::LN_CT_Shd_*. - SAL_FALLTHROUGH; + [[fallthrough]]; case NS_ooxml::LN_CT_PPrBase_ind: // Expected children are NS_ooxml::LN_CT_Ind_*. return true; diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx index 35218c5325f0..cb607630f502 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -239,7 +239,7 @@ SvXMLImportContextRef SchXMLTableContext::CreateChildContext( { case XML_TOK_TABLE_HEADER_COLS: mrTable.bHasHeaderColumn = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_TOK_TABLE_COLUMNS: pContext = new SchXMLTableColumnsContext( GetImport(), rLocalName, mrTable ); break; @@ -250,7 +250,7 @@ SvXMLImportContextRef SchXMLTableContext::CreateChildContext( case XML_TOK_TABLE_HEADER_ROWS: mrTable.bHasHeaderRow = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_TOK_TABLE_ROWS: pContext = new SchXMLTableRowsContext( mrImportHelper, GetImport(), rLocalName, mrTable ); break; diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx index e70dafd83b4e..d916d56e794e 100644 --- a/xmloff/source/core/nmspmap.cxx +++ b/xmloff/source/core/nmspmap.cxx @@ -197,7 +197,7 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey, case XML_NAMESPACE_UNKNOWN: // ...if it's a completely unknown namespace, assert and return the local name SAL_WARN("xmloff.core", "unknown namespace, probable missing xmlns: declaration"); - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_NAMESPACE_NONE: // ...if there isn't one, return the local name return rLocalName; diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index de66a89dcd8d..db53c162472d 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -690,7 +690,7 @@ void AnimationsExporterImpl::prepareNode( const Reference< XAnimationNode >& xNo { Reference< XIterateContainer > xIter( xNode, UNO_QUERY_THROW ); prepareValue( xIter->getTarget() ); - SAL_FALLTHROUGH; + [[fallthrough]]; } case AnimationNodeType::PAR: case AnimationNodeType::SEQ: diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 3f7337dd5030..6402d130f26e 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -870,7 +870,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax: xAudio->setSource( makeAny(lcl_GetMediaReference(GetImport(), rValue)) ); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; } case ANA_Target: { diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index c543eee01752..73a92b9592e3 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -399,7 +399,7 @@ void SdXMLEventContext::EndElement() case ClickAction_BOOKMARK: msBookmark = msBookmark.copy(1); - SAL_FALLTHROUGH; + [[fallthrough]]; case ClickAction_DOCUMENT: case ClickAction_PROGRAM: @@ -422,7 +422,7 @@ void SdXMLEventContext::EndElement() pProperties->State = beans::PropertyState_DIRECT_VALUE; pProperties++; - SAL_FALLTHROUGH; + [[fallthrough]]; case ClickAction_SOUND: pProperties->Name = "SoundURL"; diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index d0fee7480896..8a4e99168e58 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -1444,7 +1444,7 @@ namespace xmloff case FormComponentType::DATEFIELD: m_eType = DATE; knownType = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case FormComponentType::TIMEFIELD: if ( !knownType ) { @@ -1452,7 +1452,7 @@ namespace xmloff knownType = true; } m_nIncludeSpecial |= SCAFlags::Validation; - SAL_FALLTHROUGH; + [[fallthrough]]; case FormComponentType::NUMERICFIELD: case FormComponentType::CURRENCYFIELD: case FormComponentType::PATTERNFIELD: @@ -1461,7 +1461,7 @@ namespace xmloff m_eType = FORMATTED_TEXT; knownType = true; } - SAL_FALLTHROUGH; + [[fallthrough]]; case FormComponentType::TEXTFIELD: { // it's some kind of edit. To know which type we need further investigation @@ -1615,7 +1615,7 @@ namespace xmloff m_eType = BUTTON; m_nIncludeCommon |= CCAFlags::TabStop | CCAFlags::Label; m_nIncludeSpecial = SCAFlags::DefaultButton | SCAFlags::Toggle | SCAFlags::FocusOnClick | SCAFlags::ImagePosition | SCAFlags::RepeatDelay; - SAL_FALLTHROUGH; + [[fallthrough]]; case FormComponentType::IMAGEBUTTON: if (BUTTON != m_eType) { @@ -1632,7 +1632,7 @@ namespace xmloff case FormComponentType::CHECKBOX: m_eType = CHECKBOX; m_nIncludeSpecial = SCAFlags::CurrentState | SCAFlags::IsTristate | SCAFlags::State; - SAL_FALLTHROUGH; + [[fallthrough]]; case FormComponentType::RADIOBUTTON: m_nIncludeCommon = CCAFlags::Name | CCAFlags::ServiceName | CCAFlags::Disabled | CCAFlags::Label | CCAFlags::Printable | @@ -1697,7 +1697,7 @@ namespace xmloff default: OSL_FAIL("OControlExport::examineControl: unknown control type (class id)!"); - SAL_FALLTHROUGH; + [[fallthrough]]; case FormComponentType::NAVIGATIONBAR: // TODO: should we have an own file format for this? diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index e9ac0bba5dec..1099af354d77 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -126,7 +126,7 @@ Any PropertyConversion::convertString( const css::uno::Type& _rExpectedType, break; } bEnumAsInt = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case TypeClass_ENUM: { sal_uInt16 nEnumValue(0); diff --git a/xmloff/source/forms/valueproperties.cxx b/xmloff/source/forms/valueproperties.cxx index 94bd723c7a5b..1728ad7f4c90 100644 --- a/xmloff/source/forms/valueproperties.cxx +++ b/xmloff/source/forms/valueproperties.cxx @@ -61,7 +61,7 @@ namespace xmloff case FormComponentType::FILECONTROL: case FormComponentType::COMBOBOX: _rpValuePropertyName = PROPERTY_DEFAULT_TEXT; - SAL_FALLTHROUGH; + [[fallthrough]]; case FormComponentType::COMMANDBUTTON: _rpCurrentValuePropertyName = PROPERTY_TEXT; break; diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx index 4e835bf68a6e..d50bfbbfb83c 100644 --- a/xmloff/source/style/numehelp.cxx +++ b/xmloff/source/style/numehelp.cxx @@ -108,7 +108,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp { rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_FLOAT); bWasSetTypeAttribute = true; - SAL_FALLTHROUGH; + [[fallthrough]]; } case util::NumberFormat::PERCENT: { @@ -117,7 +117,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_PERCENTAGE); bWasSetTypeAttribute = true; } - SAL_FALLTHROUGH; + [[fallthrough]]; } case util::NumberFormat::CURRENCY: { @@ -374,7 +374,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes( { pExport->AddAttribute(sAttrValType, XML_FLOAT); bWasSetTypeAttribute = true; - SAL_FALLTHROUGH; + [[fallthrough]]; } case util::NumberFormat::PERCENT: { @@ -383,7 +383,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes( pExport->AddAttribute(sAttrValType, XML_PERCENTAGE); bWasSetTypeAttribute = true; } - SAL_FALLTHROUGH; + [[fallthrough]]; } case util::NumberFormat::CURRENCY: { diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 4a4028717490..98a8e72f17ce 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -1063,7 +1063,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt // number-style. case SvNumFormatType::UNDEFINED: SAL_WARN("xmloff.style","UNDEFINED number format: '" << rFormat.GetFormatstring() << "'"); - SAL_FALLTHROUGH; + [[fallthrough]]; // Type is 0 if a format contains no recognized elements // (like text only) - this is handled as a number-style. case SvNumFormatType::ALL: diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx index aeb74de1d951..7f62cf03dc95 100644 --- a/xmloff/source/text/XMLTextListBlockContext.cxx +++ b/xmloff/source/text/XMLTextListBlockContext.cxx @@ -266,7 +266,7 @@ SvXMLImportContextRef XMLTextListBlockContext::CreateChildContext( { case XML_TOK_TEXT_LIST_HEADER: bHeader = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_TOK_TEXT_LIST_ITEM: pContext = new XMLTextListItemContext( GetImport(), mrTxtImport, nPrefix, rLocalName, diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx index 66edfc6f7df8..3b2961e02ebe 100644 --- a/xmloff/source/text/XMLTextListItemContext.cxx +++ b/xmloff/source/text/XMLTextListItemContext.cxx @@ -141,7 +141,7 @@ SvXMLImportContextRef XMLTextListItemContext::CreateChildContext( { case XML_TOK_TEXT_H: bHeading = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_TOK_TEXT_P: pContext = new XMLParaContext( GetImport(), nPrefix, rLocalName, diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index ea00d0aae2cd..3e2533b8de35 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -217,7 +217,7 @@ void XMLTextMarkImportContext::EndElement() } } } - SAL_FALLTHROUGH; + [[fallthrough]]; case TypeFieldmark: { const char *formFieldmarkName=lcl_getFormFieldmarkName(m_sFieldName); @@ -284,7 +284,7 @@ void XMLTextMarkImportContext::EndElement() } } } - SAL_FALLTHROUGH; + [[fallthrough]]; case TypeFieldmarkEnd: { // get old range, and construct diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index 8e963dbe9e0a..552c72b69cc7 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -985,7 +985,7 @@ void XMLTextExportPropertySetMapper::ContextFilter( // no wrapping: disable para-only and contour if( pWrapParagraphOnlyState ) pWrapParagraphOnlyState->mnIndex = -1; - SAL_FALLTHROUGH; + [[fallthrough]]; case WrapTextMode_THROUGH: // wrap through: disable only contour if( pWrapContourState ) diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index cb192f8df4fb..8576b261d5ce 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -838,7 +838,7 @@ void XMLTextFieldExport::ExportFieldAutoStyle( bool dummy_for_autostyles(true); ExportMetaField(xPropSet, true, bProgress, dummy_for_autostyles); } - SAL_FALLTHROUGH; + [[fallthrough]]; case FIELD_ID_DOCINFO_PRINT_TIME: case FIELD_ID_DOCINFO_PRINT_DATE: case FIELD_ID_DOCINFO_CREATION_DATE: diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 60768588f3ee..c12ab120785f 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -2234,7 +2234,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext( { case XML_TOK_TEXT_H: bHeading = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_TOK_TEXT_P: pContext = new XMLParaContext( rImport, nPrefix, rLocalName, diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx index 7fa6d4bd00ef..a3303594ce7b 100644 --- a/xmloff/source/text/txtimppr.cxx +++ b/xmloff/source/text/txtimppr.cxx @@ -483,7 +483,7 @@ void XMLTextImportPropertyMapper::finished( case CTF_FRAMEHEIGHT_MIN_REL: // case CTF_SYNCHEIGHT_MIN: bHasAnyMinHeight = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case CTF_FRAMEHEIGHT_ABS: case CTF_FRAMEHEIGHT_REL: // case CTF_SYNCHEIGHT: @@ -491,7 +491,7 @@ void XMLTextImportPropertyMapper::finished( case CTF_FRAMEWIDTH_MIN_ABS: case CTF_FRAMEWIDTH_MIN_REL: bHasAnyMinWidth = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case CTF_FRAMEWIDTH_ABS: case CTF_FRAMEWIDTH_REL: bHasAnyWidth = true; break; diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index ee56231ccc93..45b5129c5973 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -835,7 +835,7 @@ void XMLStyleOASISTContext::StartElement( break; case XML_ATACTION_DECODE_STYLE_NAME: m_bControlStyle = rAttrValue.startsWith( "ctrl" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_ATACTION_DECODE_STYLE_NAME_REF: { OUString aAttrValue( rAttrValue ); diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 727deec521d2..1b864ae662c1 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -513,7 +513,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( break; case XML_ATACTION_RENAME_IN2INCH: bRename = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_ATACTION_IN2INCH: { OUString aAttrValue( rAttrValue ); @@ -530,7 +530,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( break; case XML_ATACTION_RENAME_INCH2IN: bRename = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_ATACTION_INCH2IN: { OUString aAttrValue( rAttrValue ); @@ -578,7 +578,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( break; case XML_ATACTION_RENAME_DECODE_STYLE_NAME_REF: bRename = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_ATACTION_DECODE_STYLE_NAME: case XML_ATACTION_DECODE_STYLE_NAME_REF: { @@ -605,7 +605,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( break; case XML_ATACTION_RENAME_ENCODE_STYLE_NAME_REF: bRename = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_ATACTION_ENCODE_STYLE_NAME_REF: { OUString aAttrValue( rAttrValue ); @@ -615,7 +615,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( break; case XML_ATACTION_RENAME_NEG_PERCENT: bRename = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_ATACTION_NEG_PERCENT: { OUString aAttrValue( rAttrValue ); @@ -625,7 +625,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( break; case XML_ATACTION_RENAME_ADD_NAMESPACE_PREFIX: bRename = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_ATACTION_ADD_NAMESPACE_PREFIX: { OUString aAttrValue( rAttrValue ); @@ -652,7 +652,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( break; case XML_ATACTION_RENAME_REMOVE_NAMESPACE_PREFIX: bRename = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_ATACTION_REMOVE_NAMESPACE_PREFIX: { OUString aAttrValue( rAttrValue ); |