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 /unotools | |
| 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 'unotools')
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 4 | ||||
| -rw-r--r-- | unotools/source/config/securityoptions.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 69f530ae240c..03c849655f3f 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -482,7 +482,7 @@ static Bootstrap::FailureCode describeError(OUStringBuffer& _rBuf, Bootstrap::Im eErrCode = Bootstrap::INVALID_VERSION_FILE_ENTRY; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case Bootstrap::DATA_MISSING: switch (_rData.aVersionINI_.status) @@ -509,7 +509,7 @@ static Bootstrap::FailureCode describeError(OUStringBuffer& _rBuf, Bootstrap::Im eErrCode = Bootstrap::INVALID_BOOTSTRAP_FILE_ENTRY; break; - case Bootstrap::DATA_INVALID: OSL_ASSERT(false); SAL_FALLTHROUGH; + case Bootstrap::DATA_INVALID: OSL_ASSERT(false); [[fallthrough]]; case Bootstrap::PATH_VALID: addFileError(_rBuf, _rData.aBootstrapINI_.path, IS_MISSING); eErrCode = Bootstrap::MISSING_BOOTSTRAP_FILE; diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index 1194c7a24e75..25e70207da1d 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -981,7 +981,7 @@ bool SvtSecurityOptions::isSecureMacroUri( // is considered safe: return true; } - SAL_FALLTHROUGH; + [[fallthrough]]; case INetProtocol::Slot: return referer.equalsIgnoreAsciiCase("private:user") || isTrustedLocationUri(referer); |