diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-08 09:46:01 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-08 13:28:16 +0100 |
| commit | ab9b67bbb001f380b3973941443bfbc59fe7141c (patch) | |
| tree | 4737847b2970d2310932f115935a9454aacff6fe /sw/source/core/undo | |
| parent | 3c0cb54b7ca20439e7e5e1e19dc6fcc75709973b (diff) | |
Remove obsolete SAL_FALLTHROUGH completely
...after 7ffdd830d5fb52f2ca25aa80277d22ea6d89970b
"HAVE_CPP_ATTRIBUTE_FALLTHROUGH is always true now"
Change-Id: I54e5ff4e036a6bb3e5774d1c0524158aae18e937
Reviewed-on: https://gerrit.libreoffice.org/64800
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw/source/core/undo')
| -rw-r--r-- | sw/source/core/undo/unattr.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/undo/undobj1.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/undo/untbl.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
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: { |