diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-05-10 16:42:16 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-05-10 16:42:16 +0200 |
commit | 14cd5182c5f64c43581c82db8c958369152226ac (patch) | |
tree | 57f150ba2707f29214eeb9b1eaad2373780d1b15 /svtools/source/svhtml/parhtml.cxx | |
parent | e4bb2b4f4875c15bd68297b5be716edd6859841e (diff) |
Replace fallthrough comments with new SAL_FALLTHROUGH macro
...which (in LIBO_INTERNAL_ONLY) for Clang expands to [[clang::fallthrough]] in
preparation of enabling -Wimplicit-fallthrough. (This is only relevant for
C++11, as neither C nor old C++ has a way to annotate intended fallthroughs.)
Could use BOOST_FALLTHROUGH instead of introducing our own SAL_FALLTHROUGH, but
that would require adding back in dependencies on boost_headers to many
libraries where we carefully removed any remaining Boost dependencies only
recently. (At least make SAL_FALLTHROUGH strictly LIBO_INTERNAL_ONLY, so its
future evolution will not have any impact on the stable URE interface.) C++17
will have a proper [[fallthroug]], eventually removing the need for a macro
altogether.
Change-Id: I342a7610a107db7d7a344ea9cbddfd9714d7e9ca
Diffstat (limited to 'svtools/source/svhtml/parhtml.cxx')
-rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index e227dce6f1f4..d27cc0e992d6 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -703,7 +703,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) break; } // Reduce sequence of CR/LF/BLANK/TAB to a single blank - // no break!! + SAL_FALLTHROUGH; case '\t': if( '\t'==nNextCh && bReadPRE && '>'!=cBreak ) { @@ -711,7 +711,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) bContinue = false; break; } - // no break + SAL_FALLTHROUGH; case '\x0b': if( '\x0b'==nNextCh && (bReadPRE || bReadXMP ||bReadListing) && '>'!=cBreak ) @@ -719,7 +719,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) break; } nNextCh = ' '; - // no break; + SAL_FALLTHROUGH; case ' ': sTmpBuffer.appendUtf32( nNextCh ); if( '>'!=cBreak && (!bReadListing && !bReadXMP && @@ -981,7 +981,7 @@ int HTMLParser::GetNextRawToken() } break; } - // no break + SAL_FALLTHROUGH; default: // all remaining characters are appended to the buffer sTmpBuffer.appendUtf32( nNextCh ); @@ -1328,16 +1328,16 @@ int HTMLParser::GetNextToken_() nRet = HTML_NEWPARA; break; } - // no break ! + SAL_FALLTHROUGH; case '\t': if( bReadPRE ) { nRet = HTML_TABCHAR; break; } - // no break ! + SAL_FALLTHROUGH; case ' ': - // no break ! + SAL_FALLTHROUGH; default: scan_text: @@ -1579,7 +1579,7 @@ int HTMLParser::FilterPRE( int nToken ) // in Netscape they only have impact in not empty paragraphs case HTML_PARABREAK_ON: nToken = HTML_LINEBREAK; - //fall-through + SAL_FALLTHROUGH; case HTML_LINEBREAK: case HTML_NEWPARA: nPre_LinePos = 0; |