diff options
Diffstat (limited to 'sw')
90 files changed, 200 insertions, 200 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: { 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 |