Remove obsolete SAL_FALLTHROUGH completely

...after 7ffdd830d5fb52f2ca25aa80277d22ea6d89970b
"HAVE_CPP_ATTRIBUTE_FALLTHROUGH is always true now"

Change-Id: I54e5ff4e036a6bb3e5774d1c0524158aae18e937
Reviewed-on: https://gerrit.libreoffice.org/64800
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

33 files changed, 62 insertions, 62 deletions

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;
         }