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 /svtools/source/svhtml | |
| 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 'svtools/source/svhtml')
| -rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index ab174dd713a2..1274be0c06ee 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -700,7 +700,7 @@ HtmlTokenId HTMLParser::ScanText( const sal_Unicode cBreak ) break; } // Reduce sequence of CR/LF/BLANK/TAB to a single blank - SAL_FALLTHROUGH; + [[fallthrough]]; case '\t': if( '\t'==nNextCh && bReadPRE && '>'!=cBreak ) { @@ -708,7 +708,7 @@ HtmlTokenId HTMLParser::ScanText( const sal_Unicode cBreak ) bContinue = false; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case '\x0b': if( '\x0b'==nNextCh && (bReadPRE || bReadXMP ||bReadListing) && '>'!=cBreak ) @@ -716,7 +716,7 @@ HtmlTokenId HTMLParser::ScanText( const sal_Unicode cBreak ) break; } nNextCh = ' '; - SAL_FALLTHROUGH; + [[fallthrough]]; case ' ': sTmpBuffer.appendUtf32( nNextCh ); if( '>'!=cBreak && (!bReadListing && !bReadXMP && @@ -987,7 +987,7 @@ HtmlTokenId HTMLParser::GetNextRawToken() } break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: // all remaining characters are appended to the buffer sTmpBuffer.appendUtf32( nNextCh ); @@ -1355,16 +1355,16 @@ HtmlTokenId HTMLParser::GetNextToken_() nRet = HtmlTokenId::NEWPARA; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case '\t': if( bReadPRE ) { nRet = HtmlTokenId::TABCHAR; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case ' ': - SAL_FALLTHROUGH; + [[fallthrough]]; default: scan_text: @@ -1605,7 +1605,7 @@ HtmlTokenId HTMLParser::FilterPRE( HtmlTokenId nToken ) // in Netscape they only have impact in not empty paragraphs case HtmlTokenId::PARABREAK_ON: nToken = HtmlTokenId::LINEBREAK; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlTokenId::LINEBREAK: case HtmlTokenId::NEWPARA: nPre_LinePos = 0; @@ -1786,7 +1786,7 @@ HtmlTokenId HTMLParser::FilterXMP( HtmlTokenId nToken ) case HtmlTokenId::NEWPARA: if( bPre_IgnoreNewPara ) nToken = HtmlTokenId::NONE; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlTokenId::TEXTTOKEN: case HtmlTokenId::NONBREAKSPACE: case HtmlTokenId::SOFTHYPH: @@ -1827,7 +1827,7 @@ HtmlTokenId HTMLParser::FilterListing( HtmlTokenId nToken ) case HtmlTokenId::NEWPARA: if( bPre_IgnoreNewPara ) nToken = HtmlTokenId::NONE; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlTokenId::TEXTTOKEN: case HtmlTokenId::NONBREAKSPACE: case HtmlTokenId::SOFTHYPH: |