From 01f787a21a9dd0116545fbaa13d0a073db5b5d74 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 11 May 2016 17:09:13 +0200 Subject: 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 --- 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(+) diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 0c596e7db598..6fa3ead43578 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 c3a10695262b..68a5c7d7622a 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 f13449c5ffdb..95f1d2b4d0b4 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 04e44a599bc2..2591656f86df 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 6f5ade66ee98..2394ed9c8765 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 6b0f99bb93c1..b419700de59c 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; //
s in
 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 680da5088447..03572fcc3809 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 b0324efc7d67..a46822aa690c 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);
     }
-- 
cgit