sw/source/core/bastyp/calc.cxx | 2 +-
sw/source/core/text/itrtxt.cxx | 1 +
sw/source/core/txtnode/atrfld.cxx | 1 +
sw/source/filter/html/htmltab.cxx | 5 +++++
sw/source/uibase/docvw/edtwin.cxx | 1 +
5 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 6356b3374788cc9e90e23dd17cc3ff536ac7fed8
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed May 11 17:08:36 2016 +0200
Add SAL_FALLTHROUGH, where apparently appropriate
Change-Id: I4394a2e54da7c8a0e998db818211b0935b4cb1cd
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index cb9e985..a82ea01 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 4c4c9c4..0c174ee 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 2e895c9..d19ec03 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 cf7e789..3f6a930 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 762f4ab..5a4c0b7 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() )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
