diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-05-10 16:42:16 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-05-10 16:42:16 +0200 |
commit | 14cd5182c5f64c43581c82db8c958369152226ac (patch) | |
tree | 57f150ba2707f29214eeb9b1eaad2373780d1b15 /reportdesign/source | |
parent | e4bb2b4f4875c15bd68297b5be716edd6859841e (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.
Change-Id: I342a7610a107db7d7a344ea9cbddfd9714d7e9ca
Diffstat (limited to 'reportdesign/source')
-rw-r--r-- | reportdesign/source/filter/xml/xmlfilter.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/GroupsSorting.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/inspection/GeometryHandler.cxx | 8 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ViewsWindow.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/dlgedfunc.cxx | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index ba6df0b7ee0c..c9d3404a3873 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -596,7 +596,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 62857d7f81b5..7cd7e9638adc 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -748,7 +748,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 2cad0b53a9d9..cb7759f68d84 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -975,7 +975,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()) @@ -983,7 +983,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: @@ -1139,7 +1139,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: @@ -1245,7 +1245,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/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 0baafc13f727..b0ebb41885d0 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -881,7 +881,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli else if ( _nControlModification == ControlModification::WIDTH_GREATEST ) nYMov = aObjRect.getHeight(); lcl_getNewRectSize(aObjRect,nXMov,nYMov,pObj,pView,_nControlModification,false); - // run through + SAL_FALLTHROUGH; case ControlModification::WIDTH_SMALLEST: case ControlModification::HEIGHT_SMALLEST: pView->AddUndo( pView->GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 9619f11c25e8..2a7f639a507a 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); |