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 /starmath | |
| 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 'starmath')
| -rw-r--r-- | starmath/source/mathtype.cxx | 4 | ||||
| -rw-r--r-- | starmath/source/parse.cxx | 2 | ||||
| -rw-r--r-- | starmath/source/view.cxx | 2 | ||||
| -rw-r--r-- | starmath/source/wordexportbase.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index 9cc65c08500c..3e6c6c7dd2f3 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -2623,13 +2623,13 @@ void MathType::HandleOperator(SmNode *pNode,int nLevel) pS->WriteUChar( CHAR ); pS->WriteUChar( 0x86 ); pS->WriteUInt16( 0x222B ); - ///fall-through + SAL_FALLTHROUGH; case TIINT: case TLLINT: pS->WriteUChar( CHAR ); pS->WriteUChar( 0x86 ); pS->WriteUInt16( 0x222B ); - ///fall-through + SAL_FALLTHROUGH; case TINT: case TINTD: case TLINT: diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 714e7045d7fa..b9b3a31d5258 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -2132,7 +2132,7 @@ void SmParser::DoFunction() { case TFUNC: NextToken(); // skip "FUNC"-statement - // fall through + SAL_FALLTHROUGH; case TSIN : case TCOS : diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index e084ddf821ac..ac4d48d3492f 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -1944,7 +1944,7 @@ void SmViewShell::GetState(SfxItemSet &rSet) case SID_ATTR_ZOOM: rSet.Put(SvxZoomItem( SvxZoomType::PERCENT, aGraphic->GetZoom())); - /* no break here */ + SAL_FALLTHROUGH; case SID_ZOOMIN: case SID_ZOOMOUT: case SID_ZOOM_OPTIMAL: diff --git a/starmath/source/wordexportbase.cxx b/starmath/source/wordexportbase.cxx index 99420d8005f4..215a6c73769c 100644 --- a/starmath/source/wordexportbase.cxx +++ b/starmath/source/wordexportbase.cxx @@ -170,7 +170,7 @@ void SmWordExportBase::HandleMath(const SmNode* pNode, int nLevel) case TDIVIDEBY: case TACUTE: OSL_ASSERT(false); - // the above are handled elsewhere, e.g. when handling BINHOR + SAL_FALLTHROUGH; // the above are handled elsewhere, e.g. when handling BINHOR default: HandleText(pNode, nLevel); break; |