diff options
Diffstat (limited to 'sw/source/core')
45 files changed, 77 insertions, 77 deletions
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: { |