[Libreoffice-commits] core.git: 2 commits - editeng/source registry/tools sc/source sw/source
Tor Lillqvist
tml at collabora.com
Mon Nov 24 04:20:20 PST 2014
editeng/source/editeng/editeng.cxx | 2 --
registry/tools/regcompare.cxx | 2 --
sc/source/core/data/conditio.cxx | 1 -
sc/source/core/data/formulacell.cxx | 1 -
sc/source/core/tool/interpr1.cxx | 2 --
sc/source/core/tool/parclass.cxx | 2 --
sc/source/filter/excel/xeview.cxx | 8 ++++----
sc/source/ui/attrdlg/scdlgfact.cxx | 14 +++-----------
sc/source/ui/docshell/impex.cxx | 1 -
sc/source/ui/view/editsh.cxx | 1 -
sc/source/ui/view/formatsh.cxx | 7 -------
sc/source/ui/view/viewfun2.cxx | 1 -
sw/source/filter/html/swhtml.cxx | 8 ++++----
13 files changed, 11 insertions(+), 39 deletions(-)
New commits:
commit d92e8b5ede388bd05a28e7f7a27d3758567481ed
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Nov 24 14:18:39 2014 +0200
Remove superfluous and inconsistent whitespace
Change-Id: I90fdf94aa01912e86015f7263b1dc81d20e53e8d
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 7dfb4f9..d7c33a8 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1025,7 +1025,7 @@ CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI
{
case RID_SCPAGE_OPREDLINE :
return ScRedlineOptionsTabPage::Create;
- case RID_SCPAGE_CALC :
+ case RID_SCPAGE_CALC :
return ScTpCalcOptions::Create;
case RID_SCPAGE_FORMULA:
return ScTpFormulaOptions::Create;
@@ -1033,9 +1033,9 @@ CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI
return ScTpCompatOptions::Create;
case RID_SCPAGE_DEFAULTS:
return ScTpDefaultsOptions::Create;
- case RID_SCPAGE_PRINT :
+ case RID_SCPAGE_PRINT :
return ScTpPrintOptions::Create;
- case RID_SCPAGE_STAT :
+ case RID_SCPAGE_STAT :
return ScDocStatPage::Create;
case RID_SCPAGE_USERLISTS :
return ScTpUserLists::Create;
commit 766f7388dd3d33cfc9efcbec86bcf15a51be8c73
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Nov 24 14:12:36 2014 +0200
Bin commented-out unreachable 'break' statements
Change-Id: If0f47a78bbffec5c2ebd33c552d0d8a300b48eb1
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 4635136..1208536 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -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;
diff --git a/registry/tools/regcompare.cxx b/registry/tools/regcompare.cxx
index 4dae9e6..191aa18 100644
--- a/registry/tools/regcompare.cxx
+++ b/registry/tools/regcompare.cxx
@@ -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
}
}
}
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 794fb56..4395096 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 dfeda72..667be87 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 327b5ed..552770e 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 a397e79..2ebdfdf 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 5e5ded5..faa3bb0 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 2bb26ce..7dfb4f9 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 ca4a6ef..75c7566 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 c91c1cb..0703589 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 067a6d6..9632c17 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 9f93231..dd46c18 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;
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index b47a601..08a04af 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -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;
}
}
More information about the Libreoffice-commits
mailing list