Bin commented-out unreachable 'break' statements

Change-Id: If0f47a78bbffec5c2ebd33c552d0d8a300b48eb1
This commit is contained in:
Tor Lillqvist
2014-11-24 14:13:13 +02:00
parent 2119906423
commit 766f7388dd
13 changed files with 8 additions and 36 deletions
-2
View File
@@ -984,14 +984,12 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, v
pEditView->Undo();
return true;
}
// break;
case KeyFuncType::REDO:
{
if ( !bReadOnly )
pEditView->Redo();
return true;
}
// break;
default: // is then possible edited below.
eFunc = KeyFuncType::DONTKNOW;
-2
View File
@@ -242,12 +242,10 @@ bool Options_Impl::initOptions_Impl (std::vector< std::string > & rArgs)
return badOption("invalid", (*first).c_str());
}
return printUsage();
// break; // Unreachable
}
default:
{
return badOption("unknown", (*first).c_str());
// break; // Unreachable
}
}
}
-1
View File
@@ -122,7 +122,6 @@ static bool lcl_HasRelRef( ScDocument* pDoc, ScTokenArray* pFormula, sal_uInt16
case ocTable: // SHEET() returns own sheet index
case ocCell: // CELL() may return own cell address
return true;
// break;
default:
{
// added to avoid warnings
-1
View File
@@ -2504,7 +2504,6 @@ sal_uInt16 ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos ) const
}
#endif
return nEdges;
// break;
}
default:
return 0;
-2
View File
@@ -3000,7 +3000,6 @@ void ScInterpreter::ScValue()
return;
case svDouble:
return; // leave on stack
//break;
case svSingleRef:
case svDoubleRef:
@@ -3046,7 +3045,6 @@ void ScInterpreter::ScValue()
case SC_MATVAL_BOOLEAN:
PushDouble( fVal);
return;
//break;
case SC_MATVAL_STRING:
// evaluated below
break;
-2
View File
@@ -312,10 +312,8 @@ ScParameterClassification::Type ScParameterClassification::GetParameterType(
{
case ocExternal:
return GetExternalParameterType( pToken, nParameter);
//break;
case ocMacro:
return Reference;
//break;
default:
{
// added to avoid warnings
+4 -4
View File
@@ -169,10 +169,10 @@ static const char* lcl_GetActivePane( sal_uInt8 nActivePane )
{
switch( nActivePane )
{
case EXC_PANE_TOPLEFT: return "topLeft"; //break;
case EXC_PANE_TOPRIGHT: return "topRight"; //break;
case EXC_PANE_BOTTOMLEFT: return "bottomLeft"; //break;
case EXC_PANE_BOTTOMRIGHT: return "bottomRight"; //break;
case EXC_PANE_TOPLEFT: return "topLeft";
case EXC_PANE_TOPRIGHT: return "topRight";
case EXC_PANE_BOTTOMLEFT: return "bottomLeft";
case EXC_PANE_BOTTOMRIGHT: return "bottomRight";
}
return "**error: lcl_GetActivePane";
}
-8
View File
@@ -1025,10 +1025,8 @@ CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI
{
case RID_SCPAGE_OPREDLINE :
return ScRedlineOptionsTabPage::Create;
//break;
case RID_SCPAGE_CALC :
return ScTpCalcOptions::Create;
//break;
case RID_SCPAGE_FORMULA:
return ScTpFormulaOptions::Create;
case RID_SCPAGE_COMPATIBILITY:
@@ -1037,20 +1035,14 @@ CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI
return ScTpDefaultsOptions::Create;
case RID_SCPAGE_PRINT :
return ScTpPrintOptions::Create;
//break;
case RID_SCPAGE_STAT :
return ScDocStatPage::Create;
//break;
case RID_SCPAGE_USERLISTS :
return ScTpUserLists::Create;
//break;
case RID_SCPAGE_CONTENT :
return ScTpContentOptions::Create;
//break;
case RID_SCPAGE_LAYOUT :
return ScTpLayoutOptions::Create;
//break;
default:
break;
}
-1
View File
@@ -285,7 +285,6 @@ bool ScImportExport::ImportString( const OUString& rText, sal_uLong nFmt )
return ImportStream( aStrm, OUString(), nFmt );
// ImportStream must handle RTL_TEXTENCODING_UNICODE
}
//break;
default:
{
rtl_TextEncoding eEnc = osl_getThreadTextEncoding();
-1
View File
@@ -577,7 +577,6 @@ void ScEditShell::Execute( SfxRequest& rReq )
ScGlobal::OpenURL( pURLField->GetURL(), pURLField->GetTargetFrame() );
return;
}
//break;
case FN_INSERT_SOFT_HYPHEN:
lclInsertCharacter( pTableView, pTopView, CHAR_SHY );
-7
View File
@@ -1523,7 +1523,6 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
SVX_HOR_JUSTIFY_LEFT : SVX_HOR_JUSTIFY_STANDARD, SID_H_ALIGNCELL ) );
ExecuteSlot( rReq, GetInterface() );
return;
//break;
case SID_ALIGNRIGHT:
rReq.SetSlot( SID_H_ALIGNCELL );
@@ -1532,7 +1531,6 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
SVX_HOR_JUSTIFY_RIGHT : SVX_HOR_JUSTIFY_STANDARD, SID_H_ALIGNCELL ) );
ExecuteSlot( rReq, GetInterface() );
return;
//break;
case SID_ALIGNCENTERHOR:
rReq.SetSlot( SID_H_ALIGNCELL );
@@ -1541,7 +1539,6 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
SVX_HOR_JUSTIFY_CENTER : SVX_HOR_JUSTIFY_STANDARD, SID_H_ALIGNCELL ) );
ExecuteSlot( rReq, GetInterface() );
return;
//break;
case SID_ALIGNBLOCK:
rReq.SetSlot( SID_H_ALIGNCELL );
@@ -1550,7 +1547,6 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
SVX_HOR_JUSTIFY_BLOCK : SVX_HOR_JUSTIFY_STANDARD, SID_H_ALIGNCELL ) );
ExecuteSlot( rReq, GetInterface() );
return;
//break;
case SID_ALIGNTOP:
rReq.SetSlot( SID_V_ALIGNCELL );
@@ -1559,7 +1555,6 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
SVX_VER_JUSTIFY_TOP : SVX_VER_JUSTIFY_STANDARD, SID_V_ALIGNCELL ) );
ExecuteSlot( rReq, GetInterface() );
return;
//break;
case SID_ALIGNBOTTOM:
rReq.SetSlot( SID_V_ALIGNCELL );
@@ -1568,7 +1563,6 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
SVX_VER_JUSTIFY_BOTTOM : SVX_VER_JUSTIFY_STANDARD, SID_V_ALIGNCELL ) );
ExecuteSlot( rReq, GetInterface() );
return;
//break;
case SID_ALIGNCENTERVER:
rReq.SetSlot( SID_V_ALIGNCELL );
@@ -1577,7 +1571,6 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
SVX_VER_JUSTIFY_CENTER : SVX_VER_JUSTIFY_STANDARD, SID_V_ALIGNCELL ) );
ExecuteSlot( rReq, GetInterface() );
return;
//break;
default:
break;
-1
View File
@@ -2485,7 +2485,6 @@ void ScViewFunc::MoveTable(
ErrorMessage(STR_TABINSERT_ERROR);
return;
}
//break;
case 2:
ErrorMessage(STR_ABSREFLOST);
break;
+4 -4
View File
@@ -2724,7 +2724,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
// ungueltige Attribute koennen gloescht werden
delete pAttr;
pAttr = pPrev;
continue; //break;
continue;
}
pCNd = pAttr->nSttPara.GetNode().GetCntntNode();
@@ -2740,7 +2740,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
// es sei denn, es ist ein Text-Attribut.
delete pAttr;
pAttr = pPrev;
continue; //break;
continue;
}
pCNd = pDoc->GetNodes().GoNext( &(pAttr->nSttPara) );
if( pCNd )
@@ -2750,7 +2750,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
OSL_ENSURE( false, "SetAttr: GoNext() failed!" );
delete pAttr;
pAttr = pPrev;
continue; // break;
continue;
}
}
pAttrPam->GetPoint()->nNode = pAttr->nSttPara;
@@ -2777,7 +2777,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
pAttrPam->DeleteMark();
delete pAttr;
pAttr = pPrev;
continue; // break;
continue;
}
}