diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-11-24 14:12:36 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-11-24 14:13:13 +0200 |
commit | 766f7388dd3d33cfc9efcbec86bcf15a51be8c73 (patch) | |
tree | db213dccee756c8b345d1b2c58713e4bc34ddad9 /sc | |
parent | 211990642306d08a388682b4ac84a5776b3afbd7 (diff) |
Bin commented-out unreachable 'break' statements
Change-Id: If0f47a78bbffec5c2ebd33c552d0d8a300b48eb1
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/data/conditio.cxx | 1 | ||||
-rw-r--r-- | sc/source/core/data/formulacell.cxx | 1 | ||||
-rw-r--r-- | sc/source/core/tool/interpr1.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/parclass.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xeview.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/docshell/impex.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/view/editsh.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/view/formatsh.cxx | 7 | ||||
-rw-r--r-- | sc/source/ui/view/viewfun2.cxx | 1 |
10 files changed, 4 insertions, 28 deletions
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 794fb5695add..439509688a42 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -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 diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index dfeda726016f..667be87983eb 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -2504,7 +2504,6 @@ sal_uInt16 ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos ) const } #endif return nEdges; -// break; } default: return 0; diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 327b5edddee8..552770e98892 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -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; diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx index a397e795e11f..2ebdfdf3ffe8 100644 --- a/sc/source/core/tool/parclass.cxx +++ b/sc/source/core/tool/parclass.cxx @@ -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 diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx index 5e5ded5cb3f7..faa3bb07cbea 100644 --- a/sc/source/filter/excel/xeview.cxx +++ b/sc/source/filter/excel/xeview.cxx @@ -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"; } diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 2bb26ceb8706..7dfb4f9b413e 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -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; } diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index ca4a6ef912a1..75c75665a37c 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -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(); diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index c91c1cb885b4..0703589af626 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -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 ); diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 067a6d6c062c..9632c17b1e37 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -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; diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 9f932315711e..dd46c18143c3 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -2485,7 +2485,6 @@ void ScViewFunc::MoveTable( ErrorMessage(STR_TABINSERT_ERROR); return; } - //break; case 2: ErrorMessage(STR_ABSREFLOST); break; |