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>

6 files changed, 14 insertions, 14 deletions

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: