diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-05-10 16:42:16 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-20 01:26:06 -0400 |
| commit | e7b11300cd813f821d1ec5cb4633ce2c5f7d1b9f (patch) | |
| tree | a6c39d9d4cde1baa84a9d788affbce3508af89a8 /sc/source/filter/dif/difimp.cxx | |
| parent | 34f591ca95c4c63be092da4c4b2294230404f336 (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.
(cherry picked from commit 14cd5182c5f64c43581c82db8c958369152226ac)
Change-Id: I342a7610a107db7d7a344ea9cbddfd9714d7e9ca
Diffstat (limited to 'sc/source/filter/dif/difimp.cxx')
| -rw-r--r-- | sc/source/filter/dif/difimp.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index 1dd10d6fc16c..46487a3f99c4 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -382,7 +382,7 @@ TOPIC DifParser::GetNextTopic() case S_UNKNOWN: // skip 2 lines ReadNextLine( aLine ); - // fall-through + SAL_FALLTHROUGH; case S_ERROR_L2: // error happened in line 2 // skip 1 line ReadNextLine( aLine ); @@ -700,8 +700,9 @@ bool DifParser::ScanFloatVal( const sal_Unicode* pStart ) eS = S_EXP; break; case 0x00: // IsNumberEnding( cAkt ) - bRet = true; // no - default: // break! + bRet = true; + SAL_FALLTHROUGH; + default: eS = S_END; } } @@ -721,8 +722,9 @@ bool DifParser::ScanFloatVal( const sal_Unicode* pStart ) eS = S_EXP_FIRST; break; case 0x00: // IsNumberEnding( cAkt ) - bRet = true; // no - default: // break! + bRet = true; + SAL_FALLTHROUGH; + default: eS = S_END; } } |