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 /connectivity | |
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 'connectivity')
-rw-r--r-- | connectivity/source/commontools/CommonTools.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/commontools/FValue.cxx | 4 | ||||
-rw-r--r-- | connectivity/source/commontools/dbtools.cxx | 4 | ||||
-rw-r--r-- | connectivity/source/commontools/filtermanager.cxx | 4 | ||||
-rw-r--r-- | connectivity/source/drivers/dbase/DTable.cxx | 4 | ||||
-rw-r--r-- | connectivity/source/drivers/file/FDatabaseMetaData.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/flat/ETable.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/postgresql/pq_tools.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/parse/sqlnode.cxx | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx index f4562c2d38ed..eb06c5551b67 100644 --- a/connectivity/source/commontools/CommonTools.cxx +++ b/connectivity/source/commontools/CommonTools.cxx @@ -77,7 +77,7 @@ namespace connectivity break; // WARNING/TODO: in certain circumstances it will run into // the next 'case'! - SAL_FALLTHROUGH; + [[fallthrough]]; case CHAR_WILD: while ( *pWild == CHAR_WILD ) pWild++; diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index b12170775213..a33fdbebea6f 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -1033,7 +1033,7 @@ bool ORowSetValue::getBool() const break; } } - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::DECIMAL: case DataType::NUMERIC: @@ -1931,7 +1931,7 @@ css::util::Date ORowSetValue::getDate() const case DataType::OBJECT: default: OSL_ENSURE( false, "ORowSetValue::getDate: cannot retrieve the data!" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::BINARY: case DataType::VARBINARY: diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 757e4fa37fb1..b2788d134e0a 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -1489,7 +1489,7 @@ bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject, _rxUpdatedObject->updateBinaryStream(_nColumnIndex, *xStream, (*xStream)->available()); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: bSuccessfullyReRouted = false; } @@ -1594,7 +1594,7 @@ bool implSetObject( const Reference< XParameters >& _rxParameters, _rxParameters->setBinaryStream(_nColumnIndex, xStream, xStream->available()); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: bSuccessfullyReRouted = false; diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx index 9a2950f4d2d8..08489cf8024a 100644 --- a/connectivity/source/commontools/filtermanager.cxx +++ b/connectivity/source/commontools/filtermanager.cxx @@ -106,14 +106,14 @@ namespace dbtools { case FilterComponent::PublicFilter: propagate = propagate && m_bApplyPublicFilter; - SAL_FALLTHROUGH; + [[fallthrough]]; case FilterComponent::LinkFilter: if (propagate) m_xComponentAggregate->setPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FILTER), makeAny( getComposedFilter() ) ); break; case FilterComponent::PublicHaving: propagate = propagate && m_bApplyPublicFilter; - SAL_FALLTHROUGH; + [[fallthrough]]; case FilterComponent::LinkHaving: if (propagate) m_xComponentAggregate->setPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HAVINGCLAUSE), makeAny( getComposedHaving() ) ); diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 871545f55d9b..b24603d7b79d 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -1252,7 +1252,7 @@ bool ODbaseTable::CreateFile(const INetURLObject& aFile, bool& bCreateMemo) break; case DataType::LONGVARBINARY: bBinary = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataType::LONGVARCHAR: cTyp = 'M'; break; @@ -1730,7 +1730,7 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo case DataType::DOUBLE: case DataType::TIMESTAMP: bSetZero = true; - SAL_FALLTHROUGH; + [[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 1f44f23f1fe4..ac234f608016 100644 --- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx +++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx @@ -241,7 +241,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( break; case -1: bKnowCaseSensivity = false; - SAL_FALLTHROUGH; + [[fallthrough]]; case 0: bCaseSensitiveDir = false; } diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 49e9d99d2528..0a3d56216811 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -724,7 +724,7 @@ bool OFlatTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 n { case IResultSetHelper::FIRST: m_nRowPos = 0; - SAL_FALLTHROUGH; + [[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 c88583f95a3b..39d4604e098b 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -1219,7 +1219,7 @@ bool implSetObject( const Reference< XParameters >& _rxParameters, _rxParameters->setBinaryStream(_nColumnIndex, xStream, xStream->available()); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; } default: bSuccessfullyReRouted = false; diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 14b271a61ee7..f9acc655347f 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -2487,7 +2487,7 @@ void OSQLParseNode::parseLeaf(OUStringBuffer& rString, const SQLParseNodeParamet rString.append(m_aNodeValue); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: if (!rString.isEmpty() && m_aNodeValue.toChar() != '.' && m_aNodeValue.toChar() != ':' ) { |