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 /ucb/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 'ucb/source')
-rw-r--r-- | ucb/source/core/ucbcmds.cxx | 6 | ||||
-rw-r--r-- | ucb/source/inc/regexpmap.hxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/NeonSession.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/webdavcontent.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/webdavcontent.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/webdavresponseparser.cxx | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx index 1fd8f877350b..8df2f9f94b1c 100644 --- a/ucb/source/core/ucbcmds.cxx +++ b/ucb/source/core/ucbcmds.cxx @@ -1347,7 +1347,7 @@ void globalTransfer_( rContext.xProcessor, rContext.aArg.NameClash ) ), rContext.xOrigEnv ); - SAL_FALLTHROUGH; // Unreachable + [[fallthrough]]; // Unreachable } case ucb::NameClash::ERROR: @@ -1381,7 +1381,7 @@ void globalTransfer_( case NOT_HANDLED: // Not handled. cppu::throwException( aExc ); - SAL_FALLTHROUGH; // break; + [[fallthrough]]; // break; case UNKNOWN: // Handled, but not clear, how... @@ -1743,7 +1743,7 @@ void UniversalContentBroker::globalTransfer( case NOT_HANDLED: // Not handled. cppu::throwException( aExc ); - SAL_FALLTHROUGH; // break; + [[fallthrough]]; // break; case UNKNOWN: // Handled, but not clear, how... diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx index 49e86bfeec2e..f28c2e58ce06 100644 --- a/ucb/source/inc/regexpmap.hxx +++ b/ucb/source/inc/regexpmap.hxx @@ -180,13 +180,13 @@ RegexpMapConstIter< Val > & RegexpMapConstIter< Val >::operator ++() case Regexp::KIND_DOMAIN: if (m_aIndex == m_pMap->m_aList[m_nList].end()) return *this; - SAL_FALLTHROUGH; + [[fallthrough]]; default: ++m_aIndex; if (m_nList == Regexp::KIND_DOMAIN || m_aIndex != m_pMap->m_aList[m_nList].end()) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case -1: do { diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx index 05260df637b3..979fb3819406 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx @@ -1920,7 +1920,7 @@ void NeonSession::HandleError( int nError, default: // set 400 error, if not one of others code = SC_BAD_REQUEST; - SAL_FALLTHROUGH; + [[fallthrough]]; case SC_FORBIDDEN: case SC_NOT_FOUND: case SC_METHOD_NOT_ALLOWED: @@ -1948,7 +1948,7 @@ void NeonSession::HandleError( int nError, // set 500 error, if not one of others // expand the error code code = SC_INTERNAL_SERVER_ERROR; - SAL_FALLTHROUGH; + [[fallthrough]]; case SC_INTERNAL_SERVER_ERROR: case SC_NOT_IMPLEMENTED: throw DAVException( DAVException::DAV_HTTP_ERROR, aText, code ); diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index 4616957b0725..7a376f48fcfa 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -2902,7 +2902,7 @@ void Content::transfer( task::InteractionClassification_ERROR, aTargetURI ) ), Environment ); - SAL_FALLTHROUGH; // Unreachable + [[fallthrough]]; // Unreachable } case ucb::NameClash::OVERWRITE: diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index 72913059c5e3..2e70cef80bc8 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -2724,7 +2724,7 @@ void Content::transfer( Environment ); // Unreachable } - SAL_FALLTHROUGH; + [[fallthrough]]; case ucb::NameClash::OVERWRITE: break; diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx index 3e38ac91561f..b03a392d5cbb 100644 --- a/ucb/source/ucp/webdav/webdavresponseparser.cxx +++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx @@ -710,7 +710,7 @@ namespace maLock.Scope = maLockScope; maResult_Lock.push_back(maLock); } - SAL_FALLTHROUGH; // I hope intentional? + [[fallthrough]]; // I hope intentional? case WebDAVName_propstat: { // propstat end, check status |