Insert explicit "break" when falling through to empty next case

...which itself only contains a "break" (or nothing at all at the end of the
"switch"), as otherwise Clang -Wimplicit-fallthrough would warn about these.

Change-Id: I25c1cf2ca74dfeba7ca0385ca8f1c1bf30bbf91b
This commit is contained in:
Stephan Bergmann
2016-05-10 14:57:26 +02:00
parent 356cef6435
commit 0f3ac23d73
67 changed files with 102 additions and 18 deletions
+1
View File
@@ -422,6 +422,7 @@ void Player::processMessage( GstMessage *message )
if (mbPlayPending)
mbPlayPending = ((newstate == GST_STATE_READY) || (newstate == GST_STATE_PAUSED));
}
break;
default:
break;
}
+2 -1
View File
@@ -73,8 +73,9 @@ OUString lcl_createClassificationStringForType( ObjectType eObjectType
case OBJECTTYPE_DATA_ERRORS_Y: //parent is intended to be OBJECTTYPE_DATA_ERRORS
case OBJECTTYPE_DATA_ERRORS_Z: //parent is intended to be OBJECTTYPE_DATA_ERRORS
aRet=m_aMultiClick;
break;
default:
;//empty string
break;//empty string
}
if( !rDragMethodServiceName.isEmpty() )
{
@@ -227,6 +227,7 @@ awt::Point RelativePositionHelper::getCenterOfAnchoredObject(
case drawing::Alignment_TOP:
case drawing::Alignment_TOP_RIGHT:
fYDelta += aUnrotatedObjectSize.Height/2;
break;
default:
// nothing to do
break;
@@ -917,8 +917,9 @@ sal_Bool java_sql_ResultSet::convertFastPropertyValue(
break;
case PROPERTY_ID_FETCHSIZE:
bRet = ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchSize());
break;
default:
;
break;
}
return bRet;
}
@@ -319,6 +319,7 @@ void OTools::ThrowException(const OConnection* _pConnection,
case SQL_NO_DATA_FOUND:
if(_bNoFound)
return; // no need to throw a exception
break;
case SQL_ERROR: break;
+1
View File
@@ -826,6 +826,7 @@ OSQLParseNode* OSQLParser::convertNode(sal_Int32 nType, OSQLParseNode* pLiteral)
case DataType::CLOB:
if ( !SQL_ISRULE(pReturn,char_value_exp) && !buildStringNodes(pReturn) )
pReturn = nullptr;
break;
default:
break;
}
@@ -91,9 +91,10 @@ static bool relatesToInterface(typelib_TypeDescription * pTypeDescr)
TYPELIB_DANGER_RELEASE( pTD );
if (bRel)
return true;
break;
}
default:
;
break;
}
}
if (pComp->pBaseTypeDescription)
+1
View File
@@ -80,6 +80,7 @@ SvxLineTabDialog::SvxLineTabDialog
case OBJ_MEASURE:
case OBJ_EDGE:
bLineOnly = true;
break;
default:
break;
+1
View File
@@ -541,6 +541,7 @@ sal_Bool SAL_CALL OApplicationController::suspend(sal_Bool bSuspend) throw( Runt
break;
case RET_CANCEL:
bCanSuspend = false;
break;
default:
break;
}
@@ -331,6 +331,7 @@ namespace dbaui
aFileDlg.AddFilter(sFilterName,sExt);
aFileDlg.SetCurrentFilter(sFilterName);
askForFileName(aFileDlg);
break;
}
default:
break;
@@ -355,6 +356,7 @@ namespace dbaui
aFileDlg.AddFilter(sFilterName,sExt);
aFileDlg.SetCurrentFilter(sFilterName);
askForFileName(aFileDlg);
break;
}
default:
break;
@@ -562,6 +562,7 @@ sal_Bool SAL_CALL OTableController::suspend(sal_Bool /*_bSuspend*/) throw( Runti
break;
case RET_CANCEL:
bCheck = false;
break;
default:
break;
}
@@ -589,6 +590,7 @@ sal_Bool SAL_CALL OTableController::suspend(sal_Bool /*_bSuspend*/) throw( Runti
break;
case RET_CANCEL:
bCheck = false;
break;
default:
break;
}
@@ -964,6 +964,7 @@ namespace accessibility
case text::textfield::Type::EXTENDED_FILE:
case text::textfield::Type::DOCINFO_TITLE:
strFldType = "file name";
break;
default:
break;
}
@@ -718,6 +718,7 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha
case TAV_BOTTOM :
case TAV_NORMAL :
aTextPos.Y -= static_cast<sal_Int32>( mpCGM->pElement->nCharacterHeight * 1.5 );
break;
case TAV_TOP :
break;
case TAV_CAP:
@@ -632,6 +632,7 @@ ipsGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
case 0x0a :
if ( --nScanLines < 0 )
bIsValid = false;
break;
case 0x09 :
case 0x0d :
case 0x20 :
@@ -209,6 +209,7 @@ bool PSDReader::ImplReadHeader()
{
case 2 :
mbTransparent = true;
break;
case 1 :
break;
case 4 :
+2
View File
@@ -2486,6 +2486,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
case mso_sptTextCircleCurve :
case mso_sptTextButtonCurve :
bTextPathFitShape = false;
break;
default : break;
}
}
@@ -5133,6 +5134,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
case mso_txflHorzA:
bVerticalText = true;
nTextRotationAngle = 9000;
break;
case mso_txflHorzN:
default :
break;
+3
View File
@@ -3258,6 +3258,7 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const
#ifdef DBG_UTIL
default :
OSL_FAIL( "PPTExParaProv::PPTExParaProv - unknown atom reading ppt2000 num rules (SJ)" );
break;
case PPT_PST_MasterText : // first seen in: ms-tt02.ppt
case PPT_PST_SrKinsoku :
case PPT_PST_TextDefaults9Atom :
@@ -3312,6 +3313,7 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const
break;
default :
OSL_FAIL( "PPTExParaProv::PPTExParaProv - unknown atom, assuming PPT_PST_ExtendedParagraphMasterAtom (SJ)" );
break;
case PPT_PST_HashCodeAtom :
case PPT_PST_BuildList :
case PPT_PST_SlideFlags10Atom :
@@ -6555,6 +6557,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
// fall-through
case PPT_MASTERPAGE :
nInstance++;
break;
case PPT_SLIDEPAGE :
break;
default :
+1
View File
@@ -549,6 +549,7 @@ EquationResult Read_SubF_Combined(WW8ReadFieldParams& rReadParam)
}
}
}
break;
}
default:
break;
+2
View File
@@ -1605,6 +1605,7 @@ struct ShapeWritingVisitor
break;
case XML_R:
r = convLength(sAttributeValue,maCurrState,'r');
break;
default:
// skip
break;
@@ -1643,6 +1644,7 @@ struct ShapeWritingVisitor
break;
case XML_RY:
ry = convLength(sAttributeValue,maCurrState,'v');
break;
default:
// skip
break;
+1
View File
@@ -1316,6 +1316,7 @@ namespace frm
default:
break;
}
break;
}
default:
break;
+1 -2
View File
@@ -178,9 +178,8 @@ void Formula::makeExpr(Node *res)
break;
case ID_BLOCK:
makeBlock(tmp);
//fall-through
break;
case ID_BEGIN:
//fall-through
case ID_END:
break;
}
+1
View File
@@ -263,6 +263,7 @@ bool MsLangId::isTraditionalChinese( LanguageType nLang )
case LANGUAGE_CHINESE_HONGKONG:
case LANGUAGE_CHINESE_MACAU:
bRet = true;
break;
default:
break;
}
@@ -354,6 +354,7 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
}
rShape->setSize(aTotalSize);
break;
}
default:
+1
View File
@@ -430,6 +430,7 @@ void ControlConverter::convertToAxBorder( PropertySet& rPropSet,
break;
case API_BORDER_SUNKEN:
nSpecialEffect = AX_SPECIALEFFECT_SUNKEN;
break;
case API_BORDER_NONE:
default:
break;
@@ -123,6 +123,7 @@ ContextHandlerRef PPTGraphicShapeContext::onCreateContext( sal_Int32 aElementTok
case XML_sldImg : // notes/notesmaster
case XML_pic : // slide/layout
nFirstPlaceholder = nSubType;
break;
default:
break;
}
+1
View File
@@ -118,6 +118,7 @@ ContextHandlerRef PPTShapeContext::onCreateContext( sal_Int32 aElementToken, con
case XML_sldImg : // notes/notesmaster
case XML_pic : // slide/layout
nFirstPlaceholder = nSubType;
break;
default:
break;
}
+2 -1
View File
@@ -91,8 +91,9 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32
break;
case (XML_SD_TYPES_START+34):
pHandler = new xmloff::ImageScaleModeHandler();
break;
default:
;
break;
}
if ( !pHandler )
@@ -663,6 +663,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const OUString & PropertyName, c
Value >>= sValue;
aNewValue <<= impl_ConvertUIToMimeType_nothrow(sValue);
}
break;
default:
break;
}
+1
View File
@@ -2329,6 +2329,7 @@ public:
break;
case CELLTYPE_STRING:
rColumn.SetRawString(aBlockPos, r.mnRow, *r.maValue.mpString, false);
break;
default:
;
}
+2 -1
View File
@@ -461,8 +461,9 @@ bool setCacheTableReferenced(formula::FormulaToken& rToken, ScExternalRefManager
* have to be marked as well, if so. Mechanism would be
* different. */
OSL_FAIL("ScDocument::MarkUsedExternalReferences: implement the svExternalName case!");
break;
default:
;
break;
}
return false;
}
+1
View File
@@ -179,6 +179,7 @@ void ScDPOutputGeometry::adjustFieldsForDataLayout(sal_uInt32& rColumnFields, sa
case Row:
if (rRowFields > 0)
rRowFields -= 1;
break;
default:
;
}
+3
View File
@@ -684,6 +684,7 @@ ScMatrixValue ScMatrixImpl::Get(SCSIZE nC, SCSIZE nR) const
assert(false);
}
aVal.fVal = 0.0;
break;
default:
;
}
@@ -1554,6 +1555,7 @@ public:
for (size_t i = 0; i < node.size; ++i)
compare();
}
break;
default:
;
}
@@ -1792,6 +1794,7 @@ public:
*miPos = op(*miPos, 0.0);
}
}
break;
default:
;
}
+1
View File
@@ -1564,6 +1564,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
case svUnknown:
// We don't support vectorization on these.
meVectorState = FormulaVectorDisabled;
break;
default:
;
}
+1
View File
@@ -276,6 +276,7 @@ XclExpExtCfRule::XclExpExtCfRule( const XclExpRoot& rRoot, const ScFormatEntry&
mxEntry.reset(new XclExpExtIconSet(*this, rIconSet, rPos));
pType = "iconSet";
}
break;
default:
break;
}
+1
View File
@@ -2143,6 +2143,7 @@ void XclExpFmlaCompImpl::ProcessExternalName( const XclExpScToken& rTokData )
mxData->mpLinkMgr->StoreCellRange(
nFileId, pScToken->GetString().getString(), aRefData.toAbs(*mxData->mpScBasePos));
}
break;
default:
; // nothing, avoid compiler warning
}
@@ -286,8 +286,9 @@ void NumberFormatPropertyPanel::NotifyItemUpdate(
mpEdDecimals->SetValue(nPrecision);
mpEdLeadZeroes->SetValue(nLeadZeroes);
}
break;
default:
;
break;
}
}
+1
View File
@@ -3519,6 +3519,7 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam)
case SVX_VER_JUSTIFY_TOP:
// align to top
aLogicStart.Y() -= nGap;
break;
default:
;
}
+1
View File
@@ -201,6 +201,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
// fall-through
case 2 : // semi-automatic
mnDiaMode++;
break;
default :
case 0 : // manual
break;
+1
View File
@@ -400,6 +400,7 @@ void LayoutMenu::AssignLayoutToSelectedSlides (AutoLayout aLayout)
if (pDrawViewShell != nullptr)
if (pDrawViewShell->GetEditMode() == EM_MASTERPAGE)
bMasterPageMode = true;
break;
}
default:
break;
@@ -90,6 +90,7 @@ void MasterPageContainerFiller::RunNextStep()
mrContainerAdapter.FillingDone();
mpScannerTask.reset();
}
break;
default:
break;
}
@@ -446,6 +446,7 @@ void MasterPagesSelector::NotifyContainerChangeEvent (const MasterPageContainerC
{
int nIndex (GetIndexForToken(rEvent.maChildToken));
SetItem(nIndex, MasterPageContainer::NIL_TOKEN);
break;
}
default:
+1
View File
@@ -243,6 +243,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
Cancel();
rReq.Done ();
break;
}
default:
break;
+2 -1
View File
@@ -3088,9 +3088,10 @@ void DrawViewShell::ExecChar( SfxRequest &rReq )
FuText::ChangeFontSize( nSId == SID_GROW_FONT_SIZE, nullptr, pFontList, mpView );
GetViewFrame()->GetBindings().Invalidate( SID_ATTR_CHAR_FONTHEIGHT );
}
break;
}
default:
;
break;
}
mpDrawView->SetAttributes(aNewAttr);
+1
View File
@@ -473,6 +473,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
UpdatePreview( mpActualPage );
rReq.Done();
}
break;
default:
break;
+1
View File
@@ -229,6 +229,7 @@ bool View::InsertMetaFile( TransferableDataHelper& rDataHelper, const Point& rPo
break;
default: break;
}
break;
default: break;
}
@@ -1038,6 +1038,7 @@ void PresenterController::HandleNumericKeyPress (
// Ignore unsupported key.
break;
}
break;
default:
// Ignore unsupported modifiers.
+1
View File
@@ -379,6 +379,7 @@ uno::Any SAL_CALL IFrameObject::getPropertyValue(const OUString& aPropertyName)
{
aAny <<= (sal_Int32 ) maFrmDescr.GetMargin().Height();
}
break;
default: ;
}
return aAny;
+3 -2
View File
@@ -120,6 +120,7 @@ static bool getNumericValue( double & rfVal, const OUString & rStr )
bNeg = true;
else if (trim[0] != '+')
return false;
break;
case 1: // 0x...
break;
default:
@@ -200,6 +201,7 @@ static bool getHyperValue( sal_Int64 & rnVal, const OUString & rStr )
bNeg = true;
else if (trim[0] != '+')
return false;
break;
case 1: // 0x...
break;
default:
@@ -728,9 +730,8 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina
switch (aSourceClass)
{
default:
{
aRet <<= (toDouble( rVal ) != 0.0);
}
break;
case TypeClass_ENUM: // exclude enums
break;
@@ -6223,6 +6223,7 @@ sal_Int16 GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType )
case mso_sptVerticalScroll :
case mso_sptHorizontalScroll :
nGluePointType = css::drawing::EnhancedCustomShapeGluePointType::RECT;
break;
default: break;
}
}
+1
View File
@@ -753,6 +753,7 @@ IMPL_LINK_TYPED( IMapWindow, MenuSelectHdl, Menu*, pMenu, bool )
case MN_DELETE1:
pView->DeleteMarked();
break;
default :
break;
+2
View File
@@ -194,6 +194,7 @@ bool SwFlowFrame::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKee
case SVX_BREAK_PAGE_BOTH:
{
bKeep = false;
break;
}
default: break;
}
@@ -247,6 +248,7 @@ bool SwFlowFrame::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKee
case SVX_BREAK_PAGE_BEFORE:
case SVX_BREAK_PAGE_BOTH:
bKeep = false;
break;
default: break;
}
}
+1
View File
@@ -635,6 +635,7 @@ OUString SwFormToken::GetString() const
{
sData = OUString::number( nAuthorityField ) + sData;
}
break;
default:
break;
}
+2 -1
View File
@@ -820,8 +820,9 @@ void SwHTMLParser::MovePageDescAttrs( SwNode *pSrcNd,
if( bFormatBreak )
pDestContentNd->SetAttr( *pItem );
pSrcContentNd->ResetAttr( RES_BREAK );
break;
default:
;
break;
}
}
}
+2 -1
View File
@@ -3726,8 +3726,9 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
case SVX_BREAK_PAGE_BOTH:
pFrameFormat->SetFormatAttr( *pItem2 );
pOldTextNd->ResetAttr( RES_BREAK );
break;
default:
;
break;
}
}
}
+4 -2
View File
@@ -1264,9 +1264,10 @@ static void ParseCSS1_font_variant( const CSS1Expression *pExpr,
rItemSet.Put( SvxCaseMapItem( (SvxCaseMap)nCaseMap,
aItemIds.nCaseMap ) );
}
break;
}
default:
;
break;
}
}
@@ -1290,9 +1291,10 @@ static void ParseCSS1_text_transform( const CSS1Expression *pExpr,
rItemSet.Put( SvxCaseMapItem( (SvxCaseMap)nCaseMap,
aItemIds.nCaseMap ) );
}
break;
}
default:
;
break;
}
}
@@ -2553,6 +2553,7 @@ void DocxAttributeOutput::StartRedline( const SwRedlineData * pRedlineData )
case nsRedlineType_t::REDLINE_FORMAT:
OSL_TRACE( "TODO DocxAttributeOutput::StartRedline()" );
break;
default:
break;
}
+1
View File
@@ -786,6 +786,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
case mso_txflHorzA:
bVerticalText = true;
nTextRotationAngle = 9000;
break;
case mso_txflHorzN:
default :
break;
+1
View File
@@ -1304,6 +1304,7 @@ short WW8_BRCVer9::DetermineBorderProperties(short *pSpace) const
case 5:
case 22:
OSL_FAIL("Can't create these from the menus, please report");
break;
default:
case 23: //Only 3pt in the menus, but honours the size setting.
break;
+1
View File
@@ -99,6 +99,7 @@ SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
// use only these metrics
sal_Int32 nPos = m_pMetricLB->InsertEntry( sMetric );
m_pMetricLB->SetEntryData( nPos, reinterpret_cast<void*>((sal_IntPtr)eFUnit) );
break;
}
default:; //prevent warning
}
+1
View File
@@ -155,6 +155,7 @@ SwContentOptPage::SwContentOptPage( vcl::Window* pParent,
sal_Int32 nPos = m_pVMetric->InsertEntry( sMetric );
m_pVMetric->SetEntryData( nPos, reinterpret_cast<void*>((sal_IntPtr)eFUnit) );
}
break;
}
default:;//prevent warning
}
+9 -2
View File
@@ -578,7 +578,10 @@ void SwDocStyleSheet::SetHidden( bool bValue )
bChg = true;
}
}
default:;
break;
default:
break;
}
if( bChg )
@@ -625,7 +628,9 @@ bool SwDocStyleSheet::IsHidden( ) const
SwNumRule* pRule = rDoc.FindNumRulePtr( aName );
bRet = pRule && pRule->IsHidden( );
}
default:;
break;
default:
break;
}
return bRet;
@@ -717,6 +722,7 @@ bool SwDocStyleSheet::HasParentSupport() const
case SfxStyleFamily::Char :
case SfxStyleFamily::Para :
case SfxStyleFamily::Frame: bRet = true;
break;
default:; //prevent warning
}
return bRet;
@@ -730,6 +736,7 @@ bool SwDocStyleSheet::HasClearParentSupport() const
case SfxStyleFamily::Para :
case SfxStyleFamily::Char :
case SfxStyleFamily::Frame: bRet = true;
break;
default:; //prevent warning
}
return bRet;
+1
View File
@@ -1009,6 +1009,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
case HEADLINE_BOXATTRCOPY:
case HEADLINE_BOXATRCOLLCOPY:
rSh.SplitTable(pType->GetValue()) ;
break;
default: ;//wrong parameter, do nothing
}
}
+2
View File
@@ -1436,6 +1436,7 @@ OUString SwXTextViewCursor::getString()
SwWrtShell& rSh = m_pView->GetWrtShell();
SwPaM* pShellCursor = rSh.GetCursor();
SwUnoCursorHelper::GetTextFromPam(*pShellCursor, uRet);
break;
}
default:;//prevent warning
}
@@ -1467,6 +1468,7 @@ void SwXTextViewCursor::setString(const OUString& aString)
SwWrtShell& rSh = m_pView->GetWrtShell();
SwCursor* pShellCursor = rSh.GetSwCursor();
SwUnoCursorHelper::SetString(*pShellCursor, aString);
break;
}
default:;//prevent warning
}
+3 -1
View File
@@ -1637,7 +1637,9 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const css::uno::Any&
case WINDOW_GROUPBOX:
case WINDOW_FIXEDLINE:
pWindow->SetPaintTransparent( false );
default: ;
break;
default:
break;
}
pWindow->Invalidate(); // Invalidate if control does not respond to it
}
+2
View File
@@ -1815,6 +1815,8 @@ void WinMtfOutput::ResolveBitmapActions( BSaveStructList_impl& rSaveList )
SetRasterOp( R2_NOT );
DrawRect( aRect, false );
}
break;
case 0xa : // no operation
break;
}
+1
View File
@@ -983,6 +983,7 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p
case WINDOW_ERRORBOX:
case WINDOW_QUERYBOX:
nFrameStyle |= SalFrameStyleFlags::DIALOG;
break;
default:
break;
}
+1
View File
@@ -903,6 +903,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
contentRect = boundingRect = rect;
retVal = true;
}
break;
}
default:
break;