[Libreoffice-commits] core.git: sc/source sfx2/source sw/source
Stephan Bergmann
sbergman at redhat.com
Wed May 11 15:11:26 UTC 2016
sc/source/ui/drawfunc/fuins2.cxx | 1 +
sc/source/ui/vba/vbacondition.cxx | 1 +
sc/source/ui/vba/vbarange.cxx | 1 +
sfx2/source/view/viewfrm.cxx | 2 ++
sw/source/filter/html/css1atr.cxx | 1 +
sw/source/filter/html/swhtml.cxx | 1 +
sw/source/uibase/shells/basesh.cxx | 1 +
sw/source/uibase/utlui/content.cxx | 1 +
8 files changed, 9 insertions(+)
New commits:
commit 01f787a21a9dd0116545fbaa13d0a073db5b5d74
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed May 11 17:09:13 2016 +0200
Mark dubious fallthrough cases as "SAL_FALLTHROUGH; //TODO ???"
Would be great if people knowing about the respective code areas could look into
these, and either change them into plain "SAL_FALLTHROUGH;" or "break;".
Change-Id: I6bd5e04bbb84452bea57d10946522b456c2ad5f0
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 0c596e7..6fa3ead 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -237,6 +237,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView*
aServerLst.FillInsertObjects();
aServerLst.Remove( ScDocShell::Factory().GetClassId() ); // Starcalc nicht anzeigen
//TODO/LATER: currently no inserting of ClassId into SfxRequest!
+ SAL_FALLTHROUGH; //TODO ???
case SID_INSERT_FLOATINGFRAME :
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
diff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxx
index c3a1069..68a5c7d 100644
--- a/sc/source/ui/vba/vbacondition.cxx
+++ b/sc/source/ui/vba/vbacondition.cxx
@@ -144,6 +144,7 @@ ScVbaCondition< Ifc... >::Operator(bool _bIncludeFormulaValue) throw ( script::B
retvalue = ISFORMULA;
break;
}
+ SAL_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 f13449c..95f1d2b 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -5460,6 +5460,7 @@ ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw (
}
case excel::XlCellType::xlCellTypeLastCell:
xRange = Cells( uno::makeAny( getCount() ), uno::Any() );
+ SAL_FALLTHROUGH; //TODO ???
case excel::XlCellType::xlCellTypeVisible:
xLocSheetCellRanges = xQuery->queryVisibleCells();
break;
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 04e44a5..2591656 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -533,6 +533,8 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
rReq.AppendItem( SfxBoolItem( SID_FORCERELOAD, true) );
rReq.AppendItem( SfxBoolItem( SID_SILENT, true ));
+
+ SAL_FALLTHROUGH; //TODO ???
}
case SID_RELOAD:
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 6f5ade6..2394ed9 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -1991,6 +1991,7 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat
}
break;
}
+ SAL_FALLTHROUGH; //TODO ???
case FLY_AT_PAGE:
case FLY_AT_FLY:
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 6b0f99b..b419700 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -1413,6 +1413,7 @@ void SwHTMLParser::NextToken( int nToken )
else
bGetIDOption = true;
// <BR>s in <PRE> resemble true LFs, hence no break
+ SAL_FALLTHROUGH; //TODO ???
case HTML_NEWPARA:
// CR in PRE/LISTING/XMP
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 680da50..03572fcc 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -427,6 +427,7 @@ void SwBaseShell::StateClpbrd(SfxItemSet &rSet)
rSet.DisableItem( nWhich );
break;
}
+ SAL_FALLTHROUGH; //TODO ???
case SID_COPY:
if( !bCopy )
rSet.DisableItem( nWhich );
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index b0324ef..a46822a 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1791,6 +1791,7 @@ bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer,
break;
else
rDragMode &= ~( DND_ACTION_MOVE | DND_ACTION_LINK );
+ SAL_FALLTHROUGH; //TODO ???
default:
sEntry = GetEntryText(pEntry);
}
More information about the Libreoffice-commits
mailing list