diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-08 09:46:01 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-08 13:28:16 +0100 |
| commit | ab9b67bbb001f380b3973941443bfbc59fe7141c (patch) | |
| tree | 4737847b2970d2310932f115935a9454aacff6fe /reportdesign/source | |
| parent | 3c0cb54b7ca20439e7e5e1e19dc6fcc75709973b (diff) | |
Remove obsolete SAL_FALLTHROUGH completely
...after 7ffdd830d5fb52f2ca25aa80277d22ea6d89970b
"HAVE_CPP_ATTRIBUTE_FALLTHROUGH is always true now"
Change-Id: I54e5ff4e036a6bb3e5774d1c0524158aae18e937
Reviewed-on: https://gerrit.libreoffice.org/64800
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'reportdesign/source')
| -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 |
4 files changed, 7 insertions, 7 deletions
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index bac0c4dbae50..e933b6218752 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -717,7 +717,7 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt) m_nDeleteEvent = Application::PostUserEvent( LINK(this, OFieldExpressionControl, DelayedDelete), nullptr, true ); } } - SAL_FALLTHROUGH; + [[fallthrough]]; } default: EditBrowseBox::Command(rEvt); diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 90a6ec84213a..a90e1bd2b7f5 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 <<= COL_TRANSPARENT; break; } - SAL_FALLTHROUGH; + [[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; } - SAL_FALLTHROUGH; + [[fallthrough]]; case PROPERTY_ID_VISIBLE: case PROPERTY_ID_CANGROW: @@ -1167,7 +1167,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; } - SAL_FALLTHROUGH; + [[fallthrough]]; case PROPERTY_ID_VISIBLE: case PROPERTY_ID_CANGROW: case PROPERTY_ID_CANSHRINK: @@ -1267,7 +1267,7 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & Proper if ( (aPropertyValue >>= nColor) && COL_TRANSPARENT == nColor ) aPropertyValue.clear(); } - SAL_FALLTHROUGH; + [[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 f37bce178528..6e9c2e21a027 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -867,7 +867,7 @@ void OViewsWindow::alignMarkedObjects(ControlModification _nControlModification, else if ( _nControlModification == ControlModification::WIDTH_GREATEST ) nYMov = aObjRect.getHeight(); lcl_getNewRectSize(aObjRect,nXMov,nYMov,pObj,pView,_nControlModification); - SAL_FALLTHROUGH; + [[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 58a71a4bddcd..d66ce42d381e 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -358,7 +358,7 @@ bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent) bReturn = true; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: { bReturn = m_rView.KeyInput(_rEvent, m_pParent); |