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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/source/fsys/urlobj.cxx | 6 | ||||
| -rw-r--r-- | tools/source/fsys/wldcrd.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index d5b2df68803a..e280a7f84abe 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -1185,7 +1185,7 @@ bool INetURLObject::setAbsURIRef(OUString const & rTheAbsURIRef, break; } } - SAL_FALLTHROUGH; + [[fallthrough]]; default: { // For INetProtocol::File, allow an empty authority ("//") to be @@ -4632,7 +4632,7 @@ void INetURLObject::appendUCS4(OUStringBuffer& rTheText, sal_uInt32 nUCS4, { default: OSL_FAIL("INetURLObject::appendUCS4(): Unsupported charset"); - SAL_FALLTHROUGH; + [[fallthrough]]; case RTL_TEXTENCODING_ASCII_US: case RTL_TEXTENCODING_ISO_8859_1: appendEscape(rTheText, nUCS4); @@ -4676,7 +4676,7 @@ sal_uInt32 INetURLObject::getUTF32(sal_Unicode const *& rBegin, default: OSL_FAIL( "INetURLObject::getUTF32(): Unsupported charset"); - SAL_FALLTHROUGH; + [[fallthrough]]; case RTL_TEXTENCODING_ASCII_US: rEscapeType = rtl::isAscii(nUTF32) ? EscapeType::Utf32 : EscapeType::Octet; diff --git a/tools/source/fsys/wldcrd.cxx b/tools/source/fsys/wldcrd.cxx index 2ea29eedddeb..1cdf20c30046 100644 --- a/tools/source/fsys/wldcrd.cxx +++ b/tools/source/fsys/wldcrd.cxx @@ -51,7 +51,7 @@ bool WildCard::ImpMatch( const char *pWild, const char *pStr ) break; // WARNING/TODO: may cause execution of next case in some // circumstances! - SAL_FALLTHROUGH; + [[fallthrough]]; case '*': while ( *pWild == '*' ) pWild++; |