summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-05-10 16:42:16 +0200
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-07-20 01:26:06 -0400
commite7b11300cd813f821d1ec5cb4633ce2c5f7d1b9f (patch)
treea6c39d9d4cde1baa84a9d788affbce3508af89a8
parent34f591ca95c4c63be092da4c4b2294230404f336 (diff)
Replace fallthrough comments with new SAL_FALLTHROUGH macro
...which (in LIBO_INTERNAL_ONLY) for Clang expands to [[clang::fallthrough]] in preparation of enabling -Wimplicit-fallthrough. (This is only relevant for C++11, as neither C nor old C++ has a way to annotate intended fallthroughs.) Could use BOOST_FALLTHROUGH instead of introducing our own SAL_FALLTHROUGH, but that would require adding back in dependencies on boost_headers to many libraries where we carefully removed any remaining Boost dependencies only recently. (At least make SAL_FALLTHROUGH strictly LIBO_INTERNAL_ONLY, so its future evolution will not have any impact on the stable URE interface.) C++17 will have a proper [[fallthroug]], eventually removing the need for a macro altogether. (cherry picked from commit 14cd5182c5f64c43581c82db8c958369152226ac) Change-Id: I342a7610a107db7d7a344ea9cbddfd9714d7e9ca
-rw-r--r--accessibility/source/standard/vclxaccessibletoolbox.cxx2
-rw-r--r--basegfx/source/polygon/b2dlinegeometry.cxx2
-rw-r--r--basegfx/source/polygon/b2dsvgpolypolygon.cxx17
-rw-r--r--basic/source/comp/loops.cxx6
-rw-r--r--binaryurp/source/incomingrequest.cxx2
-rw-r--r--binaryurp/source/marshal.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx3
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx3
-rw-r--r--bridges/source/jni_uno/jni_data.cxx2
-rw-r--r--canvas/source/cairo/cairo_canvashelper.cxx2
-rw-r--r--canvas/source/cairo/cairo_canvashelper_text.cxx2
-rw-r--r--canvas/source/vcl/canvashelper.cxx2
-rw-r--r--chart2/source/controller/dialogs/res_ErrorBar.cxx2
-rw-r--r--configmgr/source/access.cxx2
-rw-r--r--configmgr/source/components.cxx4
-rw-r--r--configmgr/source/configurationregistry.cxx2
-rw-r--r--configmgr/source/type.cxx2
-rw-r--r--configmgr/source/valueparser.cxx4
-rw-r--r--configmgr/source/xcdparser.cxx2
-rw-r--r--configmgr/source/xcsparser.cxx4
-rw-r--r--configmgr/source/xcuparser.cxx2
-rw-r--r--connectivity/source/commontools/CommonTools.cxx6
-rw-r--r--connectivity/source/commontools/FValue.cxx4
-rw-r--r--connectivity/source/commontools/dbtools.cxx4
-rw-r--r--connectivity/source/drivers/dbase/DTable.cxx4
-rw-r--r--connectivity/source/drivers/file/FDatabaseMetaData.cxx2
-rw-r--r--connectivity/source/drivers/flat/ETable.cxx2
-rw-r--r--connectivity/source/drivers/postgresql/pq_tools.cxx2
-rw-r--r--connectivity/source/parse/sqlnode.cxx2
-rw-r--r--cppu/source/typelib/typelib.cxx2
-rw-r--r--cppuhelper/source/servicemanager.cxx6
-rw-r--r--cppuhelper/source/typemanager.cxx2
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx2
-rw-r--r--cui/source/tabpages/numfmt.cxx2
-rw-r--r--cui/source/tabpages/paragrph.cxx4
-rw-r--r--cui/source/tabpages/textattr.cxx2
-rw-r--r--cui/source/tabpages/tpline.cxx2
-rw-r--r--dbaccess/source/core/api/FilteredContainer.cxx2
-rw-r--r--dbaccess/source/core/api/RowSet.cxx3
-rw-r--r--dbaccess/source/core/api/SingleSelectQueryComposer.cxx2
-rw-r--r--dbaccess/source/core/api/TableDeco.cxx4
-rw-r--r--dbaccess/source/core/recovery/subcomponentrecovery.cxx2
-rw-r--r--dbaccess/source/ui/app/AppController.cxx10
-rw-r--r--dbaccess/source/ui/app/AppControllerDnD.cxx2
-rw-r--r--dbaccess/source/ui/browser/brwctrlr.cxx8
-rw-r--r--dbaccess/source/ui/browser/dataview.cxx2
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx10
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx2
-rw-r--r--dbaccess/source/ui/control/dbtreelistbox.cxx2
-rw-r--r--dbaccess/source/ui/dlg/sqlmessage.cxx2
-rw-r--r--dbaccess/source/ui/misc/HtmlReader.cxx2
-rw-r--r--dbaccess/source/ui/misc/UITools.cxx16
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx14
-rw-r--r--dbaccess/source/ui/misc/linkeddocuments.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/limitboxcontroller.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignControl.cxx2
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.cxx5
-rw-r--r--desktop/source/app/userinstall.cxx2
-rw-r--r--drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx4
-rw-r--r--drawinglayer/source/processor2d/vclprocessor2d.cxx2
-rw-r--r--editeng/source/editeng/eehtml.cxx4
-rw-r--r--editeng/source/items/frmitems.cxx8
-rw-r--r--editeng/source/items/textitem.cxx2
-rw-r--r--editeng/source/rtf/rtfitem.cxx14
-rw-r--r--editeng/source/rtf/svxrtf.cxx6
-rw-r--r--embeddedobj/source/msole/oleembed.cxx2
-rw-r--r--extensions/source/abpilot/abspilot.cxx2
-rw-r--r--extensions/source/propctrlr/eformshelper.cxx2
-rw-r--r--extensions/source/propctrlr/eformspropertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx6
-rw-r--r--extensions/source/propctrlr/formgeometryhandler.cxx2
-rw-r--r--extensions/source/propctrlr/handlerhelper.cxx2
-rw-r--r--filter/source/flash/swfwriter1.cxx2
-rw-r--r--filter/source/graphicfilter/idxf/dxfentrd.cxx2
-rw-r--r--filter/source/graphicfilter/ios2met/ios2met.cxx4
-rw-r--r--filter/source/graphicfilter/ipbm/ipbm.cxx6
-rw-r--r--filter/source/graphicfilter/ipsd/ipsd.cxx2
-rw-r--r--filter/source/msfilter/svdfppt.cxx12
-rw-r--r--filter/source/msfilter/util.cxx2
-rw-r--r--filter/source/svg/svgexport.cxx2
-rw-r--r--forms/source/component/Filter.cxx4
-rw-r--r--forms/source/component/FormattedField.cxx2
-rw-r--r--forms/source/runtime/formoperations.cxx2
-rw-r--r--forms/source/xforms/model.cxx2
-rw-r--r--hwpfilter/source/hwpreader.cxx4
-rw-r--r--i18npool/source/calendar/calendar_gregorian.cxx4
-rw-r--r--i18npool/source/characterclassification/cclass_unicode_parser.cxx6
-rw-r--r--i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx4
-rw-r--r--i18npool/source/indexentry/indexentrysupplier_default.cxx2
-rw-r--r--i18npool/source/localedata/LocaleNode.cxx4
-rw-r--r--i18npool/source/localedata/localedata.cxx2
-rw-r--r--idlc/source/options.cxx2
-rw-r--r--include/sal/types.h8
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.cxx2
-rw-r--r--libreofficekit/source/gtk/lokdocview.cxx2
-rw-r--r--lotuswordpro/source/filter/lwpobjstrm.cxx2
-rw-r--r--oox/source/drawingml/color.cxx4
-rw-r--r--oox/source/drawingml/customshapegeometry.cxx21
-rw-r--r--oox/source/export/drawingml.cxx2
-rw-r--r--oox/source/ole/axcontrol.cxx2
-rw-r--r--oox/source/vml/vmlformatting.cxx2
-rw-r--r--registry/tools/options.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.cxx2
-rw-r--r--reportdesign/source/ui/dlg/GroupsSorting.cxx2
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx8
-rw-r--r--reportdesign/source/ui/report/dlgedfunc.cxx2
-rw-r--r--rsc/source/parser/erscerr.cxx2
-rw-r--r--rsc/source/parser/rsclex.cxx2
-rw-r--r--sal/osl/unx/security.cxx2
-rw-r--r--sal/rtl/digest.cxx14
-rw-r--r--sal/rtl/uri.cxx2
-rw-r--r--sax/source/tools/converter.cxx4
-rw-r--r--sc/source/core/data/attrib.cxx4
-rw-r--r--sc/source/core/data/conditio.cxx2
-rw-r--r--sc/source/core/tool/compiler.cxx8
-rw-r--r--sc/source/core/tool/interpr1.cxx6
-rw-r--r--sc/source/core/tool/scmatrix.cxx2
-rw-r--r--sc/source/core/tool/token.cxx15
-rw-r--r--sc/source/filter/dif/difimp.cxx12
-rw-r--r--sc/source/filter/excel/excform.cxx10
-rw-r--r--sc/source/filter/excel/read.cxx2
-rw-r--r--sc/source/filter/excel/xeformula.cxx2
-rw-r--r--sc/source/filter/excel/xestyle.cxx12
-rw-r--r--sc/source/filter/excel/xetable.cxx2
-rw-r--r--sc/source/filter/excel/xiescher.cxx3
-rw-r--r--sc/source/filter/excel/xihelper.cxx4
-rw-r--r--sc/source/filter/html/htmlexp.cxx2
-rw-r--r--sc/source/filter/html/htmlpars.cxx3
-rw-r--r--sc/source/ui/dbgui/validate.cxx3
-rw-r--r--sc/source/ui/docshell/docfunc.cxx8
-rw-r--r--sc/source/ui/docshell/docsh.cxx6
-rw-r--r--sc/source/ui/unoobj/tokenuno.cxx2
-rw-r--r--sc/source/ui/view/cellsh3.cxx2
-rw-r--r--sc/source/ui/view/formatsh.cxx2
-rw-r--r--sd/source/core/CustomAnimationCloner.cxx2
-rw-r--r--sd/source/core/drawdoc4.cxx2
-rw-r--r--sd/source/filter/eppt/eppt.cxx5
-rw-r--r--sd/source/filter/eppt/epptso.cxx8
-rw-r--r--sd/source/filter/eppt/pptexanimations.cxx2
-rw-r--r--sd/source/filter/ppt/pptin.cxx10
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx2
-rw-r--r--sd/source/ui/dlg/tpaction.cxx2
-rw-r--r--sd/source/ui/func/fuconrec.cxx2
-rw-r--r--sd/source/ui/func/fuinsert.cxx2
-rw-r--r--sd/source/ui/func/fusnapln.cxx2
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx4
-rw-r--r--sd/source/ui/slidesorter/view/SlsTheme.cxx2
-rw-r--r--sd/source/ui/unoidl/unoobj.cxx4
-rw-r--r--sd/source/ui/view/drviews2.cxx2
-rw-r--r--sd/source/ui/view/drviewse.cxx2
-rw-r--r--sd/source/ui/view/viewshel.cxx2
-rw-r--r--sfx2/source/bastyp/sfxhtml.cxx4
-rw-r--r--sfx2/source/control/thumbnailview.cxx2
-rw-r--r--sfx2/source/control/thumbnailviewitem.cxx2
-rw-r--r--sfx2/source/dialog/templdlg.cxx2
-rw-r--r--sfx2/source/dialog/titledockwin.cxx2
-rw-r--r--sfx2/source/doc/objserv.cxx2
-rw-r--r--sfx2/source/view/viewprn.cxx2
-rw-r--r--slideshow/source/engine/activities/activitiesfactory.cxx8
-rw-r--r--slideshow/source/engine/animationnodes/basenode.cxx4
-rw-r--r--slideshow/source/engine/animationnodes/generateevent.cxx2
-rw-r--r--slideshow/source/engine/shapes/drawshapesubsetting.cxx14
-rw-r--r--slideshow/source/engine/shapes/gdimtftools.cxx4
-rw-r--r--slideshow/source/engine/slide/targetpropertiescreator.cxx3
-rw-r--r--starmath/source/mathtype.cxx4
-rw-r--r--starmath/source/parse.cxx2
-rw-r--r--starmath/source/view.cxx2
-rw-r--r--starmath/source/wordexportbase.cxx2
-rw-r--r--store/source/lockbyte.cxx4
-rw-r--r--svl/source/numbers/zforfind.cxx2
-rw-r--r--svl/source/numbers/zforlist.cxx2
-rw-r--r--svl/source/numbers/zformat.cxx4
-rw-r--r--svl/source/numbers/zforscan.cxx4
-rw-r--r--svtools/source/brwbox/ebbcontrols.cxx4
-rw-r--r--svtools/source/brwbox/editbrowsebox.cxx2
-rw-r--r--svtools/source/control/valueset.cxx6
-rw-r--r--svtools/source/graphic/grfcache.cxx66
-rw-r--r--svtools/source/graphic/grfmgr2.cxx92
-rw-r--r--svtools/source/svhtml/parhtml.cxx16
-rw-r--r--svtools/source/svrtf/parrtf.cxx5
-rw-r--r--svtools/source/table/tablecontrol_impl.cxx2
-rw-r--r--svx/source/customshapes/EnhancedCustomShape2d.cxx2
-rw-r--r--svx/source/dialog/rubydialog.cxx4
-rw-r--r--svx/source/dialog/svxruler.cxx4
-rw-r--r--svx/source/fmcomp/gridcell.cxx2
-rw-r--r--svx/source/fmcomp/gridctrl.cxx7
-rw-r--r--svx/source/form/fmshell.cxx4
-rw-r--r--svx/source/form/fmsrcimp.cxx2
-rw-r--r--svx/source/form/fmvwimp.cxx2
-rw-r--r--svx/source/form/formcontrolfactory.cxx2
-rw-r--r--svx/source/items/rotmodit.cxx2
-rw-r--r--svx/source/svdraw/svdhdl.cxx2
-rw-r--r--svx/source/svdraw/svdobj.cxx2
-rw-r--r--svx/source/svdraw/svdopath.cxx2
-rw-r--r--svx/source/toolbars/extrusionbar.cxx33
-rw-r--r--svx/source/toolbars/fontworkbar.cxx11
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx2
-rw-r--r--sw/source/core/access/accnotextframe.cxx2
-rw-r--r--sw/source/core/access/acctextframe.cxx2
-rw-r--r--sw/source/core/attr/calbck.cxx2
-rw-r--r--sw/source/core/attr/cellatr.cxx2
-rw-r--r--sw/source/core/attr/hints.cxx6
-rw-r--r--sw/source/core/crsr/crstrvl.cxx2
-rw-r--r--sw/source/core/doc/DocumentFieldsManager.cxx6
-rw-r--r--sw/source/core/doc/DocumentLayoutManager.cxx2
-rw-r--r--sw/source/core/doc/DocumentRedlineManager.cxx2
-rw-r--r--sw/source/core/doc/doccomp.cxx2
-rw-r--r--sw/source/core/doc/docfld.cxx4
-rw-r--r--sw/source/core/doc/docfly.cxx4
-rw-r--r--sw/source/core/doc/doclay.cxx2
-rw-r--r--sw/source/core/doc/docruby.cxx2
-rw-r--r--sw/source/core/doc/doctxm.cxx4
-rw-r--r--sw/source/core/doc/notxtfrm.cxx2
-rw-r--r--sw/source/core/doc/tblrwcl.cxx2
-rw-r--r--sw/source/core/docnode/nodes.cxx2
-rw-r--r--sw/source/core/docnode/section.cxx2
-rw-r--r--sw/source/core/draw/dcontact.cxx2
-rw-r--r--sw/source/core/edit/autofmt.cxx2
-rw-r--r--sw/source/core/frmedt/fefly1.cxx2
-rw-r--r--sw/source/core/frmedt/feshview.cxx3
-rw-r--r--sw/source/core/frmedt/fews.cxx19
-rw-r--r--sw/source/core/layout/dbg_lay.cxx15
-rw-r--r--sw/source/core/layout/fly.cxx2
-rw-r--r--sw/source/core/layout/pagechg.cxx3
-rw-r--r--sw/source/core/layout/tabfrm.cxx2
-rw-r--r--sw/source/core/layout/wsfrm.cxx8
-rw-r--r--sw/source/core/objectpositioning/anchoredobjectposition.cxx2
-rw-r--r--sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx2
-rw-r--r--sw/source/core/text/inftxt.cxx2
-rw-r--r--sw/source/core/text/itrform2.cxx2
-rw-r--r--sw/source/core/text/porfld.cxx14
-rw-r--r--sw/source/core/text/pormulti.cxx6
-rw-r--r--sw/source/core/text/txtfrm.cxx6
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx2
-rw-r--r--sw/source/core/txtnode/thints.cxx2
-rw-r--r--sw/source/core/txtnode/txtedt.cxx3
-rw-r--r--sw/source/core/undo/unattr.cxx4
-rw-r--r--sw/source/core/undo/undobj1.cxx4
-rw-r--r--sw/source/core/undo/untbl.cxx4
-rw-r--r--sw/source/filter/html/css1atr.cxx6
-rw-r--r--sw/source/filter/html/htmlform.cxx32
-rw-r--r--sw/source/filter/html/htmlgrin.cxx20
-rw-r--r--sw/source/filter/html/htmltab.cxx10
-rw-r--r--sw/source/filter/html/htmltabw.cxx2
-rw-r--r--sw/source/filter/html/parcss1.cxx6
-rw-r--r--sw/source/filter/html/swhtml.cxx12
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx2
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx8
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx4
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx12
-rw-r--r--sw/source/filter/xml/xmltbli.cxx2
-rw-r--r--sw/source/filter/xml/xmltexte.cxx2
-rw-r--r--sw/source/ui/dialog/macassgn.cxx6
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx12
-rw-r--r--sw/source/ui/fldui/flddb.cxx2
-rw-r--r--sw/source/ui/fldui/flddok.cxx2
-rw-r--r--sw/source/ui/fldui/fldref.cxx4
-rw-r--r--sw/source/uibase/app/docsh.cxx4
-rw-r--r--sw/source/uibase/app/docshini.cxx2
-rw-r--r--sw/source/uibase/app/docst.cxx2
-rw-r--r--sw/source/uibase/app/docstyle.cxx4
-rw-r--r--sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx2
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx2
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx15
-rw-r--r--sw/source/uibase/docvw/edtwin2.cxx2
-rw-r--r--sw/source/uibase/fldui/fldmgr.cxx2
-rw-r--r--sw/source/uibase/ribbar/conrect.cxx2
-rw-r--r--sw/source/uibase/shells/basesh.cxx6
-rw-r--r--sw/source/uibase/shells/drawsh.cxx2
-rw-r--r--sw/source/uibase/shells/drwbassh.cxx4
-rw-r--r--sw/source/uibase/shells/tabsh.cxx5
-rw-r--r--sw/source/uibase/shells/textsh1.cxx5
-rw-r--r--sw/source/uibase/uiview/view.cxx2
-rw-r--r--sw/source/uibase/uiview/view2.cxx2
-rw-r--r--sw/source/uibase/uno/unotxvw.cxx5
-rw-r--r--sw/source/uibase/utlui/content.cxx4
-rw-r--r--sw/source/uibase/wrtsh/wrtsh1.cxx2
-rw-r--r--toolkit/source/awt/vclxwindow.cxx2
-rw-r--r--toolkit/source/awt/vclxwindows.cxx2
-rw-r--r--tools/source/fsys/urlobj.cxx4
-rw-r--r--tools/source/fsys/wldcrd.cxx6
-rw-r--r--tools/source/inet/inetmime.cxx2
-rw-r--r--ucb/source/core/ucbcmds.cxx6
-rw-r--r--ucb/source/inc/regexpmap.hxx4
-rw-r--r--ucb/source/ucp/webdav-neon/webdavcontent.cxx2
-rw-r--r--ucbhelper/source/client/proxydecider.cxx2
-rw-r--r--unoidl/source/legacyprovider.cxx2
-rw-r--r--unotools/source/config/bootstrap.cxx2
-rw-r--r--unotools/source/config/configitem.cxx2
-rw-r--r--unotools/source/config/securityoptions.cxx2
-rw-r--r--vcl/source/control/edit.cxx4
-rw-r--r--vcl/source/edit/textview.cxx24
-rw-r--r--vcl/source/fontsubset/cff.cxx2
-rw-r--r--vcl/source/fontsubset/xlat.cxx2
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx4
-rw-r--r--vcl/source/gdi/pngread.cxx4
-rw-r--r--vcl/source/window/decoview.cxx6
-rw-r--r--vcl/source/window/layout.cxx2
-rw-r--r--vcl/source/window/winproc.cxx2
-rw-r--r--vcl/unx/generic/gdi/salbmp.cxx2
-rw-r--r--vcl/unx/generic/window/salframe.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atkutil.cxx2
-rw-r--r--writerfilter/source/dmapper/DomainMapper.cxx6
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx2
-rw-r--r--writerfilter/source/ooxml/OOXMLFastContextHandler.cxx2
-rw-r--r--writerfilter/source/rtftok/rtfsdrimport.cxx2
-rw-r--r--xmloff/source/chart/SchXMLTableContext.cxx4
-rw-r--r--xmloff/source/draw/animationexport.cxx2
-rw-r--r--xmloff/source/draw/animationimport.cxx3
-rw-r--r--xmloff/source/draw/eventimp.cxx4
-rw-r--r--xmloff/source/forms/elementexport.cxx12
-rw-r--r--xmloff/source/forms/propertyimport.cxx2
-rw-r--r--xmloff/source/forms/valueproperties.cxx2
-rw-r--r--xmloff/source/style/numehelp.cxx12
-rw-r--r--xmloff/source/text/XMLTextListBlockContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextMarkImportContext.cxx6
-rw-r--r--xmloff/source/text/txtexppr.cxx2
-rw-r--r--xmloff/source/text/txtflde.cxx2
-rw-r--r--xmloff/source/text/txtimppr.cxx4
-rw-r--r--xmloff/source/transform/StyleOASISTContext.cxx2
328 files changed, 805 insertions, 706 deletions
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 46546829ad79..58ad5e3a2688 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -635,7 +635,7 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow
}
m_aAccessibleChildren.clear();
- //!!! no break to call base class
+ SAL_FALLTHROUGH; // call base class
}
default:
diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx b/basegfx/source/polygon/b2dlinegeometry.cxx
index c62fbe7b23d9..2ec9d77a5ff2 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -757,7 +757,7 @@ namespace basegfx
}
else
{
- // wanted fall-through to default
+ SAL_FALLTHROUGH; // wanted fall-through to default
}
}
default: // B2DLineJoin::Bevel
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
index 25773e7fac40..86bafd576fbc 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
@@ -109,8 +109,7 @@ namespace basegfx
o_rPolyPolygon.append(aCurrPoly);
aCurrPoly.clear();
}
-
- // FALLTHROUGH intended to add coordinate data as 1st point of new polygon
+ SAL_FALLTHROUGH; // to add coordinate data as 1st point of new polygon
}
case 'l' :
case 'L' :
@@ -150,7 +149,7 @@ namespace basegfx
case 'h' :
{
bRelative = true;
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
}
case 'H' :
{
@@ -180,7 +179,7 @@ namespace basegfx
case 'v' :
{
bRelative = true;
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
}
case 'V' :
{
@@ -210,7 +209,7 @@ namespace basegfx
case 's' :
{
bRelative = true;
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
}
case 'S' :
{
@@ -269,7 +268,7 @@ namespace basegfx
case 'c' :
{
bRelative = true;
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
}
case 'C' :
{
@@ -319,7 +318,7 @@ namespace basegfx
case 'q' :
{
bRelative = true;
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
}
case 'Q' :
{
@@ -370,7 +369,7 @@ namespace basegfx
case 't' :
{
bRelative = true;
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
}
case 'T' :
{
@@ -444,7 +443,7 @@ namespace basegfx
case 'a' :
{
bRelative = true;
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
}
case 'A' :
{
diff --git a/basic/source/comp/loops.cxx b/basic/source/comp/loops.cxx
index 2c4f79e6146c..c7ca8e72677f 100644
--- a/basic/source/comp/loops.cxx
+++ b/basic/source/comp/loops.cxx
@@ -539,7 +539,8 @@ void SbiParser::Resume()
{
aGen.Gen( _RESUME, 0 );
break;
- } // fall through
+ }
+ SAL_FALLTHROUGH;
case SYMBOL:
if( MayBeLabel() )
{
@@ -547,7 +548,8 @@ void SbiParser::Resume()
aGen.Gen( _RESUME, nLbl );
Next();
break;
- } // fall through
+ }
+ SAL_FALLTHROUGH;
default:
Error( ERRCODE_BASIC_LABEL_EXPECTED );
}
diff --git a/binaryurp/source/incomingrequest.cxx b/binaryurp/source/incomingrequest.cxx
index 009e473c64b4..2413b6894f6f 100644
--- a/binaryurp/source/incomingrequest.cxx
+++ b/binaryurp/source/incomingrequest.cxx
@@ -171,7 +171,7 @@ bool IncomingRequest::execute_throw(
}
break;
}
- // fall through
+ SAL_FALLTHROUGH;
default:
{
OSL_ASSERT(object_.is());
diff --git a/binaryurp/source/marshal.cxx b/binaryurp/source/marshal.cxx
index a45d1c639d0c..b2251e9ca6a8 100644
--- a/binaryurp/source/marshal.cxx
+++ b/binaryurp/source/marshal.cxx
@@ -194,7 +194,7 @@ void Marshal::writeValue(
break;
case typelib_TypeClass_BOOLEAN:
assert(*static_cast< sal_uInt8 const * >(value) <= 1);
- // fall through
+ SAL_FALLTHROUGH;
case typelib_TypeClass_BYTE:
write8(buffer, *static_cast< sal_uInt8 const * >(value));
break;
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index 46f8d0f03111..f7e3f448e73d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -364,7 +364,8 @@ typelib_TypeClass cpp_vtable_call(
}
TYPELIB_DANGER_RELEASE( pTD );
}
- } // else perform queryInterface()
+ SAL_FALLTHROUGH; // else perform queryInterface()
+ }
default:
{
typelib_InterfaceMethodTypeDescription *pMethodTD =
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index a4686916ca1e..ec305990b609 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -432,7 +432,8 @@ void unoInterfaceProxyDispatch(
}
TYPELIB_DANGER_RELEASE( pTD );
}
- } // else perform queryInterface()
+ SAL_FALLTHROUGH; // else perform queryInterface()
+ }
default:
// dependent dispatch
cpp_call(
diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx
index 7de2d6c100a7..ccd9ef957248 100644
--- a/bridges/source/jni_uno/jni_data.cxx
+++ b/bridges/source/jni_uno/jni_data.cxx
@@ -1738,7 +1738,7 @@ void Bridge::map_to_java(
jni.ensure_no_exception();
break;
}
- // fall through
+ SAL_FALLTHROUGH;
}
default:
{
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index c42e85f8d76d..8d974afc25d4 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1197,7 +1197,7 @@ namespace cairocanvas
{
case rendering::PathJoinType::NONE:
bNoLineJoin = true;
- // cairo doesn't have join type NONE so we use MITER as it's pretty close
+ SAL_FALLTHROUGH; // cairo doesn't have join type NONE so we use MITER as it's pretty close
case rendering::PathJoinType::MITER:
cairo_set_line_join( mpCairo.get(), CAIRO_LINE_JOIN_MITER );
break;
diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx
index 6f37f7f310b2..34fbb1face5a 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.cxx
@@ -288,7 +288,7 @@ namespace cairocanvas
case rendering::TextDirection::WEAK_RIGHT_TO_LEFT:
nLayoutMode |= TEXT_LAYOUT_BIDI_RTL;
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case rendering::TextDirection::STRONG_RIGHT_TO_LEFT:
nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_BIDI_STRONG;
nLayoutMode |= TEXT_LAYOUT_TEXTORIGIN_RIGHT;
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index f7fec84338cf..5e5af9fa1620 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -598,7 +598,7 @@ namespace vclcanvas
case rendering::TextDirection::WEAK_RIGHT_TO_LEFT:
nLayoutMode |= TEXT_LAYOUT_BIDI_RTL;
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case rendering::TextDirection::STRONG_RIGHT_TO_LEFT:
nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_BIDI_STRONG;
nLayoutMode |= TEXT_LAYOUT_TEXTORIGIN_RIGHT;
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 2837307c6dbe..d776ab35ad81 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -563,7 +563,7 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
case CHINDICATE_NONE :
// no longer used, use both as default
m_eIndicate = CHINDICATE_BOTH;
- // fall-through intended to BOTH
+ SAL_FALLTHROUGH; // to BOTH
case CHINDICATE_BOTH :
m_pRbBoth->Check(); break;
case CHINDICATE_UP :
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 3f4f9cae37a4..53bcf957cd0d 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -696,7 +696,7 @@ void Access::setName(OUString const & aName)
}
}
}
- // fall through
+ SAL_FALLTHROUGH;
case Node::KIND_LOCALIZED_PROPERTY:
// renaming a property could only work for an extension property,
// but a localized property is never an extension property
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index b1b4b725c579..c0ad6f2cb673 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -650,7 +650,7 @@ void Components::parseFiles(
if (!recursive) {
return;
}
- // fall through
+ SAL_FALLTHROUGH;
default:
throw css::uno::RuntimeException(
"cannot open directory " + url);
@@ -808,7 +808,7 @@ void Components::parseXcsXcuIniLayer(
case ':':
case '\\':
prefix.append('\\');
- // fall through
+ SAL_FALLTHROUGH;
default:
prefix.append(c);
}
diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx
index b91bd1db21ee..437cc798d335 100644
--- a/configmgr/source/configurationregistry.cxx
+++ b/configmgr/source/configurationregistry.cxx
@@ -517,7 +517,7 @@ css::registry::RegistryValueType RegistryKey::getValueType()
{
return css::registry::RegistryValueType_STRINGLIST;
}
- // fall through
+ SAL_FALLTHROUGH;
default:
return css::registry::RegistryValueType_NOT_DEFINED;
}
diff --git a/configmgr/source/type.cxx b/configmgr/source/type.cxx
index 23bf85e88027..241bff5f6167 100644
--- a/configmgr/source/type.cxx
+++ b/configmgr/source/type.cxx
@@ -156,7 +156,7 @@ Type getDynamicType(css::uno::Any const & value) {
return TYPE_HEXBINARY_LIST;
}
}
- // fall through
+ SAL_FALLTHROUGH;
default:
return TYPE_ERROR;
}
diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx
index eb81d738e8a4..f8d98dde2d76 100644
--- a/configmgr/source/valueparser.cxx
+++ b/configmgr/source/valueparser.cxx
@@ -260,7 +260,7 @@ xmlreader::XmlReader::Text ValueParser::getTextMode() const {
if (!items_.empty()) {
break;
}
- // fall through
+ SAL_FALLTHROUGH;
case STATE_IT:
return
(type_ == TYPE_STRING || type_ == TYPE_STRING_LIST ||
@@ -292,7 +292,7 @@ bool ValueParser::startElement(
state_ = STATE_IT;
return true;
}
- // fall through
+ SAL_FALLTHROUGH;
case STATE_IT:
if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals("unicode") &&
diff --git a/configmgr/source/xcdparser.cxx b/configmgr/source/xcdparser.cxx
index c98067b9d304..5026f5d3b678 100644
--- a/configmgr/source/xcdparser.cxx
+++ b/configmgr/source/xcdparser.cxx
@@ -117,7 +117,7 @@ bool XcdParser::startElement(
return true;
}
state_ = STATE_COMPONENTS;
- // fall through
+ SAL_FALLTHROUGH;
case STATE_COMPONENTS:
if (nsId == ParseManager::NAMESPACE_OOR &&
name.equals("component-schema"))
diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx
index 844a69136a34..6c1b2fea9a4a 100644
--- a/configmgr/source/xcsparser.cxx
+++ b/configmgr/source/xcsparser.cxx
@@ -160,7 +160,7 @@ bool XcsParser::startElement(
state_ = STATE_TEMPLATES;
return true;
}
- // fall through
+ SAL_FALLTHROUGH;
case STATE_TEMPLATES_DONE:
if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals("component"))
@@ -190,7 +190,7 @@ bool XcsParser::startElement(
}
break;
}
- // fall through
+ SAL_FALLTHROUGH;
case STATE_COMPONENT:
assert(!elements_.empty());
switch (elements_.top().node->kind()) {
diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index 4d239ab4f1f9..a89ab668f020 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -646,7 +646,7 @@ void XcuParser::handleUnknownGroupProp(
recordModification(false);
break;
}
- // fall through
+ SAL_FALLTHROUGH;
default:
SAL_WARN(
"configmgr",
diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx
index 8a0f25b2d316..c924be523ed2 100644
--- a/connectivity/source/commontools/CommonTools.cxx
+++ b/connectivity/source/commontools/CommonTools.cxx
@@ -75,8 +75,10 @@ namespace connectivity
else
pWild += pos;
else
- break; // WARNING in certain circumstances
- // it will run into the next 'case'!!
+ break;
+ // WARNING/TODO: in certain circumstances it will run into
+ // the next 'case'!
+ SAL_FALLTHROUGH;
case CHAR_WILD:
while ( *pWild == CHAR_WILD )
pWild++;
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index be18ec286b1e..9299309561ae 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -1151,7 +1151,7 @@ bool ORowSetValue::getBool() const
break;
}
}
- // run through
+ SAL_FALLTHROUGH;
case DataType::DECIMAL:
case DataType::NUMERIC:
@@ -2045,7 +2045,7 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
case DataType::OBJECT:
default:
OSL_ENSURE( false, "ORowSetValue::getDate: cannot retrieve the data!" );
- // NO break!
+ SAL_FALLTHROUGH;
case DataType::BINARY:
case DataType::VARBINARY:
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 16e0b1250f30..7f9a443b6756 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1515,7 +1515,7 @@ bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject,
_rxUpdatedObject->updateBinaryStream(_nColumnIndex, xStream, xStream->available());
break;
}
- // run through
+ SAL_FALLTHROUGH;
default:
bSuccessfullyReRouted = false;
}
@@ -1622,7 +1622,7 @@ bool implSetObject( const Reference< XParameters >& _rxParameters,
_rxParameters->setBinaryStream(_nColumnIndex, xStream, xStream->available());
break;
}
- // run through
+ SAL_FALLTHROUGH;
default:
bSuccessfullyReRouted = false;
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 2aab28139ea3..57104d299c30 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -1300,7 +1300,7 @@ bool ODbaseTable::CreateFile(const INetURLObject& aFile, bool& bCreateMemo)
break;
case DataType::LONGVARBINARY:
bBinary = true;
- // run through
+ SAL_FALLTHROUGH;
case DataType::LONGVARCHAR:
cTyp = 'M';
break;
@@ -1783,7 +1783,7 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow, cons
case DataType::DOUBLE:
case DataType::TIMESTAMP:
bSetZero = true;
- //fall-through
+ SAL_FALLTHROUGH;
case DataType::LONGVARBINARY:
case DataType::DATE:
case DataType::BIT:
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index 12c9e1e6eb38..7eec6cca2797 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -240,7 +240,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
break;
case -1:
bKnowCaseSensivity = false;
- /** run through */
+ SAL_FALLTHROUGH;
case 0:
bCaseSensitiveDir = false;
}
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 6600515984d3..cf79bb18271c 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -743,7 +743,7 @@ bool OFlatTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 n
{
case IResultSetHelper::FIRST:
m_nRowPos = 0;
- // run through
+ SAL_FALLTHROUGH;
case IResultSetHelper::NEXT:
{
assert(m_nRowPos >= 0);
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 0c70c9db06ee..784aac9dfa6d 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -1233,8 +1233,8 @@ bool implSetObject( const Reference< XParameters >& _rxParameters,
_rxParameters->setBinaryStream(_nColumnIndex, xStream, xStream->available());
break;
}
+ SAL_FALLTHROUGH;
}
- // run through
default:
bSuccessfullyReRouted = false;
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 6a7bb9956464..45d8333a7ba0 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -2493,7 +2493,7 @@ void OSQLParseNode::parseLeaf(OUStringBuffer& rString, const SQLParseNodeParamet
rString.append(m_aNodeValue);
break;
}
- // fall through
+ SAL_FALLTHROUGH;
default:
if (!rString.isEmpty() && m_aNodeValue.toChar() != '.' && m_aNodeValue.toChar() != ':' )
{
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index fc751ff1ba99..e04cd71a4b95 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -1308,7 +1308,7 @@ static inline void typelib_typedescription_destructExtendedMembers(
case typelib_TypeClass_STRUCT:
delete[] reinterpret_cast< typelib_StructTypeDescription * >(pTD)->
pParameterizedTypes;
- // Fall-through intentional
+ SAL_FALLTHROUGH;
case typelib_TypeClass_EXCEPTION:
{
typelib_CompoundTypeDescription * pCTD = reinterpret_cast<typelib_CompoundTypeDescription*>(pTD);
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx
index 2cdc7241e9e7..b2738a4e5e76 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -188,7 +188,7 @@ Parser::Parser(
state = STATE_COMPONENTS;
break;
}
- // fall through
+ SAL_FALLTHROUGH;
case STATE_COMPONENT_INITIAL:
if (res == xmlreader::XmlReader::RESULT_BEGIN && nsId == ucNsId
&& name.equals(RTL_CONSTASCII_STRINGPARAM("implementation")))
@@ -1516,7 +1516,7 @@ void cppuhelper::ServiceManager::readRdbDirectory(
SAL_INFO("cppuhelper", "Ignored optional " << uri);
return;
}
- // fall through
+ SAL_FALLTHROUGH;
default:
throw css::uno::DeploymentException(
"Cannot open directory " + uri,
@@ -1578,7 +1578,7 @@ bool cppuhelper::ServiceManager::readLegacyRdbFile(rtl::OUString const & uri) {
}
}
}
- // fall through
+ SAL_FALLTHROUGH;
default:
return false;
}
diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx
index 12a88dc2006a..84e6657dbb8d 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -2123,7 +2123,7 @@ void cppuhelper::TypeManager::readRdbDirectory(
SAL_INFO("cppuhelper", "Ignored optional " << uri);
return;
}
- // fall through
+ SAL_FALLTHROUGH;
default:
throw css::uno::DeploymentException(
"Cannot open directory " + uri,
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 17d6da871044..8ef0efceda2a 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -735,8 +735,8 @@ IMPL_LINK_TYPED(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProg
? RID_STR_SEARCH_GENERAL_ERROR
: RID_STR_SEARCH_NORECORD;
ScopedVclPtrInstance<MessageDialog>::Create(this, CUI_RES(nErrorId))->Execute();
+ SAL_FALLTHROUGH;
}
- // NO break !
case FmSearchProgress::STATE_CANCELED:
EnableSearchUI(true);
if (m_lnkCanceledNotFoundHdl.IsSet())
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index f0b3255373c3..fd5f20649712 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -966,7 +966,7 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( bool bCheckCatChange /*= sal_Fa
else
bThousand = false;
}
- // fallthru
+ SAL_FALLTHROUGH;
case CAT_NUMBER:
case CAT_PERCENT:
case CAT_CURRENCY:
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 775e80b61dd8..b00e6b4fbcc9 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -2058,7 +2058,7 @@ IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, WidowHdl_Impl, Button*, void)
if ( m_pOrphanBox->GetState() == TRISTATE_FALSE )
m_pKeepTogetherBox->Enable();
- // no break
+ SAL_FALLTHROUGH;
case TRISTATE_INDET:
m_pWidowRowNo->Enable(false);
m_pWidowRowLabel->Enable(false);
@@ -2080,7 +2080,7 @@ IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, OrphanHdl_Impl, Button*, void)
if ( m_pWidowBox->GetState() == TRISTATE_FALSE )
m_pKeepTogetherBox->Enable();
- // no break
+ SAL_FALLTHROUGH;
case TRISTATE_INDET:
m_pOrphanRowNo->Enable(false);
m_pOrphanRowLabel->Enable(false);
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index a0ba1bb62641..ba7d6ccee10c 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -407,7 +407,7 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet* rAttrs)
{
default: ; //prevent warning
OSL_FAIL( "svx::SvxTextAttrPage::FillItemSet(), unhandled state!" );
- /* Fall through */
+ SAL_FALLTHROUGH;
case TRISTATE_FALSE: eFTS = SDRTEXTFIT_NONE; break;
case TRISTATE_TRUE: eFTS = SDRTEXTFIT_AUTOFIT; break;
}
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 2dca969491a0..cc5e6bbb6e48 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -155,7 +155,7 @@ SvxLineTabPage::SvxLineTabPage
case FUNIT_M:
case FUNIT_KM:
eFUnit = FUNIT_MM;
- // no break -> we now have mm
+ SAL_FALLTHROUGH; // we now have mm
case FUNIT_MM:
m_pMtrLineWidth->SetSpinSize( 50 );
m_pMtrStartWidth->SetSpinSize( 50 );
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx
index 4dad392d6ee4..35cbe0ac9dfe 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -442,7 +442,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
{
default:
SAL_WARN("dbaccess", "OTableContainer::getAllTableTypeFilter: unknown TableTypeFilterMode!" );
- /* Fall through */
+ SAL_FALLTHROUGH;
case FILTER_MODE_MIX_ALL:
_rFilter.realloc( 3 );
_rFilter[0] = sView;
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index f0ff2696750c..e3cf7f632b9c 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -291,7 +291,8 @@ void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const
break;
case PROPERTY_ID_FETCHDIRECTION:
if( m_nResultSetType == ResultSetType::FORWARD_ONLY)
- throw Exception(); // else run through
+ throw Exception();
+ SAL_FALLTHROUGH;
default:
OPropertyStateContainer::setFastPropertyValue_NoBroadcast(nHandle,rValue);
}
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index aaaf28f40a57..8d799f03a5e3 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -1812,7 +1812,7 @@ OUString OSingleSelectQueryComposer::getKeyword( SQLPart _ePart )
{
default:
SAL_WARN("dbaccess", "OSingleSelectQueryComposer::getKeyWord: Invalid enum value!" );
- // no break, fallback to WHERE
+ SAL_FALLTHROUGH; // fallback to WHERE
case Where:
sKeyword = STR_WHERE;
break;
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index fc50e380c597..f16cfddf4f20 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -155,7 +155,7 @@ void ODBTableDecorator::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, con
{
case PROPERTY_ID_PRIVILEGES:
SAL_WARN("dbaccess", "Property is readonly!");
- /* Fall through */
+ SAL_FALLTHROUGH;
case PROPERTY_ID_FILTER:
case PROPERTY_ID_ORDER:
case PROPERTY_ID_APPLYFILTER:
@@ -234,7 +234,7 @@ void ODBTableDecorator::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) c
break;
}
}
- // run through
+ SAL_FALLTHROUGH;
case PROPERTY_ID_FILTER:
case PROPERTY_ID_ORDER:
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index 18e59d47eb8f..177335605100 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -444,7 +444,7 @@ namespace dbaccess
m_aCompDesc.bForEditing = true;
break;
}
- // fall through
+ SAL_FALLTHROUGH;
case FORM:
m_aCompDesc.bForEditing = !lcl_determineReadOnly( m_xComponent );
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 5d1d893e3775..df54ae4eaf6a 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -1193,14 +1193,14 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
case SID_DB_FORM_NEW_PILOT:
case SID_FORM_CREATE_REPWIZ_PRE_SEL:
bAutoPilot = true;
- // run through
+ SAL_FALLTHROUGH;
case SID_APP_NEW_FORM:
eType = E_FORM;
break;
case ID_DOCUMENT_CREATE_REPWIZ:
case SID_REPORT_CREATE_REPWIZ_PRE_SEL:
bAutoPilot = true;
- // run through
+ SAL_FALLTHROUGH;
case SID_APP_NEW_REPORT:
case SID_APP_NEW_REPORT_PRE_SEL:
eType = E_REPORT;
@@ -1217,7 +1217,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
break;
case ID_NEW_TABLE_DESIGN_AUTO_PILOT:
bAutoPilot = true;
- // run through
+ SAL_FALLTHROUGH;
case ID_NEW_TABLE_DESIGN:
break;
default:
@@ -1794,7 +1794,7 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const
// component, but standalone documents.
isStandaloneDocument = true;
}
- // NO break!
+ SAL_FALLTHROUGH;
case E_FORM:
{
if ( isStandaloneDocument || !m_pSubComponentManager->activateSubFrame( _sName, _eType, _eOpenMode, xRet ) )
@@ -2075,7 +2075,7 @@ void OApplicationController::renameEntry()
ensureConnection();
if ( !getConnection().is() )
break;
- // NO break
+ SAL_FALLTHROUGH;
case E_QUERY:
if ( xContainer->hasByName(*aList.begin()) )
{
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 151ad461c6c1..b632da014960 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -783,7 +783,7 @@ void OApplicationController::getSupportedFormats(ElementType _eType,::std::vecto
_rFormatIds.push_back(SotClipboardFormatId::DBACCESS_TABLE);
_rFormatIds.push_back(SotClipboardFormatId::RTF);
_rFormatIds.push_back(SotClipboardFormatId::HTML);
- // run through
+ SAL_FALLTHROUGH;
case E_QUERY:
_rFormatIds.push_back(SotClipboardFormatId::DBACCESS_QUERY);
break;
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 36425d0f9c7f..d66fd914b989 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -1470,7 +1470,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
aReturn.bEnabled = m_aCurrentFrame.isActive();
break;
}
- // run through
+ SAL_FALLTHROUGH;
case ID_BROWSER_PASTE:
case ID_BROWSER_CUT:
{
@@ -1526,7 +1526,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
aReturn.bEnabled = true;
break;
}
- // no break
+ SAL_FALLTHROUGH;
case ID_BROWSER_ORDERCRIT:
{
const Reference< XPropertySet > xFormSet(getRowSet(), UNO_QUERY);
@@ -1950,7 +1950,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
getBrowserView()->getVclControl()->CopySelectedRowsToClipboard();
break;
}
- // run through
+ SAL_FALLTHROUGH;
case ID_BROWSER_CUT:
case ID_BROWSER_PASTE:
{
@@ -1978,7 +1978,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
case ID_BROWSER_SORTDOWN:
bSortUp = false;
- // DON'T break
+ SAL_FALLTHROUGH;
case ID_BROWSER_SORTUP:
{
if (!SaveModified())
diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index a722433db8d8..848b84f4ac40 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -117,8 +117,8 @@ namespace dbaui
if ( m_pAccel.get() && m_pAccel->execute( aKeyCode ) )
// the accelerator consumed the event
return true;
+ SAL_FALLTHROUGH;
}
- // NO break
case MouseNotifyEvent::KEYUP:
case MouseNotifyEvent::MOUSEBUTTONDOWN:
case MouseNotifyEvent::MOUSEBUTTONUP:
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 30cff7ef186e..8175553bd47e 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -718,7 +718,7 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm
case DataType::LONGVARCHAR:
case DataType::CLOB:
aInitialValues.push_back( NamedValue( OUString( "MultiLine" ), makeAny( true ) ) );
- // NO break!
+ SAL_FALLTHROUGH;
case DataType::BINARY:
case DataType::VARBINARY:
case DataType::LONGVARBINARY:
@@ -729,7 +729,7 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm
case DataType::VARCHAR:
case DataType::CHAR:
bFormattedIsNumeric = false;
- // NO break!
+ SAL_FALLTHROUGH;
default:
aCurrentModelType = "FormattedField";
sDefaultProperty = PROPERTY_EFFECTIVEDEFAULT;
@@ -1678,7 +1678,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const
if ( !m_pTreeView->HasChildPathFocus() )
// handled below
break;
- // NO break!
+ SAL_FALLTHROUGH;
case ID_TREE_CLOSE_CONN:
case ID_TREE_EDIT_DATABASE:
{
@@ -1825,7 +1825,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const
aReturn.bEnabled = pControl->canCopyCellText(pControl->GetCurRow(), pControl->GetCurColumnId());
break;
}
- // NO break here
+ SAL_FALLTHROUGH;
default:
return SbaXDataBrowserController::GetState(nId);
}
@@ -1885,7 +1885,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue
SbaXDataBrowserController::Execute(nId,aArgs);
break;
}
- // NO break here!
+ SAL_FALLTHROUGH;
}
case ID_BROWSER_REFRESH_REBUILD:
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 97ddddebab75..dbe520f40464 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -1188,7 +1188,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
DeactivateAggregate( tpBoolDefault );
break;
}
- // run through
+ SAL_FALLTHROUGH;
case DataType::BOOLEAN:
DeactivateAggregate( tpTextLen );
DeactivateAggregate( tpFormat );
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 3a1c35732b61..ee127dd451ee 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -607,7 +607,7 @@ std::unique_ptr<PopupMenu> DBTreeListBox::CreateContextMenu()
default:
OSL_FAIL( "DBTreeListBox::CreateContextMenu: unexpected return value of the interceptor call!" );
-
+ SAL_FALLTHROUGH;
case ContextMenuInterceptorAction_IGNORED:
break;
}
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index bae6b8dfe07e..5a110146b4e8 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -533,7 +533,7 @@ void OSQLMessageBox::impl_initImage( MessageType _eImage )
{
default:
OSL_FAIL( "OSQLMessageBox::impl_initImage: unsupported image type!" );
- /* Fall through */
+ SAL_FALLTHROUGH;
case Info:
m_aInfoImage->SetImage(InfoBox::GetStandardImage());
break;
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index 2cf1497bff1f..e90ef6241521 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -147,7 +147,7 @@ void OHTMLReader::NextToken( int nToken )
}
}
}
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_THEAD_ON:
case HTML_TBODY_ON:
{
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index db995cc875ff..cebe8027d52c 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -569,7 +569,7 @@ void fillTypeInfo( const Reference< css::sdbc::XConnection>& _rxConnection,
aName = _rsTypeNames.getToken(TYPE_BIT, ';');
break;
}
- // run through
+ SAL_FALLTHROUGH;
case DataType::BOOLEAN:
aName = _rsTypeNames.getToken(TYPE_BOOL, ';');
break;
@@ -1221,19 +1221,19 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType
case DataType::TINYINT:
if( (pTypeInfo = queryTypeInfoByType(DataType::SMALLINT,_rTypeInfo) ) )
break;
- // run through
+ SAL_FALLTHROUGH;
case DataType::SMALLINT:
if( (pTypeInfo = queryTypeInfoByType(DataType::INTEGER,_rTypeInfo) ) )
break;
- // run through
+ SAL_FALLTHROUGH;
case DataType::INTEGER:
if( (pTypeInfo = queryTypeInfoByType(DataType::FLOAT,_rTypeInfo) ) )
break;
- // run through
+ SAL_FALLTHROUGH;
case DataType::FLOAT:
if( (pTypeInfo = queryTypeInfoByType(DataType::REAL,_rTypeInfo) ) )
break;
- // run through
+ SAL_FALLTHROUGH;
case DataType::DATE:
case DataType::TIME:
if( DataType::DATE == _nDataType || DataType::TIME == _nDataType )
@@ -1241,17 +1241,17 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType
if( (pTypeInfo = queryTypeInfoByType(DataType::TIMESTAMP,_rTypeInfo) ) )
break;
}
- // run through
+ SAL_FALLTHROUGH;
case DataType::TIMESTAMP:
case DataType::REAL:
case DataType::BIGINT:
if ( (pTypeInfo = queryTypeInfoByType(DataType::DOUBLE,_rTypeInfo) ) )
break;
- // run through
+ SAL_FALLTHROUGH;
case DataType::DOUBLE:
if ( (pTypeInfo = queryTypeInfoByType(DataType::NUMERIC,_rTypeInfo) ) )
break;
- // run through
+ SAL_FALLTHROUGH;
case DataType::NUMERIC:
pTypeInfo = queryTypeInfoByType(DataType::DECIMAL,_rTypeInfo);
break;
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 51549cc3b29d..d030787effbe 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -1451,19 +1451,19 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType, bool& _bN
case DataType::TINYINT:
if(supportsType(DataType::SMALLINT,nDefaultType))
break;
- // run through
+ SAL_FALLTHROUGH;
case DataType::SMALLINT:
if(supportsType(DataType::INTEGER,nDefaultType))
break;
- // run through
+ SAL_FALLTHROUGH;
case DataType::INTEGER:
if(supportsType(DataType::FLOAT,nDefaultType))
break;
- // run through
+ SAL_FALLTHROUGH;
case DataType::FLOAT:
if(supportsType(DataType::REAL,nDefaultType))
break;
- // run through
+ SAL_FALLTHROUGH;
case DataType::DATE:
case DataType::TIME:
if( DataType::DATE == _pType->nType || DataType::TIME == _pType->nType )
@@ -1471,17 +1471,17 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType, bool& _bN
if(supportsType(DataType::TIMESTAMP,nDefaultType))
break;
}
- // run through
+ SAL_FALLTHROUGH;
case DataType::TIMESTAMP:
case DataType::REAL:
case DataType::BIGINT:
if ( supportsType(DataType::DOUBLE,nDefaultType) )
break;
- // run through
+ SAL_FALLTHROUGH;
case DataType::DOUBLE:
if ( supportsType(DataType::NUMERIC,nDefaultType) )
break;
- // run through
+ SAL_FALLTHROUGH;
case DataType::NUMERIC:
supportsType(DataType::DECIMAL,nDefaultType);
break;
diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx
index c544b2159afa..2904b81b7eca 100644
--- a/dbaccess/source/ui/misc/linkeddocuments.cxx
+++ b/dbaccess/source/ui/misc/linkeddocuments.cxx
@@ -139,7 +139,7 @@ namespace dbaui
case E_OPEN_FOR_MAIL:
aArguments.put( "Hidden", true );
- // fall through
+ SAL_FALLTHROUGH;
case E_OPEN_DESIGN:
sOpenMode = "openDesign";
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 67b8d374c9b4..4727b2355986 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -2002,8 +2002,9 @@ void OSelectionBrowseBox::Command(const CommandEvent& rEvt)
EditBrowseBox::Command(rEvt);
return;
}
+
+ SAL_FALLTHROUGH;
}
- //fall-through
default:
EditBrowseBox::Command(rEvt);
}
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index 46c6154ceb6c..37373d9d50b5 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -68,7 +68,7 @@ bool LimitBoxImpl::Notify( NotifyEvent& rNEvt )
{
case KEY_ESCAPE:
Undo();
- // fall-through
+ SAL_FALLTHROUGH;
case KEY_RETURN:
GrabFocusToDocument();
bHandled = true;
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index cc9b7d8b4c39..cec03384ad0b 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -553,7 +553,7 @@ FeatureState OQueryController::GetState(sal_uInt16 _nId) const
aReturn.bEnabled = false;
break;
}
- // run through
+ SAL_FALLTHROUGH;
default:
aReturn = OJoinController::GetState(_nId);
break;
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index 8003504f6b04..77f0650e17da 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -142,8 +142,8 @@ void OTableRowView::Command(const CommandEvent& rEvt)
}
}
+ SAL_FALLTHROUGH;
}
- //fall-through
default:
EditBrowseBox::Command(rEvt);
}
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index bdfd531da0aa..4d0f15211aed 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -1250,7 +1250,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou
aTransfer.transferComplexValue( &XRow::getBytes, &XParameters::setBytes );
break;
}
- // run through
+ SAL_FALLTHROUGH;
case DataType::BOOLEAN:
aTransfer.transferValue( &XRow::getBoolean, &XParameters::setBoolean );
break;
@@ -1333,8 +1333,9 @@ void CopyTableWizard::impl_doCopy_nothrow()
if( CopyTableOperation::CopyDefinitionOnly == rWizard.getOperation() )
break;
+
+ SAL_FALLTHROUGH;
}
- // run through
case CopyTableOperation::AppendData:
{
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index 86cf478cf5ad..86ca552355e9 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -154,7 +154,7 @@ Status finalize() {
if (isCreated()) {
return EXISTED;
}
- // fall through
+ SAL_FALLTHROUGH;
case utl::Bootstrap::PATH_VALID:
return create(uri);
default:
diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
index 026fd9200484..a9d653b99bb1 100644
--- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
@@ -73,7 +73,7 @@ namespace drawinglayer
aHatch.appendTransformations(aMatrices);
- // fall-through by purpose
+ SAL_FALLTHROUGH;
}
case attribute::HATCHSTYLE_DOUBLE:
{
@@ -86,7 +86,7 @@ namespace drawinglayer
aHatch.appendTransformations(aMatrices);
- // fall-through by purpose
+ SAL_FALLTHROUGH;
}
case attribute::HATCHSTYLE_SINGLE:
{
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index b1281bc65968..e410ca942ab5 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -228,7 +228,7 @@ namespace drawinglayer
{
default:
SAL_WARN( "drawinglayer", "Unknown Relief style " << pTCPP->getTextRelief() );
- // fall through
+ SAL_FALLTHROUGH;
case primitive2d::TEXT_RELIEF_NONE: eFontRelief = RELIEF_NONE; break;
case primitive2d::TEXT_RELIEF_EMBOSSED: eFontRelief = RELIEF_EMBOSSED; break;
case primitive2d::TEXT_RELIEF_ENGRAVED: eFontRelief = RELIEF_ENGRAVED; break;
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index dec2be7479f1..4d644a6b539a 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -297,7 +297,7 @@ void EditHTMLParser::NextToken( int nToken )
case HTML_TABLEHEADER_ON:
case HTML_TABLEDATA_ON:
nInCell++;
- // fall through
+ SAL_FALLTHROUGH;
case HTML_BLOCKQUOTE_ON:
case HTML_BLOCKQUOTE_OFF:
case HTML_BLOCKQUOTE30_ON:
@@ -321,8 +321,8 @@ void EditHTMLParser::NextToken( int nToken )
{
if ( nInCell )
nInCell--;
+ SAL_FALLTHROUGH;
}
- // fall through
case HTML_LISTHEADER_OFF:
case HTML_LI_OFF:
case HTML_DD_OFF:
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index e3caabbb2b49..36c3756c1bbf 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1908,28 +1908,28 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
case LEFT_BORDER_DISTANCE:
bDistMember = true;
- //fall-through
+ SAL_FALLTHROUGH;
case LEFT_BORDER:
case MID_LEFT_BORDER:
nLine = SvxBoxItemLine::LEFT;
break;
case RIGHT_BORDER_DISTANCE:
bDistMember = true;
- //fall-through
+ SAL_FALLTHROUGH;
case RIGHT_BORDER:
case MID_RIGHT_BORDER:
nLine = SvxBoxItemLine::RIGHT;
break;
case BOTTOM_BORDER_DISTANCE:
bDistMember = true;
- //fall-through
+ SAL_FALLTHROUGH;
case BOTTOM_BORDER:
case MID_BOTTOM_BORDER:
nLine = SvxBoxItemLine::BOTTOM;
break;
case TOP_BORDER_DISTANCE:
bDistMember = true;
- //fall-through
+ SAL_FALLTHROUGH;
case TOP_BORDER:
case MID_TOP_BORDER:
nLine = SvxBoxItemLine::TOP;
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 5893f27f7372..dc7b382a71b9 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -3336,7 +3336,7 @@ void SvxScriptSetItem::GetSlotIds( sal_uInt16 nSlotId, sal_uInt16& rLatin,
{
default:
DBG_ASSERT( false, "wrong SlotId for class SvxScriptSetItem" );
- // no break - default to font - Id Range !!
+ SAL_FALLTHROUGH; // default to font - Id Range !!
case SID_ATTR_CHAR_FONT:
rLatin = SID_ATTR_CHAR_FONT;
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 9464e043cea9..02939c7a3599 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -1366,17 +1366,17 @@ static void SetBorderLine( int nBorderTyp, SvxBoxItem& rItem,
rItem.SetLine( &rBorder, SvxBoxItemLine::TOP );
if( RTF_BOX != nBorderTyp )
return;
- // fall-through
+ SAL_FALLTHROUGH;
case RTF_BRDRB:
rItem.SetLine( &rBorder, SvxBoxItemLine::BOTTOM );
if( RTF_BOX != nBorderTyp )
return;
- // fall-through
+ SAL_FALLTHROUGH;
case RTF_BRDRL:
rItem.SetLine( &rBorder, SvxBoxItemLine::LEFT );
if( RTF_BOX != nBorderTyp )
return;
- // fall-through
+ SAL_FALLTHROUGH;
case RTF_BRDRR:
rItem.SetLine( &rBorder, SvxBoxItemLine::RIGHT );
if( RTF_BOX != nBorderTyp )
@@ -1815,7 +1815,9 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
bIsLeftToRightDef = true;
switch( nToken )
{
- case RTF_ADEFF: bIsLeftToRightDef = false; // no break!
+ case RTF_ADEFF:
+ bIsLeftToRightDef = false;
+ SAL_FALLTHROUGH;
case RTF_DEFF:
{
if( -1 == nValue )
@@ -1829,7 +1831,9 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
}
break;
- case RTF_ADEFLANG: bIsLeftToRightDef = false; // no break!
+ case RTF_ADEFLANG:
+ bIsLeftToRightDef = false;
+ SAL_FALLTHROUGH;
case RTF_DEFLANG:
// store default Language
if( -1 != nValue )
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 7b4fb438705a..dd2105fff1cf 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -189,7 +189,7 @@ void SvxRTFParser::NextToken( int nToken )
case RTF_RDBLQUOTE: cCh = 0x201D; goto INSINGLECHAR;
INSINGLECHAR:
aToken = OUString(cCh);
- // no Break, aToken is set as Text
+ SAL_FALLTHROUGH; // aToken is set as Text
case RTF_TEXTTOKEN:
{
InsertText();
@@ -420,7 +420,7 @@ void SvxRTFParser::ReadColorTable()
: -1 == aToken.indexOf( ";" ) )
break; // At least the ';' must be found
- // else no break !!
+ SAL_FALLTHROUGH;
case ';':
if( IsParserWorking() )
@@ -509,7 +509,7 @@ void SvxRTFParser::ReadFontTable()
// for technical/symbolic font of the rtl_TextEncoding is changed!
case RTF_FTECH:
pFont->SetCharSet( RTL_TEXTENCODING_SYMBOL );
- // deliberate fall through
+ SAL_FALLTHROUGH;
case RTF_FNIL:
pFont->SetFamily( FAMILY_DONTKNOW );
break;
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index d9d3ddb34d3c..dab2e1d0a748 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -405,7 +405,7 @@ bool OleEmbeddedObject::TryToConvertToOOo()
throw uno::RuntimeException(); // the repairing is not possible
}
- // no break as designed!
+ SAL_FALLTHROUGH;
case 1:
case 0:
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 7e978e435a74..ace7b9a9de59 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -250,7 +250,7 @@ namespace abp
implCreateDataSource();
if ( needAdminInvokationPage() )
break;
- // no break here
+ SAL_FALLTHROUGH;
case STATE_INVOKE_ADMIN_DIALOG:
if ( !connectToDataSource( false ) )
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index 53ce924cf45f..6f74be887141 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -164,7 +164,7 @@ namespace pcr
break;
}
}
- // NO break here!
+ SAL_FALLTHROUGH;
}
case FormComponentType::LISTBOX:
case FormComponentType::COMBOBOX:
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index d4870a456f99..4bccf525bff8 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -572,8 +572,8 @@ namespace pcr
bool bBoundToSomeModel = !sDataModelName.isEmpty();
_rxInspectorUI->rebuildPropertyUI( PROPERTY_BINDING_NAME );
_rxInspectorUI->enablePropertyUI( PROPERTY_BINDING_NAME, bBoundToSomeModel );
+ SAL_FALLTHROUGH;
}
- // NO break
case PROPERTY_ID_BINDING_NAME:
{
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index f805cac7276f..2a021f05dc74 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -1555,7 +1555,7 @@ namespace pcr
// Command also depends on DataSource
aDependentProperties.push_back( PROPERTY_ID_COMMAND );
- // NO break!
+ SAL_FALLTHROUGH;
// ----- Command -----
case PROPERTY_ID_COMMAND:
@@ -1572,7 +1572,7 @@ namespace pcr
_rxInspectorUI->rebuildPropertyUI( PROPERTY_LISTSOURCE );
aDependentProperties.push_back( PROPERTY_ID_STRINGITEMLIST );
aDependentProperties.push_back( PROPERTY_ID_BOUNDCOLUMN );
- // NO break!
+ SAL_FALLTHROUGH;
// ----- StringItemList -----
case PROPERTY_ID_STRINGITEMLIST:
@@ -1677,8 +1677,8 @@ namespace pcr
FormButtonType eButtonType( FormButtonType_PUSH );
OSL_VERIFY( _rNewValue >>= eButtonType );
_rxInspectorUI->enablePropertyUI( PROPERTY_TARGET_URL, FormButtonType_URL == eButtonType );
+ SAL_FALLTHROUGH;
}
- // NO break!
// ----- TargetURL -----
case PROPERTY_ID_TARGET_URL:
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index 961b6bc18763..de5f935fb73f 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -453,7 +453,7 @@ namespace pcr
case PROPERTY_ID_WIDTH:
case PROPERTY_ID_HEIGHT:
bIsSize = true;
- // NO break!
+ SAL_FALLTHROUGH;
case PROPERTY_ID_POSITIONX:
case PROPERTY_ID_POSITIONY:
{
diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx
index cb1d20590c22..74488936da24 100644
--- a/extensions/source/propctrlr/handlerhelper.cxx
+++ b/extensions/source/propctrlr/handlerhelper.cxx
@@ -99,7 +99,7 @@ namespace pcr
default:
OSL_FAIL( "PropertyHandlerHelper::describePropertyLine: don't know how to represent this at the UI!" );
- // NO break!
+ SAL_FALLTHROUGH;
case TypeClass_STRING:
nControlType = PropertyControlType::TextField;
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 93dfe76f645b..112173ba0e90 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -1766,6 +1766,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
{
const MetaISectRectClipRegionAction* pA = static_cast<const MetaISectRectClipRegionAction*>(pAction);
clipRect = pA->GetRect();
+ SAL_FALLTHROUGH;
}
// fall-through
case( MetaActionType::CLIPREGION ):
@@ -1779,6 +1780,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
case( MetaActionType::MAPMODE ):
{
bMap++;
+ SAL_FALLTHROUGH;
}
// fall-through
case( MetaActionType::REFPOINT ):
diff --git a/filter/source/graphicfilter/idxf/dxfentrd.cxx b/filter/source/graphicfilter/idxf/dxfentrd.cxx
index 755b9df2bc78..85508ac2d1cc 100644
--- a/filter/source/graphicfilter/idxf/dxfentrd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfentrd.cxx
@@ -699,7 +699,7 @@ void DXFHatchEntity::EvaluateGroup( DXFGroupReader & rDGR )
case 92:
nCurrentBoundaryPathIndex++;
- //fallthrough
+ SAL_FALLTHROUGH;
default:
{
bool bExecutingGroupCode = false;
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 26b73206ec01..ff578ac5f44a 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -698,11 +698,11 @@ void OS2METReader::SetPen( const Color& rColor, sal_uInt16 nLineWidth, PenStyle
break;
case PEN_DASHDOT :
nDashCount++;
- //fall-through
+ SAL_FALLTHROUGH;
case PEN_DOT :
nDotCount++;
nDashCount--;
- //fall-through
+ SAL_FALLTHROUGH;
case PEN_DASH :
nDashCount++;
aLineInfo.SetDotCount( nDotCount );
diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx
index b54a1f74ad04..c84a60601001 100644
--- a/filter/source/graphicfilter/ipbm/ipbm.cxx
+++ b/filter/source/graphicfilter/ipbm/ipbm.cxx
@@ -155,7 +155,7 @@ bool PBMReader::ImplReadHeader()
{
case '1' :
mbRaw = false;
- //fall-through
+ SAL_FALLTHROUGH;
case '4' :
mnMode = 0;
nMax = 2; // number of parameters in Header
@@ -163,14 +163,14 @@ bool PBMReader::ImplReadHeader()
break;
case '2' :
mbRaw = false;
- //fall-through
+ SAL_FALLTHROUGH;
case '5' :
mnMode = 1;
nMax = 3;
break;
case '3' :
mbRaw = false;
- //fall-through
+ SAL_FALLTHROUGH;
case '6' :
mnMode = 2;
nMax = 3;
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index d6213de3be19..3556aa71c6e0 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -241,7 +241,7 @@ bool PSDReader::ImplReadHeader()
case PSD_DUOTONE : // we'll handle the duotone color like a normal grayscale picture
m_rPSD.SeekRel( nColorLength );
nColorLength = 0;
- /* Fall through */
+ SAL_FALLTHROUGH;
case PSD_GRAYSCALE :
{
if ( nColorLength )
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 74268e99bd25..a53aa3123649 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -758,11 +758,11 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
switch ( aPlaceholderAtom.nPlaceholderId )
{
case PptPlaceholder::MASTERSLIDENUMBER : nHeaderFooterInstance++;
- // fall-through
+ SAL_FALLTHROUGH;
case PptPlaceholder::MASTERFOOTER : nHeaderFooterInstance++;
- // fall-through
+ SAL_FALLTHROUGH;
case PptPlaceholder::MASTERHEADER : nHeaderFooterInstance++;
- // fall-through
+ SAL_FALLTHROUGH;
case PptPlaceholder::MASTERDATE : nHeaderFooterInstance++; break;
default: break;
@@ -6436,13 +6436,13 @@ void PPTFieldEntry::GetDateTime( const sal_uInt32 nVal, SvxDateFormat& eDateForm
break;
case 7:
eDateFormat = SVXDATEFORMAT_A;
- //fall-through
+ SAL_FALLTHROUGH;
case 9:
eTimeFormat = SVXTIMEFORMAT_24_HM;
break;
case 8:
eDateFormat = SVXDATEFORMAT_A;
- //fall-through
+ SAL_FALLTHROUGH;
case 11:
eTimeFormat = SVXTIMEFORMAT_12_HM;
break;
@@ -6552,7 +6552,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
{
case PPT_NOTEPAGE :
nInstance++;
- // fall-through
+ SAL_FALLTHROUGH;
case PPT_MASTERPAGE :
nInstance++;
case PPT_SLIDEPAGE :
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 687411198c08..673a948b95c5 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -479,7 +479,7 @@ EquationResult Read_SubF_Combined(WW8ReadFieldParams& rReadParam)
break;
}
(void)rReadParam.SkipToNextToken();
- // intentional fall-through
+ SAL_FALLTHROUGH;
case -2:
{
if ( rReadParam.GetResult().startsWithIgnoreAsciiCase("(") )
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 4c7153221ada..c96981e2abe2 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -2331,7 +2331,7 @@ IMPL_LINK_TYPED( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo, void )
aDate.SetDay( i );
sDate += SvxDateField::GetFormatted( aDate, eDateFormat, *pNumberFormatter, eLang );
}
- // No break here! We need months too!
+ SAL_FALLTHROUGH; // We need months too!
case SVXDATEFORMAT_C: // 13.Feb 1996
case SVXDATEFORMAT_D: // 13.February 1996
for( sal_uInt16 i = 1; i <= 12; ++i ) // we get all months in a year
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 5cb32bd9f9c2..87b4e5823227 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -214,14 +214,14 @@ namespace frm
{
Reference< XListBox > xListBox( getPeer(), UNO_QUERY_THROW );
xListBox->addItemListener( this );
+ SAL_FALLTHROUGH;
}
- // no break
case FormComponentType::COMBOBOX:
{
xVclWindow->setProperty(PROPERTY_AUTOCOMPLETE, makeAny( true ) );
+ SAL_FALLTHROUGH;
}
- // no break
default:
{
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index b00f7ceb8d37..aab467b5f839 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -943,8 +943,8 @@ Any OFormattedModel::translateControlValueToExternalValue( ) const
aExternalValue <<= sString;
break;
}
+ SAL_FALLTHROUGH;
}
- // NO break here!
case TypeClass_BOOLEAN:
{
double fValue = 0;
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index bdd507f05c7d..e10c29d4cb8f 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -449,7 +449,7 @@ namespace frm
{
case RET_NO:
shouldCommit = false;
- // no break on purpose: don't ask again!
+ SAL_FALLTHROUGH; // don't ask again!
case RET_YES:
needConfirmation = false;
return true;
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index 1a0e50bc81b3..b07c92d5517b 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -329,8 +329,8 @@ bool Model::setSimpleContent( const XNode_t& xConstNode,
OSL_ENSURE( xNode.is() &&
xNode->getNodeType() == NodeType_TEXT_NODE,
"text node creation failed?" );
+ SAL_FALLTHROUGH; // continue as with text node:
}
- // no break; continue as with text node:
case NodeType_TEXT_NODE:
case NodeType_ATTRIBUTE_NODE:
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index b02ff5c12cec..5704ee1c0ed8 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -1812,7 +1812,7 @@ void HwpReader::makeColumns(ColumnDef *coldef)
{
case 1: /* thin line */
padd("style:width", sXML_CDATA, "0.02mm");
- //fall-through
+ SAL_FALLTHROUGH;
case 3: /* dotted line */
padd("style:style", sXML_CDATA, "dotted");
padd("style:width", sXML_CDATA, "0.02mm");
@@ -3402,7 +3402,7 @@ void HwpReader::makeDateFormat(DateCode * hbox)
break;
case '_':
padd("number:style", sXML_CDATA, "long");
- //fall-through
+ SAL_FALLTHROUGH;
case '6':
case '^':
rstartEl("number:day-of-week", rList);
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index ba8428cd6474..abdf5d538914 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -868,7 +868,7 @@ static sal_Int16 SAL_CALL NatNumForCalendar(const css::lang::Locale& aLocale,
case NativeNumberMode::NATNUM4:
if (isKorean)
return isShort ? NativeNumberMode::NATNUM9 : NativeNumberMode::NATNUM11;
- // fall through
+ SAL_FALLTHROUGH;
default: return 0;
}
}
@@ -1092,7 +1092,7 @@ Calendar_gregorian::getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, sal_In
switch( nCalendarDisplayCode ) {
case CalendarDisplayCode::SHORT_MONTH:
value += 1; // month is zero based
- // fall through
+ SAL_FALLTHROUGH;
case CalendarDisplayCode::SHORT_DAY:
sprintf(aStr, "%d", value); // #100211# - checked
break;
diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
index 2a6f9548eeda..94019c73d56f 100644
--- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
@@ -372,7 +372,7 @@ sal_Int32 cclass_Unicode::getParseTokensType(sal_uInt32 const c, bool const isFi
case U_OTHER_LETTER :
// Non_Spacing_Mark could not be as leading character
if (isFirst) break;
- // fall through, treat it as Other_Letter.
+ SAL_FALLTHROUGH; // treat it as Other_Letter.
case U_NON_SPACING_MARK :
return KParseTokens::UNI_OTHER_LETTER;
case U_DECIMAL_DIGIT_NUMBER :
@@ -642,7 +642,7 @@ UPT_FLAG_TYPE cclass_Unicode::getFlagsExtended(sal_uInt32 const c)
// nor can a spacing combining mark.
if (bStart)
return TOKEN_ILLEGAL;
- // fall through, treat it as Other_Letter.
+ SAL_FALLTHROUGH; // treat it as Other_Letter.
case U_OTHER_LETTER :
return (nTypes & KParseTokens::UNI_OTHER_LETTER) ?
(bStart ? TOKEN_CHAR_WORD : TOKEN_WORD) :
@@ -890,7 +890,7 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
break;
case ssGetWordFirstChar :
eState = ssGetWord;
- // fall through
+ SAL_FALLTHROUGH;
case ssGetWord :
{
if ( nMask & TOKEN_WORD )
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 40fb536e848a..3a72b6686a84 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -318,8 +318,8 @@ OUString toRoman( sal_Int32 n )
}
switch( nZahl )
{
- case 3: sTmp.append(*cRomanStr); //no break!
- case 2: sTmp.append(*cRomanStr); //no break!
+ case 3: sTmp.append(*cRomanStr); SAL_FALLTHROUGH;
+ case 2: sTmp.append(*cRomanStr); SAL_FALLTHROUGH;
case 1: sTmp.append(*cRomanStr); break;
case 4: sTmp.append(*cRomanStr).append(*(cRomanStr-nDiff)); break;
case 5: sTmp.append(*(cRomanStr-nDiff)); break;
diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx
index 72967bd1d5cd..6db7a116c0eb 100644
--- a/i18npool/source/indexentry/indexentrysupplier_default.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx
@@ -214,7 +214,7 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm
break;
case sal_Unicode('{'):
close = '}';
- //fall-through
+ SAL_FALLTHROUGH;
case sal_Unicode('('):
if (key_count > 0) {
sal_Int16 end = i+1;
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 098c39228fc0..bc8899e84f40 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -778,7 +778,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
sTheCompatibleCurrency = aCode.copy( nStart + 2, nHyphen - nStart - 2);
}
}
- // fallthru
+ SAL_FALLTHROUGH;
case cssi::NumberFormatIndex::CURRENCY_1000INT :
case cssi::NumberFormatIndex::CURRENCY_1000INT_RED :
case cssi::NumberFormatIndex::CURRENCY_1000DEC2_RED :
@@ -1111,7 +1111,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
// separators and generate a second pattern with the
// format's separator at the current position.
cDateSep2 = cChar;
- // fallthru
+ SAL_FALLTHROUGH;
default:
handleDefault:
if (!cDateSep)
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index d8f5ed09371a..19fa90179930 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -650,7 +650,7 @@ Sequence< CalendarItem2 > &LocaleDataImpl::getCalendarItemByName(const OUString&
return ref_cal.PartitiveMonths;
default:
OSL_FAIL( "LocaleDataImpl::getCalendarItemByName: unhandled REF_* case");
- // fallthru
+ SAL_FALLTHROUGH;
case REF_ERAS:
return ref_cal.Eras;
}
diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx
index 229e5b45f5a7..58bd79c6d9da 100644
--- a/idlc/source/options.cxx
+++ b/idlc/source/options.cxx
@@ -153,8 +153,8 @@ bool Options::checkCommandFile (std::vector< std::string > & rArgs, char const *
}
break;
}
+ SAL_FALLTHROUGH;
default:
- // quoted white-space fall through
buffer.push_back(sal::static_int_cast<char>(c));
break;
}
diff --git a/include/sal/types.h b/include/sal/types.h
index c4bf4982cbae..eeaf94c028f4 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -443,6 +443,14 @@ namespace css = ::com::sun::star;
#define SAL_CONSTEXPR
#endif
+#if defined LIBO_INTERNAL_ONLY
+#if defined __clang__
+#define SAL_FALLTHROUGH [[clang::fallthrough]]
+#else
+#define SAL_FALLTHROUGH
+#endif
+#endif
+
#endif /* __cplusplus */
#ifdef __cplusplus
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 25ae2a4fa4ca..24efce5788c8 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -282,7 +282,7 @@ FileHandleReader::readLine(OString * pLine)
{
case osl_File_E_PIPE: //HACK! for windows
nRead = 0;
- //fall-through
+ SAL_FALLTHROUGH;
case osl_File_E_None:
if (nRead == 0)
{
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 79faa24491ef..7989c1321c4b 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -886,7 +886,7 @@ globalCallback (gpointer pData)
break;
case LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY:
bModify = true;
- // fallthrough
+ SAL_FALLTHROUGH;
case LOK_CALLBACK_DOCUMENT_PASSWORD:
{
char const*const pURL(pCallback->m_aPayload.c_str());
diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx b/lotuswordpro/source/filter/lwpobjstrm.cxx
index 9a4e19df31f6..e80d62d173f7 100644
--- a/lotuswordpro/source/filter/lwpobjstrm.cxx
+++ b/lotuswordpro/source/filter/lwpobjstrm.cxx
@@ -363,7 +363,7 @@ sal_uInt16 LwpObjectStream::DecompressBuffer(sal_uInt8* pDst, sal_uInt8* pSrc, s
*pDst++ = 0;
DstSize++;
- // fall through into next case!
+ SAL_FALLTHROUGH;
case 0xC0:
// 1 - 64 bytes of non-zero
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx
index e92713ba1b91..35d18df6a3f2 100644
--- a/oox/source/drawingml/color.cxx
+++ b/oox/source/drawingml/color.cxx
@@ -695,7 +695,7 @@ void Color::toCrgb() const
{
case COLOR_HSL:
toRgb();
- // run through!
+ SAL_FALLTHROUGH;
case COLOR_RGB:
meMode = COLOR_CRGB;
mnC1 = lclGamma( lclRgbCompToCrgbComp( mnC1 ), DEC_GAMMA );
@@ -716,7 +716,7 @@ void Color::toHsl() const
{
case COLOR_CRGB:
toRgb();
- // run through!
+ SAL_FALLTHROUGH;
case COLOR_RGB:
{
meMode = COLOR_HSL;
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index 88aa8a72961f..3210528c81ba 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -223,18 +223,24 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
}
break;
- case XML_hd10 : // !!PASSTHROUGH INTENDED
+ case XML_hd10 :
nIntVal += 2; // */ h 1.0 10.0
+ SAL_FALLTHROUGH;
case XML_hd8 : // */ h 1.0 8.0
nIntVal += 2;
+ SAL_FALLTHROUGH;
case XML_hd6 : // */ h 1.0 6.0
nIntVal++;
+ SAL_FALLTHROUGH;
case XML_hd5 : // */ h 1.0 5.0
nIntVal++;
+ SAL_FALLTHROUGH;
case XML_hd4 : // */ h 1.0 4.0
nIntVal++;
+ SAL_FALLTHROUGH;
case XML_hd3 : // */ h 1.0 3.0
nIntVal++;
+ SAL_FALLTHROUGH;
case XML_hd2 : // */ h 1.0 2.0
case XML_vc : // */ h 1.0 2.0
{
@@ -279,14 +285,19 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
break;
case XML_ssd32 : // */ ss 1.0 32.0
nIntVal += 16;
+ SAL_FALLTHROUGH;
case XML_ssd16 : // */ ss 1.0 16.0
nIntVal += 8;
+ SAL_FALLTHROUGH;
case XML_ssd8 : // */ ss 1.0 8.0
nIntVal += 2;
+ SAL_FALLTHROUGH;
case XML_ssd6 : // */ ss 1.0 6.0
nIntVal += 2;
+ SAL_FALLTHROUGH;
case XML_ssd4 : // */ ss 1.0 4.0
nIntVal += 2;
+ SAL_FALLTHROUGH;
case XML_ssd2 : // */ ss 1.0 2.0
{
nIntVal += 2;
@@ -319,20 +330,28 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
case XML_wd32 : // */ w 1.0 32.0
nIntVal += 20;
+ SAL_FALLTHROUGH;
case XML_wd12 : // */ w 1.0 12.0
nIntVal += 2;
+ SAL_FALLTHROUGH;
case XML_wd10 : // */ w 1.0 10.0
nIntVal += 2;
+ SAL_FALLTHROUGH;
case XML_wd8 : // */ w 1.0 8.0
nIntVal += 2;
+ SAL_FALLTHROUGH;
case XML_wd6 : // */ w 1.0 6.0
nIntVal++;
+ SAL_FALLTHROUGH;
case XML_wd5 : // */ w 1.0 5.0
nIntVal++;
+ SAL_FALLTHROUGH;
case XML_wd4 : // */ w 1.0 4.0
nIntVal++;
+ SAL_FALLTHROUGH;
case XML_wd3 : // */ w 1.0 3.0
nIntVal++;
+ SAL_FALLTHROUGH;
case XML_hc : // */ w 1.0 2.0
case XML_wd2 : // */ w 1.0 2.0
{
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index a23314350c1f..319b791f7cd4 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -632,7 +632,7 @@ void DrawingML::WriteOutline( Reference<XPropertySet> rXPropSet )
SAL_INFO("oox.shape", "dash dots: " << aLineDash.Dots << " dashes: " << aLineDash.Dashes
<< " dotlen: " << aLineDash.DotLen << " dashlen: " << aLineDash.DashLen << " distance: " << aLineDash.Distance);
}
- /* fallthru intended */
+ SAL_FALLTHROUGH;
case drawing::LineStyle_SOLID:
default:
if ( GETA( LineColor ) )
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 18a700e2b163..602b86e5f6a7 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -398,7 +398,7 @@ void ControlConverter::convertAxBackground( PropertyMap& rPropMap,
break;
case API_TRANSPARENCY_PAINTTRANSPARENT:
rPropMap.setProperty( PROP_PaintTransparent, !bOpaque );
- // run-through intended!
+ SAL_FALLTHROUGH;
case API_TRANSPARENCY_VOID:
// keep transparency by leaving the (void) default property value
if( bOpaque )
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index 1d1dedbe0b65..491bb322533d 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -781,7 +781,7 @@ void FillModel::pushToPropMap( ShapePropertyMap& rPropMap, const GraphicHelper&
}
}
}
- // run-through to XML_solid in case of missing bitmap path intended!
+ SAL_FALLTHROUGH; // to XML_solid in case of missing bitmap path intended!
case XML_solid:
default:
diff --git a/registry/tools/options.cxx b/registry/tools/options.cxx
index 71c7162945e3..6584a0e2fe84 100644
--- a/registry/tools/options.cxx
+++ b/registry/tools/options.cxx
@@ -117,8 +117,8 @@ bool Options::checkCommandFile(std::vector< std::string > & rArgs, char const *
}
break;
}
+ SAL_FALLTHROUGH;
default:
- // quoted white-space fall through
buffer.push_back(sal::static_int_cast<char>(c));
break;
}
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 998428070dc9..029b453d8c53 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -600,7 +600,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
// TODO/LATER: no way to transport the error outside from the filter!
break;
}
- // fall through intended
+ SAL_FALLTHROUGH;
default:
{
// TODO/LATER: this is completely wrong! Filter code should never call ErrorHandler directly! But for now this is the only way!
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 990277a36f78..fd6a1720da56 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -752,7 +752,7 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt)
break;
}
}
- // run through
+ SAL_FALLTHROUGH;
}
default:
EditBrowseBox::Command(rEvt);
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 47a6d4ede761..6b24e4f942c3 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -974,7 +974,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope
aPropertyValue <<= static_cast<sal_Int32>(COL_TRANSPARENT);
break;
}
- // run through
+ SAL_FALLTHROUGH;
case PROPERTY_ID_KEEPTOGETHER:
if ( uno::Reference< report::XGroup>(m_xReportComponent,uno::UNO_QUERY).is())
@@ -982,7 +982,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope
aPropertyValue = getConstantValue(false,RID_STR_KEEPTOGETHER_CONST,_rControlValue,"com.sun.star.report.KeepTogether",PropertyName);
break;
}
- // run through
+ SAL_FALLTHROUGH;
case PROPERTY_ID_VISIBLE:
case PROPERTY_ID_CANGROW:
@@ -1138,7 +1138,7 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & Proper
aControlValue = getConstantValue(true,RID_STR_KEEPTOGETHER_CONST,aPropertyValue,"com.sun.star.report.KeepTogether",PropertyName);
break;
}
- // run through
+ SAL_FALLTHROUGH;
case PROPERTY_ID_VISIBLE:
case PROPERTY_ID_CANGROW:
case PROPERTY_ID_CANSHRINK:
@@ -1244,7 +1244,7 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & Proper
if ( (aPropertyValue >>= nColor) && static_cast<sal_Int32>(COL_TRANSPARENT) == nColor )
aPropertyValue.clear();
}
- // run through
+ SAL_FALLTHROUGH;
default:
aControlValue = m_xFormComponentHandler->convertToControlValue(PropertyName, aPropertyValue, _rControlValueType);
}
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index a8f7cede94d1..43b0c368a2a8 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -363,7 +363,7 @@ bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent)
bReturn = true;
break;
}
- // run through
+ SAL_FALLTHROUGH;
default:
{
bReturn = m_rView.KeyInput(_rEvent, m_pParent);
diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
index edd7a4dc3f96..761dedbfaa9b 100644
--- a/rsc/source/parser/erscerr.cxx
+++ b/rsc/source/parser/erscerr.cxx
@@ -124,7 +124,7 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage )
case ERR_NOINPUT:
StdLstErr( "Input file was not specified.\n");
- //fall-through
+ SAL_FALLTHROUGH;
case ERR_USAGE:
StdLstOut( "Copyright (C) 2000 - 2012 LibreOffice contributors.\n" );
{
diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx
index 47c31877ef6e..b276013d85ab 100644
--- a/rsc/source/parser/rsclex.cxx
+++ b/rsc/source/parser/rsclex.cxx
@@ -254,7 +254,7 @@ int MakeToken( YYSTYPE * pTokenVal )
break;
case INCLUDE:
bLastInclude = true;
- //fall-through
+ SAL_FALLTHROUGH;
default:
pTokenVal->value = aKey.yylval;
}
diff --git a/sal/osl/unx/security.cxx b/sal/osl/unx/security.cxx
index 16a5f74cba36..75097d2d4361 100644
--- a/sal/osl/unx/security.cxx
+++ b/sal/osl/unx/security.cxx
@@ -132,7 +132,7 @@ oslSecurity SAL_CALL osl_getCurrentSecurity()
if (found != nullptr) {
return p;
}
- /* fall through */
+ SAL_FALLTHROUGH;
default:
deleteSecurityImpl(p);
return nullptr;
diff --git a/sal/rtl/digest.cxx b/sal/rtl/digest.cxx
index da6df0ef2e32..fde91c7d166a 100644
--- a/sal/rtl/digest.cxx
+++ b/sal/rtl/digest.cxx
@@ -702,13 +702,12 @@ static void __rtl_digest_endMD5 (DigestContextMD5 *ctx)
switch (ctx->m_nDatLen & 0x03)
{
case 0: X[i] = ((sal_uInt32)(*(p++))) << 0L;
- /* fallthrough */
+ SAL_FALLTHROUGH;
case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L;
- /* fallthrough */
+ SAL_FALLTHROUGH;
case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16L;
- /* fallthrough */
+ SAL_FALLTHROUGH;
case 3: X[i] |= ((sal_uInt32)(*p)) << 24L;
- /* fallthrough */
}
i += 1;
@@ -1157,13 +1156,12 @@ static void __rtl_digest_endSHA (DigestContextSHA *ctx)
switch (ctx->m_nDatLen & 0x03)
{
case 0: X[i] = ((sal_uInt32)(*(p++))) << 0L;
- /* fallthrough */
+ SAL_FALLTHROUGH;
case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L;
- /* fallthrough */
+ SAL_FALLTHROUGH;
case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16L;
- /* fallthrough */
+ SAL_FALLTHROUGH;
case 3: X[i] |= ((sal_uInt32)(*(p++))) << 24L;
- /* fallthrough */
}
__rtl_digest_swapLong (X, i + 1);
diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx
index b028b3cf6664..1f5675f1abfe 100644
--- a/sal/rtl/uri.cxx
+++ b/sal/rtl/uri.cxx
@@ -605,7 +605,7 @@ void SAL_CALL rtl_uriDecode(rtl_uString * pText,
case rtl_UriDecodeToIuri:
eCharset = RTL_TEXTENCODING_UTF8;
- //fall-through
+ SAL_FALLTHROUGH;
default: // rtl_UriDecodeWithCharset, rtl_UriDecodeStrict
{
sal_Unicode const * p = pText->buffer;
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 0570024cfd45..19038e996d18 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -295,7 +295,7 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer,
case MeasureUnit::MM_100TH:
case MeasureUnit::MM_10TH:
OSL_ENSURE( MeasureUnit::INCH == nTargetUnit,"output unit not supported for twip values" );
- //fall-through
+ SAL_FALLTHROUGH;
case MeasureUnit::MM:
// 0.01mm = 0.57twip (exactly)
nMul = 25400; // 25.4 * 1000
@@ -352,7 +352,7 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer,
case MeasureUnit::MM_10TH:
OSL_ENSURE( MeasureUnit::INCH == nTargetUnit,
"output unit not supported for 1/100mm values" );
- //fall-through
+ SAL_FALLTHROUGH;
case MeasureUnit::MM:
// 0.01mm = 1 mm/100 (exactly)
nMul = 10;
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index 9072410caece..d12240484e35 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -407,7 +407,7 @@ bool ScRangeItem::GetPresentation
{
case SFX_ITEM_PRESENTATION_COMPLETE:
rText = ScGlobal::GetRscString(STR_AREA) + ": ";
- /* !!! fall-through !!! */
+ SAL_FALLTHROUGH;
case SFX_ITEM_PRESENTATION_NAMELESS:
{
@@ -854,7 +854,7 @@ bool ScViewObjectModeItem::GetPresentation
ePres = SFX_ITEM_PRESENTATION_NAMELESS; // Default setting!
break;
}
- /* !!! fall-through !!! */
+ SAL_FALLTHROUGH;
case SFX_ITEM_PRESENTATION_NAMELESS:
rText += ScGlobal::GetRscString(STR_VOBJ_MODE_SHOW+GetValue());
return true;
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index aaeb3c880d1a..c4b32cd813dd 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -93,8 +93,8 @@ static bool lcl_HasRelRef( ScDocument* pDoc, ScTokenArray* pFormula, sal_uInt16
ScSingleRefData& rRef2 = t->GetDoubleRef()->Ref2;
if ( rRef2.IsColRel() || rRef2.IsRowRel() || rRef2.IsTabRel() )
return true;
+ SAL_FALLTHROUGH;
}
- // fall through
case svSingleRef:
{
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 6c44e6b0f0eb..417ca2623a36 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2350,7 +2350,7 @@ Label_MaskStateMachine:
SetError( errStringOverflow);
eState = ssSkipReference;
}
- // fall through and follow logic
+ SAL_FALLTHROUGH;
case ssSkipReference:
// ODF reference: ['External'#$'Sheet'.A1:.B2] with dots being
// mandatory also if no sheet name. 'External'# is optional,
@@ -2475,7 +2475,7 @@ Label_MaskStateMachine:
case SC_COMPILER_FILE_TAB_SEP:
// sheet name should follow
nRefInName |= kFileSep;
- // fallthru
+ SAL_FALLTHROUGH;
default:
// quote not followed by quote => close
nRefInName |= kClose;
@@ -3048,7 +3048,7 @@ bool ScCompiler::IsReference( const OUString& rName )
// operator as it is within a quoted name.
if (rName[0] != '\'')
return false; // Document name has to be single quoted.
- // fallthru
+ SAL_FALLTHROUGH;
case FormulaGrammar::CONV_XL_R1C1:
// C2 or C[1] are valid entire column references.
if (IsDoubleReference( rName))
@@ -5221,7 +5221,7 @@ bool ScCompiler::HandleTableRef()
if (pDBData->HasHeader())
aRange.aStart.IncRow();
}
- // fallthru
+ SAL_FALLTHROUGH;
case ScTableRefToken::HEADERS_DATA:
{
if (pDBData->HasTotals())
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 2c303f94a978..4a27ab6cb63c 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2631,7 +2631,7 @@ void ScInterpreter::ScFormula()
PushMatrix( pResMat);
return;
}
- // fallthru
+ SAL_FALLTHROUGH;
case svSingleRef :
{
ScAddress aAdr;
@@ -3133,7 +3133,7 @@ void ScInterpreter::ScValue()
{
case SC_MATVAL_EMPTY:
fVal = 0.0;
- // fallthru
+ SAL_FALLTHROUGH;
case SC_MATVAL_VALUE:
case SC_MATVAL_BOOLEAN:
PushDouble( fVal);
@@ -5939,7 +5939,7 @@ void ScInterpreter::ScLookup()
break;
case svDoubleRef:
aResAdr.Set( nResCol1, nResRow1, nResTab);
- // fallthru
+ SAL_FALLTHROUGH;
case svSingleRef:
PushCellResultToken( true, aResAdr, nullptr, nullptr);
break;
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 61df4dd119e6..e5de4b3692d4 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -571,7 +571,7 @@ svl::SharedString ScMatrixImpl::GetString(SCSIZE nC, SCSIZE nR) const
case mdds::mtm::element_numeric:
case mdds::mtm::element_boolean:
fErr = maMat.get_numeric(aPos);
- //fallthrough
+ SAL_FALLTHROUGH;
default:
OSL_FAIL("ScMatrixImpl::GetString: access error, no string");
}
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 1fe40aaea6a6..f516a765e5e7 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1136,7 +1136,7 @@ void ScMatrixFormulaCellToken::SetUpperLeftDouble( double f )
xUpperLeft = new FormulaDoubleToken( f);
break;
}
- // fall through
+ SAL_FALLTHROUGH;
default:
{
OSL_FAIL("ScMatrixFormulaCellToken::SetUpperLeftDouble: not modifying unhandled token type");
@@ -1914,7 +1914,7 @@ FormulaToken* ScTokenArray::MergeArray( )
case ocArrayOpen :
nStart = i; // stop iteration
- // fall through to ArrayRowSep
+ SAL_FALLTHROUGH; // to ArrayRowSep
case ocArrayRowSep :
if( checkArraySep( bPrevWasSep, true ) )
@@ -2278,7 +2278,7 @@ void ScTokenArray::ReadjustRelative3DReferences( const ScAddress& rOldPos,
rRef2.SetAddress(aAbs, rNewPos);
}
}
- // fall through
+ SAL_FALLTHROUGH;
case svSingleRef :
{
ScSingleRefData& rRef1 = *p->GetSingleRef();
@@ -2295,7 +2295,7 @@ void ScTokenArray::ReadjustRelative3DReferences( const ScAddress& rOldPos,
ScAddress aAbs = rRef2.toAbs(rOldPos);
rRef2.SetAddress(aAbs, rNewPos);
}
- // fall through
+ SAL_FALLTHROUGH;
case svExternalSingleRef :
{
ScSingleRefData& rRef1 = *p->GetSingleRef();
@@ -2345,7 +2345,8 @@ bool SkipReference(formula::FormulaToken* pToken, const ScAddress& rPos, const S
ScSingleRefData& rRef = *pToken->GetSingleRef2();
if (rRef.IsColRel() || rRef.IsRowRel())
return true;
- } // fall through
+ }
+ SAL_FALLTHROUGH;
case svSingleRef:
{
ScSingleRefData& rRef = *pToken->GetSingleRef();
@@ -4109,7 +4110,7 @@ void ScTokenArray::AdjustReferenceOnMovedOriginIfOtherSheet( const ScAddress& rO
{
case svExternalSingleRef:
bAdjust = true; // always
- // fallthru
+ SAL_FALLTHROUGH;
case svSingleRef:
{
ScSingleRefData& rRef = *p->GetSingleRef();
@@ -4122,7 +4123,7 @@ void ScTokenArray::AdjustReferenceOnMovedOriginIfOtherSheet( const ScAddress& rO
break;
case svExternalDoubleRef:
bAdjust = true; // always
- // fallthru
+ SAL_FALLTHROUGH;
case svDoubleRef:
{
ScComplexRefData& rRef = *p->GetDoubleRef();
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 1dd10d6fc16c..46487a3f99c4 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -382,7 +382,7 @@ TOPIC DifParser::GetNextTopic()
case S_UNKNOWN:
// skip 2 lines
ReadNextLine( aLine );
- // fall-through
+ SAL_FALLTHROUGH;
case S_ERROR_L2: // error happened in line 2
// skip 1 line
ReadNextLine( aLine );
@@ -700,8 +700,9 @@ bool DifParser::ScanFloatVal( const sal_Unicode* pStart )
eS = S_EXP;
break;
case 0x00: // IsNumberEnding( cAkt )
- bRet = true; // no
- default: // break!
+ bRet = true;
+ SAL_FALLTHROUGH;
+ default:
eS = S_END;
}
}
@@ -721,8 +722,9 @@ bool DifParser::ScanFloatVal( const sal_Unicode* pStart )
eS = S_EXP_FIRST;
break;
case 0x00: // IsNumberEnding( cAkt )
- bRet = true; // no
- default: // break!
+ bRet = true;
+ SAL_FALLTHROUGH;
+ default:
eS = S_END;
}
}
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index 47d7a85204a4..c05f8adf3bec 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -414,7 +414,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
case EXC_BIFF4: aIn.Ignore( 10 ); break;
case EXC_BIFF5:
SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1A does not exist in Biff5!" );
- //fall-through
+ SAL_FALLTHROUGH;
default:
SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" );
}
@@ -427,7 +427,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
case EXC_BIFF4: aIn.Ignore( 4 ); break;
case EXC_BIFF5:
SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1B does not exist in Biff5!" );
- //fall-through
+ SAL_FALLTHROUGH;
default:
SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" );
}
@@ -625,7 +625,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
case 0x66:
case 0x26: // Constant Reference Subexpression [321 271]
aExtensions.push_back( EXTENSION_MEMAREA );
- // fall through
+ SAL_FALLTHROUGH;
case 0x47:
case 0x67:
@@ -1028,7 +1028,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
case EXC_BIFF3:
case EXC_BIFF4: nIgnore = 10; break;
case EXC_BIFF5: SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1A does not exist in Biff5!" );
- //fall-through
+ SAL_FALLTHROUGH;
default: SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" );
}
break;
@@ -1039,7 +1039,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
case EXC_BIFF3:
case EXC_BIFF4: nIgnore = 4; break;
case EXC_BIFF5: SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1B does not exist in Biff5!" );
- //fall-through
+ SAL_FALLTHROUGH;
default: SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" );
}
break;
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 93ed6df0a48d..29188b3fa6ba 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -904,7 +904,7 @@ FltError ImportExcel8::Read()
break;
case Biff8W: // workbook
OSL_FAIL( "ImportExcel8::Read - double workbook globals" );
- // run through
+ SAL_FALLTHROUGH;
case Biff8V: // VB module
default:
// TODO: do not create a sheet in the Calc document
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 7ef64cc074bf..74bb0cd8d1b8 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -1742,7 +1742,7 @@ void XclExpFmlaCompImpl::AppendTrailingParam( XclExpFuncData& rFuncData )
PrepareParam( rFuncData );
AppendIntToken( 0 );
FinishParam( rFuncData );
- // do not break, add next default parameter
+ SAL_FALLTHROUGH; // add next default parameter
case 2:
PrepareParam( rFuncData );
AppendIntToken( 1 );
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 8e67c026e4c1..39697ac68910 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1478,8 +1478,6 @@ bool XclExpCellAlign::FillFromItemSet(
switch( eBiff )
{
- // ALL 'case's - run through!
-
case EXC_BIFF8: // attributes new in BIFF8
{
// text indent
@@ -1495,6 +1493,8 @@ bool XclExpCellAlign::FillFromItemSet(
// CTL text direction
SetScFrameDir( GETITEMVALUE( rItemSet, SvxFrameDirectionItem, ATTR_WRITINGDIR, SvxFrameDirection ) );
bUsed |= ScfTools::CheckItem( rItemSet, ATTR_WRITINGDIR, bStyle );
+
+ SAL_FALLTHROUGH;
}
case EXC_BIFF5: // attributes new in BIFF5
@@ -1519,6 +1519,8 @@ bool XclExpCellAlign::FillFromItemSet(
bUsed |= ScfTools::CheckItem( rItemSet, ATTR_ROTATE_VALUE, bStyle );
}
mnOrient = XclTools::GetXclOrientFromRot( mnRotation );
+
+ SAL_FALLTHROUGH;
}
case EXC_BIFF3: // attributes new in BIFF3
@@ -1526,6 +1528,8 @@ bool XclExpCellAlign::FillFromItemSet(
// text wrap
mbLineBreak = bForceLineBreak || GETITEMBOOL( rItemSet, ATTR_LINEBREAK );
bUsed |= bForceLineBreak || ScfTools::CheckItem( rItemSet, ATTR_LINEBREAK, bStyle );
+
+ SAL_FALLTHROUGH;
}
case EXC_BIFF2: // attributes new in BIFF2
@@ -1711,8 +1715,6 @@ bool XclExpCellBorder::FillFromItemSet(
switch( eBiff )
{
- // ALL 'case's - run through!
-
case EXC_BIFF8: // attributes new in BIFF8
{
const SvxLineItem& rTLBRItem = GETITEM( rItemSet, SvxLineItem, ATTR_BORDER_TLBR );
@@ -1740,6 +1742,8 @@ bool XclExpCellBorder::FillFromItemSet(
bUsed |= ScfTools::CheckItem( rItemSet, ATTR_BORDER_TLBR, bStyle ) ||
ScfTools::CheckItem( rItemSet, ATTR_BORDER_BLTR, bStyle );
+
+ SAL_FALLTHROUGH;
}
case EXC_BIFF5:
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index b05b3d31234b..1dc6dbbf4d75 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2505,7 +2505,7 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) :
default:
OSL_FAIL( "XclExpCellTable::XclExpCellTable - unknown cell type" );
- // run-through!
+ SAL_FALLTHROUGH;
case CELLTYPE_NONE:
{
xCell.reset( new XclExpBlankCell(
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index a1eb0433d214..ca306b57c4f1 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -1540,9 +1540,10 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject&
}
break;
- case EXC_OBJ_ORIENT_STACKED: // PASSTHROUGH INTENDED
+ case EXC_OBJ_ORIENT_STACKED:
{
// sj: STACKED is not supported, maybe it can be optimized here a bit
+ SAL_FALLTHROUGH;
}
case EXC_OBJ_ORIENT_90CW:
{
diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx
index 6b1bc9497ddc..dc243fdd9095 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -405,7 +405,7 @@ void XclImpHFConverter::ParseString( const OUString& rHFString )
{
case '\"':
--pChar;
- // run through
+ SAL_FALLTHROUGH;
case ',':
eState = xlPSFontStyle;
break;
@@ -688,7 +688,7 @@ void XclImpUrlHelper::DecodeUrl(
lclAppendUrlChar( rUrl, cCurrDrive );
rUrl += ":";
}
- // run through
+ SAL_FALLTHROUGH;
case EXC_URL_SUBDIR:
if( bEncoded )
rUrl += "\\";
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 12ce2a120229..60e802655669 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -1181,7 +1181,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
bFieldText = WriteFieldText(aCell.mpEditText);
if ( bFieldText )
break;
- //! else: fallthru
+ SAL_FALLTHROUGH;
default:
ScCellFormat::GetString(aCell, nFormat, aStrOut, &pColor, *pFormatter, pDoc);
}
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 5ecfeaa71f0c..ba3e01a1531d 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1594,7 +1594,8 @@ void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo )
// Do not set bInCell to true, TableDataOn does that
pActEntry->aItemSet.Put(
SvxWeightItem( WEIGHT_BOLD, ATTR_FONT_WEIGHT) );
- } // fall through
+ SAL_FALLTHROUGH;
+ }
case HTML_TABLEDATA_ON: // Opens cell
{
TableDataOn( pInfo );
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index db7301280b1e..55ec8396252f 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -635,7 +635,8 @@ IMPL_LINK_NOARG_TYPED(ScTPValidationValue, SelectHdl, ListBox&, void)
case SC_VALIDDLG_DATA_EQLESS: m_pFtMin->SetText( maStrMax ); break;
case SC_VALIDDLG_DATA_VALIDRANGE:
- case SC_VALIDDLG_DATA_INVALIDRANGE: bShowMax = true; // fall through
+ case SC_VALIDDLG_DATA_INVALIDRANGE: bShowMax = true;
+ SAL_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 10faf54726c4..dad4824f1a1c 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1472,7 +1472,7 @@ bool canInsertCellsByPivot(const ScRange& rRange, const ScMarkData& rMarkData, I
{
aRange.aStart.SetCol(0);
aRange.aEnd.SetCol(MAXCOL);
- // Continue below.
+ SAL_FALLTHROUGH;
}
case INS_CELLSDOWN:
{
@@ -1508,7 +1508,7 @@ bool canInsertCellsByPivot(const ScRange& rRange, const ScMarkData& rMarkData, I
{
aRange.aStart.SetRow(0);
aRange.aEnd.SetRow(MAXROW);
- // Continue below.
+ SAL_FALLTHROUGH;
}
case INS_CELLSRIGHT:
{
@@ -1570,7 +1570,7 @@ bool canDeleteCellsByPivot(const ScRange& rRange, const ScMarkData& rMarkData, D
{
aRange.aStart.SetCol(0);
aRange.aEnd.SetCol(MAXCOL);
- // Continue below.
+ SAL_FALLTHROUGH;
}
case DEL_CELLSUP:
{
@@ -1595,7 +1595,7 @@ bool canDeleteCellsByPivot(const ScRange& rRange, const ScMarkData& rMarkData, D
{
aRange.aStart.SetRow(0);
aRange.aEnd.SetRow(MAXROW);
- // Continue below.
+ SAL_FALLTHROUGH;
}
case DEL_CELLSLEFT:
{
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index e018bef6b81a..f7d98a6be422 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -938,7 +938,8 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
SetError( ERRCODE_IO_ABORT, OSL_LOG_PREFIX ); // this error code will produce no error message, but will break the further saving process
}
}
- } // fall through
+ SAL_FALLTHROUGH;
+ }
case SFX_EVENT_SAVETODOC:
// #i108978# If no event is sent before saving, there will also be no "...DONE" event,
// and SAVE/SAVEAS can't be distinguished from SAVETO. So stream copying is only enabled
@@ -951,7 +952,8 @@ 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
- } // fall through
+ SAL_FALLTHROUGH;
+ }
case SFX_EVENT_SAVETODOCDONE:
// only reset the flag, don't use the new positions
if (pSheetSaveData)
diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx
index 6e769d03bd61..03bf7faf8fec 100644
--- a/sc/source/ui/unoobj/tokenuno.cxx
+++ b/sc/source/ui/unoobj/tokenuno.cxx
@@ -478,7 +478,7 @@ bool ScTokenConversion::ConvertToTokenSequence( const ScDocument& rDoc,
break;
default:
OSL_TRACE( "ScTokenConversion::ConvertToTokenSequence: unhandled token type SvStackVar %d", rToken.GetType());
- //fall-through
+ SAL_FALLTHROUGH;
case svSep: // occurs with ocSep, ocOpen, ocClose, ocArray*
case svJump: // occurs with ocIf, ocChoose
case svMissing: // occurs with ocMissing
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 132fe9373ba0..b287493af17f 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -80,7 +80,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
//! cannot always be switched ????
if (!pTabViewShell->GetViewFrame()->GetFrame().IsInPlace())
pTabViewShell->SetDontSwitch(true); // do not switch off EditShell
- // no break
+ SAL_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 e0de249a8248..bc8f446f75bb 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -420,8 +420,8 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
{
}
}
+ SAL_FALLTHROUGH;
}
- //fall-through
case SID_STYLE_EDIT:
case SID_STYLE_DELETE:
case SID_STYLE_HIDE:
diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx
index 79a1636fae12..48d74bcdb17e 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -152,8 +152,8 @@ namespace sd
{
Reference< XIterateContainer > xIter( xNode, UNO_QUERY_THROW );
xIter->setTarget( transformValue( xIter->getTarget() ) );
+ SAL_FALLTHROUGH;
}
- // its intended that here is no break!
case AnimationNodeType::PAR:
case AnimationNodeType::SEQ:
{
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 5a219fc8361a..5220c0c7098f 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -1046,7 +1046,7 @@ OUString SdDrawDocument::CreatePageNumValue(sal_uInt16 nNum) const
break;
case SVX_ROMAN_UPPER:
bUpper = true;
- //fall-through
+ SAL_FALLTHROUGH;
case SVX_ROMAN_LOWER:
aPageNumValue += SvxNumberFormat::CreateRomanString(nNum, bUpper);
break;
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index f77c716c4aa5..a4c80708fbed 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -197,7 +197,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
{
case 1 : // automatic
mnDiaMode++;
- // fall-through
+ SAL_FALLTHROUGH;
case 2 : // semi-automatic
mnDiaMode++;
default :
@@ -1216,7 +1216,8 @@ void PPTWriter::ImplWriteBackground( css::uno::Reference< css::beans::XPropertyS
nFillColor = EscherEx::GetColor( *static_cast<sal_uInt32 const *>(mAny.getValue()) );
nFillBackColor = nFillColor ^ 0xffffff;
}
- } // PASSTHROUGH INTENDED
+ SAL_FALLTHROUGH;
+ }
case css::drawing::FillStyle_NONE :
default:
aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x120012 );
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 3addfbfc5194..483e3e7bd847 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1935,16 +1935,16 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, css::presentation::ClickAct
{
case css::presentation::ClickAction_STOPPRESENTATION :
nJump += 2;
- //fall-through
+ SAL_FALLTHROUGH;
case css::presentation::ClickAction_LASTPAGE :
nJump++;
- //fall-through
+ SAL_FALLTHROUGH;
case css::presentation::ClickAction_FIRSTPAGE :
nJump++;
- //fall-through
+ SAL_FALLTHROUGH;
case css::presentation::ClickAction_PREVPAGE :
nJump++;
- //fall-through
+ SAL_FALLTHROUGH;
case css::presentation::ClickAction_NEXTPAGE :
{
nJump++;
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 6b321991b858..af56d7739a9b 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -836,7 +836,7 @@ void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnima
{
case AnimationNodeType::PAR :
aAnim.mnGroupType = mso_Anim_GroupType_PAR;
- // PASSTROUGH!!! (as it was intended)
+ SAL_FALLTHROUGH;
case AnimationNodeType::SEQ :
{
sal_Int16 nType = 0;
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 844ae34c0b43..38f49fb61841 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1255,7 +1255,7 @@ bool ImplSdPPTImport::Import()
break;
case 10 : // titlemaster
nSelectedPage = 1;
- //fall-through
+ SAL_FALLTHROUGH;
case 2 : // master
{
ePageKind = PK_STANDARD;
@@ -1264,7 +1264,7 @@ bool ImplSdPPTImport::Import()
break;
case 5 : // notes master
eEditMode = EM_MASTERPAGE;
- //fall-through
+ SAL_FALLTHROUGH;
case 3 : // notes
ePageKind = PK_NOTES;
break;
@@ -2367,10 +2367,12 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
{
case PptPlaceholder::NOTESBODY : ePresObjKind = PRESOBJ_NOTES; break;
case PptPlaceholder::VERTICALTEXTTITLE :
- bVertical = true; // PASSTHROUGH !!!
+ bVertical = true;
+ SAL_FALLTHROUGH;
case PptPlaceholder::TITLE : ePresObjKind = PRESOBJ_TITLE; break;
case PptPlaceholder::VERTICALTEXTBODY :
- bVertical = true; // PASSTHROUGH !!!
+ bVertical = true;
+ SAL_FALLTHROUGH;
case PptPlaceholder::BODY : ePresObjKind = PRESOBJ_OUTLINE; break;
case PptPlaceholder::CENTEREDTITLE : ePresObjKind = PRESOBJ_TITLE; break;
case PptPlaceholder::SUBTITLE : ePresObjKind = PRESOBJ_TEXT; break; // PRESOBJ_OUTLINE
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index e147a75bd1c4..8d3a83bcd4f5 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -692,7 +692,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
nError = ERRCODE_IO_BROKENPACKAGE;
break;
}
- // fall through intended
+ SAL_FALLTHROUGH;
default:
{
// TODO/LATER: this is completely wrong! Filter code should never call ErrorHandler directly!
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 7e90868080c4..8d9434b5b32b 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1901,7 +1901,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
aEvent.Repeat = 0;
aEnd <<= aEvent;
}
- // ATTENTION: FALL THROUGH INTENDED!
+ SAL_FALLTHROUGH;
case 7:
aRepeatCount <<= Timing_INDEFINITE;
break;
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index c50955fe97b9..1d944115a7c9 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -329,7 +329,7 @@ IMPL_LINK_TYPED(CustomAnimationPane,EventMultiplexerListener,
break;
}
}
- // fall through intended
+ SAL_FALLTHROUGH;
case tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED:
mxView = nullptr;
mxCurrentPage = nullptr;
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 3a6ed516e930..fac2f2fea661 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -730,7 +730,7 @@ void SdTPAction::SetEditText( OUString const & rStr )
if( comphelper::string::getTokenCount(rStr, DOCUMENT_TOKEN) == 2 )
aText = rStr.getToken( 0, DOCUMENT_TOKEN );
- // fallthrough intended
+ SAL_FALLTHROUGH;
case presentation::ClickAction_SOUND:
case presentation::ClickAction_PROGRAM:
{
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 5ad85e42d554..0acc56c3cef4 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -289,7 +289,7 @@ void FuConstructRectangle::Activate()
case SID_LINE_ARROW_SQUARE:
case SID_LINE_SQUARE_ARROW:
mpView->SetGlueVisible();
- // no break !
+ SAL_FALLTHROUGH;
case SID_DRAW_LINE :
case SID_DRAW_XLINE:
aObjKind = OBJ_LINE;
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 753c56155510..8a978ee129cc 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -489,7 +489,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
aServerLst.Remove( DrawDocShell::Factory().GetClassId() );
}
- // intentionally no break!
+ SAL_FALLTHROUGH;
}
case SID_INSERT_PLUGIN :
case SID_INSERT_FLOATINGFRAME :
diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx
index 84688cdb3d87..641e9b2c49fd 100644
--- a/sd/source/ui/func/fusnapln.cxx
+++ b/sd/source/ui/func/fusnapln.cxx
@@ -156,7 +156,7 @@ void FuSnapLine::DoExecute( SfxRequest& rReq )
// delete snap object
if ( !bCreateNew )
pPV->DeleteHelpLine(nHelpLine);
- /*fall-through*/
+ SAL_FALLTHROUGH;
default:
return;
}
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 07287a08e996..49400ce82ee3 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1863,7 +1863,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
gotoNextSlide();
break;
}
- // warning, fall through!
+ SAL_FALLTHROUGH;
case KEY_SPACE:
case KEY_RIGHT:
case KEY_DOWN:
@@ -1909,7 +1909,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
gotoPreviousSlide();
break;
}
- // warning, fall through!
+ SAL_FALLTHROUGH;
case KEY_LEFT:
case KEY_UP:
case KEY_P:
diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx
index f669b6ad4639..934dddf96d63 100644
--- a/sd/source/ui/slidesorter/view/SlsTheme.cxx
+++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx
@@ -186,7 +186,7 @@ ColorData Theme::GetGradientColor (
case Border2: return rDescriptor.maBorderColor2;
case Fill1: return rDescriptor.maFillColor1;
case Fill2: return rDescriptor.maFillColor2;
- default: OSL_ASSERT(false); // fall through
+ default: OSL_ASSERT(false); SAL_FALLTHROUGH;
case Base: return rDescriptor.maBaseColor;
}
}
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index f348e66b52c3..1f40c13b9c2a 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -1389,7 +1389,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno
bOk = true;
- // NOTE: No break here!!!
+ SAL_FALLTHROUGH;
case presentation::ClickAction_SOUND:
if( nFound & FOUND_SOUNDURL )
@@ -1634,7 +1634,7 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName )
pProperties->State = beans::PropertyState_DIRECT_VALUE;
pProperties++;
- // NOTE: no break here!!!
+ SAL_FALLTHROUGH;
case presentation::ClickAction_SOUND:
if( eClickAction == presentation::ClickAction_SOUND || pInfo->mbSecondSoundOn )
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 08d0ced34835..fb5810415cd9 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1250,7 +1250,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
case SID_CAPTUREPOINT:
// negative value to signal call from menu
maMousePos = Point(-1,-1);
- // fall-through
+ SAL_FALLTHROUGH;
case SID_SET_SNAPITEM:
{
SetCurrentFunction( FuSnapLine::Create(this, GetActiveWindow(), mpDrawView, GetDoc(), rReq) );
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index a293696455b6..6ef1ea408577 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -971,7 +971,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
// AutoLayouts have to be ready.
GetDoc()->StopWorkStartupDelay();
- // Fall through to following case statements.
+ SAL_FALLTHROUGH;
case SID_DRAWINGMODE:
case SID_SLIDE_SORTER_MODE:
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 2deed289b00a..a493ecea8e05 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -778,7 +778,7 @@ bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi
break;
}
}
- // fall through when not running slideshow
+ SAL_FALLTHROUGH;
case CommandEventId::StartAutoScroll:
case CommandEventId::AutoScroll:
{
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 6d3c57479e25..045b49c16bff 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -153,14 +153,14 @@ bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const OUString& rBase
case HTML_O_ONMOUSEOVER:
eScrpType = JAVASCRIPT;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_SDONMOUSEOVER:
nEvent = nEventMouseOver;
goto IMAPOBJ_SETEVENT;
case HTML_O_ONMOUSEOUT:
eScrpType = JAVASCRIPT;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_SDONMOUSEOUT:
nEvent = nEventMouseOut;
goto IMAPOBJ_SETEVENT;
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 6e5321d4aeea..6ef977c9e7e6 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -602,7 +602,7 @@ void ThumbnailView::KeyInput( const KeyEvent& rKEvt )
if ( bFoundLast )
OnItemDblClicked( mFilteredItemList[nLastPos] );
}
- //fall-through
+ SAL_FALLTHROUGH;
default:
Control::KeyInput( rKEvt );
}
diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx
index b085229baeb3..bd6746710812 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -77,7 +77,7 @@ bool ResizableMultiLineEdit::PreNotify(NotifyEvent& rNEvt)
{
case KEY_RETURN:
mpItem->setTitle( GetText() );
- //fall-through
+ SAL_FALLTHROUGH;
case KEY_ESCAPE:
mpItem->setEditTitle(false);
bDone = true;
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index e5fa7b57233b..9a0bd9ebe52e 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2407,7 +2407,7 @@ void SfxTemplateDialog_Impl::EnableItem(sal_uInt16 nMesId, bool bCheck)
case SID_STYLE_WATERCAN :
if(!bCheck && IsCheckedItem(SID_STYLE_WATERCAN))
Execute_Impl(SID_STYLE_WATERCAN, "", "", 0);
- //fall-through
+ SAL_FALLTHROUGH;
case SID_STYLE_NEW_BY_EXAMPLE:
case SID_STYLE_UPDATE_BY_EXAMPLE:
m_aActionTbR->EnableItem(nMesId,bCheck);
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index 22af458a4d8e..c48605133abb 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -302,7 +302,7 @@ namespace sfx2
case DataChangedEventType::SETTINGS:
if ( !( i_rDataChangedEvent.GetFlags() & AllSettingsFlags::STYLE ) )
break;
- // else fall through.
+ SAL_FALLTHROUGH;
case DataChangedEventType::FONTS:
case DataChangedEventType::FONTSUBSTITUTION:
{
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 5bd9e1df2508..1cb82cf9f2d8 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -523,7 +523,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
case SID_EXPORTDOCASPDF:
case SID_DIRECTEXPORTDOCASPDF:
bIsPDFExport = true;
- //fall-through
+ SAL_FALLTHROUGH;
case SID_EXPORTDOC:
case SID_SAVEASDOC:
case SID_SAVEASREMOTE:
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index aa09dc681117..e6c0200efc56 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -343,7 +343,7 @@ void SfxPrinterController::jobFinished( css::view::PrintableState nState )
OUString aMsg( SfxResId(STR_NOSTARTPRINTER).toString() );
if ( !m_bApi )
ScopedVclPtrInstance<MessageDialog>::Create(mpViewShell->GetWindow(), aMsg)->Execute();
- // intentionally no break
+ SAL_FALLTHROUGH;
}
case view::PrintableState_JOB_ABORTED :
{
diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx
index f982a6096518..712eefb695de 100644
--- a/slideshow/source/engine/activities/activitiesfactory.cxx
+++ b/slideshow/source/engine/activities/activitiesfactory.cxx
@@ -669,11 +669,9 @@ AnimationActivitySharedPtr createActivity(
default:
OSL_FAIL( "createActivity(): unexpected case" );
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case animations::AnimationCalcMode::PACED:
- // FALLTHROUGH intended
case animations::AnimationCalcMode::SPLINE:
- // FALLTHROUGH intended
case animations::AnimationCalcMode::LINEAR:
return createValueListActivity< ContinuousKeyTimeActivityBase >(
xNode->getValues(),
@@ -737,11 +735,9 @@ AnimationActivitySharedPtr createActivity(
default:
OSL_FAIL( "createActivity(): unexpected case" );
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case animations::AnimationCalcMode::PACED:
- // FALLTHROUGH intended
case animations::AnimationCalcMode::SPLINE:
- // FALLTHROUGH intended
case animations::AnimationCalcMode::LINEAR:
return createFromToByActivity< ContinuousActivityBase >(
xNode->getFrom(),
diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx
index edfe95ee604c..660a89f02e06 100644
--- a/slideshow/source/engine/animationnodes/basenode.cxx
+++ b/slideshow/source/engine/animationnodes/basenode.cxx
@@ -204,7 +204,7 @@ const int* getStateTransitionTable( sal_Int16 nRestartMode,
// same value: animations::AnimationRestart::INHERIT:
OSL_FAIL(
"getStateTransitionTable(): unexpected case for restart" );
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case animations::AnimationRestart::NEVER:
nRestartValue = 0;
break;
@@ -224,7 +224,7 @@ const int* getStateTransitionTable( sal_Int16 nRestartMode,
// same value: animations::AnimationFill::INHERIT:
OSL_FAIL(
"getStateTransitionTable(): unexpected case for fill" );
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case animations::AnimationFill::REMOVE:
nFillValue = 0;
break;
diff --git a/slideshow/source/engine/animationnodes/generateevent.cxx b/slideshow/source/engine/animationnodes/generateevent.cxx
index 76a778c4acec..513f0bc889b3 100644
--- a/slideshow/source/engine/animationnodes/generateevent.cxx
+++ b/slideshow/source/engine/animationnodes/generateevent.cxx
@@ -188,7 +188,7 @@ EventSharedPtr generateEvent(
case animations::EventTrigger::ON_PREV:
OSL_FAIL( "event trigger ON_PREV not yet implemented, "
"mapped to ON_NEXT!" );
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case animations::EventTrigger::ON_NEXT:
pEvent = makeDelay( rFunctor,
nDelay2 + nAdditionalDelay,
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index 053d22efcabe..108be0882da6 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -152,7 +152,7 @@ namespace slideshow
SAL_INFO("slideshow.verbose", "Shape text \"" <<
(static_cast<MetaTextAction*>(pCurrAct))->GetText() <<
"\" at action #" << nActionIndex );
- // fallthrough intended
+ SAL_FALLTHROUGH;
default:
// comment action and all actions not
// explicitly handled here:
@@ -504,8 +504,7 @@ namespace slideshow
}
++nCurrShapeCount;
- // FALLTHROUGH intended: shape end also
- // ends lines
+ SAL_FALLTHROUGH; // shape end also ends lines
case DrawShapeSubsetting::CLASS_PARAGRAPH_END:
if( !io_rFunctor( DrawShapeSubsetting::CLASS_PARAGRAPH_END,
nCurrParaCount,
@@ -517,8 +516,7 @@ namespace slideshow
++nCurrParaCount;
aLastParaStart = aNext;
- // FALLTHROUGH intended: para end also
- // ends line
+ SAL_FALLTHROUGH; // para end also ends line
case DrawShapeSubsetting::CLASS_LINE_END:
if( !io_rFunctor( DrawShapeSubsetting::CLASS_LINE_END,
nCurrLineCount,
@@ -545,7 +543,7 @@ namespace slideshow
// character cell, OTOH?
break;
}
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case DrawShapeSubsetting::CLASS_SENTENCE_END:
if( !io_rFunctor( DrawShapeSubsetting::CLASS_SENTENCE_END,
nCurrSentenceCount,
@@ -557,7 +555,7 @@ namespace slideshow
++nCurrSentenceCount;
aLastSentenceStart = aNext;
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case DrawShapeSubsetting::CLASS_WORD_END:
if( !io_rFunctor( DrawShapeSubsetting::CLASS_WORD_END,
nCurrWordCount,
@@ -569,7 +567,7 @@ namespace slideshow
++nCurrWordCount;
aLastWordStart = aNext;
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case DrawShapeSubsetting::CLASS_CHARACTER_CELL_END:
if( !io_rFunctor( DrawShapeSubsetting::CLASS_CHARACTER_CELL_END,
nCurrCharCount,
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index 5c95f290b4b7..d1d4342effdf 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -86,11 +86,9 @@ bool hasUnsupportedActions( const GDIMetaFile& rMtf )
{
break;
}
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MOVECLIPREGION:
- // FALLTHROUGH intended
case MetaActionType::REFPOINT:
- // FALLTHROUGH intended
case MetaActionType::WALLPAPER:
return true; // at least one unsupported
// action encountered
diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx
index 8974acdc4b17..6eb1f70b5cdc 100644
--- a/slideshow/source/engine/slide/targetpropertiescreator.cxx
+++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx
@@ -168,10 +168,9 @@ namespace internal
return;
}
}
+ SAL_FALLTHROUGH;
}
- // FALLTHROUGH intended
case animations::AnimationNodeType::PAR:
- // FALLTHROUGH intended
case animations::AnimationNodeType::SEQ:
{
/// forward bInitial
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 9cc65c08500c..3e6c6c7dd2f3 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -2623,13 +2623,13 @@ void MathType::HandleOperator(SmNode *pNode,int nLevel)
pS->WriteUChar( CHAR );
pS->WriteUChar( 0x86 );
pS->WriteUInt16( 0x222B );
- ///fall-through
+ SAL_FALLTHROUGH;
case TIINT:
case TLLINT:
pS->WriteUChar( CHAR );
pS->WriteUChar( 0x86 );
pS->WriteUInt16( 0x222B );
- ///fall-through
+ SAL_FALLTHROUGH;
case TINT:
case TINTD:
case TLINT:
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 714e7045d7fa..b9b3a31d5258 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2132,7 +2132,7 @@ void SmParser::DoFunction()
{
case TFUNC:
NextToken(); // skip "FUNC"-statement
- // fall through
+ SAL_FALLTHROUGH;
case TSIN :
case TCOS :
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index e084ddf821ac..ac4d48d3492f 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1944,7 +1944,7 @@ void SmViewShell::GetState(SfxItemSet &rSet)
case SID_ATTR_ZOOM:
rSet.Put(SvxZoomItem( SvxZoomType::PERCENT, aGraphic->GetZoom()));
- /* no break here */
+ SAL_FALLTHROUGH;
case SID_ZOOMIN:
case SID_ZOOMOUT:
case SID_ZOOM_OPTIMAL:
diff --git a/starmath/source/wordexportbase.cxx b/starmath/source/wordexportbase.cxx
index 99420d8005f4..215a6c73769c 100644
--- a/starmath/source/wordexportbase.cxx
+++ b/starmath/source/wordexportbase.cxx
@@ -170,7 +170,7 @@ void SmWordExportBase::HandleMath(const SmNode* pNode, int nLevel)
case TDIVIDEBY:
case TACUTE:
OSL_ASSERT(false);
- // the above are handled elsewhere, e.g. when handling BINHOR
+ SAL_FALLTHROUGH; // the above are handled elsewhere, e.g. when handling BINHOR
default:
HandleText(pNode, nLevel);
break;
diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx
index bec443928816..921faacc0d9a 100644
--- a/store/source/lockbyte.cxx
+++ b/store/source/lockbyte.cxx
@@ -201,10 +201,10 @@ struct FileHandle
case store_AccessCreate:
case store_AccessReadCreate:
nFlags |= osl_File_OpenFlag_Create;
- // fall through
+ SAL_FALLTHROUGH;
case store_AccessReadWrite:
nFlags |= osl_File_OpenFlag_Write;
- // fall through
+ SAL_FALLTHROUGH;
case store_AccessReadOnly:
nFlags |= osl_File_OpenFlag_Read;
break;
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index da04cfca494e..b2ad644f1072 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -854,7 +854,7 @@ int ImpSvNumberInputScan::GetSign( const OUString& rString, sal_Int32& nPos )
return 1;
case '(': // '(' similar to '-' ?!?
nNegCheck = 1;
- //! fallthru
+ SAL_FALLTHROUGH;
case '-':
nPos++;
return -1;
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 277754719a9e..48dfe92e6d05 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -2182,7 +2182,7 @@ sal_Int32 SvNumberFormatter::ImpAdjustFormatCodeDefault(
case i18n::KNumberFormatType::LONG :
if ( nMedium == -1 )
nDef = nElem;
- // fallthru
+ SAL_FALLTHROUGH;
default:
if ( nDef == -1 )
nDef = nElem;
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 90175f9fadc7..6050716e710e 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2351,7 +2351,7 @@ bool SvNumberformat::ImpGetScientificOutput(double fNumber,
{
case '-' :
nExpSign = -1;
- // fall through
+ SAL_FALLTHROUGH;
case '+' :
++nExpStart;
break;
@@ -4145,7 +4145,7 @@ bool SvNumberformat::ImpNumberFillWithThousands( OUStringBuffer& sBuff, // numb
{
case NF_SYMBOLTYPE_DECSEP:
aGrouping.reset();
- // fall through
+ SAL_FALLTHROUGH;
case NF_SYMBOLTYPE_STRING:
case NF_SYMBOLTYPE_CURRENCY:
case NF_SYMBOLTYPE_PERCENT:
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index aeff7d110964..8dd7ba30865c 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -2268,7 +2268,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
break;
case NF_KEY_THAI_T :
bThaiT = true;
- // fall through
+ SAL_FALLTHROUGH;
case NF_KEY_M: // M
case NF_KEY_MM: // MM
case NF_KEY_MMM: // MMM
@@ -2424,7 +2424,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
break;
case NF_KEY_THAI_T :
bThaiT = true;
- // fall through
+ SAL_FALLTHROUGH;
case NF_KEY_MI: // M
case NF_KEY_MMI: // MM
case NF_KEY_H: // H
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index ef1974a2f149..df4c22eb5906 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -103,7 +103,7 @@ namespace svt
// drop down the list box
else if (rEvt.GetKeyCode().IsMod2() && rEvt.GetKeyCode().GetCode() == KEY_DOWN)
return false;
- // fall-through
+ SAL_FALLTHROUGH;
case KEY_PAGEUP:
case KEY_PAGEDOWN:
case KEY_RETURN:
@@ -183,7 +183,7 @@ namespace svt
else
if (rEvt.GetKeyCode().IsMod2() && rEvt.GetKeyCode().GetCode() == KEY_DOWN)
return false;
- // fall-through
+ SAL_FALLTHROUGH;
case KEY_PAGEUP:
case KEY_PAGEDOWN:
if (rBox.IsTravelSelect())
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 1865e0d5a4bd..03850cfc2d24 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -471,7 +471,7 @@ namespace svt
Control::KeyInput(rEvt);
return;
}
- // fall-through
+ SAL_FALLTHROUGH;
default:
BrowseBox::KeyInput(rEvt);
}
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index b62d6ce68ada..0dfdabb69bd7 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1342,7 +1342,7 @@ void ValueSet::KeyInput( const KeyEvent& rKeyEvent )
return;
}
nVStep *= mnVisLines;
- // intentional fall-through
+ SAL_FALLTHROUGH;
case KEY_UP:
if (nCurPos != VALUESET_ITEM_NONEITEM)
{
@@ -1379,7 +1379,7 @@ void ValueSet::KeyInput( const KeyEvent& rKeyEvent )
return;
}
nVStep *= mnVisLines;
- // intentional fall-through
+ SAL_FALLTHROUGH;
case KEY_DOWN:
if (nCurPos != nLastItem)
{
@@ -1404,7 +1404,7 @@ void ValueSet::KeyInput( const KeyEvent& rKeyEvent )
Select();
break;
}
- // intentional fall-through
+ SAL_FALLTHROUGH;
default:
Control::KeyInput( rKeyEvent );
return;
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index e8fdfe1f1341..cdc01b0c77d9 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -658,79 +658,79 @@ bool GraphicDisplayCacheEntry::IsCacheableAsBitmap( const GDIMetaFile& rMtf,
case MetaActionType::RASTEROP:
if( static_cast<MetaRasterOpAction*>(pAct)->GetRasterOp() == ROP_OVERPAINT )
break;
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::PIXEL:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POINT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::LINE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::RECT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ROUNDRECT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ELLIPSE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ARC:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::PIE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::CHORD:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POLYLINE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POLYGON:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POLYPOLYGON:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTARRAY:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::STRETCHTEXT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTRECT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MASK:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MASKSCALE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MASKSCALEPART:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::GRADIENT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::HATCH:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::WALLPAPER:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::Transparent:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::EPS:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::FLOATTRANSPARENT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::GRADIENTEX:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
// OutDev state changes that _do_ affect bitmap
// output
case MetaActionType::CLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ISECTRECTCLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ISECTREGIONCLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MOVECLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MAPMODE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::REFPOINT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
default:
bNonBitmapActionEncountered = true;
break;
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index 06f15f82d52b..caad9c5c0895 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -1139,35 +1139,35 @@ bool GraphicManager::ImplCreateOutput( OutputDevice* pOut,
aFont.SetWidth( aFontMetric.GetWidth() );
pModAct = new MetaFontAction( aFont );
}
+ SAL_FALLTHROUGH;
}
- // FALLTHROUGH intended
case MetaActionType::NONE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
// OutDev state changes (which don't affect bitmap
// output)
case MetaActionType::LINECOLOR:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::FILLCOLOR:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTCOLOR:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTFILLCOLOR:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTALIGN:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTLINECOLOR:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTLINE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::PUSH:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POP:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::LAYOUTMODE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTLANGUAGE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::COMMENT:
break;
@@ -1284,79 +1284,79 @@ bool GraphicManager::ImplCreateOutput( OutputDevice* pOut,
case MetaActionType::RASTEROP:
if( static_cast<MetaRasterOpAction*>(pAct)->GetRasterOp() == ROP_OVERPAINT )
break;
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::PIXEL:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POINT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::LINE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::RECT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ROUNDRECT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ELLIPSE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ARC:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::PIE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::CHORD:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POLYLINE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POLYGON:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POLYPOLYGON:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTARRAY:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::STRETCHTEXT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTRECT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MASK:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MASKSCALE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MASKSCALEPART:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::GRADIENT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::HATCH:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::WALLPAPER:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::Transparent:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::EPS:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::FLOATTRANSPARENT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::GRADIENTEX:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
// OutDev state changes that _do_ affect bitmap
// output
case MetaActionType::CLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ISECTRECTCLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ISECTREGIONCLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MOVECLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MAPMODE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::REFPOINT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
default:
bNonBitmapActionEncountered = true;
break;
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 801e4e00ae68..c38982fb069c 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -734,7 +734,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak )
break;
}
// Reduce sequence of CR/LF/BLANK/TAB to a single blank
- // no break!!
+ SAL_FALLTHROUGH;
case '\t':
if( '\t'==nNextCh && bReadPRE && '>'!=cBreak )
{
@@ -742,7 +742,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak )
bContinue = false;
break;
}
- // no break
+ SAL_FALLTHROUGH;
case '\x0b':
if( '\x0b'==nNextCh && (bReadPRE || bReadXMP ||bReadListing) &&
'>'!=cBreak )
@@ -750,7 +750,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak )
break;
}
nNextCh = ' ';
- // no break;
+ SAL_FALLTHROUGH;
case ' ':
sTmpBuffer.append( nNextCh );
if( '>'!=cBreak && (!bReadListing && !bReadXMP &&
@@ -1012,7 +1012,7 @@ int HTMLParser::_GetNextRawToken()
}
break;
}
- // no break
+ SAL_FALLTHROUGH;
default:
// all remaining characters are appended to the buffer
sTmpBuffer.append( nNextCh );
@@ -1359,16 +1359,16 @@ int HTMLParser::_GetNextToken()
nRet = HTML_NEWPARA;
break;
}
- // no break !
+ SAL_FALLTHROUGH;
case '\t':
if( bReadPRE )
{
nRet = HTML_TABCHAR;
break;
}
- // no break !
+ SAL_FALLTHROUGH;
case ' ':
- // no break !
+ SAL_FALLTHROUGH;
default:
scan_text:
@@ -1595,7 +1595,7 @@ int HTMLParser::FilterPRE( int nToken )
// in Netscape they only have impact in not empty paragraphs
case HTML_PARABREAK_ON:
nToken = HTML_LINEBREAK;
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_LINEBREAK:
case HTML_NEWPARA:
nPre_LinePos = 0;
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index f6f75eb73162..cf65fdfdf364 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -466,8 +466,9 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
}
break;
- case sal_Unicode(EOF): eState = SVPAR_ERROR;
- // continue
+ case sal_Unicode(EOF):
+ eState = SVPAR_ERROR;
+ SAL_FALLTHROUGH;
case '{':
case '}':
bContinue = false;
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 6538e03d4166..b0b07413085f 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -2272,7 +2272,7 @@ namespace svt { namespace table
m_aSelectedRows[0] = i_rowIndex;
break;
}
- // fall through
+ SAL_FALLTHROUGH;
case MULTIPLE_SELECTION:
m_aSelectedRows.push_back( i_rowIndex );
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index e65e60cdc7c7..8ed0518cc70c 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -2037,7 +2037,7 @@ void CorrectCalloutArrows( MSO_SPT eSpType, sal_uInt32 nLineObjectCount, std::ve
case mso_sptAccentCallout2 :
case mso_sptAccentBorderCallout2 :
bAccent = true;
- //fall-through
+ SAL_FALLTHROUGH;
case mso_sptCallout2 :
case mso_sptBorderCallout2 :
{
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 223727c85059..3cf1d17ddb05 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -888,8 +888,8 @@ void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*r
nLeftStart += nCharWidth;
nRightEnd -= nCharWidth;
}
+ SAL_FALLTHROUGH;
}
- // no break!
case RubyAdjust_BLOCK:
{
if (sOutputText.getLength() > 1)
@@ -905,8 +905,8 @@ void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*r
}
break;
}
+ SAL_FALLTHROUGH;
}
- //no break;
case RubyAdjust_CENTER:
rRenderContext.DrawText(Point(nCenter - nOutTextWidth / 2 , nYOutput), sOutputText);
break;
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 9f55e1b978a1..c010985902a8 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -1764,7 +1764,7 @@ void SvxRuler::UpdateParaContents_Impl(
break;
case MOVE_ALL:
mpIndents[INDENT_RIGHT_MARGIN].nPos += lDifference;
- // no break
+ SAL_FALLTHROUGH;
case MOVE_LEFT:
{
mpIndents[INDENT_FIRST_LINE].nPos += lDifference;
@@ -1848,7 +1848,7 @@ ADD_DEBUG_TEXT("lLastLMargin: ", OUString::number(mxRulerImpl->lLastLMargin))
{
default: ;//prevent warning
OSL_FAIL("svx::SvxRuler::DragBorders(), unknown drag type!" );
- //fall-through
+ SAL_FALLTHROUGH;
case RULER_TYPE_BORDER:
if(mxRulerImpl->bIsTableRows)
{
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 28115bc369f0..1daaf351ad72 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -158,7 +158,7 @@ void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const Reference< css::bea
case DataType::TIME:
case DataType::TIMESTAMP:
m_bDateTime = true;
- //fall-through
+ SAL_FALLTHROUGH;
case DataType::BIT:
case DataType::BOOLEAN:
case DataType::TINYINT:
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 53bf0f894543..0fbf38422be5 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2900,8 +2900,9 @@ void DbGridControl::Command(const CommandEvent& rEvt)
DbGridControl_Base::Command(rEvt);
return;
}
+
+ SAL_FALLTHROUGH;
}
- //fall-through
default:
DbGridControl_Base::Command(rEvt);
}
@@ -3320,7 +3321,9 @@ bool DbGridControl::PreNotify(NotifyEvent& rEvt)
return true;
}
}
- } // no break!
+
+ SAL_FALLTHROUGH;
+ }
default:
return DbGridControl_Base::PreNotify(rEvt);
}
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 18a29f44c7ed..30514ae30f5c 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -274,7 +274,7 @@ bool FmFormShell::PrepareClose(bool bUI)
{
case RET_YES:
bResult = rController->commitCurrentRecord( );
- // fallthrough to next case
+ SAL_FALLTHROUGH;
case RET_NO:
GetImpl()->didPrepareClose( true );
break;
@@ -872,7 +872,7 @@ void FmFormShell::GetState(SfxItemSet &rSet)
rSet.Put( SfxVisibilityItem( nWhich, false ) );
break;
}
- // NO break!
+ SAL_FALLTHROUGH;
case SID_FM_SCROLLBAR:
case SID_FM_IMAGECONTROL:
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 98a48cbddf29..c5817ff7d306 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -613,7 +613,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString
bFound = false;
break;
}
- // laeuft in den naechsten Case rein !
+ SAL_FALLTHROUGH;
case MATCHING_BEGINNING :
if (nStart != 0)
bFound = false;
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index b49d64418dfa..7badff7df860 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1331,7 +1331,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const svx::ODataAccessDescriptor
case DataType::TIMESTAMP:
bDateNTimeField = true;
sLabelPostfix = SVX_RESSTR(RID_STR_POSTFIX_DATE);
- // DON'T break !
+ SAL_FALLTHROUGH;
case DataType::DATE:
nOBJID = OBJ_FM_DATEFIELD;
break;
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index 853aed3cd538..444186024f46 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -405,7 +405,7 @@ namespace svxform
{
case FormComponentType::SCROLLBAR:
_rxControlModel->setPropertyValue("LiveScroll", makeAny( true ) );
- // NO break!
+ SAL_FALLTHROUGH;
case FormComponentType::SPINBUTTON:
{
sal_Int32 eOrientation = ScrollBarOrientation::HORIZONTAL;
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index 11c76c6aceb7..e586fa0b7324 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -75,7 +75,7 @@ bool SvxRotateModeItem::GetPresentation(
{
case SFX_ITEM_PRESENTATION_COMPLETE:
rText += "...: ";
-// break; // FALL THROUGH!!!
+ SAL_FALLTHROUGH; // break; // FALL THROUGH!!!
case SFX_ITEM_PRESENTATION_NAMELESS:
rText += OUString( sal_Unicode(GetValue()) );
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 639cd2e40d6b..0da46f748f6c 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -134,7 +134,7 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal
default:
{
OSL_FAIL( "Unknown kind of marker." );
- // no break here, return Rect_9x9 as default
+ SAL_FALLTHROUGH; // return Rect_9x9 as default
}
case Rect_9x9:
{
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 4e931a9888d8..66ffc0a8f08a 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2814,7 +2814,7 @@ void SdrObject::SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundR
{
case SDRUSERCALL_RESIZE:
notifyShapePropertyChange( svx::eShapeSize );
- // fall through - RESIZE might also imply a change of the position
+ SAL_FALLTHROUGH; // RESIZE might also imply a change of the position
case SDRUSERCALL_MOVEONLY:
notifyShapePropertyChange( svx::eShapePosition );
break;
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 0a0ee30862af..e51f318f557c 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -1308,7 +1308,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
SdrObjKind eNewKind=(SdrObjKind)nIdent;
switch (eNewKind) {
case OBJ_CARC: case OBJ_CIRC: case OBJ_CCUT: case OBJ_SECT: eNewKind=OBJ_CARC;
- //fall-through
+ SAL_FALLTHROUGH;
case OBJ_RECT:
case OBJ_LINE: case OBJ_PLIN: case OBJ_POLY:
case OBJ_PATHLINE: case OBJ_PATHFILL:
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index b364f051daa4..d7309827819b 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -482,57 +482,68 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
{
if ( !nStrResId )
nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ON_OFF;
- } // PASSTROUGH
+ SAL_FALLTHROUGH;
+ }
case SID_EXTRUSION_TILT_DOWN:
{
if ( !nStrResId )
nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_DOWN;
- } // PASSTROUGH
+ SAL_FALLTHROUGH;
+ }
case SID_EXTRUSION_TILT_UP:
{
if ( !nStrResId )
nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_UP;
- } // PASSTROUGH
+ SAL_FALLTHROUGH;
+ }
case SID_EXTRUSION_TILT_LEFT:
{
if ( !nStrResId )
nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_LEFT;
- } // PASSTROUGH
+ SAL_FALLTHROUGH;
+ }
case SID_EXTRUSION_TILT_RIGHT:
{
if ( !nStrResId )
nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_RIGHT;
- } // PASSTROUGH
+ SAL_FALLTHROUGH;
+ }
case SID_EXTRUSION_DIRECTION:
{
if ( !nStrResId )
nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ORIENTATION;
- } // PASSTROUGH
+ SAL_FALLTHROUGH;
+ }
case SID_EXTRUSION_PROJECTION:
{
if ( !nStrResId )
nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_PROJECTION;
- } // PASSTROUGH
+ SAL_FALLTHROUGH;
+ }
case SID_EXTRUSION_DEPTH:
{
if ( !nStrResId )
nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_DEPTH;
- } // PASSTROUGH
+ SAL_FALLTHROUGH;
+ }
case SID_EXTRUSION_3D_COLOR:
{
if ( !nStrResId )
nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR;
- } // PASSTROUGH
+ SAL_FALLTHROUGH;
+ }
case SID_EXTRUSION_SURFACE:
{
if ( !nStrResId )
nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE;
- } // PASSTROUGH
+ SAL_FALLTHROUGH;
+ }
case SID_EXTRUSION_LIGHTING_INTENSITY:
{
if ( !nStrResId )
nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_BRIGHTNESS;
- } // PASSTROUGH
+ SAL_FALLTHROUGH;
+ }
case SID_EXTRUSION_LIGHTING_DIRECTION:
{
if ( !nStrResId )
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 9d32139fafc2..07b688e84b8f 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -275,7 +275,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
SdrTextHorzAdjust eHorzAdjust;
switch ( nValue )
{
- case 4 : eFTS = SDRTEXTFIT_ALLLINES; // passthrough
+ case 4 : eFTS = SDRTEXTFIT_ALLLINES; SAL_FALLTHROUGH;
case 3 : eHorzAdjust = SDRTEXTHORZADJUST_BLOCK; break;
default: eHorzAdjust = SDRTEXTHORZADJUST_LEFT; break;
case 1 : eHorzAdjust = SDRTEXTHORZADJUST_CENTER; break;
@@ -506,17 +506,20 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi
{
if ( !nStrResId )
nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT;
- } // PASSTROUGH
+ SAL_FALLTHROUGH;
+ }
case SID_FONTWORK_CHARACTER_SPACING:
{
if ( !nStrResId )
nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING;
- } // PASSTROUGH
+ SAL_FALLTHROUGH;
+ }
case SID_FONTWORK_KERN_CHARACTER_PAIRS:
{
if ( !nStrResId )
nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING;
- } // PASSTROUGH
+ SAL_FALLTHROUGH;
+ }
case SID_FONTWORK_SAME_LETTER_HEIGHTS:
{
if ( !nStrResId )
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 9affc7146a4b..2a61710413f0 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -363,7 +363,7 @@ IMPL_LINK_TYPED(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo, void)
break;
case SVX_ROMAN_UPPER:
bUpper = true;
- /* Fall through */
+ SAL_FALLTHROUGH;
case SVX_ROMAN_LOWER:
aPageNumValue += SvxNumberFormat::CreateRomanString(mnPageNumber, bUpper);
break;
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index c9d4ab844835..c1903a1a88ab 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -134,8 +134,8 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem
{
break;
}
+ SAL_FALLTHROUGH;
}
- // intentional no break here
case RES_DESCRIPTION_CHANGED:
{
if ( pNd && GetFrame() )
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index ac338185363d..bbedcbbf097a 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -107,8 +107,8 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *
{
break;
}
+ SAL_FALLTHROUGH;
}
- // intentionally no break here
case RES_DESCRIPTION_CHANGED:
{
if ( pFlyFrame )
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index 8c671de14cee..d38532e32b9c 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -248,7 +248,7 @@ void SwModify::CheckCaching( const sal_uInt16 nWhich )
case RES_FMT_CHG:
case RES_ATTRSET_CHG:
SetInSwFntCache( false );
- // fall through
+ SAL_FALLTHROUGH;
case RES_UL_SPACE:
case RES_LR_SPACE:
case RES_BOX:
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index 9df9a1c520d3..9a99b65fd34d 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -149,7 +149,7 @@ void SwTableBoxFormula::ChangeState( const SfxPoolItem* pItem )
}
else
pUpdateField->m_bBehindSplitLine = false;
- // no break
+ SAL_FALLTHROUGH;
case TBL_MERGETBL:
if( pUpdateField->m_pHistory )
{
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index 32f92d7bf444..50270341868b 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -226,9 +226,11 @@ sal_uInt16 GetWhichOfScript( sal_uInt16 nWhich, sal_uInt16 nScript )
switch( nScript)
{
case i18n::ScriptType::COMPLEX:
- ++pM; // no break;
+ ++pM;
+ SAL_FALLTHROUGH;
case i18n::ScriptType::ASIAN:
- ++pM; // no break;
+ ++pM;
+ SAL_FALLTHROUGH;
default:
nRet = *pM;
}
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 7e57d314efed..df1d3eee2582 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1934,7 +1934,7 @@ bool SwCursorShell::SetShadowCursorPos( const Point& rPt, SwFillMode eFillMode )
if (!sInsert.isEmpty())
GetDoc()->getIDocumentContentOperations().InsertString( *m_pCurrentCursor, sInsert.makeStringAndClear());
}
- // no break - still need to set orientation
+ SAL_FALLTHROUGH; // still need to set orientation
case FILL_MARGIN:
if( text::HoriOrientation::NONE != aFPos.eOrient )
{
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx
index 7180489ce1f3..df6c802eecb9 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -176,7 +176,7 @@ SwFieldType* DocumentFieldsManager::InsertFieldType(const SwFieldType &rFieldTyp
//constructing string pools and when reading SetExp fields
if( nsSwGetSetExpType::GSE_SEQ & static_cast<const SwSetExpFieldType&>(rFieldTyp).GetType() )
i -= INIT_SEQ_FLDTYPES;
- // no break;
+ SAL_FALLTHROUGH;
case RES_DBFLD:
case RES_USERFLD:
case RES_DDEFLD:
@@ -308,7 +308,7 @@ void DocumentFieldsManager::RemoveFieldType(size_t nField)
case RES_SETEXPFLD:
case RES_USERFLD:
mpUpdateFields->RemoveFieldType( *pTmp );
- // no break;
+ SAL_FALLTHROUGH;
case RES_DDEFLD:
if( pTmp->HasWriterListeners() && !m_rDoc.IsUsed( *pTmp ) )
{
@@ -553,7 +553,7 @@ bool DocumentFieldsManager::UpdateField(SwTextField * pDstTextField, SwField & r
pDBField->InitContent();
}
#endif
- // no break;
+ SAL_FALLTHROUGH;
default:
pDstFormatField->ModifyNotification( nullptr, pMsgHint );
diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx b/sw/source/core/doc/DocumentLayoutManager.cxx
index 72978cebac7e..c5380df0b3de 100644
--- a/sw/source/core/doc/DocumentLayoutManager.cxx
+++ b/sw/source/core/doc/DocumentLayoutManager.cxx
@@ -120,7 +120,7 @@ SwFrameFormat *DocumentLayoutManager::MakeLayoutFormat( RndStdIds eRequest, cons
case RND_STD_HEADERR:
{
bHeader = true;
- // no break, we continue further down
+ SAL_FALLTHROUGH;
}
case RND_STD_FOOTER:
case RND_STD_FOOTERL:
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index 4974408b1a08..c8802930f371 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -1187,7 +1187,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
bCompress = true;
mpRedlineTable->DeleteAndDestroy( n );
bDec = true;
- // no break!
+ SAL_FALLTHROUGH;
case POS_INSIDE:
if( bCallDelete )
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 91aa08a286a0..319a60800f0d 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1979,7 +1979,7 @@ sal_uInt16 SaveMergeRedline::InsertRedline(SwPaM* pLastDestRedline)
case POS_EQUAL:
delete pDestRedl;
pDestRedl = nullptr;
- // break; -> no break !!!!
+ SAL_FALLTHROUGH;
case POS_COLLIDE_END:
case POS_BEFORE:
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index cd25942f9be4..7abc9ab99857 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -483,7 +483,7 @@ void SwDoc::GetAllUsedDB( std::vector<OUString>& rDBNameList,
case RES_DBNEXTSETFLD:
AddUsedDBToList( rDBNameList,
lcl_DBDataToString(static_cast<const SwDBNameInfField*>(pField)->GetRealDBData() ));
- // no break // JP: is that right like that?
+ SAL_FALLTHROUGH; // JP: is that right like that?
case RES_HIDDENTXTFLD:
case RES_HIDDENPARAFLD:
@@ -663,7 +663,7 @@ void SwDoc::ChangeDBFields( const std::vector<OUString>& rOldNames,
{
static_cast<SwDBNameInfField*>(pField)->SetDBData(aNewDBData);
}
- // no break;
+ SAL_FALLTHROUGH;
case RES_HIDDENTXTFLD:
case RES_HIDDENPARAFLD:
pField->SetPar1( ReplaceUsedDBs(rOldNames, rNewName, pField->GetPar1()) );
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 517933bfbed4..da9c84b618c4 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -470,7 +470,7 @@ lcl_SetFlyFrameAttr(SwDoc & rDoc,
case RES_CNTNT:
case RES_FOOTER:
OSL_FAIL( "Unknown Fly attribute." );
- // no break;
+ SAL_FALLTHROUGH;
case RES_CHAIN:
rSet.ClearItem( nWhich );
break;
@@ -851,7 +851,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
}
aNewAnch.SetType( FLY_AT_PAGE );
- // no break
+ SAL_FALLTHROUGH;
}
case FLY_AT_PAGE:
{
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 30f3f8872c0a..183766375799 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -675,7 +675,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTextFormatColls *const pTextFormatCollTable,
{
case LTYPE_TABLE:
bTable = true;
- // no break here
+ SAL_FALLTHROUGH;
case LTYPE_FLY:
// At the FlySection's Beginning/End insert the corresponding Node with its Field.
// The Frame is created automatically.
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx
index 0bb6e4ad18b7..df67b94800ab 100644
--- a/sw/source/core/doc/docruby.cxx
+++ b/sw/source/core/doc/docruby.cxx
@@ -283,7 +283,7 @@ bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt
case UnicodeType::OTHER_LETTER:
bChkNxtWrd = true;
- //fall-through
+ SAL_FALLTHROUGH;
default:
bIsAlphaNum = false;
break;
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 1ddc0cad9558..3c36405bce1c 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -257,7 +257,7 @@ const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark,
case TOX_SAME_PRV:
if( pTOXMark->GetText() != rCurTOXMark.GetText() )
break;
- /* no break here */
+ SAL_FALLTHROUGH;
case TOX_PRV:
if ( (aAbsNew < aAbsIdx && aAbsNew > aPrevPos) ||
(aAbsIdx == aAbsNew &&
@@ -279,7 +279,7 @@ const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark,
case TOX_SAME_NXT:
if( pTOXMark->GetText() != rCurTOXMark.GetText() )
break;
- /* no break here */
+ SAL_FALLTHROUGH;
case TOX_NXT:
if ( (aAbsNew > aAbsIdx && aAbsNew < aNextPos) ||
(aAbsIdx == aAbsNew &&
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 3c4b25b77600..af3f3215f22a 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -608,7 +608,7 @@ void SwNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
if (GetNode()->GetNodeType() != ND_GRFNODE) {
break;
}
- // fall through
+ SAL_FALLTHROUGH;
case RES_FMT_CHG:
CLEARCACHE
break;
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 15ae0f2381ff..ee84093fffc2 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -4165,7 +4165,7 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
pLines = &pLine->GetUpper()->GetTabLines();
nBaseLinePos = pLines->GetPos( pLine );
pBaseLine = pLine;
- // no break!
+ SAL_FALLTHROUGH;
case nsTableChgWidthHeightType::WH_ROW_TOP:
case nsTableChgWidthHeightType::WH_ROW_BOTTOM:
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 8fe1bc0c1d27..5267fbed8cbf 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -699,7 +699,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
--aIdx;
break;
}
- // no break !!
+ SAL_FALLTHROUGH;
case ND_TABLENODE:
case ND_STARTNODE:
{
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 74fd835a7fc0..3ed06a81398a 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -786,7 +786,7 @@ void SwSectionFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
case RES_SECTION_RESETHIDDENFLAG:
case RES_FTN_AT_TXTEND:
case RES_END_AT_TXTEND : bClients = true;
- // no break !!
+ SAL_FALLTHROUGH;
case RES_SECTION_HIDDEN:
case RES_SECTION_NOT_HIDDEN:
{
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index f421748c0c22..7cf80a5f76c2 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1254,7 +1254,7 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
}
}
}
- // fallthrough intended here
+ SAL_FALLTHROUGH;
}
case SDRUSERCALL_MOVEONLY:
case SDRUSERCALL_RESIZE:
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 82b58222a81c..17ab994db4a4 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -2004,7 +2004,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
case '?':
if( m_aFlags.bCapitalStartSentence )
bFirstSent = true;
- /* fallthrough */
+ SAL_FALLTHROUGH;
default:
if( !( rAppCC.isLetterNumeric( *pText, nPos )
|| '/' == cChar )) // '/' should not be a word separator (e.g. '1/2' needs to be handled as one word for replacement)
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 491a1c1ce4ff..091475cd8425 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -177,7 +177,7 @@ static bool lcl_FindAnchorPos(
}
aNewAnch.SetType( nNew = FLY_AT_PAGE );
- // no break
+ SAL_FALLTHROUGH;
case FLY_AT_PAGE:
pNewAnch = rFrame.FindPageFrame();
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index aa941c5956a2..5c629b9f4425 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -388,7 +388,8 @@ bool SwFEShell::MoveAnchor( SwMove nDir )
if( pos != *aAnch.GetContentAnchor())
aAnch.SetAnchor( &pos );
}
- } // no break!
+ SAL_FALLTHROUGH;
+ }
case FLY_AT_PARA:
{
OSL_ENSURE( pOld->IsContentFrame(), "Wrong anchor, page expected." );
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index e6c938f74be7..287b94bca4b1 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -109,7 +109,8 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt,
bool bFrame = true;
switch ( eType )
{
- case RECT_PAGE_PRT: bFrame = false; /* no break */
+ case RECT_PAGE_PRT: bFrame = false;
+ SAL_FALLTHROUGH;
case RECT_PAGE : pFrame = pFrame->FindPageFrame();
break;
@@ -118,7 +119,8 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt,
pFrame->Calc(Imp()->GetShell()->GetOut());
break;
- case RECT_FLY_PRT_EMBEDDED: bFrame = false; /* no break */
+ case RECT_FLY_PRT_EMBEDDED: bFrame = false;
+ SAL_FALLTHROUGH;
case RECT_FLY_EMBEDDED: pFrame = xObj.is() ? FindFlyFrame( xObj )
: pFrame->IsFlyFrame()
? pFrame
@@ -131,7 +133,7 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt,
else {
OSL_FAIL( "Missing Table" );
}
- /* no break */
+ SAL_FALLTHROUGH;
case RECT_SECTION_PRT:
case RECT_SECTION: if( pFrame->IsInSct() )
pFrame = pFrame->FindSctFrame();
@@ -144,7 +146,8 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt,
bFrame = false;
break;
- case RECT_HEADERFOOTER_PRT: bFrame = false; /* no break */
+ case RECT_HEADERFOOTER_PRT: bFrame = false;
+ SAL_FALLTHROUGH;
case RECT_HEADERFOOTER: if( nullptr == (pFrame = pFrame->FindFooterOrHeader()) )
return GetLayout()->Frame();
break;
@@ -738,7 +741,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
{
case text::RelOrientation::PAGE_RIGHT:
case text::RelOrientation::FRAME_RIGHT: aPos.Y() += pFrame->Prt().Height();
- // no break!
+ SAL_FALLTHROUGH;
case text::RelOrientation::PRINT_AREA:
case text::RelOrientation::PAGE_PRINT_AREA: aPos.Y() += pFrame->Prt().Top(); break;
default: break;
@@ -750,7 +753,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
{
case text::RelOrientation::PRINT_AREA:
case text::RelOrientation::PAGE_PRINT_AREA: aPos.X() += pFrame->Prt().Width();
- // no break
+ SAL_FALLTHROUGH;
case text::RelOrientation::PAGE_RIGHT:
case text::RelOrientation::FRAME_RIGHT: aPos.X() += pFrame->Prt().Left(); break;
default: aPos.X() += pFrame->Frame().Width();
@@ -762,7 +765,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
{
case text::RelOrientation::PRINT_AREA:
case text::RelOrientation::PAGE_PRINT_AREA: aPos.X() += pFrame->Prt().Width();
- // no break!
+ SAL_FALLTHROUGH;
case text::RelOrientation::PAGE_LEFT:
case text::RelOrientation::FRAME_LEFT: aPos.X() += pFrame->Prt().Left() -
pFrame->Frame().Width(); break;
@@ -775,7 +778,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
{
case text::RelOrientation::PAGE_RIGHT:
case text::RelOrientation::FRAME_RIGHT: aPos.X() += pFrame->Prt().Width();
- // no break!
+ SAL_FALLTHROUGH;
case text::RelOrientation::PRINT_AREA:
case text::RelOrientation::PAGE_PRINT_AREA: aPos.X() += pFrame->Prt().Left(); break;
default:break;
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 80182070235d..4204b8ca1978 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -538,7 +538,8 @@ void SwImplProtocol::_Record( const SwFrame* pFrame, sal_uLong nFunction, sal_uL
if( nAct == ACT_START )
lcl_Flags( aOut, pFrame );
break;
- case PROT_MOVE_FWD: bTmp = true; // NoBreak
+ case PROT_MOVE_FWD: bTmp = true;
+ SAL_FALLTHROUGH;
case PROT_MOVE_BWD:
if (nFunction == (bTmp ? 1U : 0U))
aOut.append("Fwd");
@@ -560,7 +561,8 @@ void SwImplProtocol::_Record( const SwFrame* pFrame, sal_uLong nFunction, sal_uL
aOut.append("TestShrink");
break;
case PROT_ADJUSTN :
- case PROT_SHRINK: bTmp = true; // NoBreak
+ case PROT_SHRINK: bTmp = true;
+ SAL_FALLTHROUGH;
case PROT_GROW:
if (!bTmp)
aOut.append("Grow");
@@ -601,7 +603,8 @@ void SwImplProtocol::_Record( const SwFrame* pFrame, sal_uLong nFunction, sal_uL
break;
case PROT_SECTION: SectFunc(aOut, pFrame, nAct, pParam);
break;
- case PROT_CUT: bTmp = true; // NoBreak
+ case PROT_CUT: bTmp = true;
+ SAL_FALLTHROUGH;
case PROT_PASTE:
if (bTmp)
aOut.append("Cut from ");
@@ -667,7 +670,8 @@ void SwImplProtocol::SectFunc(OStringBuffer &rOut, const SwFrame* , sal_uLong nA
case ACT_MERGE: rOut.append("Merge Section ");
rOut.append(static_cast<sal_Int64>(lcl_GetFrameId(static_cast<SwFrame*>(pParam))));
break;
- case ACT_CREATE_MASTER: bTmp = true; // NoBreak
+ case ACT_CREATE_MASTER: bTmp = true;
+ SAL_FALLTHROUGH;
case ACT_CREATE_FOLLOW: rOut.append("Create Section ");
if (bTmp)
rOut.append("Master to ");
@@ -675,7 +679,8 @@ void SwImplProtocol::SectFunc(OStringBuffer &rOut, const SwFrame* , sal_uLong nA
rOut.append("Follow from ");
rOut.append(static_cast<sal_Int64>(lcl_GetFrameId(static_cast<SwFrame*>(pParam))));
break;
- case ACT_DEL_MASTER: bTmp = true; // NoBreak
+ case ACT_DEL_MASTER: bTmp = true;
+ SAL_FALLTHROUGH;
case ACT_DEL_FOLLOW: rOut.append("Delete Section ");
if (bTmp)
rOut.append("Master to ");
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 248fab1fb22d..bef91bf29597 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -1057,7 +1057,7 @@ void SwFlyFrame::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
else if ( GetPrevLink() )
SwFlyFrame::UnchainFrames( GetPrevLink(), this );
}
- //fall-through
+ SAL_FALLTHROUGH;
default:
bClear = false;
}
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 9f2c94c51eca..b9babcb78718 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -586,8 +586,9 @@ void SwPageFrame::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
if( rOldF != rNewF )
rInvFlags |= 0x10;
CheckDirChange();
+
+ SAL_FALLTHROUGH;
}
- // no break
case RES_FRM_SIZE:
{
const SwRect aOldPageFrameRect( Frame() );
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 820bb000a883..174e6c4c883c 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -3172,7 +3172,7 @@ void SwTabFrame::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
break;
case RES_UL_SPACE:
rInvFlags |= 0x1C;
- /* no break here */
+ SAL_FALLTHROUGH;
default:
bClear = false;
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 2661d190a022..dcb314d0b71e 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -276,7 +276,7 @@ void SwFrame::_UpdateAttrFrame( const SfxPoolItem *pOld, const SfxPoolItem *pNew
case RES_BOX:
case RES_SHADOW:
Prepare( PREP_FIXSIZE_CHG );
- // no break here!
+ SAL_FALLTHROUGH;
case RES_LR_SPACE:
case RES_UL_SPACE:
rInvFlags |= 0x0B;
@@ -2003,7 +2003,7 @@ void SwContentFrame::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pN
{
case RES_FMT_CHG:
rInvFlags = 0xFF;
- /* no break here */
+ SAL_FALLTHROUGH;
case RES_PAGEDESC: //attribute changes (on/off)
if ( IsInDocBody() && !IsInTab() )
@@ -2053,7 +2053,7 @@ void SwContentFrame::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pN
}
Prepare( PREP_UL_SPACE ); //TextFrame has to correct line spacing.
rInvFlags |= 0x80;
- /* no break here */
+ SAL_FALLTHROUGH;
}
case RES_LR_SPACE:
case RES_BOX:
@@ -2124,7 +2124,7 @@ void SwContentFrame::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pN
case RES_FRM_SIZE:
rInvFlags |= 0x01;
- /* no break here */
+ SAL_FALLTHROUGH;
default:
bClear = false;
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index 9354af983d0e..34c0df1910f6 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -653,7 +653,7 @@ void SwAnchoredObjectPosition::_GetHoriAlignmentValues( const SwFrame& _rHoriOr
(ToCharOrientFrame()->Frame().*fnRect->fnGetLeft)() );
break;
}
- // no break!
+ SAL_FALLTHROUGH;
}
case text::RelOrientation::PAGE_PRINT_AREA:
{
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index f51d0612dad6..6a373825afd0 100644
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -278,8 +278,8 @@ void SwToContentAnchoredObjectPosition::CalcPosition()
}
break;
}
+ SAL_FALLTHROUGH;
}
- // no break here
case text::VertOrientation::TOP:
{
// #i22341# - special case for vertical
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index ed7d4163459f..46b51cd210ad 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1576,7 +1576,7 @@ sal_Int32 SwTextFormatInfo::ScanPortionEnd( const sal_Int32 nStart,
case CH_TXTATR_INWORD:
if( !HasHint( i ))
break;
- // no break;
+ SAL_FALLTHROUGH;
case CHAR_SOFTHYPHEN:
case CHAR_HARDHYPHEN:
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 2649c1f2697a..9559d2ffa221 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1336,7 +1336,7 @@ SwLinePortion *SwTextFormatter::NewPortion( SwTextFormatInfo &rInf )
pPor = NewExtraPortion( rInf );
break;
}
- // No break
+ SAL_FALLTHROUGH;
default :
{
SwTabPortion* pLastTabPortion = rInf.GetLastTab();
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index e905301f9f1f..645125b52d87 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -379,7 +379,7 @@ bool SwFieldPortion::Format( SwTextFormatInfo &rInf )
switch (nNew)
{
case CH_BREAK : bFull = true;
- // no break
+ SAL_FALLTHROUGH;
case ' ' :
case CH_TAB :
case CHAR_HARDHYPHEN: // non-breaking hyphen
@@ -1275,16 +1275,20 @@ bool SwCombinedPortion::Format( SwTextFormatInfo &rInf )
nBotDiff = ( Width() - nMaxWidth ) / 2;
switch( nTop)
{
- case 3: aPos[1] = aPos[0] + nTopDiff; // no break
+ case 3: aPos[1] = aPos[0] + nTopDiff;
+ SAL_FALLTHROUGH;
case 2: aPos[nTop-1] = Width() - aPos[nTop-1];
}
aPos[0] = 0;
switch( nCount )
{
- case 5: aPos[4] = aPos[3] + nBotDiff; // no break
+ case 5: aPos[4] = aPos[3] + nBotDiff;
+ SAL_FALLTHROUGH;
case 3: aPos[nTop] = nBotDiff; break;
- case 6: aPos[4] = aPos[3] + nBotDiff; // no break
- case 4: aPos[nTop] = 0; // no break
+ case 6: aPos[4] = aPos[3] + nBotDiff;
+ SAL_FALLTHROUGH;
+ case 4: aPos[nTop] = 0;
+ SAL_FALLTHROUGH;
case 2: aPos[nCount-1] = Width() - aPos[nCount-1];
}
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 56e5df1240a9..14f12667cdfc 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -642,9 +642,11 @@ void SwRubyPortion::_Adjust( SwTextFormatInfo &rInf )
sal_Int32 nSub = 0;
switch ( nAdjustment )
{
- case 1: nRight = static_cast<sal_uInt16>(nLineDiff / 2); // no break
+ case 1: nRight = static_cast<sal_uInt16>(nLineDiff / 2);
+ SAL_FALLTHROUGH;
case 2: nLeft = static_cast<sal_uInt16>(nLineDiff - nRight); break;
- case 3: nSub = 1; // no break
+ case 3: nSub = 1;
+ SAL_FALLTHROUGH;
case 4:
{
sal_Int32 nCharCnt = 0;
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index e7813d939252..c43c30caed47 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -1525,7 +1525,7 @@ bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid,
Prt().Height(0);
_InvalidatePrt();
_InvalidateSize();
- /* no break here */
+ SAL_FALLTHROUGH;
case PREP_ADJUST_FRM : pPara->SetPrepAdjust();
if( IsFootnoteNumFrame() != pPara->IsFootnoteNum() ||
IsUndersized() )
@@ -1536,7 +1536,7 @@ bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid,
}
break;
case PREP_MUST_FIT : pPara->SetPrepMustFit();
- /* no break here */
+ SAL_FALLTHROUGH;
case PREP_WIDOWS_ORPHANS : pPara->SetPrepAdjust();
break;
@@ -1783,7 +1783,7 @@ bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid,
InvalidateRange( SwCharRange( nWhere, 1 ) );
return bParaPossiblyInvalid;
}
- // else: continue with default case block
+ SAL_FALLTHROUGH; // else: continue with default case block
}
case PREP_CLEAR:
default:
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 257c95ed6d3c..bf1711add806 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -185,7 +185,7 @@ SwTextNode *SwNodes::MakeTextNode( const SwNodeIndex & rWhere,
aTmp = *pNd->StartOfSectionNode();
break;
}
- // no break !!!
+ SAL_FALLTHROUGH;
default:
if( rWhere == aTmp )
aTmp -= 2;
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 2124f077acea..9cf14e4c1a90 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1159,7 +1159,7 @@ void SwTextNode::DestroyAttr( SwTextAttr* pAttr )
{
case RES_HIDDENPARAFLD:
SetCalcHiddenParaField();
- // no break
+ SAL_FALLTHROUGH;
case RES_DBSETNUMBERFLD:
case RES_GETEXPFLD:
case RES_DBFLD:
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 9807a5aee509..d7f2f9b5ffad 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1363,7 +1363,8 @@ SwRect SwTextFrame::_AutoSpell( const SwContentNode* pActNode, sal_Int32 nActPos
pNode->GetWrong()->Insert(OUString(), nullptr, nBegin, nLen, nInsertPos++);
break;
case SwWrongList::FreshState::CURSOR:
- bPending = true; // fall-through to mark as invalid
+ bPending = true;
+ SAL_FALLTHROUGH; // to mark as invalid
case SwWrongList::FreshState::NOTHING:
nInvStart = nBegin;
nInvEnd = nBegin + nLen;
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index adb31b0ea3a2..4c07d71d79b2 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -252,7 +252,7 @@ bool SwUndoFormatAttr::IsFormatInDoc( SwDoc* pDoc )
}
}
}
- // no break!
+ SAL_FALLTHROUGH;
case RES_DRAWFRMFMT:
case RES_FLYFRMFMT:
bFound = pDoc->GetSpzFrameFormats()->Contains( m_pFormat );
@@ -378,7 +378,7 @@ void SwUndoFormatAttr::SaveFlyAnchor( bool bSvDrwPt )
case FLY_AS_CHAR:
case FLY_AT_CHAR:
nContent = rAnchor.GetContentAnchor()->nContent.GetIndex();
- // fallthrough
+ SAL_FALLTHROUGH;
case FLY_AT_PARA:
case FLY_AT_FLY:
m_nNodeIndex = rAnchor.GetContentAnchor()->nNode.GetIndex();
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index 7696d1a7971b..62d262b005cb 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -645,7 +645,7 @@ void SwUndoSetFlyFormat::PutAttr( sal_uInt16 nWhich, const SfxPoolItem* pItem )
case FLY_AS_CHAR:
case FLY_AT_CHAR:
nOldContent = pAnchor->GetContentAnchor()->nContent.GetIndex();
- //fall-through
+ SAL_FALLTHROUGH;
case FLY_AT_PARA:
case FLY_AT_FLY:
nOldNode = pAnchor->GetContentAnchor()->nNode.GetIndex();
@@ -661,7 +661,7 @@ void SwUndoSetFlyFormat::PutAttr( sal_uInt16 nWhich, const SfxPoolItem* pItem )
case FLY_AS_CHAR:
case FLY_AT_CHAR:
nNewContent = pAnchor->GetContentAnchor()->nContent.GetIndex();
- //fall-through
+ SAL_FALLTHROUGH;
case FLY_AT_PARA:
case FLY_AT_FLY:
nNewNode = pAnchor->GetContentAnchor()->nNode.GetIndex();
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 0b6d5f571091..5d8f28fbeeac 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -2888,7 +2888,7 @@ SwUndoSplitTable::SwUndoSplitTable( const SwTableNode& rTableNd,
{
case HEADLINE_BOXATRCOLLCOPY:
pHistory = new SwHistory;
- // no break
+ SAL_FALLTHROUGH;
case HEADLINE_BORDERCOPY:
case HEADLINE_BOXATTRCOPY:
pSavTable = new _SaveTable( rTableNd.GetTable(), 1, false );
@@ -2939,7 +2939,7 @@ void SwUndoSplitTable::UndoImpl(::sw::UndoRedoContext & rContext)
case HEADLINE_BOXATRCOLLCOPY:
if( pHistory )
pHistory->TmpRollback( pDoc, nFormulaEnd );
- // no break
+ SAL_FALLTHROUGH;
case HEADLINE_BOXATTRCOPY:
case HEADLINE_BORDERCOPY:
{
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index f039ef7ad183..80d9e688dd46 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -348,7 +348,7 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal,
{
case FUNIT_100TH_MM:
OSL_ENSURE( FUNIT_MM == eUnit, "Measuring unit not supported" );
- //fall-through
+ SAL_FALLTHROUGH;
case FUNIT_MM:
// 0.01mm = 0.57twip
nMul = 25400; // 25.4 * 1000
@@ -360,7 +360,7 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal,
case FUNIT_M:
case FUNIT_KM:
OSL_ENSURE( FUNIT_CM == eUnit, "Measuring unit not supported" );
- //fall-through
+ SAL_FALLTHROUGH;
case FUNIT_CM:
// 0.01cm = 5.7twip (not exact, but the UI is also not exact)
nMul = 2540; // 2.54 * 1000
@@ -371,7 +371,7 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal,
case FUNIT_TWIP:
OSL_ENSURE( FUNIT_POINT == eUnit, "Measuring unit not supported" );
- //fall-through
+ SAL_FALLTHROUGH;
case FUNIT_POINT:
// 0.1pt = 2.0twip (not exact, but the UI is also not exact)
nMul = 100;
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 835c88bacdc3..bc6e71c2dd7d 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -1285,7 +1285,7 @@ void SwHTMLParser::NewForm( bool bAppend )
case HTML_O_SDONSUBMIT:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONSUBMIT:
nEvent = HTML_ET_ONSUBMITFORM;
bSetEvent = true;
@@ -1293,7 +1293,7 @@ void SwHTMLParser::NewForm( bool bAppend )
case HTML_O_SDONRESET:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONRESET:
nEvent = HTML_ET_ONRESETFORM;
bSetEvent = true;
@@ -1491,7 +1491,7 @@ void SwHTMLParser::InsertInput()
case HTML_O_SDONFOCUS:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONFOCUS:
nEvent = HTML_ET_ONGETFOCUS;
bSetEvent = true;
@@ -1499,7 +1499,7 @@ void SwHTMLParser::InsertInput()
case HTML_O_SDONBLUR: // eigtl. nur EDIT
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONBLUR:
nEvent = HTML_ET_ONLOSEFOCUS;
bSetEvent = true;
@@ -1507,7 +1507,7 @@ void SwHTMLParser::InsertInput()
case HTML_O_SDONCLICK:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONCLICK:
nEvent = HTML_ET_ONCLICK;
bSetEvent = true;
@@ -1515,7 +1515,7 @@ void SwHTMLParser::InsertInput()
case HTML_O_SDONCHANGE: // eigtl. nur EDIT
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONCHANGE:
nEvent = HTML_ET_ONCHANGE;
bSetEvent = true;
@@ -1523,7 +1523,7 @@ void SwHTMLParser::InsertInput()
case HTML_O_SDONSELECT: // eigtl. nur EDIT
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONSELECT:
nEvent = HTML_ET_ONSELECT;
bSetEvent = true;
@@ -1948,7 +1948,7 @@ void SwHTMLParser::NewTextArea()
case HTML_O_SDONFOCUS:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONFOCUS:
nEvent = HTML_ET_ONGETFOCUS;
bSetEvent = true;
@@ -1956,7 +1956,7 @@ void SwHTMLParser::NewTextArea()
case HTML_O_SDONBLUR:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONBLUR:
nEvent = HTML_ET_ONLOSEFOCUS;
bSetEvent = true;
@@ -1964,7 +1964,7 @@ void SwHTMLParser::NewTextArea()
case HTML_O_SDONCLICK:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONCLICK:
nEvent = HTML_ET_ONCLICK;
bSetEvent = true;
@@ -1972,7 +1972,7 @@ void SwHTMLParser::NewTextArea()
case HTML_O_SDONCHANGE:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONCHANGE:
nEvent = HTML_ET_ONCHANGE;
bSetEvent = true;
@@ -1980,7 +1980,7 @@ void SwHTMLParser::NewTextArea()
case HTML_O_SDONSELECT:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONSELECT:
nEvent = HTML_ET_ONSELECT;
bSetEvent = true;
@@ -2224,7 +2224,7 @@ void SwHTMLParser::NewSelect()
case HTML_O_SDONFOCUS:
eScriptType2 = STARBASIC;
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_O_ONFOCUS:
nEvent = HTML_ET_ONGETFOCUS;
bSetEvent = true;
@@ -2232,7 +2232,7 @@ void SwHTMLParser::NewSelect()
case HTML_O_SDONBLUR:
eScriptType2 = STARBASIC;
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_O_ONBLUR:
nEvent = HTML_ET_ONLOSEFOCUS;
bSetEvent = true;
@@ -2240,7 +2240,7 @@ void SwHTMLParser::NewSelect()
case HTML_O_SDONCLICK:
eScriptType2 = STARBASIC;
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_O_ONCLICK:
nEvent = HTML_ET_ONCLICK;
bSetEvent = true;
@@ -2248,7 +2248,7 @@ void SwHTMLParser::NewSelect()
case HTML_O_SDONCHANGE:
eScriptType2 = STARBASIC;
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_O_ONCHANGE:
nEvent = HTML_ET_ONCHANGE;
bSetEvent = true;
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 00ec79fd3f97..48923939e689 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -390,21 +390,21 @@ void SwHTMLParser::InsertImage()
case HTML_O_SDONLOAD:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONLOAD:
nEvent = SVX_EVENT_IMAGE_LOAD;
goto IMAGE_SETEVENT;
case HTML_O_SDONABORT:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONABORT:
nEvent = SVX_EVENT_IMAGE_ABORT;
goto IMAGE_SETEVENT;
case HTML_O_SDONERROR:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONERROR:
nEvent = SVX_EVENT_IMAGE_ERROR;
goto IMAGE_SETEVENT;
@@ -874,7 +874,7 @@ void SwHTMLParser::InsertBodyOptions()
case HTML_O_SDONLOAD:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONLOAD:
aEvent = GlobalEventConfig::GetEventName( GlobalEventId::OPENDOC );
bSetEvent = true;
@@ -882,7 +882,7 @@ void SwHTMLParser::InsertBodyOptions()
case HTML_O_SDONUNLOAD:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONUNLOAD:
aEvent = GlobalEventConfig::GetEventName( GlobalEventId::PREPARECLOSEDOC );
bSetEvent = true;
@@ -890,7 +890,7 @@ void SwHTMLParser::InsertBodyOptions()
case HTML_O_SDONFOCUS:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONFOCUS:
aEvent = GlobalEventConfig::GetEventName( GlobalEventId::ACTIVATEDOC );
bSetEvent = true;
@@ -898,7 +898,7 @@ void SwHTMLParser::InsertBodyOptions()
case HTML_O_SDONBLUR:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONBLUR:
aEvent = GlobalEventConfig::GetEventName( GlobalEventId::DEACTIVATEDOC );
bSetEvent = true;
@@ -1118,21 +1118,21 @@ void SwHTMLParser::NewAnchor()
case HTML_O_SDONCLICK:
eScriptType2 = STARBASIC;
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_O_ONCLICK:
nEvent = SFX_EVENT_MOUSECLICK_OBJECT;
goto ANCHOR_SETEVENT;
case HTML_O_SDONMOUSEOVER:
eScriptType2 = STARBASIC;
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_O_ONMOUSEOVER:
nEvent = SFX_EVENT_MOUSEOVER_OBJECT;
goto ANCHOR_SETEVENT;
case HTML_O_SDONMOUSEOUT:
eScriptType2 = STARBASIC;
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_O_ONMOUSEOUT:
nEvent = SFX_EVENT_MOUSEOUT_OBJECT;
goto ANCHOR_SETEVENT;
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 02dfb42cd009..0c1132aa1b46 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -3692,7 +3692,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
break;
case SVX_ADJUST_LEFT:
eSurround = SURROUND_RIGHT;
- //fall-through
+ SAL_FALLTHROUGH;
default:
eHori = text::HoriOrientation::LEFT;
break;
@@ -3881,7 +3881,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
case HTML_TBODY_OFF:
case HTML_TABLE_OFF:
SkipToken();
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_TABLEHEADER_OFF:
case HTML_TABLEDATA_OFF:
bDone = true;
@@ -4284,7 +4284,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, bool bReadOptions,
case HTML_TFOOT_OFF:
case HTML_TABLE_OFF:
SkipToken();
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_TABLEROW_OFF:
bDone = true;
break;
@@ -4457,7 +4457,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
case HTML_TBODY_ON:
case HTML_TABLE_OFF:
SkipToken();
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_THEAD_OFF:
case HTML_TBODY_OFF:
case HTML_TFOOT_OFF:
@@ -4653,7 +4653,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
case HTML_TABLEROW_ON:
case HTML_TABLE_OFF:
SkipToken();
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_COLGROUP_OFF:
bDone = true;
break;
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 1773f8d6b42a..c2551a1b4e7a 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -987,7 +987,7 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode,
case text::HoriOrientation::LEFT_AND_WIDTH:
eTabHoriOri = text::HoriOrientation::LEFT;
bCheckDefList = true;
- // no break
+ SAL_FALLTHROUGH;
default:
// In allen anderen Faellen kann eine absolute oder relative
// Breite direkt uebernommen werden.
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index 2b14d4195a7b..6ac6d9d18a8d 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -578,7 +578,7 @@ CSS1Token CSS1Parser::GetNextToken()
bNextCh = false;
break;
}
- // no break
+ SAL_FALLTHROUGH;
default: // IDENT | syntax error
if (rtl::isAsciiAlpha(cNextCh))
@@ -1043,7 +1043,7 @@ CSS1Expression *CSS1Parser::ParseDeclaration( OUString& rProperty )
case CSS1_EMX:
if( '-'==cSign )
nValue = -nValue;
- //fall-through
+ SAL_FALLTHROUGH;
case CSS1_STRING:
case CSS1_PERCENTAGE:
case CSS1_IDENT:
@@ -1308,7 +1308,7 @@ bool CSS1Expression::GetColor( Color &rColor ) const
if( bRet || CSS1_STRING != eType || aValue.isEmpty() ||
aValue[0] != '#' )
break;
-
+ SAL_FALLTHROUGH;
case CSS1_HEXCOLOR:
{
// HACK fuer MS-IE: DIe Farbe kann auch in einem String stehen
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 7a6def77a8a0..53411b8b0497 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -1237,7 +1237,7 @@ void SwHTMLParser::NextToken( int nToken )
case HTML_UNKNOWNCONTROL_OFF:
if( m_aUnknownToken != sSaveToken )
return;
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_FRAMESET_ON:
case HTML_HEAD_OFF:
case HTML_BODY_ON:
@@ -2011,7 +2011,7 @@ void SwHTMLParser::NextToken( int nToken )
!sSaveToken.isEmpty() && '!' != sSaveToken[0] &&
'%' != sSaveToken[0] )
m_aUnknownToken = sSaveToken;
- // no break
+ SAL_FALLTHROUGH;
default:
bInsertUnknown = m_bKeepUnknown;
@@ -2050,7 +2050,7 @@ static void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr,
{
case RES_CHRATR_FONT:
rFont = true;
- //fall-through
+ SAL_FALLTHROUGH;
case RES_CHRATR_FONTSIZE:
case RES_CHRATR_LANGUAGE:
case RES_CHRATR_POSTURE:
@@ -2060,7 +2060,7 @@ static void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr,
break;
case RES_CHRATR_CJK_FONT:
rFont = true;
- //fall-through
+ SAL_FALLTHROUGH;
case RES_CHRATR_CJK_FONTSIZE:
case RES_CHRATR_CJK_LANGUAGE:
case RES_CHRATR_CJK_POSTURE:
@@ -2070,7 +2070,7 @@ static void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr,
break;
case RES_CHRATR_CTL_FONT:
rFont = true;
- //fall-through
+ SAL_FALLTHROUGH;
case RES_CHRATR_CTL_FONTSIZE:
case RES_CHRATR_CTL_LANGUAGE:
case RES_CHRATR_CTL_POSTURE:
@@ -4158,7 +4158,7 @@ void SwHTMLParser::NewTextFormatColl( int nToken, sal_uInt16 nColl )
// Fuer dem Fall, dass ein CLASS angegeben ist, loeschen wir
// es damit wir nicht die CLASS der PRE-Vorlage bekommen.
aClass = aEmptyOUStr;
- // fall-through
+ SAL_FALLTHROUGH;
case HTML_BLOCKQUOTE_ON:
case HTML_BLOCKQUOTE30_ON:
case HTML_PREFORMTXT_ON:
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 42138325ce11..2a13bedef6a5 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3412,7 +3412,7 @@ void RtfAttributeOutput::WriteExpand(const SwField* pField)
//#i119803# Export user field and DB field for RTF filter
case RES_DBFLD:
sCmd = FieldString(ww::eMERGEFIELD);
- // no break !!
+ SAL_FALLTHROUGH;
case RES_USERFLD:
sCmd += pField->GetTyp()->GetName();
m_rExport.OutputField(pField, ww::eNONE, sCmd);
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index d4bac28e8bf9..28e53b319c8a 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -3018,7 +3018,7 @@ sal_Int32 SwEscherEx::WriteTextFlyFrame(const DrawObj &rObj, sal_uInt32 nShapeId
{
default:
OSL_ENSURE(false, "unknown direction type");
- //fall-through
+ SAL_FALLTHROUGH;
case FRMDIR_HORI_LEFT_TOP:
nFlow=mso_txflHorzN;
break;
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 172be21f527a..ad0552504e0b 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1205,7 +1205,7 @@ void AttributeOutputBase::TOXMark( const SwTextNode& rNode, const SwTOXMark& rAt
case TOX_USER:
sText += "\" \\f \"" + OUString((sal_Char)( 'A' + GetExport( ).GetId( *rAttr.GetTOXType() ) ));
- // fall through - no break;
+ SAL_FALLTHROUGH;
case TOX_CONTENT:
{
eType = ww::eTC;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index ca7e8950a3bd..47b4e4db29f2 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2335,7 +2335,7 @@ void AttributeOutputBase::GetNumberPara( OUString& rStr, const SwField& rField )
default:
OSL_ENSURE(rField.GetFormat() == SVX_NUM_ARABIC,
"Unknown numbering type exported as default of Arabic\n");
- //fallthrough
+ SAL_FALLTHROUGH;
case SVX_NUM_ARABIC:
rStr += "\\* ARABIC ";
break;
@@ -3467,7 +3467,7 @@ void AttributeOutputBase::FormatBreak( const SvxFormatBreakItem& rBreak )
case SVX_BREAK_COLUMN_BEFORE: // ColumnBreak
bBefore = true;
- // no break;
+ SAL_FALLTHROUGH;
case SVX_BREAK_COLUMN_AFTER:
case SVX_BREAK_COLUMN_BOTH:
if ( GetExport().Sections().CurrentNumberOfColumns( *GetExport().m_pDoc ) > 1 || GetExport().SupportsOneColumnBreak() )
@@ -3567,7 +3567,7 @@ void WW8AttributeOutput::FormatTextGrid( const SwTextGridItem& rGrid )
{
default:
OSL_FAIL("Unknown grid type");
- //fall-through
+ SAL_FALLTHROUGH;
case GRID_NONE:
nGridType = 0;
break;
@@ -4444,7 +4444,7 @@ void WW8AttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDir
default:
//Can't get an unknown type here
OSL_FAIL("Unknown frame direction");
- //fall-through
+ SAL_FALLTHROUGH;
case FRMDIR_HORI_LEFT_TOP:
nTextFlow = 0;
break;
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 4a583b86bd44..8ef53ba13070 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3037,7 +3037,7 @@ SvxFrameDirection MakeDirection(sal_uInt16 nCode, bool bIsBiDi)
{
default:
OSL_ENSURE(eDir == 4, "unknown direction code, maybe it's a bitfield");
- //fall-through
+ SAL_FALLTHROUGH;
case 3:
eDir = bIsBiDi ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP; // #i38158# - Consider RTL tables
break;
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index b6d70adcb925..6d10dc30768b 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -983,7 +983,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
case FLD_TAGTXT:
if ((m_nFieldTagBad[nI] & nMask)) // Flag: Tag bad
return Read_F_Tag(&aF); // Taggen
- //fall through...
+ SAL_FALLTHROUGH;
case FLD_TEXT:
// so viele ueberlesen, das Resultfeld wird wie Haupttext
// eingelesen
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index e421bc08bd19..7e638214df8e 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -165,7 +165,7 @@ void wwSection::SetDirection()
{
default:
OSL_ENSURE(false, "Unknown layout type");
- //fall-through
+ SAL_FALLTHROUGH;
case 0:
meDir=FRMDIR_HORI_LEFT_TOP;
break;
@@ -240,7 +240,7 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrameFormat &rFormat, const wwSection &r
break;
default:
OSL_ENSURE(false, "Unknown grid type");
- //fall-through
+ SAL_FALLTHROUGH;
case 3:
eType = GRID_LINES_CHARS;
aGrid.SetSnapToChars(true);
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index d3481edc8f53..21232c0e9760 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -5364,19 +5364,19 @@ bool WW8Fib::GetBaseCp(ManTypes nType, WW8_CP * cp) const
default:
case MAN_TXBX_HDFT:
nOffset = ccpTxbx;
- // fall through
+ SAL_FALLTHROUGH;
case MAN_TXBX:
if (ccpEdn > std::numeric_limits<WW8_CP>::max() - nOffset) {
return false;
}
nOffset += ccpEdn;
- // fall through
+ SAL_FALLTHROUGH;
case MAN_EDN:
if (ccpAtn > std::numeric_limits<WW8_CP>::max() - nOffset) {
return false;
}
nOffset += ccpAtn;
- // fall through
+ SAL_FALLTHROUGH;
case MAN_AND:
if (ccpMcr > std::numeric_limits<WW8_CP>::max() - nOffset) {
return false;
@@ -5395,19 +5395,19 @@ bool WW8Fib::GetBaseCp(ManTypes nType, WW8_CP * cp) const
return false;
}
nOffset += ccpHdr;
- // fall through
+ SAL_FALLTHROUGH;
case MAN_HDFT:
if (ccpFootnote > std::numeric_limits<WW8_CP>::max() - nOffset) {
return false;
}
nOffset += ccpFootnote;
- // fall through
+ SAL_FALLTHROUGH;
case MAN_FTN:
if (ccpText > std::numeric_limits<WW8_CP>::max() - nOffset) {
return false;
}
nOffset += ccpText;
- // fall through
+ SAL_FALLTHROUGH;
case MAN_MAINTEXT:
break;
}
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index eda3db88f092..d098832d3b20 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1472,7 +1472,7 @@ SvXMLImportContext *SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
break;
case XML_TOK_TABLE_HEADER_ROWS:
bHeader = true;
- //fall-through
+ SAL_FALLTHROUGH;
case XML_TOK_TABLE_ROWS:
pContext = new SwXMLTableRowsContext_Impl( GetSwImport(), nPrefix,
rLocalName, xAttrList,
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 4dc0d55a5083..f45d40e07643 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -471,7 +471,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
}
if( '\'' == c || '\\' == c )
aBuffer.append( '\\' );
- // no break!
+ SAL_FALLTHROUGH;
default:
if( !aBuffer.isEmpty() )
aBuffer.append( c );
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx
index 7db602354c48..07e44f602583 100644
--- a/sw/source/ui/dialog/macassgn.cxx
+++ b/sw/source/ui/dialog/macassgn.cxx
@@ -67,7 +67,7 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType )
aItem.AddEvent( OUString( SW_RES(STR_EVENT_IMAGE_LOAD) ), OUString(),
SVX_EVENT_IMAGE_LOAD);
}
- // no break;
+ SAL_FALLTHROUGH;
case MACASSGN_FRMURL: // Frame - URL-Attributes
{
if( !bHtmlMode &&
@@ -83,14 +83,14 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType )
SW_EVENT_FRM_MOVE );
}
}
- // no break;
+ SAL_FALLTHROUGH;
case MACASSGN_OLE: // OLE
{
if( !bHtmlMode )
aItem.AddEvent( OUString( SW_RES(STR_EVENT_OBJECT_SELECT) ), OUString(),
SW_EVENT_OBJECT_SELECT );
}
- // no break;
+ SAL_FALLTHROUGH;
case MACASSGN_INETFMT: // INetFormat-Attributes
{
aItem.AddEvent( OUString( SW_RES(STR_EVENT_MOUSEOVER_OBJECT) ), OUString(),
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 44b1119449ee..8525ff22896e 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1898,7 +1898,7 @@ bool SwSectionFootnoteEndTabPage::FillItemSet( SfxItemSet* rSet )
aFootnote.SetNumType( m_pFootnoteNumViewBox->GetSelectedNumberingType() );
aFootnote.SetPrefix( m_pFootnotePrefixED->GetText().replaceAll("\\t", "\t") ); // fdo#65666
aFootnote.SetSuffix( m_pFootnoteSuffixED->GetText().replaceAll("\\t", "\t") );
- // no break;
+ SAL_FALLTHROUGH;
case FTNEND_ATTXTEND_OWNNUMSEQ:
aFootnote.SetOffset( static_cast< sal_uInt16 >( m_pFootnoteOffsetField->GetValue()-1 ) );
@@ -1919,7 +1919,7 @@ bool SwSectionFootnoteEndTabPage::FillItemSet( SfxItemSet* rSet )
aEnd.SetNumType( m_pEndNumViewBox->GetSelectedNumberingType() );
aEnd.SetPrefix( m_pEndPrefixED->GetText().replaceAll("\\t", "\t") );
aEnd.SetSuffix( m_pEndSuffixED->GetText().replaceAll("\\t", "\t") );
- // no break;
+ SAL_FALLTHROUGH;
case FTNEND_ATTXTEND_OWNNUMSEQ:
aEnd.SetOffset( static_cast< sal_uInt16 >( m_pEndOffsetField->GetValue()-1 ) );
@@ -1974,11 +1974,11 @@ void SwSectionFootnoteEndTabPage::ResetState( bool bFootnote,
{
case FTNEND_ATTXTEND_OWNNUMANDFMT:
pNtNumFormatCB->SetState( TRISTATE_TRUE );
- // no break;
+ SAL_FALLTHROUGH;
case FTNEND_ATTXTEND_OWNNUMSEQ:
pNtNumCB->SetState( TRISTATE_TRUE );
- // no break;
+ SAL_FALLTHROUGH;
case FTNEND_ATTXTEND:
pNtAtTextEndCB->SetState( TRISTATE_TRUE );
@@ -1994,13 +1994,13 @@ void SwSectionFootnoteEndTabPage::ResetState( bool bFootnote,
{
case FTNEND_ATPGORDOCEND:
pNtNumCB->Enable( false );
- // no break;
+ SAL_FALLTHROUGH;
case FTNEND_ATTXTEND:
pNtNumFormatCB->Enable( false );
pOffsetField->Enable( false );
pOffsetText->Enable( false );
- // no break;
+ SAL_FALLTHROUGH;
case FTNEND_ATTXTEND_OWNNUMSEQ:
pNumViewBox->Enable( false );
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index f3ddc962ecbf..3065e4152b00 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -345,7 +345,7 @@ void SwFieldDBPage::TypeHdl( ListBox* pBox )
case TYP_DBNUMSETFLD:
bSetNo = true;
- // no break!
+ SAL_FALLTHROUGH;
case TYP_DBNEXTSETFLD:
bCond = true;
if (IsFieldEdit())
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index d73b2570d1d0..cae7d207468e 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -590,7 +590,7 @@ bool SwFieldDokPage::FillItemSet(SfxItemSet* )
case TYP_AUTHORFLD:
nFormat = nSubType;
nSubType = 0;
- // no break!
+ SAL_FALLTHROUGH;
case TYP_EXTUSERFLD:
nFormat |= m_pFixedCB->IsChecked() ? AF_FIXED : 0;
break;
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index b5d72b56e31e..52429205464e 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -387,7 +387,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldRefPage, TypeHdl, ListBox&, void)
case REFFLDFLAG_BOOKMARK:
bName = true;
- // no break!!!
+ SAL_FALLTHROUGH;
default:
if( REFFLDFLAG & nTypeId )
{
@@ -692,7 +692,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId)
case REFFLDFLAG_HEADING:
case REFFLDFLAG_NUMITEM:
bAddCrossRefFormats = true;
- // intentional no break here
+ SAL_FALLTHROUGH;
case TYP_GETREFFLD:
case REFFLDFLAG_BOOKMARK:
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 48f8b0500c85..ae41621efd33 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -329,7 +329,7 @@ bool SwDocShell::Save()
case SfxObjectCreateMode::EMBEDDED:
// Suppress SfxProgress, if we are Embedded
SW_MOD()->SetEmbeddedLoadSave( true );
- // no break;
+ SAL_FALLTHROUGH;
case SfxObjectCreateMode::STANDARD:
case SfxObjectCreateMode::PREVIEW:
@@ -1006,7 +1006,7 @@ void SwDocShell::GetState(SfxItemSet& rSet)
if ( !aMOpt.IsImpress() )
rSet.DisableItem( nWhich );
}
- /* no break here */
+ SAL_FALLTHROUGH;
case FN_ABSTRACT_NEWDOC:
case FN_OUTLINE_TO_CLIPBOARD:
{
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index 448986570fb5..768025897d61 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -531,7 +531,7 @@ bool SwDocShell::Load( SfxMedium& rMedium )
}
// suppress SfxProgress, when we are Embedded
SW_MOD()->SetEmbeddedLoadSave( true );
- // no break;
+ SAL_FALLTHROUGH;
case SfxObjectCreateMode::STANDARD:
case SfxObjectCreateMode::PREVIEW:
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index 82cf42efa7ca..00b15616a4d5 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -336,7 +336,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
}
}
- // intentionally no break
+ SAL_FALLTHROUGH;
case SID_STYLE_EDIT:
case SID_STYLE_DELETE:
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index 74cb5591f81a..cc3fadb5cd88 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -896,7 +896,7 @@ OUString SwDocStyleSheet::GetDescription(SfxMapUnit eUnit)
bHasWesternFontPrefix = true;
bIsDefault = true;
}
- // no break;
+ SAL_FALLTHROUGH;
default:
bIsDefault = true;
}
@@ -2694,7 +2694,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
case SWSTYLEBIT_HTML | SFXSTYLEBIT_USERDEF:
if(IsPoolUserFormat(nId))
break;
- // otherwise move on
+ SAL_FALLTHROUGH;
case SWSTYLEBIT_HTML:
if( (nId & COLL_GET_RANGE_BITS) != COLL_HTML_BITS)
{
diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
index d78167a6d169..ffe7b8c580a3 100644
--- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -685,7 +685,7 @@ bool SwSpellDialogChildWindow::MakeTextSelection_Impl(SwWrtShell& rShell, ShellM
rView.AttrChangedNotify(&rShell);
break;
}
- // otherwise no break to deselect the object
+ SAL_FALLTHROUGH; // to deselect the object
case SHELL_MODE_GRAPHIC:
case SHELL_MODE_OBJECT:
{
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index f9d0569265cf..6e4548ec5743 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -1665,7 +1665,7 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
break;
}
}
- // no break - because then test if we get a stream
+ SAL_FALLTHROUGH; // because then test if we get a stream
default:
if( rData.GetSotStorageStream( nFormat, xStrm ) )
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 513000842a0c..2eb7d8c7a916 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -1094,7 +1094,8 @@ void SwEditWin::ChangeFly( sal_uInt8 nDir, bool bWeb )
case MOVE_RIGHT_SMALL:
if( aTmp.Width() < aSnap.Width() + MINFLY )
break;
- nRight = aSnap.Width(); // no break
+ nRight = aSnap.Width();
+ SAL_FALLTHROUGH;
case MOVE_RIGHT_HUGE:
case MOVE_RIGHT_BIG: aTmp.Left( aTmp.Left() + nRight );
break;
@@ -1102,7 +1103,8 @@ void SwEditWin::ChangeFly( sal_uInt8 nDir, bool bWeb )
case MOVE_DOWN_SMALL:
if( aTmp.Height() < aSnap.Height() + MINFLY )
break;
- nDown = aSnap.Height(); // no break
+ nDown = aSnap.Height();
+ SAL_FALLTHROUGH;
case MOVE_DOWN_HUGE:
case MOVE_DOWN_BIG: aTmp.Top( aTmp.Top() + nDown );
break;
@@ -2411,7 +2413,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
break;
}
aCh = '\t';
- // no break!
+ SAL_FALLTHROUGH;
case KS_InsChar:
if (rSh.GetChar(false)==CH_TXT_ATR_FORMELEMENT)
{
@@ -3479,8 +3481,9 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
default:
return;
}
+
+ SAL_FALLTHROUGH;
}
- /* no break */
case MOUSE_LEFT + KEY_SHIFT:
case MOUSE_LEFT + KEY_SHIFT + KEY_MOD1:
{
@@ -4205,8 +4208,8 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
}
else
m_rView.GetPostItMgr()->SetShadowState(nullptr,false);
+ SAL_FALLTHROUGH;
}
- // no break;
case KEY_SHIFT:
case KEY_MOD2:
case KEY_MOD1:
@@ -4564,7 +4567,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
break;
}
bPopMode = true;
- // no break
+ SAL_FALLTHROUGH;
case MOUSE_LEFT + KEY_SHIFT:
if (rSh.IsSelFrameMode())
{
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index 5f97ff06a9f9..a480b73d47d9 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -306,7 +306,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
}
case RES_INPUTFLD: // BubbleHelp, because the suggestion could be quite long
bBalloon = true;
- /* no break */
+ SAL_FALLTHROUGH;
case RES_JUMPEDITFLD:
sText = pField->GetPar2();
break;
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index 2c26252317a1..201ca5539624 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -445,7 +445,7 @@ bool SwFieldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill)
case TYP_INPUTFLD:
{
rToFill.push_back(SW_RES(aSwFields[nPos].nSubTypeStart));
- // move on at generic types
+ SAL_FALLTHROUGH; // move on at generic types
}
case TYP_DDEFLD:
case TYP_SEQFLD:
diff --git a/sw/source/uibase/ribbar/conrect.cxx b/sw/source/uibase/ribbar/conrect.cxx
index 0913d101cf68..8394299cf9f6 100644
--- a/sw/source/uibase/ribbar/conrect.cxx
+++ b/sw/source/uibase/ribbar/conrect.cxx
@@ -171,7 +171,7 @@ void ConstRectangle::Activate(const sal_uInt16 nSlotId)
case SID_DRAW_CAPTION_VERTICAL:
bCapVertical = true;
- // no break
+ SAL_FALLTHROUGH;
case SID_DRAW_CAPTION:
m_pWin->SetSdrDrawMode(OBJ_CAPTION);
break;
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 7761c7c0d775..4ffe11703bf0 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -229,7 +229,7 @@ void SwBaseShell::ExecDelete(SfxRequest &rReq)
break;
}
- // otherwise call DelLeft
+ SAL_FALLTHROUGH; // otherwise call DelLeft
case FN_SHIFT_BACKSPACE:
rSh.DelLeft();
break;
@@ -1851,7 +1851,7 @@ void SwBaseShell::SetWrapMode( sal_uInt16 nSlot )
case FN_FRAME_WRAPTHRU_TRANSP:
if (aWrap.IsContour())
aWrap.SetContour(false);
- // No break!!!
+ SAL_FALLTHROUGH;
case FN_FRAME_WRAPTHRU:
nSurround = SURROUND_THROUGHT;
break;
@@ -1970,8 +1970,8 @@ void SwBaseShell::ExecTextCtrl( SfxRequest& rReq )
if(nInputLang != LANGUAGE_DONTKNOW && nInputLang != LANGUAGE_SYSTEM)
nScripts = SvtLanguageOptions::GetScriptTypeOfLanguage( nInputLang );
}
+ SAL_FALLTHROUGH;
}
- // fall-through
case SID_ATTR_CHAR_POSTURE:
case SID_ATTR_CHAR_WEIGHT:
{
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index e580ef5eeab7..72338fdc3846 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -273,7 +273,7 @@ void SwDrawShell::Execute(SfxRequest &rReq)
case SID_FLIP_VERTICAL:
bMirror = false;
- /* no break */
+ SAL_FALLTHROUGH;
case SID_FLIP_HORIZONTAL:
rSh.MirrorSelection( bMirror );
break;
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index 6e76baf97afe..c81efb17e3f4 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -497,14 +497,14 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
case FN_FRAME_UP:
bTopParam = false;
- /* no break */
+ SAL_FALLTHROUGH;
case SID_FRAME_TO_TOP:
pSh->SelectionToTop( bTopParam );
break;
case FN_FRAME_DOWN:
bBottomParam = false;
- /* no break */
+ SAL_FALLTHROUGH;
case SID_FRAME_TO_BOTTOM:
pSh->SelectionToBottom( bBottomParam );
break;
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 871a5aefd270..c8d0c1191c99 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -752,7 +752,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
{
case TBLMERGE_OK:
bCallDone = true;
- //no break;
+ SAL_FALLTHROUGH;
case TBLMERGE_NOSELECTION:
break;
case TBLMERGE_TOOCOMPLEX:
@@ -933,8 +933,9 @@ void SwTableShell::Execute(SfxRequest &rReq)
}
nSlot = bColumn ? FN_TABLE_INSERT_COL_DLG : FN_TABLE_INSERT_ROW_DLG;
+
+ SAL_FALLTHROUGH; // on Count = 0 appears the dialog
}
- // No break; on Count = 0 appears the dialog
case FN_TABLE_INSERT_COL_DLG:
case FN_TABLE_INSERT_ROW_DLG:
{
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 1961204eff06..92bc40b0212b 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -862,7 +862,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
const sal_uInt16 nWhich = GetPool().GetWhich( nSlot );
if ( pArgs && pArgs->GetItemState( nWhich ) == SfxItemState::SET )
bUseDialog = false;
- // intentionally no break
+ SAL_FALLTHROUGH;
}
case SID_CHAR_DLG:
case SID_CHAR_DLG_EFFECT:
@@ -895,8 +895,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
const sal_uInt16 nWhich = GetPool().GetWhich( nSlot );
if ( pArgs && pArgs->GetItemState( nWhich ) == SfxItemState::SET )
bUseDialog = false;
- // intentionally no break
-
+ SAL_FALLTHROUGH;
}
case SID_PARA_DLG:
{
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index f31935cd4698..0f3ff772cbb4 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -1604,7 +1604,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
m_pVRuler->SetActive( !bModal );
}
- /* no break here */
+ SAL_FALLTHROUGH;
case SFX_HINT_TITLECHANGED:
if ( GetDocShell()->IsReadOnly() != GetWrtShell().GetViewOptions()->IsReadonly() )
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 13cade0ce0c5..207da4d1adb3 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1158,8 +1158,8 @@ void SwView::Execute(SfxRequest &rReq)
xDictionary->clear();
// put cursor to the start of the document
m_pWrtShell->SttDoc();
+ SAL_FALLTHROUGH; // call spell/grammar dialog
}
- // no break; - but call spell/grammar dialog
case FN_SPELL_GRAMMAR_DIALOG:
{
SfxViewFrame* pViewFrame = GetViewFrame();
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index c83fd07b855f..9c517656d4db 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -344,10 +344,9 @@ uno::Any SwXTextView::getSelection()
aRef.set(xCursor, uno::UNO_QUERY);
break;
}
-
+ SAL_FALLTHROUGH;
+ // without a table selection the text will be delivered
}
- //Without a table selection the text will be delivered.
- //break;
case SHELL_MODE_LIST_TEXT :
case SHELL_MODE_TABLE_LIST_TEXT:
case SHELL_MODE_TEXT :
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 4cc3c0871713..7397e097015a 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1785,7 +1785,7 @@ bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer,
break;
case ContentTypeId::URLFIELD:
sUrl = static_cast<SwURLFieldContent*>(pCnt)->GetURL();
- // no break;
+ SAL_FALLTHROUGH;
case ContentTypeId::OLE:
case ContentTypeId::GRAPHIC:
if(GetParentWindow()->GetRegionDropMode() != RegionMode::NONE)
@@ -2236,7 +2236,7 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, bool bModifier)
case FN_ITEM_DOWN:
case FN_ITEM_UP:
bMove = true;
- //fall-through
+ SAL_FALLTHROUGH;
case FN_ITEM_LEFT:
case FN_ITEM_RIGHT:
if( !GetWrtShell()->GetView().GetDocShell()->IsReadOnly() &&
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 90ce1e13e170..5b9b567004b4 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -367,7 +367,7 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName
{
aServerList.FillInsertObjects();
aServerList.Remove( SwDocShell::Factory().GetClassId() );
- // Intentionally no break!
+ SAL_FALLTHROUGH;
}
// TODO/LATER: recording! Convert properties to items
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 2b563b47805f..e659c714bde8 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -1767,7 +1767,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const css::uno::Any&
case WINDOW_CANCELBUTTON:
case WINDOW_HELPBUTTON:
nAlign = PROPERTY_ALIGN_CENTER;
- // no break here!
+ SAL_FALLTHROUGH;
case WINDOW_FIXEDTEXT:
case WINDOW_EDIT:
case WINDOW_MULTILINEEDIT:
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 53ccd5184750..b1c25cd7cde0 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -2902,8 +2902,8 @@ void VCLXFixedHyperlink::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve
}
}
}
+ SAL_FALLTHROUGH;
}
- //fall-through
default:
VCLXWindow::ProcessWindowEvent( rVclWindowEvent );
break;
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 771c3bbce588..60ce75146316 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -4681,7 +4681,7 @@ void INetURLObject::appendUCS4(OUStringBuffer& rTheText, sal_uInt32 nUCS4,
{
default:
OSL_FAIL("INetURLObject::appendUCS4(): Unsupported charset");
- //fallthrough
+ SAL_FALLTHROUGH;
case RTL_TEXTENCODING_ASCII_US:
case RTL_TEXTENCODING_ISO_8859_1:
appendEscape(rTheText, nUCS4);
@@ -4726,7 +4726,7 @@ sal_uInt32 INetURLObject::getUTF32(sal_Unicode const *& rBegin,
default:
OSL_FAIL(
"INetURLObject::getUTF32(): Unsupported charset");
- //fall-through
+ SAL_FALLTHROUGH;
case RTL_TEXTENCODING_ASCII_US:
rEscapeType = rtl::isAscii(nUTF32) ?
ESCAPE_UTF32 : ESCAPE_OCTET;
diff --git a/tools/source/fsys/wldcrd.cxx b/tools/source/fsys/wldcrd.cxx
index 4adfb7c3850e..c0750b7098b1 100644
--- a/tools/source/fsys/wldcrd.cxx
+++ b/tools/source/fsys/wldcrd.cxx
@@ -48,8 +48,10 @@ bool WildCard::ImpMatch( const char *pWild, const char *pStr )
else
pWild += pos;
else
- break; // WARNING: may cause execution of next case
- // in some circumstances!
+ break;
+ // WARNING/TODO: may cause execution of next case in some
+ // circumstances!
+ SAL_FALLTHROUGH;
case '*':
while ( *pWild == '*' )
pWild++;
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index b04fc17d6a1e..cc664c21ebbc 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -1201,8 +1201,8 @@ void INetMIMEEncodedWordOutputSink::finish(bool bWriteTrailer)
m_rSink << '_';
}
m_rSink << "?=";
+ SAL_FALLTHROUGH;
}
- //fall-through
case CODING_ENCODED_TERMINATED:
m_rSink << ' ';
break;
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 2565548fdefd..bcf204240516 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -1404,7 +1404,7 @@ void globalTransfer_(
rContext.xProcessor,
rContext.aArg.NameClash ) ),
rContext.xOrigEnv );
- // Unreachable
+ SAL_FALLTHROUGH; // Unreachable
}
case ucb::NameClash::ERROR:
@@ -1438,7 +1438,7 @@ void globalTransfer_(
case NOT_HANDLED:
// Not handled.
cppu::throwException( aExc );
- // break;
+ SAL_FALLTHROUGH; // break;
case UNKNOWN:
// Handled, but not clear, how...
@@ -1811,7 +1811,7 @@ void UniversalContentBroker::globalTransfer(
case NOT_HANDLED:
// Not handled.
cppu::throwException( aExc );
-// break;
+ SAL_FALLTHROUGH; // break;
case UNKNOWN:
// Handled, but not clear, how...
diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx
index 6f7ea3f01095..f1ab2686bcd0 100644
--- a/ucb/source/inc/regexpmap.hxx
+++ b/ucb/source/inc/regexpmap.hxx
@@ -220,13 +220,13 @@ void RegexpMapIterImpl< Val >::next()
case Regexp::KIND_DOMAIN:
if (m_aIndex == m_pMap->m_aList[m_nList].end())
return;
- //fall-through
+ SAL_FALLTHROUGH;
default:
++m_aIndex;
if (m_nList == Regexp::KIND_DOMAIN
|| m_aIndex != m_pMap->m_aList[m_nList].end())
break;
- //fall-through
+ SAL_FALLTHROUGH;
case -1:
do
{
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index e0eeeeaac6eb..702e57e47c60 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -2686,7 +2686,7 @@ void Content::transfer(
task::InteractionClassification_ERROR,
aTargetURI ) ),
Environment );
- // Unreachable
+ SAL_FALLTHROUGH; // Unreachable
}
case ucb::NameClash::OVERWRITE:
diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx
index 1ce21f7e98de..5c04d7910794 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.cxx
@@ -190,7 +190,7 @@ bool WildCard::Matches( const OUString& rString ) const
else
break;
- // Note: fall-through are intended!
+ SAL_FALLTHROUGH;
case '*':
while ( *pWild == '*' )
diff --git a/unoidl/source/legacyprovider.cxx b/unoidl/source/legacyprovider.cxx
index 46058c7be032..5fb2f480ed0c 100644
--- a/unoidl/source/legacyprovider.cxx
+++ b/unoidl/source/legacyprovider.cxx
@@ -219,7 +219,7 @@ rtl::Reference< Entity > readEntity(
if (probe) {
return rtl::Reference< Entity >();
}
- // fall through
+ SAL_FALLTHROUGH;
default:
throw FileFormatException(
key.getRegistryName(),
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index d25d12981d20..ffaf33f28862 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -477,7 +477,7 @@ static Bootstrap::FailureCode describeError(OUStringBuffer& _rBuf, Bootstrap::Im
eErrCode = Bootstrap::INVALID_VERSION_FILE_ENTRY;
break;
}
- // else fall through
+ else SAL_FALLTHROUGH;
case Bootstrap::DATA_MISSING:
switch (_rData.aVersionINI_.status)
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index 554c18bbe991..960660b018be 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -608,7 +608,7 @@ static void lcl_normalizeLocalNames(Sequence< OUString >& _rNames, ConfigNameFor
}
}
OSL_FAIL("Cannot create absolute paths: missing interface");
- // make local paths instaed
+ SAL_FALLTHROUGH; // make local paths instaed
case CONFIG_NAME_LOCAL_PATH:
{
diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index 795d768cdaa5..0b723c599303 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -1005,7 +1005,7 @@ bool SvtSecurityOptions::isSecureMacroUri(
// is considered safe:
return true;
}
- // fall through
+ SAL_FALLTHROUGH;
case INetProtocol::Slot:
return referer.equalsIgnoreAsciiCase("private:user")
|| isTrustedLocationUri(referer);
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 5fb666e01122..523e12a30070 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1589,7 +1589,7 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt )
case css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH:
case css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT:
bSelect = true;
- // fallthrough intended
+ SAL_FALLTHROUGH;
case css::awt::Key::MOVE_TO_BEGIN_OF_LINE:
case css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH:
case css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT:
@@ -1598,7 +1598,7 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt )
case css::awt::Key::SELECT_TO_END_OF_PARAGRAPH:
case css::awt::Key::SELECT_TO_END_OF_DOCUMENT:
bSelect = true;
- // fallthrough intended
+ SAL_FALLTHROUGH;
case css::awt::Key::MOVE_TO_END_OF_LINE:
case css::awt::Key::MOVE_TO_END_OF_PARAGRAPH:
case css::awt::Key::MOVE_TO_END_OF_DOCUMENT:
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 1baddd57b150..1db0da853d3b 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -1265,42 +1265,50 @@ TextSelection TextView::ImpMoveCursor( const KeyEvent& rKeyEvent )
case KEY_RIGHT: aPaM = bCtrl ? CursorWordRight( aPaM ) : CursorRight( aPaM, aTranslatedKeyEvent.GetKeyCode().IsMod2() ? (sal_uInt16)i18n::CharacterIteratorMode::SKIPCHARACTER : (sal_uInt16)i18n::CharacterIteratorMode::SKIPCELL );
break;
case css::awt::Key::SELECT_WORD_FORWARD:
- bSelect = true; // fallthrough intentional
+ bSelect = true;
+ SAL_FALLTHROUGH;
case css::awt::Key::MOVE_WORD_FORWARD:
aPaM = CursorWordRight( aPaM );
break;
case css::awt::Key::SELECT_WORD_BACKWARD:
- bSelect = true; // fallthrough intentional
+ bSelect = true;
+ SAL_FALLTHROUGH;
case css::awt::Key::MOVE_WORD_BACKWARD:
aPaM = CursorWordLeft( aPaM );
break;
case css::awt::Key::SELECT_TO_BEGIN_OF_LINE:
- bSelect = true; // fallthrough intentional
+ bSelect = true;
+ SAL_FALLTHROUGH;
case css::awt::Key::MOVE_TO_BEGIN_OF_LINE:
aPaM = CursorStartOfLine( aPaM );
break;
case css::awt::Key::SELECT_TO_END_OF_LINE:
- bSelect = true; // fallthrough intentional
+ bSelect = true;
+ SAL_FALLTHROUGH;
case css::awt::Key::MOVE_TO_END_OF_LINE:
aPaM = CursorEndOfLine( aPaM );
break;
case css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH:
- bSelect = true; // falltthrough intentional
+ bSelect = true;
+ SAL_FALLTHROUGH;
case css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH:
aPaM = CursorStartOfParagraph( aPaM );
break;
case css::awt::Key::SELECT_TO_END_OF_PARAGRAPH:
- bSelect = true; // falltthrough intentional
+ bSelect = true;
+ SAL_FALLTHROUGH;
case css::awt::Key::MOVE_TO_END_OF_PARAGRAPH:
aPaM = CursorEndOfParagraph( aPaM );
break;
case css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT:
- bSelect = true; // falltthrough intentional
+ bSelect = true;
+ SAL_FALLTHROUGH;
case css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT:
aPaM = CursorStartOfDoc();
break;
case css::awt::Key::SELECT_TO_END_OF_DOCUMENT:
- bSelect = true; // falltthrough intentional
+ bSelect = true;
+ SAL_FALLTHROUGH;
case css::awt::Key::MOVE_TO_END_OF_DOCUMENT:
aPaM = CursorEndOfDoc();
break;
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 3a46f474e00b..54af9444fd81 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -1002,7 +1002,7 @@ void CffSubsetterContext::convertOneTypeEsc()
assert( mnStackIdx >= 1 );
if( pTop[0] >= 0)
break;
- // fall through
+ SAL_FALLTHROUGH;
case TYPE2OP::NEG:
assert( mnStackIdx >= 1 );
pTop[0] = -pTop[0];
diff --git a/vcl/source/fontsubset/xlat.cxx b/vcl/source/fontsubset/xlat.cxx
index 408e6b1aef22..6fc4cb7b6559 100644
--- a/vcl/source/fontsubset/xlat.cxx
+++ b/vcl/source/fontsubset/xlat.cxx
@@ -68,7 +68,7 @@ void ConverterCache::ensureConverter( int nSelect )
rtl_TextEncoding eRecodeFrom = RTL_TEXTENCODING_UNICODE;
switch( nSelect )
{
- default: nSelect = 1; // fall through to unicode recoding
+ default: nSelect = 1; SAL_FALLTHROUGH; // to unicode recoding
case 1: eRecodeFrom = RTL_TEXTENCODING_UNICODE; break;
case 2: eRecodeFrom = RTL_TEXTENCODING_SHIFT_JIS; break;
case 3: eRecodeFrom = RTL_TEXTENCODING_GB_2312; break;
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index e576f2a5c028..e667cb23ec41 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -5388,7 +5388,7 @@ bool PDFWriterImpl::emitWidgetAnnotations()
else
appendName( rWidget.m_aValue, aValue );
}
- // fall-through
+ SAL_FALLTHROUGH;
case PDFWriter::PushButton:
aLine.append( "Btn" );
break;
@@ -10980,7 +10980,7 @@ bool PDFWriterImpl::writeGradientFunction( GradientEmit& rObject )
aCol[1] = rObject.m_aGradient.GetEndColor().GetGreen();
aCol[2] = rObject.m_aGradient.GetEndColor().GetBlue();
CHECK_RETURN( writeBuffer( aCol, 3 ) );
- // fall-through
+ SAL_FALLTHROUGH;
case GradientStyle_LINEAR:
{
aCol[0] = rObject.m_aGradient.GetStartColor().GetRed();
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 8af9f0b200d0..1eb2663096ce 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -513,7 +513,7 @@ bool PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
break;
case 16 :
mnTargetDepth = 8; // we have to reduce the bitmap
- // fall through
+ SAL_FALLTHROUGH;
case 1 :
case 4 :
case 8 :
@@ -547,7 +547,7 @@ bool PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
{
case 2 :
mnTargetDepth = 4; // we have to expand the bitmap
- // fall through
+ SAL_FALLTHROUGH;
case 1 :
case 4 :
case 8 :
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index 538c6b1d9573..0f623ebdc8a4 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -256,7 +256,7 @@ void ImplDrawSymbol( OutputDevice* pDev, Rectangle nRect, const SymbolType eType
pDev->DrawLine( Point( nRect.Left(), aCenter.Y()-n2+1 ),
Point( nRect.Left(), aCenter.Y()+n2-1 ) );
++nRect.Left();
- // Intentional fall-through
+ SAL_FALLTHROUGH;
case SymbolType::WINDBACKWARD:
pDev->DrawPixel( Point( nRect.Left(), aCenter.Y() ) );
pDev->DrawPixel( Point( nRect.Left()+n2, aCenter.Y() ) );
@@ -274,7 +274,7 @@ void ImplDrawSymbol( OutputDevice* pDev, Rectangle nRect, const SymbolType eType
pDev->DrawLine( Point( nRect.Right(), aCenter.Y()-n2+1 ),
Point( nRect.Right(), aCenter.Y()+n2-1 ) );
--nRect.Right();
- // Intentional fall-through
+ SAL_FALLTHROUGH;
case SymbolType::WINDFORWARD:
pDev->DrawPixel( Point( nRect.Right(), aCenter.Y() ) );
pDev->DrawPixel( Point( nRect.Right()-n2, aCenter.Y() ) );
@@ -313,7 +313,7 @@ void ImplDrawSymbol( OutputDevice* pDev, Rectangle nRect, const SymbolType eType
Point( nRect.Right(), nRect.Bottom() ) );
pDev->DrawLine( Point( nRect.Left(), nRect.Bottom() ),
Point( nRect.Right(), nRect.Bottom() ) );
- // Intentional fall-through
+ SAL_FALLTHROUGH;
case SymbolType::ROLLUP:
pDev->DrawRect( Rectangle( nRect.Left(), nRect.Top(),
nRect.Right(), nRect.Top()+n8 ) );
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index e4efb2667270..7d0ea1544ac6 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -603,7 +603,7 @@ void VclButtonBox::setAllocation(const Size &rAllocation)
break;
default:
SAL_WARN("vcl.layout", "todo unimplemented layout style");
- //fall-through
+ SAL_FALLTHROUGH;
case VCL_BUTTONBOX_DEFAULT_STYLE:
case VCL_BUTTONBOX_END:
if (!aReq.m_aMainGroupDimensions.empty())
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 599bd9fcd4db..6fa8dde994b9 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -2609,7 +2609,7 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalFrame* /*pFrame*/,
ImplHandleSurroundingTextSelectionChange( pWindow,
pEvt->mnStart,
pEvt->mnEnd );
- // Fallthrough really intended?
+ SAL_FALLTHROUGH; // TODO: Fallthrough really intended?
}
case SALEVENT_STARTRECONVERSION:
ImplHandleStartReconversion( pWindow );
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 91c1f6fcd109..ee7ecc474d1d 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -181,7 +181,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
#endif
default:
nBitCount = 24;
- //fall through
+ SAL_FALLTHROUGH;
case 24:
pDIB->mnFormat |= BMP_FORMAT_24BIT_TC_BGR;
break;
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 9f0db5e17c85..1e4d636f8f25 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -3886,7 +3886,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
XSetInputFocus( GetXDisplay(), GetShellWindow(),
RevertToNone, CurrentTime );
}
- //fall-through
+ SAL_FALLTHROUGH;
case ButtonRelease:
case MotionNotify:
case EnterNotify:
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 1cb92cdc094a..9b5bbd0ca674 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -627,7 +627,7 @@ void WindowEventHandler(void *, VclSimpleEvent& rEvent)
case VCLEVENT_OBJECT_DYING:
g_aWindowList.erase( static_cast< ::VclWindowEvent const * >(&rEvent)->GetWindow() );
- // fallthrough intentional !
+ SAL_FALLTHROUGH;
case VCLEVENT_TOOLBOX_HIGHLIGHTOFF:
handle_toolbox_highlightoff(static_cast< ::VclWindowEvent const * >(&rEvent)->GetWindow());
break;
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index ae82adf9ee2c..c0a91760ef8a 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2273,7 +2273,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
break;
case NS_ooxml::LN_paratrackchange:
m_pImpl->StartParaMarkerChange( );
- /* fallthrough */
+ SAL_FALLTHROUGH;
case NS_ooxml::LN_CT_PPr_pPrChange:
case NS_ooxml::LN_trackchange:
case NS_ooxml::LN_EG_RPrContent_rPrChange:
@@ -3364,7 +3364,7 @@ void DomainMapper::handleUnderlineType(const Id nId, const ::std::shared_ptr<Pro
break;
case NS_ooxml::LN_Value_ST_Underline_words:
rContext->Insert(PROP_CHAR_WORD_MODE, uno::makeAny(true));
- // fall-through intended
+ SAL_FALLTHROUGH;
case NS_ooxml::LN_Value_ST_Underline_single:
nUnderline = awt::FontUnderline::SINGLE;
break;
@@ -3435,7 +3435,7 @@ void DomainMapper::handleParaJustification(const sal_Int32 nIntValue, const ::st
break;
case 4:
nLastLineAdjust = style::ParagraphAdjust_BLOCK;
- //no break;
+ SAL_FALLTHROUGH;
case NS_ooxml::LN_Value_ST_Jc_both:
nAdjust = style::ParagraphAdjust_BLOCK;
aStringValue = "both";
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 96280ea8964d..5a2a46e2534c 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -460,7 +460,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
break;
default:
SAL_WARN("writerfilter", "unknown LN_CT_Style_type " << nType);
- //fall-through
+ SAL_FALLTHROUGH;
case 0: // explicit unknown set by tokenizer
break;
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 1a4787431aa7..ebf735c26de8 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1638,7 +1638,7 @@ OOXMLFastContextHandlerShape::lcl_createFastChildContext
case NMSP_vmlOffice:
if (!bGroupShape)
xContextHandler.set(OOXMLFactory::createFastChildContextFromStart(this, Element));
- // no break;
+ SAL_FALLTHROUGH;
default:
if (!xContextHandler.is())
{
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 29a212b48688..a054cf9711c7 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -301,7 +301,7 @@ int RTFSdrImport::initShape(uno::Reference<drawing::XShape>& o_xShape,
o_xPropSet->setPropertyValue(aDefaults[j].Name, aDefaults[j].Value);
break;
}
- // fall-through intended
+ SAL_FALLTHROUGH;
default:
createShape("com.sun.star.drawing.CustomShape", o_xShape, o_xPropSet);
o_rIsCustomShape = true;
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index 3ac2e358bd8c..aa2caa505ec9 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -245,7 +245,7 @@ SvXMLImportContext *SchXMLTableContext::CreateChildContext(
{
case XML_TOK_TABLE_HEADER_COLS:
mrTable.bHasHeaderColumn = true;
- // fall through intended
+ SAL_FALLTHROUGH;
case XML_TOK_TABLE_COLUMNS:
pContext = new SchXMLTableColumnsContext( GetImport(), rLocalName, mrTable );
break;
@@ -256,7 +256,7 @@ SvXMLImportContext *SchXMLTableContext::CreateChildContext(
case XML_TOK_TABLE_HEADER_ROWS:
mrTable.bHasHeaderRow = true;
- // fall through intended
+ SAL_FALLTHROUGH;
case XML_TOK_TABLE_ROWS:
pContext = new SchXMLTableRowsContext( mrImportHelper, GetImport(), rLocalName, mrTable );
break;
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index f911e6741307..b96a34822194 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -694,8 +694,8 @@ void AnimationsExporterImpl::prepareNode( const Reference< XAnimationNode >& xNo
{
Reference< XIterateContainer > xIter( xNode, UNO_QUERY_THROW );
prepareValue( xIter->getTarget() );
+ SAL_FALLTHROUGH;
}
- // its intended that here is no break!
case AnimationNodeType::PAR:
case AnimationNodeType::SEQ:
{
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index f7c5e72c2739..f0d70d9a0269 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -875,9 +875,8 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< :
xAudio->setSource( makeAny( GetImport().GetAbsoluteReference( rValue ) ) );
break;
}
-
+ SAL_FALLTHROUGH;
}
- // fall through intended!
case ANA_Target:
{
{
diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index b19b343f66ec..0389ebae849f 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -422,7 +422,7 @@ void SdXMLEventContext::EndElement()
case ClickAction_BOOKMARK:
msBookmark = msBookmark.copy(1);
- // Note: no break here!!!
+ SAL_FALLTHROUGH;
case ClickAction_DOCUMENT:
case ClickAction_PROGRAM:
@@ -445,7 +445,7 @@ void SdXMLEventContext::EndElement()
pProperties->State = beans::PropertyState_DIRECT_VALUE;
pProperties++;
- // NOTE: no break here!!!
+ SAL_FALLTHROUGH;
case ClickAction_SOUND:
pProperties->Name = "SoundURL";
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index f39a2281654f..90b6a9c8520d 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -1454,7 +1454,7 @@ namespace xmloff
case FormComponentType::DATEFIELD:
m_eType = DATE;
knownType = true;
- // NO BREAK
+ SAL_FALLTHROUGH;
case FormComponentType::TIMEFIELD:
if ( !knownType )
{
@@ -1462,7 +1462,7 @@ namespace xmloff
knownType = true;
}
m_nIncludeSpecial |= SCA_VALIDATION;
- // NO BREAK
+ SAL_FALLTHROUGH;
case FormComponentType::NUMERICFIELD:
case FormComponentType::CURRENCYFIELD:
case FormComponentType::PATTERNFIELD:
@@ -1471,7 +1471,7 @@ namespace xmloff
m_eType = FORMATTED_TEXT;
knownType = true;
}
- // NO BREAK
+ SAL_FALLTHROUGH;
case FormComponentType::TEXTFIELD:
{ // it's some kind of edit. To know which type we need further investigation
@@ -1625,7 +1625,7 @@ namespace xmloff
m_eType = BUTTON;
m_nIncludeCommon |= CCA_TAB_STOP | CCA_LABEL;
m_nIncludeSpecial = SCA_DEFAULT_BUTTON | SCA_TOGGLE | SCA_FOCUS_ON_CLICK | SCA_IMAGE_POSITION | SCA_REPEAT_DELAY;
- // NO BREAK !
+ SAL_FALLTHROUGH;
case FormComponentType::IMAGEBUTTON:
if (BUTTON != m_eType)
{
@@ -1642,7 +1642,7 @@ namespace xmloff
case FormComponentType::CHECKBOX:
m_eType = CHECKBOX;
m_nIncludeSpecial = SCA_CURRENT_STATE | SCA_IS_TRISTATE | SCA_STATE;
- // NO BREAK !
+ SAL_FALLTHROUGH;
case FormComponentType::RADIOBUTTON:
m_nIncludeCommon =
CCA_NAME | CCA_SERVICE_NAME | CCA_DISABLED | CCA_LABEL | CCA_PRINTABLE |
@@ -1707,7 +1707,7 @@ namespace xmloff
default:
OSL_FAIL("OControlExport::examineControl: unknown control type (class id)!");
- // NO break!
+ SAL_FALLTHROUGH;
case FormComponentType::NAVIGATIONBAR:
// TODO: should we have an own file format for this?
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index 7ea93ac919b2..9d547f7e9776 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -120,7 +120,7 @@ Any PropertyConversion::convertString( const ::com::sun::star::uno::Type& _rExpe
break;
}
bEnumAsInt = true;
- // NO BREAK! handle it as enum
+ SAL_FALLTHROUGH;
case TypeClass_ENUM:
{
sal_uInt16 nEnumValue(0);
diff --git a/xmloff/source/forms/valueproperties.cxx b/xmloff/source/forms/valueproperties.cxx
index 8f0c542af581..94bd723c7a5b 100644
--- a/xmloff/source/forms/valueproperties.cxx
+++ b/xmloff/source/forms/valueproperties.cxx
@@ -61,7 +61,7 @@ namespace xmloff
case FormComponentType::FILECONTROL:
case FormComponentType::COMBOBOX:
_rpValuePropertyName = PROPERTY_DEFAULT_TEXT;
- // NO BREAK!!
+ SAL_FALLTHROUGH;
case FormComponentType::COMMANDBUTTON:
_rpCurrentValuePropertyName = PROPERTY_TEXT;
break;
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index e6b025a984f4..7d2b29edf249 100644
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -118,7 +118,8 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp
rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_FLOAT);
bWasSetTypeAttribute = true;
}
- } // No Break
+ SAL_FALLTHROUGH;
+ }
case util::NumberFormat::PERCENT:
{
if (!bWasSetTypeAttribute)
@@ -126,7 +127,8 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp
rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_PERCENTAGE);
bWasSetTypeAttribute = true;
}
- } // No Break
+ SAL_FALLTHROUGH;
+ }
case util::NumberFormat::CURRENCY:
{
if (!bWasSetTypeAttribute)
@@ -385,7 +387,8 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(
pExport->AddAttribute(sAttrValType, XML_FLOAT);
bWasSetTypeAttribute = true;
}
- } // No Break
+ SAL_FALLTHROUGH;
+ }
case util::NumberFormat::PERCENT:
{
if (!bWasSetTypeAttribute)
@@ -393,7 +396,8 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(
pExport->AddAttribute(sAttrValType, XML_PERCENTAGE);
bWasSetTypeAttribute = true;
}
- } // No Break
+ SAL_FALLTHROUGH;
+ }
case util::NumberFormat::CURRENCY:
{
if (!bWasSetTypeAttribute)
diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx
index bad3d03f0640..e0e0a63f9068 100644
--- a/xmloff/source/text/XMLTextListBlockContext.cxx
+++ b/xmloff/source/text/XMLTextListBlockContext.cxx
@@ -267,7 +267,7 @@ SvXMLImportContext *XMLTextListBlockContext::CreateChildContext(
{
case XML_TOK_TEXT_LIST_HEADER:
bHeader = true;
- //fall-through
+ SAL_FALLTHROUGH;
case XML_TOK_TEXT_LIST_ITEM:
pContext = new XMLTextListItemContext( GetImport(), mrTxtImport,
nPrefix, rLocalName,
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index bbf27beccf89..7eb2d547e2ef 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -215,7 +215,8 @@ void XMLTextMarkImportContext::EndElement()
break; // don't insert
}
}
- } // fall through
+ }
+ SAL_FALLTHROUGH;
case TypeFieldmark:
{
const char *formFieldmarkName=lcl_getFormFieldmarkName(m_sFieldName);
@@ -282,7 +283,8 @@ void XMLTextMarkImportContext::EndElement()
break; // don't insert
}
}
- } // fall through
+ }
+ SAL_FALLTHROUGH;
case TypeFieldmarkEnd:
{
// get old range, and construct
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 6192bcf0a47f..452f6062e648 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -993,7 +993,7 @@ void XMLTextExportPropertySetMapper::ContextFilter(
// no wrapping: disable para-only and contour
if( pWrapParagraphOnlyState )
pWrapParagraphOnlyState->mnIndex = -1;
- // no break
+ SAL_FALLTHROUGH;
case WrapTextMode_THROUGHT:
// wrap through: disable only contour
if( pWrapContourState )
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 5f8ebcd65a3d..89267f9efb75 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -849,7 +849,7 @@ void XMLTextFieldExport::ExportFieldAutoStyle(
{
ExportMetaField(xPropSet, true, bProgress);
}
- // fall-through: for the meta-field itself!
+ SAL_FALLTHROUGH;
case FIELD_ID_DOCINFO_PRINT_TIME:
case FIELD_ID_DOCINFO_PRINT_DATE:
case FIELD_ID_DOCINFO_CREATION_DATE:
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index 4472cbac24aa..ac5598f37ed1 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -481,7 +481,7 @@ void XMLTextImportPropertyMapper::finished(
case CTF_FRAMEHEIGHT_MIN_REL:
// case CTF_SYNCHEIGHT_MIN:
bHasAnyMinHeight = true;
- // no break here!
+ SAL_FALLTHROUGH;
case CTF_FRAMEHEIGHT_ABS:
case CTF_FRAMEHEIGHT_REL:
// case CTF_SYNCHEIGHT:
@@ -489,7 +489,7 @@ void XMLTextImportPropertyMapper::finished(
case CTF_FRAMEWIDTH_MIN_ABS:
case CTF_FRAMEWIDTH_MIN_REL:
bHasAnyMinWidth = true;
- // no break here!
+ SAL_FALLTHROUGH;
case CTF_FRAMEWIDTH_ABS:
case CTF_FRAMEWIDTH_REL:
bHasAnyWidth = true; break;
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx
index 0edd0710efa4..e0c86bedaeb8 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -859,7 +859,7 @@ void XMLStyleOASISTContext::StartElement(
break;
case XML_ATACTION_DECODE_STYLE_NAME:
m_bControlStyle = rAttrValue.startsWith( "ctrl" );
- // fall-through
+ SAL_FALLTHROUGH;
case XML_ATACTION_DECODE_STYLE_NAME_REF:
{
OUString aAttrValue( rAttrValue );