summaryrefslogtreecommitdiffstats
path: root/sc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-05-10 14:49:37 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-05-10 14:57:26 +0200
commit0f3ac23d732239b50207cfbb8cf810ef41fa9835 (patch)
treea338a71c043dfa71e9de3c6cdc5b239b5f4b04a3 /sc
parentUpdated core (diff)
downloadcore-0f3ac23d732239b50207cfbb8cf810ef41fa9835.tar.gz
core-0f3ac23d732239b50207cfbb8cf810ef41fa9835.zip
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
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/column3.cxx1
-rw-r--r--sc/source/core/data/documen4.cxx3
-rw-r--r--sc/source/core/data/dpoutputgeometry.cxx1
-rw-r--r--sc/source/core/tool/scmatrix.cxx3
-rw-r--r--sc/source/core/tool/token.cxx1
-rw-r--r--sc/source/filter/excel/xeextlst.cxx1
-rw-r--r--sc/source/filter/excel/xeformula.cxx1
-rw-r--r--sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx3
-rw-r--r--sc/source/ui/view/output2.cxx1
9 files changed, 13 insertions, 2 deletions
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index a86cffe82322..27abbbf249fe 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2329,6 +2329,7 @@ public:
break;
case CELLTYPE_STRING:
rColumn.SetRawString(aBlockPos, r.mnRow, *r.maValue.mpString, false);
+ break;
default:
;
}
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 11fba58d7d81..3f91377c7d02 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -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;
}
diff --git a/sc/source/core/data/dpoutputgeometry.cxx b/sc/source/core/data/dpoutputgeometry.cxx
index f0ec629fe21c..53a600070470 100644
--- a/sc/source/core/data/dpoutputgeometry.cxx
+++ b/sc/source/core/data/dpoutputgeometry.cxx
@@ -179,6 +179,7 @@ void ScDPOutputGeometry::adjustFieldsForDataLayout(sal_uInt32& rColumnFields, sa
case Row:
if (rRowFields > 0)
rRowFields -= 1;
+ break;
default:
;
}
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 9ed144514d34..1f5ace83c1ce 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -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:
;
}
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 11005eabe596..ebd17a0512b5 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1564,6 +1564,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
case svUnknown:
// We don't support vectorization on these.
meVectorState = FormulaVectorDisabled;
+ break;
default:
;
}
diff --git a/sc/source/filter/excel/xeextlst.cxx b/sc/source/filter/excel/xeextlst.cxx
index c9a321420eea..921642aa3910 100644
--- a/sc/source/filter/excel/xeextlst.cxx
+++ b/sc/source/filter/excel/xeextlst.cxx
@@ -276,6 +276,7 @@ XclExpExtCfRule::XclExpExtCfRule( const XclExpRoot& rRoot, const ScFormatEntry&
mxEntry.reset(new XclExpExtIconSet(*this, rIconSet, rPos));
pType = "iconSet";
}
+ break;
default:
break;
}
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 031ff4732e73..fb747cb763eb 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -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
}
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index 10d0c185147a..c559b4f235e2 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -286,8 +286,9 @@ void NumberFormatPropertyPanel::NotifyItemUpdate(
mpEdDecimals->SetValue(nPrecision);
mpEdLeadZeroes->SetValue(nLeadZeroes);
}
+ break;
default:
- ;
+ break;
}
}
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index d110c1d48dd8..2cc4f5a479e8 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -3519,6 +3519,7 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam)
case SVX_VER_JUSTIFY_TOP:
// align to top
aLogicStart.Y() -= nGap;
+ break;
default:
;
}