basctl/source/basicide/bastype3.cxx | 1 basic/source/sbx/sbxbool.cxx | 1 basic/source/sbx/sbxbyte.cxx | 1 basic/source/sbx/sbxchar.cxx | 1 basic/source/sbx/sbxdate.cxx | 1 basic/source/sbx/sbxdbl.cxx | 1 basic/source/sbx/sbxdec.cxx | 1 basic/source/sbx/sbxint.cxx | 3 + basic/source/sbx/sbxlng.cxx | 1 basic/source/sbx/sbxsng.cxx | 1 basic/source/sbx/sbxstr.cxx | 1 basic/source/sbx/sbxuint.cxx | 1 basic/source/sbx/sbxulng.cxx | 1 editeng/source/items/numitem.cxx | 4 +- editeng/source/uno/unotext.cxx | 1 embeddedobj/source/msole/oleembed.cxx | 1 filter/source/graphicfilter/ios2met/ios2met.cxx | 34 ++++++++++++++++++ filter/source/graphicfilter/ipsd/ipsd.cxx | 2 + filter/source/pdf/pdfexport.cxx | 1 hwpfilter/source/hcode.cxx | 2 - i18npool/source/nativenumber/nativenumbersupplier.cxx | 1 idlc/source/astdump.cxx | 1 jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 2 + l10ntools/source/export.cxx | 2 - package/source/zipapi/Deflater.cxx | 1 package/source/zipapi/Inflater.cxx | 1 sal/osl/unx/socket.cxx | 1 sal/rtl/cipher.cxx | 14 +++++++ sal/rtl/uri.cxx | 1 sc/source/ui/undo/undoblk.cxx | 2 + sd/source/core/CustomAnimationEffect.cxx | 2 + sd/source/core/stlsheet.cxx | 1 sd/source/filter/eppt/pptx-epptbase.cxx | 30 +++++++++++++++ sd/source/filter/eppt/pptx-epptooxml.cxx | 1 svgio/source/svgreader/svgstyleattributes.cxx | 2 + svtools/source/brwbox/brwbox2.cxx | 3 + svtools/source/brwbox/ebbcontrols.cxx | 2 + svtools/source/contnr/fileview.cxx | 1 svtools/source/svhtml/parhtml.cxx | 2 + svx/source/customshapes/EnhancedCustomShape2d.cxx | 3 + svx/source/engine3d/viewpt3d2.cxx | 1 svx/source/fmcomp/fmgridcl.cxx | 10 +++++ svx/source/xoutdev/xattr2.cxx | 2 + sw/source/filter/html/htmlform.cxx | 1 sw/source/ui/frmdlg/column.cxx | 1 sw/source/uibase/docvw/edtwin.cxx | 2 + sw/source/uibase/uiview/srcview.cxx | 1 tools/source/fsys/urlobj.cxx | 1 unotools/source/config/bootstrap.cxx | 2 - vcl/source/filter/graphicfilter2.cxx | 1 vcl/source/filter/sgvspln.cxx | 6 +++ vcl/source/filter/wmf/enhwmf.cxx | 6 +++ vcl/source/gdi/pngread.cxx | 1 vcl/unx/kde4/KDESalGraphics.cxx | 1 xmloff/source/core/nmspmap.cxx | 1 xmloff/source/text/XMLTextListItemContext.cxx | 1 xmloff/source/text/txtimp.cxx | 1 xmloff/source/transform/TransformerBase.cxx | 7 +++ 58 files changed, 174 insertions(+), 5 deletions(-)
New commits: commit 6bf020fb7ef0a13188ece51d41dd101141b42b41 Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:12:16 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: I0dd8f3c1d9330bc58cf52212c9752adf51444d3d diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 008c516..a93a781 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -1585,6 +1585,7 @@ void SwHTMLParser::InsertInput() case HTML_IT_BUTTON: bKeepCRLFInValue = true; + SAL_FALLTHROUGH; case HTML_IT_SUBMIT: case HTML_IT_RESET: pType = "CommandButton"; diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 7f0480f..6a55d0f 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -898,6 +898,7 @@ void SwColumnPage::UpdateCols() switch(nCols) { case 3: bEnable3 = true; + SAL_FALLTHROUGH; case 2: bEnable12= true; break; default: /* do nothing */; } diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 8f1ac20..80571d2 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -4036,6 +4036,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt) if (pWrdCnt) pWrdCnt->UpdateCounts(); } + SAL_FALLTHROUGH; case MOUSE_LEFT + KEY_SHIFT: case MOUSE_LEFT + KEY_SHIFT + KEY_MOD1: @@ -4487,6 +4488,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt) bCallBase = false; break; } + SAL_FALLTHROUGH; case MOUSE_LEFT + KEY_MOD1: case MOUSE_LEFT + KEY_MOD2: case MOUSE_LEFT + KEY_SHIFT + KEY_MOD1: diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 37c366f..8e0b6c4 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -593,6 +593,7 @@ void SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem, break; case SvxSearchCmd::REPLACE_ALL: bAll = true; + SAL_FALLTHROUGH; case SvxSearchCmd::REPLACE: nFound = pTextView->Replace( aSearchOpt, bAll, bForward ); break; commit 8eb8b9c1d27d97c722ecd992521226a7a49d984c Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:10:32 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: I1f147c4a0ebc6895435722d8385131917f88ecb5 diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 04b1862..0f8545c 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -1280,6 +1280,7 @@ Any CustomAnimationEffect::getColor( sal_Int32 nIndex ) case AnimationNodeType::ANIMATE: if( !implIsColorAttribute( xAnimate->getAttributeName() ) ) break; + SAL_FALLTHROUGH; case AnimationNodeType::ANIMATECOLOR: Sequence<Any> aValues( xAnimate->getValues() ); if( aValues.hasElements() ) @@ -1326,6 +1327,7 @@ void CustomAnimationEffect::setColor( sal_Int32 nIndex, const Any& rColor ) case AnimationNodeType::ANIMATE: if( !implIsColorAttribute( xAnimate->getAttributeName() ) ) break; + SAL_FALLTHROUGH; case AnimationNodeType::ANIMATECOLOR: { Sequence<Any> aValues( xAnimate->getValues() ); diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index e326ba8..22e3060 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -685,6 +685,7 @@ OUString SdStyleSheet::GetFamilyString( SfxStyleFamily eFamily ) return OUString( "cell" ); default: OSL_FAIL( "SdStyleSheet::GetFamilyString(), illegal family!" ); + SAL_FALLTHROUGH; case SD_STYLE_FAMILY_GRAPHICS: return OUString( "graphics" ); } diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index e22fe9d..7bd4b65 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -849,30 +849,39 @@ sal_Int8 PPTWriterBase::GetTransition( FadeEffect eEffect, sal_uInt8& nDirection case FadeEffect_HORIZONTAL_STRIPES : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_VERTICAL_STRIPES : nPPTTransitionType = PPT_TRANSITION_TYPE_BLINDS; break; case FadeEffect_VERTICAL_CHECKERBOARD : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_HORIZONTAL_CHECKERBOARD : nPPTTransitionType = PPT_TRANSITION_TYPE_CHECKER; break; case FadeEffect_MOVE_FROM_UPPERLEFT : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_MOVE_FROM_UPPERRIGHT : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_MOVE_FROM_LOWERLEFT : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_MOVE_FROM_LOWERRIGHT : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_MOVE_FROM_TOP : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_MOVE_FROM_LEFT : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_MOVE_FROM_BOTTOM : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_MOVE_FROM_RIGHT : nPPTTransitionType = PPT_TRANSITION_TYPE_COVER; break; @@ -883,26 +892,33 @@ sal_Int8 PPTWriterBase::GetTransition( FadeEffect eEffect, sal_uInt8& nDirection case FadeEffect_VERTICAL_LINES : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_HORIZONTAL_LINES : nPPTTransitionType = PPT_TRANSITION_TYPE_RANDOM_BARS; break; case FadeEffect_CLOSE_HORIZONTAL : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_OPEN_HORIZONTAL : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_CLOSE_VERTICAL : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_OPEN_VERTICAL : nPPTTransitionType = PPT_TRANSITION_TYPE_SPLIT; break; case FadeEffect_FADE_FROM_UPPERLEFT : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_FADE_FROM_UPPERRIGHT : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_FADE_FROM_LOWERLEFT : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_FADE_FROM_LOWERRIGHT : nDirection += 4; nPPTTransitionType = PPT_TRANSITION_TYPE_STRIPS; @@ -910,44 +926,58 @@ sal_Int8 PPTWriterBase::GetTransition( FadeEffect eEffect, sal_uInt8& nDirection case FadeEffect_UNCOVER_TO_LOWERRIGHT : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_UNCOVER_TO_LOWERLEFT : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_UNCOVER_TO_UPPERRIGHT : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_UNCOVER_TO_UPPERLEFT : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_UNCOVER_TO_BOTTOM : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_UNCOVER_TO_RIGHT : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_UNCOVER_TO_TOP : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_UNCOVER_TO_LEFT : nPPTTransitionType = PPT_TRANSITION_TYPE_PULL; break; case FadeEffect_FADE_FROM_TOP : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_FADE_FROM_LEFT : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_FADE_FROM_BOTTOM : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_FADE_FROM_RIGHT : nPPTTransitionType = PPT_TRANSITION_TYPE_WIPE; break; case FadeEffect_ROLL_FROM_TOP : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_ROLL_FROM_LEFT : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_ROLL_FROM_BOTTOM : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_ROLL_FROM_RIGHT : nPPTTransitionType = PPT_TRANSITION_TYPE_WIPE; break; case FadeEffect_FADE_TO_CENTER : nDirection++; + SAL_FALLTHROUGH; case FadeEffect_FADE_FROM_CENTER : nPPTTransitionType = PPT_TRANSITION_TYPE_ZOOM; break; diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index dd5c3a9..32f7171 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -586,6 +586,7 @@ void PowerPointExport::WriteTransition( const FSHelperPtr& pFS ) break; case animations::TransitionSubType::CORNERSIN: // Inside turning cube pInverted = "true"; + SAL_FALLTHROUGH; case animations::TransitionSubType::CORNERSOUT: // Outside turning cube nTransition = XML_fade; nTransition14 = XML_prism; commit 7a8b384271d947248430cfb189165fc64cdbec0c Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:09:14 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: Id0470b3e60a455bc3807f4fa5da98cf5f1877d00 diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index 8379d46..766069c 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -231,6 +231,7 @@ void ScUndoInsertCells::DoChange( const bool bUndo ) case INS_INSCOLS_BEFORE: case INS_INSCOLS_AFTER: nPaint |= PAINT_TOP; // top bar + SAL_FALLTHROUGH; case INS_CELLSRIGHT: for( i=0; i<nCount; i++ ) { @@ -464,6 +465,7 @@ void ScUndoDeleteCells::DoChange( const bool bUndo ) break; case DEL_DELCOLS: nPaint |= PAINT_TOP; // top bar + SAL_FALLTHROUGH; case DEL_CELLSLEFT: for( i=0; i<nCount; i++ ) { commit bdacf96e3a52c30675c6cc0cbe037870cbeb4dda Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:08:02 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: Id6e230d026184ab243e994a17515f2e5539d3646 diff --git a/basic/source/sbx/sbxbool.cxx b/basic/source/sbx/sbxbool.cxx index 563c9f4..8e7e9cca 100644 --- a/basic/source/sbx/sbxbool.cxx +++ b/basic/source/sbx/sbxbool.cxx @@ -29,6 +29,7 @@ enum SbxBOOL ImpGetBool( const SbxValues* p ) { case SbxNULL: SbxBase::SetError( ERRCODE_SBX_CONVERSION ); + SAL_FALLTHROUGH; case SbxEMPTY: nRes = SbxFALSE; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxbyte.cxx b/basic/source/sbx/sbxbyte.cxx index adaf634..5527a56 100644 --- a/basic/source/sbx/sbxbyte.cxx +++ b/basic/source/sbx/sbxbyte.cxx @@ -30,6 +30,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_SBX_CONVERSION ); + SAL_FALLTHROUGH; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxchar.cxx b/basic/source/sbx/sbxchar.cxx index 52bd101..d03bcb9 100644 --- a/basic/source/sbx/sbxchar.cxx +++ b/basic/source/sbx/sbxchar.cxx @@ -30,6 +30,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_SBX_CONVERSION ); + SAL_FALLTHROUGH; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx index b678f22..4ed7ed0 100644 --- a/basic/source/sbx/sbxdate.cxx +++ b/basic/source/sbx/sbxdate.cxx @@ -39,6 +39,7 @@ double ImpGetDate( const SbxValues* p ) { case SbxNULL: SbxBase::SetError( ERRCODE_SBX_CONVERSION ); + SAL_FALLTHROUGH; case SbxEMPTY: nRes = 0; break; diff --git a/basic/source/sbx/sbxdbl.cxx b/basic/source/sbx/sbxdbl.cxx index c0997d0..cfe9640 100644 --- a/basic/source/sbx/sbxdbl.cxx +++ b/basic/source/sbx/sbxdbl.cxx @@ -31,6 +31,7 @@ double ImpGetDouble( const SbxValues* p ) { case SbxNULL: SbxBase::SetError( ERRCODE_SBX_CONVERSION ); + SAL_FALLTHROUGH; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx index b073ea1..22d7ba2 100644 --- a/basic/source/sbx/sbxdec.cxx +++ b/basic/source/sbx/sbxdec.cxx @@ -423,6 +423,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_SBX_CONVERSION ); + SAL_FALLTHROUGH; case SbxEMPTY: pnDecRes->setShort( 0 ); break; case SbxCHAR: diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx index 60eccdc..c2d6fbe 100644 --- a/basic/source/sbx/sbxint.cxx +++ b/basic/source/sbx/sbxint.cxx @@ -35,6 +35,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_SBX_CONVERSION ); + SAL_FALLTHROUGH; case SbxEMPTY: nRes = 0; break; case SbxCHAR: @@ -390,6 +391,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_SBX_CONVERSION ); + SAL_FALLTHROUGH; case SbxEMPTY: nRes = 0; break; case SbxCHAR: @@ -649,6 +651,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_SBX_CONVERSION ); + SAL_FALLTHROUGH; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxlng.cxx b/basic/source/sbx/sbxlng.cxx index 94c6f43b..b173e8c 100644 --- a/basic/source/sbx/sbxlng.cxx +++ b/basic/source/sbx/sbxlng.cxx @@ -30,6 +30,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_SBX_CONVERSION ); + SAL_FALLTHROUGH; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxsng.cxx b/basic/source/sbx/sbxsng.cxx index 723d1f2..74402c5 100644 --- a/basic/source/sbx/sbxsng.cxx +++ b/basic/source/sbx/sbxsng.cxx @@ -30,6 +30,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_SBX_CONVERSION ); + SAL_FALLTHROUGH; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxstr.cxx b/basic/source/sbx/sbxstr.cxx index 1bdc6fa..404036d 100644 --- a/basic/source/sbx/sbxstr.cxx +++ b/basic/source/sbx/sbxstr.cxx @@ -40,6 +40,7 @@ OUString ImpGetString( const SbxValues* p ) { case SbxNULL: SbxBase::SetError( ERRCODE_SBX_CONVERSION ); + SAL_FALLTHROUGH; case SbxEMPTY: break; case SbxCHAR: diff --git a/basic/source/sbx/sbxuint.cxx b/basic/source/sbx/sbxuint.cxx index b689c9f..89cf8bb 100644 --- a/basic/source/sbx/sbxuint.cxx +++ b/basic/source/sbx/sbxuint.cxx @@ -30,6 +30,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_SBX_CONVERSION ); + SAL_FALLTHROUGH; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxulng.cxx b/basic/source/sbx/sbxulng.cxx index 44be56e..dd79eea 100644 --- a/basic/source/sbx/sbxulng.cxx +++ b/basic/source/sbx/sbxulng.cxx @@ -30,6 +30,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_SBX_CONVERSION ); + SAL_FALLTHROUGH; case SbxEMPTY: nRes = 0; break; case SbxCHAR: commit 9c121778fec1d502ab0e1d7ff2da6f82df0cc8f2 Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:07:45 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: Ief09facecb6243815309a59e23a5673db5e1d94d diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx index 98782ea..0d0dc5e 100644 --- a/basctl/source/basicide/bastype3.cxx +++ b/basctl/source/basicide/bastype3.cxx @@ -233,6 +233,7 @@ SbxVariable* TreeListBox::FindVariable( SvTreeListEntry* pEntry ) break; case OBJ_TYPE_DOCUMENT_OBJECTS: bDocumentObjects = true; + SAL_FALLTHROUGH; case OBJ_TYPE_USERFORMS: case OBJ_TYPE_NORMAL_MODULES: case OBJ_TYPE_CLASS_MODULES: commit d567f8e242c40474cdbf0f43243185d334bbc331 Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:07:28 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: I49c216ed6e1e401fcc2029c047d7a7feeb767b36 diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index 6e88eb8..801e568 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -391,6 +391,7 @@ bool OleEmbeddedObject::TryToConvertToOOo() m_xParentStorage->dispose(); // ??? the storage has information loss, it should be closed without committing! throw uno::RuntimeException(); // the repairing is not possible } + SAL_FALLTHROUGH; case 2: try { commit d3ad80f08e4821eb0ac6999c3812384e8bfeb757 Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:07:11 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: I6df171debbf4940bf27898c3ff5d8597f437897f diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index f481f5e..253a5c8 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -1673,6 +1673,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) case GOrdStkPop: PopAttr(); break; case GOrdPIvAtr: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSIvAtr: { sal_uInt8 nA, nP, nFlags, nMix; sal_uLong nVal; @@ -1748,6 +1749,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; } case GOrdPIxCol: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSIxCol: { sal_uInt8 nFlags; sal_uLong nVal; @@ -1775,6 +1777,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) case GOrdPColor: case GOrdPXtCol: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSColor: case GOrdSXtCol: { sal_uInt8 nbyte; @@ -1803,6 +1806,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) } case GOrdPBgCol: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSBgCol: { sal_uInt16 nVal; Color aCol; @@ -1825,6 +1829,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; } case GOrdPBxCol: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSBxCol: { sal_uInt8 nFlags; sal_uLong nVal; @@ -1851,6 +1856,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) } case GOrdPMixMd: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSMixMd: { sal_uInt8 nMix; pOS2MET->ReadUChar( nMix ); @@ -1868,6 +1874,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; } case GOrdPBgMix: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSBgMix: { sal_uInt8 nMix; pOS2MET->ReadUChar( nMix ); @@ -1885,10 +1892,12 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; } case GOrdPPtSet: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSPtSet: SAL_INFO("filter.os2met","GOrdSPtSet"); break; case GOrdPPtSym: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSPtSym: { sal_uInt8 nPatt; pOS2MET->ReadUChar( nPatt ); @@ -1897,18 +1906,22 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) } case GOrdPPtRef: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSPtRef: SAL_INFO("filter.os2met","GOrdSPtRef"); break; case GOrdPLnEnd: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSLnEnd: break; case GOrdPLnJoi: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSLnJoi: break; case GOrdPLnTyp: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSLnTyp: { sal_uInt8 nType; pOS2MET->ReadUChar( nType ); @@ -1923,6 +1936,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; } case GOrdPLnWdt: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSLnWdt: { sal_uInt8 nbyte; pOS2MET->ReadUChar( nbyte ); @@ -1931,10 +1945,12 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; } case GOrdPFrLWd: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSFrLWd: break; case GOrdPStLWd: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSStLWd : { sal_uInt8 nFlags; @@ -1953,20 +1969,24 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; } case GOrdPChDir: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSChDir: break; case GOrdPChPrc: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSChPrc: break; case GOrdPChSet: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSChSet: { sal_uInt8 nbyte; pOS2MET->ReadUChar( nbyte ); aAttr.nChrSet=((sal_uLong)nbyte)&0xff; break; } case GOrdPChAng: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSChAng: { long nX,nY; nX=ReadCoord(bCoord32); nY=ReadCoord(bCoord32); @@ -1979,10 +1999,12 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; } case GOrdPChBrx: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSChBrx: break; case GOrdPChCel: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSChCel: { sal_uInt8 nbyte; sal_uInt16 nLen=nOrderLen; @@ -2000,18 +2022,22 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; } case GOrdPChXtr: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSChXtr: break; case GOrdPChShr: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSChShr: break; case GOrdPTxAlg: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSTxAlg: SAL_INFO("filter.os2met","GOrdSTxAlg"); break; case GOrdPMkPrc: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSMkPrc: { sal_uInt8 nbyte; pOS2MET->ReadUChar( nbyte ); @@ -2021,6 +2047,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) } case GOrdPMkSet: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSMkSet: { sal_uInt8 nbyte; pOS2MET->ReadUChar( nbyte ); @@ -2030,6 +2057,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) } case GOrdPMkSym: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSMkSym: { sal_uInt8 nbyte; pOS2MET->ReadUChar( nbyte ); @@ -2039,6 +2067,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) } case GOrdPMkCel: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSMkCel: { sal_uInt8 nbyte; sal_uInt16 nLen=nOrderLen; @@ -2054,6 +2083,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) } case GOrdPArcPa: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSArcPa: aAttr.nArcP=ReadCoord(bCoord32); aAttr.nArcQ=ReadCoord(bCoord32); @@ -2062,15 +2092,18 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; case GOrdPCrPos: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSCrPos: aAttr.aCurPos=ReadPoint(); break; case GOrdPMdTrn: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSMdTrn: SAL_INFO("filter.os2met","GOrdSMdTrn"); break; case GOrdPPkIdn: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSPkIdn: SAL_INFO("filter.os2met","GOrdSPkIdn"); break; @@ -2078,6 +2111,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) break; case GOrdPVwWin: PushAttr(nOrderID); + SAL_FALLTHROUGH; case GOrdSVwWin: SAL_INFO("filter.os2met","GOrdSVwWin"); break; default: SAL_INFO("filter.os2met","Unknown order: " << nOrderID); diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index 3dcc603..5b68a17 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -198,6 +198,7 @@ bool PSDReader::ImplReadHeader() { case 5 : mbTransparent = true; + SAL_FALLTHROUGH; case 4 : mnDestBitDepth = 24; break; @@ -214,6 +215,7 @@ bool PSDReader::ImplReadHeader() break; case 4 : mbTransparent = true; + SAL_FALLTHROUGH; case 3 : mnDestBitDepth = 24; break; diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index b19129f..68e8624 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -677,6 +677,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& default: case 2: aContext.Encryption.CanPrintFull = true; + SAL_FALLTHROUGH; case 1: aContext.Encryption.CanPrintTheDocument = true; break; commit ad5323b2aae7a69e58629717fb71618ffb727e8d Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:06:12 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: Iba1556d1918a336e376c0fda5e7e14b3e890d267 diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx index 201ec68..ff4a185 100644 --- a/svgio/source/svgreader/svgstyleattributes.cxx +++ b/svgio/source/svgreader/svgstyleattributes.cxx @@ -2425,6 +2425,7 @@ namespace svgio const SvgNumber aParentNumber = pSvgStyleAttributes->getFontSizeNumber(); return SvgNumber(aParentNumber.getNumber() / 1.2, aParentNumber.getUnit()); } + SAL_FALLTHROUGH; } case FontSize_medium: case FontSize_initial: @@ -2443,6 +2444,7 @@ namespace svgio const SvgNumber aParentNumber = pSvgStyleAttributes->getFontSizeNumber(); return SvgNumber(aParentNumber.getNumber() * 1.2, aParentNumber.getUnit()); } + SAL_FALLTHROUGH; } case FontSize_x_large: { commit 23b5935c7d5e14196bf2b961c7702281bee97ec3 Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:05:56 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: I8fcd7bf2583c935e060a29e43c88614681d81d13 diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 4867715..32ed136 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -1683,6 +1683,7 @@ bool BrowseBox::ProcessKey( const KeyEvent& rEvt ) case KEY_TAB: if ( !bColumnCursor ) break; + SAL_FALLTHROUGH; case KEY_RIGHT: nId = BROWSER_CURSORRIGHT; break; case KEY_LEFT: nId = BROWSER_CURSORLEFT; break; case KEY_SPACE: nId = BROWSER_SELECT; break; @@ -1817,6 +1818,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) nNewId != HandleColumnId && GoToColumnId( nNewId ); break; } + SAL_FALLTHROUGH; case BROWSER_CURSORENDOFFILE: GoToRow( nRowCount - 1, false ); break; @@ -1856,6 +1858,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) } break; } + SAL_FALLTHROUGH; case BROWSER_CURSORTOPOFFILE: GoToRow( 0, false ); break; diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index cfd1d47..9bdd524 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -109,6 +109,7 @@ namespace svt case KEY_RETURN: if (rBox.IsInDropDown()) return false; + SAL_FALLTHROUGH; default: return true; } @@ -188,6 +189,7 @@ namespace svt case KEY_PAGEDOWN: if (rBox.IsTravelSelect()) return false; + SAL_FALLTHROUGH; default: return true; } diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 51e3890..7e338be 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -1170,6 +1170,7 @@ FileViewResult SvtFileView::Initialize( case eStillRunning: OSL_ENSURE( pAsyncDescriptor, "SvtFileView::Initialize: we told it to read synchronously!" ); + SAL_FALLTHROUGH; case eSuccess: return eResult; } diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index d27cc0e..931890b 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -1760,6 +1760,7 @@ int HTMLParser::FilterXMP( int nToken ) case HTML_NEWPARA: if( bPre_IgnoreNewPara ) nToken = 0; + SAL_FALLTHROUGH; case HTML_TEXTTOKEN: case HTML_NONBREAKSPACE: case HTML_SOFTHYPH: @@ -1800,6 +1801,7 @@ int HTMLParser::FilterListing( int nToken ) case HTML_NEWPARA: if( bPre_IgnoreNewPara ) nToken = 0; + SAL_FALLTHROUGH; case HTML_TEXTTOKEN: case HTML_NONBREAKSPACE: case HTML_SOFTHYPH: commit 3dfcfdb9ed32c2fff3a3df510e289db7697cdce1 Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:05:32 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: I8a42f027d4970fe31c0e713d1402668499c8dda7 diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index a7d514f..f263ac8 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -1498,6 +1498,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm } aNewB2DPolygon.clear(); } + SAL_FALLTHROUGH; } case ANGLEELLIPSETO : { @@ -1704,6 +1705,8 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm } aNewB2DPolygon.clear(); + + SAL_FALLTHROUGH; } case ARCTO : case CLOCKWISEARCTO : diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx index 1096124..635590d 100644 --- a/svx/source/engine3d/viewpt3d2.cxx +++ b/svx/source/engine3d/viewpt3d2.cxx @@ -152,6 +152,7 @@ void Viewport3D::SetDeviceWindow(const Rectangle& rRect) aViewWin.H *= fRatio; break; } + SAL_FALLTHROUGH; case AS_HOLD_X: if (nNewW == 0) throw o3tl::divide_by_zero(); diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 15c9c3b..45a8fc4 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -803,51 +803,61 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe break; case SID_FM_EDIT + nChangeTypeOffset: bReplace = true; + SAL_FALLTHROUGH; case SID_FM_EDIT: aFieldType = FM_COL_TEXTFIELD; break; case SID_FM_COMBOBOX + nChangeTypeOffset: bReplace = true; + SAL_FALLTHROUGH; case SID_FM_COMBOBOX: aFieldType = FM_COL_COMBOBOX; break; case SID_FM_LISTBOX + nChangeTypeOffset: bReplace = true; + SAL_FALLTHROUGH; case SID_FM_LISTBOX: aFieldType = FM_COL_LISTBOX; break; case SID_FM_CHECKBOX + nChangeTypeOffset: bReplace = true; + SAL_FALLTHROUGH; case SID_FM_CHECKBOX: aFieldType = FM_COL_CHECKBOX; break; case SID_FM_DATEFIELD + nChangeTypeOffset: bReplace = true; + SAL_FALLTHROUGH; case SID_FM_DATEFIELD: aFieldType = FM_COL_DATEFIELD; break; case SID_FM_TIMEFIELD + nChangeTypeOffset: bReplace = true; + SAL_FALLTHROUGH; case SID_FM_TIMEFIELD: aFieldType = FM_COL_TIMEFIELD; break; case SID_FM_NUMERICFIELD + nChangeTypeOffset: bReplace = true; + SAL_FALLTHROUGH; case SID_FM_NUMERICFIELD: aFieldType = FM_COL_NUMERICFIELD; break; case SID_FM_CURRENCYFIELD + nChangeTypeOffset: bReplace = true; + SAL_FALLTHROUGH; case SID_FM_CURRENCYFIELD: aFieldType = FM_COL_CURRENCYFIELD; break; case SID_FM_PATTERNFIELD + nChangeTypeOffset: bReplace = true; + SAL_FALLTHROUGH; case SID_FM_PATTERNFIELD: aFieldType = FM_COL_PATTERNFIELD; break; case SID_FM_FORMATTEDFIELD + nChangeTypeOffset: bReplace = true; + SAL_FALLTHROUGH; case SID_FM_FORMATTEDFIELD: aFieldType = FM_COL_FORMATTEDFIELD; break; diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index 23c6760..3e21f21 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -70,6 +70,7 @@ bool XLineTransparenceItem::GetPresentation { case SFX_ITEM_PRESENTATION_COMPLETE: rText = OUString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) ) + ": "; + SAL_FALLTHROUGH; case SFX_ITEM_PRESENTATION_NAMELESS: rText += unicode::formatPercent(GetValue(), Application::GetSettings().GetUILanguageTag()); @@ -429,6 +430,7 @@ bool XFillTransparenceItem::GetPresentation { case SFX_ITEM_PRESENTATION_COMPLETE: rText = OUString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) ) + ": "; + SAL_FALLTHROUGH; case SFX_ITEM_PRESENTATION_NAMELESS: rText += unicode::formatPercent(GetValue(), Application::GetSettings().GetUILanguageTag()); commit 03f440c379a03500a40cc34097c68a150d7a226d Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:04:40 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: I796ec3b79d7c26d9efe275b4232ae85cac80b578 diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx index 1a3af32..a2eee2c 100644 --- a/vcl/source/filter/graphicfilter2.cxx +++ b/vcl/source/filter/graphicfilter2.cxx @@ -876,6 +876,7 @@ bool GraphicDescriptor::ImpDetectPSD( SvStream& rStm, bool bExtendedInfo ) case 4 : case 3 : nBitsPerPixel = 24; + SAL_FALLTHROUGH; case 2 : case 1 : aPixSize.Width() = nColumns; diff --git a/vcl/source/filter/sgvspln.cxx b/vcl/source/filter/sgvspln.cxx index 7129b0a..fae580e 100644 --- a/vcl/source/filter/sgvspln.cxx +++ b/vcl/source/filter/sgvspln.cxx @@ -426,16 +426,19 @@ sal_uInt16 NaturalSpline(sal_uInt16 n, double* x, double* y, c[0] =c[0]-h[0]; b[n-2]=b[n-2]-h[n-1]; } + SAL_FALLTHROUGH; } case 1: { a[0] =a[0]-1.5*((y[1]-y[0])/h[0]-Marg0); a[n-2]=a[n-2]-1.5*(MargN-(y[n]-y[n-1])/h[n-1]); d[0] =d[0]-h[0]*0.5; d[n-2]=d[n-2]-h[n-1]*0.5; + SAL_FALLTHROUGH; } case 2: { a[0] =a[0]-h[0]*Marg0*0.5; a[n-2]=a[n-2]-h[n-1]*MargN*0.5; + SAL_FALLTHROUGH; } case 3: { a[0] =a[0]+Marg0*h[0]*h[0]*0.5; @@ -460,16 +463,19 @@ sal_uInt16 NaturalSpline(sal_uInt16 n, double* x, double* y, c[0]=c[1]+h[0]*(c[1]-c[2])/h[1]; c[n]=c[n-1]+h[n-1]*(c[n-1]-c[n-2])/h[n-2]; } + SAL_FALLTHROUGH; } case 1: { c[0]=1.5*((y[1]-y[0])/h[0]-Marg0); c[0]=(c[0]-c[1]*h[0]*0.5)/h[0]; c[n]=1.5*((y[n]-y[n-1])/h[n-1]-MargN); c[n]=(c[n]-c[n-1]*h[n-1]*0.5)/h[n-1]; + SAL_FALLTHROUGH; } case 2: { c[0]=Marg0*0.5; c[n]=MargN*0.5; + SAL_FALLTHROUGH; } case 3: { c[0]=c[1]-Marg0*h[0]*0.5; diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index ed02537..ebb42cf 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -954,12 +954,14 @@ bool EnhWMFReader::ReadEnhWMF() aLineInfo.SetLineCap( css::drawing::LineCap_ROUND ); break; } + SAL_FALLTHROUGH; case PS_ENDCAP_SQUARE : if ( aSize.Width() ) { aLineInfo.SetLineCap( css::drawing::LineCap_SQUARE ); break; } + SAL_FALLTHROUGH; case PS_ENDCAP_FLAT : default : aLineInfo.SetLineCap( css::drawing::LineCap_BUTT ); @@ -1042,12 +1044,14 @@ bool EnhWMFReader::ReadEnhWMF() aLineInfo.SetLineCap( css::drawing::LineCap_ROUND ); break; } + SAL_FALLTHROUGH; case PS_ENDCAP_SQUARE : if ( aLineInfo.GetWidth() ) { aLineInfo.SetLineCap( css::drawing::LineCap_SQUARE ); break; } + SAL_FALLTHROUGH; case PS_ENDCAP_FLAT : default : aLineInfo.SetLineCap( css::drawing::LineCap_BUTT ); @@ -1168,6 +1172,7 @@ bool EnhWMFReader::ReadEnhWMF() case EMR_ABORTPATH : pOut->ClearPath(); + SAL_FALLTHROUGH; case EMR_ENDPATH : bRecordPath = false; break; @@ -1527,6 +1532,7 @@ bool EnhWMFReader::ReadEnhWMF() case EMR_EXTTEXTOUTA : bFlag = true; + SAL_FALLTHROUGH; case EMR_EXTTEXTOUTW : { sal_Int32 nLeft, nTop, nRight, nBottom, ptlReferenceX, ptlReferenceY, nGfxMode, nXScale, nYScale; diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index 223e0e3..3c260f1 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -570,6 +570,7 @@ bool PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint ) { case 16 : mnTargetDepth = 8; // we have to reduce the bitmap + SAL_FALLTHROUGH; case 8 : mbGrayScale = true; break; diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx index 9bbebce..70fafa5 100644 --- a/vcl/unx/kde4/KDESalGraphics.cxx +++ b/vcl/unx/kde4/KDESalGraphics.cxx @@ -694,6 +694,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, break; } + SAL_FALLTHROUGH; case CTRL_COMBOBOX: case CTRL_LISTBOX: { commit 2ea7fe2522856167c5dc50a4f5b82805761a6977 Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:04:20 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: I646abf83b4dce8c92a3ba1c136d968bb9291dd83 diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx index 8392c20..d0fb65f 100644 --- a/xmloff/source/core/nmspmap.cxx +++ b/xmloff/source/core/nmspmap.cxx @@ -199,6 +199,7 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey, case XML_NAMESPACE_UNKNOWN: // ...if it's a completely unknown namespace, assert and return the local name SAL_WARN("xmloff.core", "unknown namespace, probable missing xmlns: declaration"); + SAL_FALLTHROUGH; case XML_NAMESPACE_NONE: // ...if there isn't one, return the local name return rLocalName; diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx index a255ecf..f448e73 100644 --- a/xmloff/source/text/XMLTextListItemContext.cxx +++ b/xmloff/source/text/XMLTextListItemContext.cxx @@ -143,6 +143,7 @@ SvXMLImportContext *XMLTextListItemContext::CreateChildContext( { case XML_TOK_TEXT_H: bHeading = true; + SAL_FALLTHROUGH; case XML_TOK_TEXT_P: pContext = new XMLParaContext( GetImport(), nPrefix, rLocalName, diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 768ae88..e35e6c3 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -2150,6 +2150,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext( { case XML_TOK_TEXT_H: bHeading = true; + SAL_FALLTHROUGH; case XML_TOK_TEXT_P: pContext = new XMLParaContext( rImport, nPrefix, rLocalName, diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 6f22f9c..e7d955c 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -548,6 +548,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( break; case XML_ATACTION_RENAME_IN2INCH: bRename = true; + SAL_FALLTHROUGH; case XML_ATACTION_IN2INCH: { OUString aAttrValue( rAttrValue ); @@ -564,6 +565,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( break; case XML_ATACTION_RENAME_INCH2IN: bRename = true; + SAL_FALLTHROUGH; case XML_ATACTION_INCH2IN: { OUString aAttrValue( rAttrValue ); @@ -611,6 +613,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( break; case XML_ATACTION_RENAME_DECODE_STYLE_NAME_REF: bRename = true; + SAL_FALLTHROUGH; case XML_ATACTION_DECODE_STYLE_NAME: case XML_ATACTION_DECODE_STYLE_NAME_REF: { @@ -637,6 +640,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( break; case XML_ATACTION_RENAME_ENCODE_STYLE_NAME_REF: bRename = true; + SAL_FALLTHROUGH; case XML_ATACTION_ENCODE_STYLE_NAME_REF: { OUString aAttrValue( rAttrValue ); @@ -646,6 +650,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( break; case XML_ATACTION_RENAME_NEG_PERCENT: bRename = true; + SAL_FALLTHROUGH; case XML_ATACTION_NEG_PERCENT: { OUString aAttrValue( rAttrValue ); @@ -655,6 +660,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( break; case XML_ATACTION_RENAME_ADD_NAMESPACE_PREFIX: bRename = true; + SAL_FALLTHROUGH; case XML_ATACTION_ADD_NAMESPACE_PREFIX: { OUString aAttrValue( rAttrValue ); @@ -681,6 +687,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( break; case XML_ATACTION_RENAME_REMOVE_NAMESPACE_PREFIX: bRename = true; + SAL_FALLTHROUGH; case XML_ATACTION_REMOVE_NAMESPACE_PREFIX: { OUString aAttrValue( rAttrValue ); commit ddb4988c581cb891c6f55ef4435f6b625b7bfe2d Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:03:59 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: I005943a7c7bc4f8bfc647b2cf44f143a66a7e997 diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 41ef9f0..2f2a80a 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -549,8 +549,8 @@ OUString SvxNumberFormat::CreateRomanString( sal_uLong nNo, bool bUpper ) } switch( nZahl ) { - case 3: { sRet += OUString(*cRomanArr); } - case 2: { sRet += OUString(*cRomanArr); } + case 3: { sRet += OUString(*cRomanArr); SAL_FALLTHROUGH; } + case 2: { sRet += OUString(*cRomanArr); SAL_FALLTHROUGH; } case 1: { sRet += OUString(*cRomanArr); } break; diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index e6db1ab..91a8ad1 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -1911,6 +1911,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text return; } + SAL_FALLTHROUGH; } default: throw lang::IllegalArgumentException(); commit 7d91753c5bf91a830620651652fe96dbeed77a92 Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:03:22 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: Ieee43fce49b7f07d6b356e8c2e34e9e92b605957 diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx index 6af18af..e1694d2 100644 --- a/package/source/zipapi/Deflater.cxx +++ b/package/source/zipapi/Deflater.cxx @@ -83,6 +83,7 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence < sal_Int8 > &rBuffer, sal_Int { case Z_STREAM_END: bFinished = true; + SAL_FALLTHROUGH; case Z_OK: nOffset += nLength - pStream->avail_in; nLength = pStream->avail_in; diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx index 1129901..d99d8cb 100644 --- a/package/source/zipapi/Inflater.cxx +++ b/package/source/zipapi/Inflater.cxx @@ -116,6 +116,7 @@ sal_Int32 Inflater::doInflateBytes (Sequence < sal_Int8 > &rBuffer, sal_Int32 n { case Z_STREAM_END: bFinished = true; + SAL_FALLTHROUGH; case Z_OK: nOffset += nLength - pStream->avail_in; nLength = pStream->avail_in; commit 21fcb2b4a2e4c2c846b9d844434dcd84f8dd728b Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:02:53 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: Ib0cb61ce63b065f6e2845ef7e8da0827556110ba diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index f176a42..269a4f2 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -378,7 +378,7 @@ void Export::Execute( int nToken, const char * pToken ) return; case RSCDEFINE: bDefine = true; // res. defined in macro - + SAL_FALLTHROUGH; case RESOURCE: case RESOURCEEXPR: { if ( nToken != RSCDEFINE ) commit bade0a1517245c6f57caf586de6c9c8bc49ed4b9 Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:02:32 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: I0dccdf984f4b171feab20e8400376cf8846ffe2e diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 90e813e..f1d33b1 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -300,6 +300,7 @@ FileHandleReader::readLine(OString * pLine) { case 0x0D: m_bLf = true; + SAL_FALLTHROUGH; case 0x0A: *pLine += OString(m_aBuffer + nStart, m_nIndex - 1 - nStart); @@ -360,6 +361,7 @@ void AsynchReader::execute() { case osl_File_E_PIPE: //HACK! for windows nRead = 0; + SAL_FALLTHROUGH; case osl_File_E_None: break; default: commit 2188f877ed4c5536e21dfac125d04bb4364ce330 Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:02:15 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: I07f247f003a5522e7d655f30f7c68d1b8f7225f2 diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx index ea267b2..c8a87ec 100644 --- a/idlc/source/astdump.cxx +++ b/idlc/source/astdump.cxx @@ -200,6 +200,7 @@ bool AstService::dump(RegistryKey& rKey) getRealService()->getRelativName(); break; } + SAL_FALLTHROUGH; case NT_interface_member: case NT_observes: case NT_needs: commit 0664c36889e082589dc3dd584ab657536c561af2 Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:02:00 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: I041971ad00b6b2e41509fa6b877c0563748f1336 diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index 6aa76d6..628a27f 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -669,6 +669,7 @@ sal_Bool SAL_CALL NativeNumberSupplierService::isValidNatNum( const Locale& rLoc case NativeNumberMode::NATNUM2: // Char, Upper if (langnum == 4) // Hebrew numbering return true; + SAL_FALLTHROUGH; case NativeNumberMode::NATNUM4: // Text, Lower, Long case NativeNumberMode::NATNUM5: // Text, Upper, Long case NativeNumberMode::NATNUM6: // Text, FullWidth commit b994589cec224de4d0ab33d115c76ada7823921e Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:01:40 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: I41dec58c163bdd33b71b3519fa0fd6eca72faae6 diff --git a/hwpfilter/source/hcode.cxx b/hwpfilter/source/hcode.cxx index 103b343..271eb9d 100644 --- a/hwpfilter/source/hcode.cxx +++ b/hwpfilter/source/hcode.cxx @@ -473,7 +473,7 @@ static hchar lineCharConv(hchar ch) case 0x3060 + '\'' - 31: case 0x3060 + '\"' - 31: ch--; - + SAL_FALLTHROUGH; case 0x3060 + '\'' - 32: case 0x3060 + '\"' - 32: case 0x3060 + '{' - 32: commit f01ba80990c96b8761079c363b87aea676e5acd9 Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:01:22 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: Ib67f7cb71255a32810f09a6b7e528f024bbef9df diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx index 02fb6c9..02000fb 100644 --- a/sal/osl/unx/socket.cxx +++ b/sal/osl/unx/socket.cxx @@ -554,6 +554,7 @@ sal_Bool SAL_CALL osl_isEqualSocketAddr ( (pInetAddr1->sin_addr.s_addr == pInetAddr2->sin_addr.s_addr) && (pInetAddr1->sin_port == pInetAddr2->sin_port)) return true; + SAL_FALLTHROUGH; } default: diff --git a/sal/rtl/cipher.cxx b/sal/rtl/cipher.cxx index 1923099..959aa8a3 100644 --- a/sal/rtl/cipher.cxx +++ b/sal/rtl/cipher.cxx @@ -47,12 +47,19 @@ switch ((n)) \ { \ case 8: (xr) = ((sal_uInt32)(*(--(c)))); \ + SAL_FALLTHROUGH; \ case 7: (xr) |= ((sal_uInt32)(*(--(c)))) << 8L; \ + SAL_FALLTHROUGH; \ case 6: (xr) |= ((sal_uInt32)(*(--(c)))) << 16L; \ + SAL_FALLTHROUGH; \ case 5: (xr) |= ((sal_uInt32)(*(--(c)))) << 24L; \ + SAL_FALLTHROUGH; \ case 4: (xl) = ((sal_uInt32)(*(--(c)))); \ + SAL_FALLTHROUGH; \ case 3: (xl) |= ((sal_uInt32)(*(--(c)))) << 8L; \ + SAL_FALLTHROUGH; \ case 2: (xl) |= ((sal_uInt32)(*(--(c)))) << 16L; \ + SAL_FALLTHROUGH; \ case 1: (xl) |= ((sal_uInt32)(*(--(c)))) << 24L; \ } \ } @@ -63,12 +70,19 @@ switch ((n)) \ { \ case 8: *(--(c)) = (sal_uInt8)(((xr) ) & 0xff); \ + SAL_FALLTHROUGH; \ case 7: *(--(c)) = (sal_uInt8)(((xr) >> 8L) & 0xff); \ + SAL_FALLTHROUGH; \ case 6: *(--(c)) = (sal_uInt8)(((xr) >> 16L) & 0xff); \ + SAL_FALLTHROUGH; \ case 5: *(--(c)) = (sal_uInt8)(((xr) >> 24L) & 0xff); \ + SAL_FALLTHROUGH; \ case 4: *(--(c)) = (sal_uInt8)(((xl) ) & 0xff); \ + SAL_FALLTHROUGH; \ case 3: *(--(c)) = (sal_uInt8)(((xl) >> 8L) & 0xff); \ + SAL_FALLTHROUGH; \ case 2: *(--(c)) = (sal_uInt8)(((xl) >> 16L) & 0xff); \ + SAL_FALLTHROUGH; \ case 1: *(--(c)) = (sal_uInt8)(((xl) >> 24L) & 0xff); \ } \ } diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx index a77eef1..aff2c77 100644 --- a/sal/rtl/uri.cxx +++ b/sal/rtl/uri.cxx @@ -624,6 +624,7 @@ void SAL_CALL rtl_uriDecode(rtl_uString * pText, writeEscapeOctet(pResult, &nCapacity, nUtf32); break; } + SAL_FALLTHROUGH; case EscapeNo: writeUcs4(pResult, &nCapacity, nUtf32); break; commit 6a922dcc4feddca3596df9e68da853913b403560 Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:01:00 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: Ic764a6499b8f5ecac62d326151b0957c53866e08 diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index a1c7e4b..85a3b5a 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -504,7 +504,7 @@ static Bootstrap::FailureCode describeError(OUStringBuffer& _rBuf, Bootstrap::Im eErrCode = Bootstrap::INVALID_BOOTSTRAP_FILE_ENTRY; break; - case Bootstrap::DATA_INVALID: OSL_ASSERT(false); + case Bootstrap::DATA_INVALID: OSL_ASSERT(false); SAL_FALLTHROUGH; case Bootstrap::PATH_VALID: addFileError(_rBuf, _rData.aBootstrapINI_.path, IS_MISSING); eErrCode = Bootstrap::MISSING_BOOTSTRAP_FILE; commit 895eaa5b02591f61f2e9c9e7a8dc0a82231477cc Author: Stephan Bergmann <[email protected]> Date: Tue May 10 17:00:38 2016 +0200 Add SAL_FALLTHROUGH, where apparently appropriate Change-Id: I28bca2b15cb2d6f521efbcc27e93be2338500489 diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 41761d9..c31e61a 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -1171,6 +1171,7 @@ bool INetURLObject::setAbsURIRef(OUString const & rTheAbsURIRef, break; } } + SAL_FALLTHROUGH; default: { // For INetProtocol::File, allow an empty authority ("//") to be _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
