summaryrefslogtreecommitdiff
path: root/dbaccess/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-05-10 16:42:16 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-05-10 16:42:16 +0200
commit14cd5182c5f64c43581c82db8c958369152226ac (patch)
tree57f150ba2707f29214eeb9b1eaad2373780d1b15 /dbaccess/source
parente4bb2b4f4875c15bd68297b5be716edd6859841e (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 'dbaccess/source')
-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.cxx12
-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
22 files changed, 52 insertions, 49 deletions
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx
index 768f600f064b..5b794a91955c 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 cc248329e631..7eb40876718b 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -289,7 +289,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 81ee85624216..d608708fe570 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -1811,7 +1811,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 d36b11ef6e1d..186a3774713d 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -440,7 +440,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 db224ff63772..351dfa1c83e9 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -1197,14 +1197,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;
@@ -1215,13 +1215,13 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
break;
case ID_NEW_QUERY_DESIGN:
aCreationArgs.put( OUString(PROPERTY_GRAPHICAL_DESIGN), true );
- // run through
+ SAL_FALLTHROUGH;
case ID_NEW_QUERY_SQL:
eType = E_QUERY;
break;
case ID_NEW_TABLE_DESIGN_AUTO_PILOT:
bAutoPilot = true;
- // run through
+ SAL_FALLTHROUGH;
case ID_NEW_TABLE_DESIGN:
break;
default:
@@ -1798,7 +1798,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 ) )
@@ -2079,7 +2079,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 73991c6354ce..3e2141f6962b 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 8b456ade177d..2d0b1ff0cadd 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 75246659c940..cc8b82c9180b 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 e33ada455982..f3979f26e217 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;
@@ -1676,7 +1676,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:
{
@@ -1823,7 +1823,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);
}
@@ -1883,7 +1883,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 dbd43d7ff597..9752c627252d 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 bd2e26ef8ca1..98726361e3d0 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -606,7 +606,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 bda17835869b..1afef0ee0a9b 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 9442f8125c69..1fc6e4da1b0c 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -146,7 +146,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 1029b77cf5e8..086d1282b77b 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -567,7 +567,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;
@@ -1219,19 +1219,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 )
@@ -1239,17 +1239,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 44ae24f14928..df67d42ab5dd 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -1443,19 +1443,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 )
@@ -1463,17 +1463,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 c5399b965c16..cff9469c682b 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -2003,8 +2003,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 19b60e6f13e2..d4b3a13bb123 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 4f543c4b693f..8a96808a58db 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 4f977ea6bb02..08f714a5b1a4 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -1246,7 +1246,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;
@@ -1329,8 +1329,9 @@ void CopyTableWizard::impl_doCopy_nothrow()
if( CopyTableOperation::CopyDefinitionOnly == rWizard.getOperation() )
break;
+
+ SAL_FALLTHROUGH;
}
- // run through
case CopyTableOperation::AppendData:
{