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 /dbaccess | |
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 'dbaccess')
22 files changed, 49 insertions, 49 deletions
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index b3b3f82d74ef..265193ee9e8a 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -434,7 +434,7 @@ static sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, std:: { default: SAL_WARN("dbaccess", "OTableContainer::getAllTableTypeFilter: unknown TableTypeFilterMode!" ); - SAL_FALLTHROUGH; + [[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 a8d1a5721274..dd5bd93d5e80 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -286,7 +286,7 @@ void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const case PROPERTY_ID_FETCHDIRECTION: if( m_nResultSetType == ResultSetType::FORWARD_ONLY) throw Exception("resultsettype is FORWARD_ONLY", nullptr); - SAL_FALLTHROUGH; + [[fallthrough]]; default: OPropertyStateContainer::setFastPropertyValue_NoBroadcast(nHandle,rValue); } diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index 06d453d645bb..67ec15d880e1 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -1838,7 +1838,7 @@ OUString OSingleSelectQueryComposer::getKeyword( SQLPart _ePart ) { default: SAL_WARN("dbaccess", "OSingleSelectQueryComposer::getKeyWord: Invalid enum value!" ); - SAL_FALLTHROUGH; // fallback to WHERE + [[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 69a8169c86ac..bb9bf49629ef 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -148,7 +148,7 @@ void ODBTableDecorator::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, con { case PROPERTY_ID_PRIVILEGES: SAL_WARN("dbaccess", "Property is readonly!"); - SAL_FALLTHROUGH; + [[fallthrough]]; case PROPERTY_ID_FILTER: case PROPERTY_ID_ORDER: case PROPERTY_ID_APPLYFILTER: @@ -227,7 +227,7 @@ void ODBTableDecorator::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) c break; } } - SAL_FALLTHROUGH; + [[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 fcfb56d3e5ef..da572744727a 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx @@ -434,7 +434,7 @@ namespace dbaccess m_aCompDesc.bForEditing = true; break; } - SAL_FALLTHROUGH; + [[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 5c92afaa74d1..0f49fdd4cb9f 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -1177,14 +1177,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; - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_APP_NEW_FORM: eType = E_FORM; break; case ID_DOCUMENT_CREATE_REPWIZ: case SID_REPORT_CREATE_REPWIZ_PRE_SEL: bAutoPilot = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_APP_NEW_REPORT: case SID_APP_NEW_REPORT_PRE_SEL: eType = E_REPORT; @@ -1195,13 +1195,13 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa break; case ID_NEW_QUERY_DESIGN: aCreationArgs.put( OUString(PROPERTY_GRAPHICAL_DESIGN), true ); - SAL_FALLTHROUGH; + [[fallthrough]]; case ID_NEW_QUERY_SQL: eType = E_QUERY; break; case ID_NEW_TABLE_DESIGN_AUTO_PILOT: bAutoPilot = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case ID_NEW_TABLE_DESIGN: break; default: @@ -1776,7 +1776,7 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const // component, but standalone documents. isStandaloneDocument = true; } - SAL_FALLTHROUGH; + [[fallthrough]]; case E_FORM: { if ( isStandaloneDocument || !m_pSubComponentManager->activateSubFrame( _sName, _eType, _eOpenMode, xRet ) ) @@ -2057,7 +2057,7 @@ void OApplicationController::renameEntry() ensureConnection(); if ( !getConnection().is() ) break; - SAL_FALLTHROUGH; + [[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 6d4dd7a9650d..18756710ff04 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -776,7 +776,7 @@ void OApplicationController::getSupportedFormats(ElementType _eType,std::vector< _rFormatIds.push_back(SotClipboardFormatId::DBACCESS_TABLE); _rFormatIds.push_back(SotClipboardFormatId::RTF); _rFormatIds.push_back(SotClipboardFormatId::HTML); - SAL_FALLTHROUGH; + [[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 5db15ad643a6..ef1ba183e2ed 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -1461,7 +1461,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const aReturn.bEnabled = m_aCurrentFrame.isActive(); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case ID_BROWSER_PASTE: case ID_BROWSER_CUT: { @@ -1517,7 +1517,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const aReturn.bEnabled = true; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case ID_BROWSER_ORDERCRIT: { const Reference< XPropertySet > xFormSet(getRowSet(), UNO_QUERY); @@ -1931,7 +1931,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property getBrowserView()->getVclControl()->CopySelectedRowsToClipboard(); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case ID_BROWSER_CUT: case ID_BROWSER_PASTE: { @@ -1959,7 +1959,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property case ID_BROWSER_SORTDOWN: bSortUp = false; - SAL_FALLTHROUGH; + [[fallthrough]]; case ID_BROWSER_SORTUP: { if (!SaveModified()) diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index d5ce5952b3a9..041315775a61 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -117,7 +117,7 @@ namespace dbaui if ( m_pAccel.get() && m_pAccel->execute( aKeyCode ) ) // the accelerator consumed the event return true; - SAL_FALLTHROUGH; + [[fallthrough]]; } case MouseNotifyEvent::KEYUP: case MouseNotifyEvent::MOUSEBUTTONDOWN: diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 581a655cd9d2..0e421beddc24 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -698,7 +698,7 @@ void SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm case DataType::LONGVARCHAR: case DataType::CLOB: aInitialValues.emplace_back( "MultiLine", makeAny( true ) ); - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::BINARY: case DataType::VARBINARY: case DataType::LONGVARBINARY: @@ -709,7 +709,7 @@ void SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm case DataType::VARCHAR: case DataType::CHAR: bFormattedIsNumeric = false; - SAL_FALLTHROUGH; + [[fallthrough]]; default: aCurrentModelType = "FormattedField"; sDefaultProperty = PROPERTY_EFFECTIVEDEFAULT; @@ -1639,7 +1639,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const if ( !m_pTreeView->HasChildPathFocus() ) // handled below break; - SAL_FALLTHROUGH; + [[fallthrough]]; case ID_TREE_CLOSE_CONN: case ID_TREE_EDIT_DATABASE: { @@ -1788,7 +1788,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const aReturn.bEnabled = pControl->canCopyCellText(pControl->GetCurRow(), pControl->GetCurColumnId()); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: return SbaXDataBrowserController::GetState(nId); } @@ -1847,7 +1847,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue SbaXDataBrowserController::Execute(nId,aArgs); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; } case ID_BROWSER_REFRESH_REBUILD: diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index d8c44c71b5b5..4e6acd9f851d 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -1184,7 +1184,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) DeactivateAggregate( tpBoolDefault ); break; } - SAL_FALLTHROUGH; + [[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 8153a2faab18..1925a2247c8a 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -526,7 +526,7 @@ VclPtr<PopupMenu> DBTreeListBox::CreateContextMenu() default: OSL_FAIL( "DBTreeListBox::CreateContextMenu: unexpected return value of the interceptor call!" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case ContextMenuInterceptorAction_IGNORED: break; } diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 74b4f115e6ec..d19e94e6925d 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -538,7 +538,7 @@ void OSQLMessageBox::Construct(weld::Window* pParent, MessBoxStyle _nStyle, Mess { default: OSL_FAIL( "OSQLMessageBox::impl_initImage: unsupported image type!" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case Info: eMessageType = VclMessageType::Info; break; diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index 246d666ebd42..709556dbbe1d 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -136,7 +136,7 @@ void OHTMLReader::NextToken( HtmlTokenId nToken ) } } } - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlTokenId::THEAD_ON: case HtmlTokenId::TBODY_ON: { diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 78ef021ca8b9..ae2c46f8ee55 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -556,7 +556,7 @@ void fillTypeInfo( const Reference< css::sdbc::XConnection>& _rxConnection, aName = _rsTypeNames.getToken(TYPE_BIT, ';'); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::BOOLEAN: aName = _rsTypeNames.getToken(TYPE_BOOL, ';'); break; @@ -1131,19 +1131,19 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType case DataType::TINYINT: if( (pTypeInfo = queryTypeInfoByType(DataType::SMALLINT,_rTypeInfo) ) ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::SMALLINT: if( (pTypeInfo = queryTypeInfoByType(DataType::INTEGER,_rTypeInfo) ) ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::INTEGER: if( (pTypeInfo = queryTypeInfoByType(DataType::FLOAT,_rTypeInfo) ) ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::FLOAT: if( (pTypeInfo = queryTypeInfoByType(DataType::REAL,_rTypeInfo) ) ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::DATE: case DataType::TIME: if( DataType::DATE == _nDataType || DataType::TIME == _nDataType ) @@ -1151,17 +1151,17 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType if( (pTypeInfo = queryTypeInfoByType(DataType::TIMESTAMP,_rTypeInfo) ) ) break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::TIMESTAMP: case DataType::REAL: case DataType::BIGINT: if ( (pTypeInfo = queryTypeInfoByType(DataType::DOUBLE,_rTypeInfo) ) ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::DOUBLE: if ( (pTypeInfo = queryTypeInfoByType(DataType::NUMERIC,_rTypeInfo) ) ) break; - SAL_FALLTHROUGH; + [[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 092714bd514a..d68357b21dc4 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -1430,19 +1430,19 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType, bool& _bN case DataType::TINYINT: if(supportsType(DataType::SMALLINT,nDefaultType)) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::SMALLINT: if(supportsType(DataType::INTEGER,nDefaultType)) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::INTEGER: if(supportsType(DataType::FLOAT,nDefaultType)) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::FLOAT: if(supportsType(DataType::REAL,nDefaultType)) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::DATE: case DataType::TIME: if( DataType::DATE == _pType->nType || DataType::TIME == _pType->nType ) @@ -1450,17 +1450,17 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType, bool& _bN if(supportsType(DataType::TIMESTAMP,nDefaultType)) break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::TIMESTAMP: case DataType::REAL: case DataType::BIGINT: if ( supportsType(DataType::DOUBLE,nDefaultType) ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::DOUBLE: if ( supportsType(DataType::NUMERIC,nDefaultType) ) break; - SAL_FALLTHROUGH; + [[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 c3bd6fa4deaf..e7fcd53ecb11 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -136,7 +136,7 @@ namespace dbaui case E_OPEN_FOR_MAIL: aArguments.put( "Hidden", true ); - SAL_FALLTHROUGH; + [[fallthrough]]; case E_OPEN_DESIGN: sOpenMode = "openDesign"; diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index e611e5977c1c..1d2ad3a6a67d 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -1990,7 +1990,7 @@ void OSelectionBrowseBox::Command(const CommandEvent& rEvt) return; } - SAL_FALLTHROUGH; + [[fallthrough]]; } default: EditBrowseBox::Command(rEvt); diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index 4a242f909691..f0145fe14301 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -66,7 +66,7 @@ bool LimitBoxImpl::EventNotify( NotifyEvent& rNEvt ) { case KEY_ESCAPE: Undo(); - SAL_FALLTHROUGH; + [[fallthrough]]; case KEY_RETURN: GrabFocusToDocument(); bHandled = true; diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 9a42963ffdfa..640297409998 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -449,7 +449,7 @@ FeatureState OQueryController::GetState(sal_uInt16 _nId) const aReturn.bEnabled = false; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: aReturn = OJoinController::GetState(_nId); break; diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 841935648226..f72ba4fa319b 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -142,7 +142,7 @@ void OTableRowView::Command(const CommandEvent& rEvt) return; } - SAL_FALLTHROUGH; + [[fallthrough]]; } default: EditBrowseBox::Command(rEvt); diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index fe18ac32a139..ccda8f1a501b 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -1248,7 +1248,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou aTransfer.transferComplexValue( &XRow::getBytes, &XParameters::setBytes ); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::BOOLEAN: aTransfer.transferValue( &XRow::getBoolean, &XParameters::setBoolean ); break; @@ -1332,7 +1332,7 @@ void CopyTableWizard::impl_doCopy_nothrow() if( CopyTableOperation::CopyDefinitionOnly == rWizard.getOperation() ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; } case CopyTableOperation::AppendData: |