diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-05-11 17:08:36 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-05-11 17:08:36 +0200 |
| commit | 6356b3374788cc9e90e23dd17cc3ff536ac7fed8 (patch) | |
| tree | e8d9cb569d38036d6065a0a950780a4e0f5ae9a7 /sw | |
| parent | 0a5f9d780662f40ffd6bd03eaec79b909277e4e7 (diff) | |
Add SAL_FALLTHROUGH, where apparently appropriate
Change-Id: I4394a2e54da7c8a0e998db818211b0935b4cb1cd
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/bastyp/calc.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/text/itrtxt.cxx | 1 | ||||
| -rw-r--r-- | sw/source/core/txtnode/atrfld.cxx | 1 | ||||
| -rw-r--r-- | sw/source/filter/html/htmltab.cxx | 5 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/edtwin.cxx | 1 |
5 files changed, 9 insertions, 1 deletions
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index cb9e98583152..a82ea0130aa6 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -727,7 +727,7 @@ SwCalcOper SwCalc::GetToken() eCurrOper = eCurrListOper; break; } - + SAL_FALLTHROUGH; case '\n': eCurrOper = CALC_PRINT; break; diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx index 4c4c9c4b1ccb..0c174ee2ee3a 100644 --- a/sw/source/core/text/itrtxt.cxx +++ b/sw/source/core/text/itrtxt.cxx @@ -280,6 +280,7 @@ sal_uInt16 SwTextCursor::AdjustBaseLine( const SwLineLayout& rLine, nOfst += ( rLine.Height() - nPorHeight ) / 2 + nPorAscent; break; } + SAL_FALLTHROUGH; case SvxParaVertAlignItem::BASELINE : // base line nOfst = nOfst + rLine.GetAscent(); diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index 2e895c947a5f..d19ec0367155 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -284,6 +284,7 @@ void SwFormatField::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) case RES_HIDDENPARAFLD: if( !pOld || RES_HIDDENPARA_PRINT != pOld->Which() ) break; + SAL_FALLTHROUGH; case RES_DBSETNUMBERFLD: case RES_DBNUMSETFLD: case RES_DBNEXTSETFLD: diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index cf7e7899cbc3..3f6a93092572 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -3987,6 +3987,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, if( !pSaveStruct->IsInSection() && 1==aToken.getLength() && ' '==aToken[0] ) break; + SAL_FALLTHROUGH; default: if( !pSaveStruct->IsInSection() ) { @@ -4282,6 +4283,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, bool bReadOptions, !pCurTable->HasParentSection()) && 1==aToken.getLength() && ' '==aToken[0] ) break; + SAL_FALLTHROUGH; default: pCurTable->MakeParentContents(); NextToken( nToken ); @@ -4444,6 +4446,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable, !pCurTable->HasParentSection()) && 1==aToken.getLength() && ' ' == aToken[0] ) break; + SAL_FALLTHROUGH; default: pCurTable->MakeParentContents(); NextToken( nToken ); @@ -4660,6 +4663,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable, !pCurTable->HasParentSection()) && 1==aToken.getLength() && ' '==aToken[0] ) break; + SAL_FALLTHROUGH; default: pCurTable->MakeParentContents(); NextToken( nToken ); @@ -5233,6 +5237,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust, !pCurTable->HasParentSection()) && 1==aToken.getLength() && ' '==aToken[0] ) break; + SAL_FALLTHROUGH; default: pCurTable->MakeParentContents(); NextToken( nToken ); diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 762f4abd2baa..5a4c0b7ddf3a 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -4042,6 +4042,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt) case MOUSE_LEFT + KEY_SHIFT + KEY_MOD1: if ( !m_bMBPressed ) break; + SAL_FALLTHROUGH; case MOUSE_LEFT + KEY_MOD1: if ( g_bFrameDrag && rSh.IsSelFrameMode() ) { |