summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/dbgui/validate.cxx2
-rw-r--r--sc/source/ui/docshell/docfunc.cxx8
-rw-r--r--sc/source/ui/docshell/docsh.cxx4
-rw-r--r--sc/source/ui/drawfunc/fuins2.cxx2
-rw-r--r--sc/source/ui/undo/undoblk.cxx4
-rw-r--r--sc/source/ui/unoobj/tokenuno.cxx2
-rw-r--r--sc/source/ui/vba/vbacondition.cxx2
-rw-r--r--sc/source/ui/vba/vbarange.cxx2
-rw-r--r--sc/source/ui/view/cellsh3.cxx2
-rw-r--r--sc/source/ui/view/formatsh.cxx2
-rw-r--r--sc/source/ui/view/output2.cxx2
-rw-r--r--sc/source/ui/view/viewfun6.cxx4
12 files changed, 18 insertions, 18 deletions
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 08998266c7f2..bfb881e0f066 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -655,7 +655,7 @@ IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl, ListBox&, void)
case SC_VALIDDLG_DATA_VALIDRANGE:
case SC_VALIDDLG_DATA_INVALIDRANGE: bShowMax = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case SC_VALIDDLG_DATA_GREATER:
case SC_VALIDDLG_DATA_EQGREATER: m_pFtMin->SetText( maStrMin ); break;
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index d3622d2c6f1e..f9c24d171cd3 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1466,7 +1466,7 @@ bool canInsertCellsByPivot(const ScRange& rRange, const ScMarkData& rMarkData, I
{
aRange.aStart.SetCol(0);
aRange.aEnd.SetCol(MAXCOL);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case INS_CELLSDOWN:
{
@@ -1502,7 +1502,7 @@ bool canInsertCellsByPivot(const ScRange& rRange, const ScMarkData& rMarkData, I
{
aRange.aStart.SetRow(0);
aRange.aEnd.SetRow(MAXROW);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case INS_CELLSRIGHT:
{
@@ -1564,7 +1564,7 @@ bool canDeleteCellsByPivot(const ScRange& rRange, const ScMarkData& rMarkData, D
{
aRange.aStart.SetCol(0);
aRange.aEnd.SetCol(MAXCOL);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case DelCellCmd::CellsUp:
{
@@ -1589,7 +1589,7 @@ bool canDeleteCellsByPivot(const ScRange& rRange, const ScMarkData& rMarkData, D
{
aRange.aStart.SetRow(0);
aRange.aEnd.SetRow(MAXROW);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case DelCellCmd::CellsLeft:
{
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index fabc04732a5d..adcc96feeae9 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1009,7 +1009,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
SetError(ERRCODE_IO_ABORT); // this error code will produce no error message, but will break the further saving process
}
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case SfxEventHintId::SaveToDoc:
// #i108978# If no event is sent before saving, there will also be no "...DONE" event,
@@ -1023,7 +1023,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
// new positions are used after "save" and "save as", but not "save to"
UseSheetSaveEntries(); // use positions from saved file for next saving
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case SfxEventHintId::SaveToDocDone:
// only reset the flag, don't use the new positions
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index dc01065c8942..66d935a5c9e7 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -261,7 +261,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView*
aServerLst.FillInsertObjects();
aServerLst.Remove( ScDocShell::Factory().GetClassId() ); // Do not show Starcalc
//TODO/LATER: currently no inserting of ClassId into SfxRequest!
- SAL_FALLTHROUGH; //TODO ???
+ [[fallthrough]]; //TODO ???
case SID_INSERT_FLOATINGFRAME :
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index e2862e5b3294..5d66cc393150 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -246,7 +246,7 @@ void ScUndoInsertCells::DoChange( const bool bUndo )
case INS_INSCOLS_BEFORE:
case INS_INSCOLS_AFTER:
nPaint |= PaintPartFlags::Top; // top bar
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case INS_CELLSRIGHT:
for( i=0; i<nCount; i++ )
{
@@ -504,7 +504,7 @@ void ScUndoDeleteCells::DoChange( const bool bUndo )
break;
case DelCellCmd::Cols:
nPaint |= PaintPartFlags::Top; // top bar
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case DelCellCmd::CellsLeft:
for( i=0; i<nCount; i++ )
{
diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx
index a5a1bca2ffe9..41186b65c4aa 100644
--- a/sc/source/ui/unoobj/tokenuno.cxx
+++ b/sc/source/ui/unoobj/tokenuno.cxx
@@ -461,7 +461,7 @@ void ScTokenConversion::ConvertToTokenSequence( const ScDocument& rDoc,
break;
default:
SAL_WARN("sc", "ScTokenConversion::ConvertToTokenSequence: unhandled token type " << StackVarEnumToString(rToken.GetType()));
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case svJump: // occurs with ocIf, ocChoose
case svError: // seems to be fairly common, and probably not exceptional and not worth a warning?
case svMissing: // occurs with ocMissing
diff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxx
index 4966e7efd6b3..cf2ff15f8761 100644
--- a/sc/source/ui/vba/vbacondition.cxx
+++ b/sc/source/ui/vba/vbacondition.cxx
@@ -132,7 +132,7 @@ ScVbaCondition< Ifc... >::Operator(bool _bIncludeFormulaValue)
retvalue = ISFORMULA;
break;
}
- SAL_FALLTHROUGH; //TODO ???
+ [[fallthrough]]; //TODO ???
case sheet::ConditionOperator_NONE:
default:
DebugHelper::basicexception(ERRCODE_BASIC_METHOD_FAILED, "Operator not supported");
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index cf4e19e68487..1f32f959981b 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -5502,7 +5502,7 @@ ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue)
}
case excel::XlCellType::xlCellTypeLastCell:
xRange = Cells( uno::makeAny( getCount() ), uno::Any() );
- SAL_FALLTHROUGH; //TODO ???
+ [[fallthrough]]; //TODO ???
case excel::XlCellType::xlCellTypeVisible:
xLocSheetCellRanges = xQuery->queryVisibleCells();
break;
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index f62eecd2b881..fb5c81ac9c35 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -75,7 +75,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
//! cannot always be switched ????
if (!pTabViewShell->GetViewFrame()->GetFrame().IsInPlace())
pTabViewShell->SetDontSwitch(true); // do not switch off EditShell
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case FID_CELL_FORMAT:
case SID_ENABLE_HYPHENATION:
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 46bce0e4251f..37b2c863751d 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -421,7 +421,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
{
}
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case SID_STYLE_EDIT:
case SID_STYLE_DELETE:
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index ddf6e6020caf..9a1652834d9c 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -2619,7 +2619,7 @@ void ScOutputData::DrawEditParam::setAlignmentToEngine()
case SvxCellHorJustify::Repeat: // repeat is not yet implemented
case SvxCellHorJustify::Standard:
SAL_WARN("sc.ui","meHorJustResult does not match getAlignmentFromContext()");
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case SvxCellHorJustify::Left:
eSvxAdjust = SvxAdjust::Left;
break;
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index 5cfcff798131..4174848fdc80 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -295,7 +295,7 @@ void ScViewFunc::InsertCurrentTime(SvNumFormatType nReqFmt, const OUString& rUnd
default:
SAL_WARN("sc.ui","unhandled current date/time request");
nReqFmt = SvNumFormatType::DATETIME;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case SvNumFormatType::DATETIME:
{
DateTime aActDateTime( DateTime::SYSTEM );
@@ -391,7 +391,7 @@ void ScViewFunc::InsertCurrentTime(SvNumFormatType nReqFmt, const OUString& rUnd
default:
SAL_WARN("sc.ui","unhandled current date/time request");
nReqFmt = SvNumFormatType::DATETIME;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case SvNumFormatType::DATETIME:
break;
}