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 /sw/source/core/layout/dbg_lay.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 'sw/source/core/layout/dbg_lay.cxx')
| -rw-r--r-- | sw/source/core/layout/dbg_lay.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index 08eeee43ad9a..00eaf234d19f 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -538,7 +538,8 @@ void SwImplProtocol::Record_( const SwFrame* pFrame, sal_uLong nFunction, sal_uL if( nAct == ACT_START ) lcl_Flags( aOut, pFrame ); break; - case PROT_MOVE_FWD: bTmp = true; // NoBreak + case PROT_MOVE_FWD: bTmp = true; + SAL_FALLTHROUGH; case PROT_MOVE_BWD: if (nFunction == (bTmp ? 1U : 0U)) aOut.append("Fwd"); @@ -560,7 +561,8 @@ void SwImplProtocol::Record_( const SwFrame* pFrame, sal_uLong nFunction, sal_uL aOut.append("TestShrink"); break; case PROT_ADJUSTN : - case PROT_SHRINK: bTmp = true; // NoBreak + case PROT_SHRINK: bTmp = true; + SAL_FALLTHROUGH; case PROT_GROW: if (!bTmp) aOut.append("Grow"); @@ -601,7 +603,8 @@ void SwImplProtocol::Record_( const SwFrame* pFrame, sal_uLong nFunction, sal_uL break; case PROT_SECTION: SectFunc(aOut, pFrame, nAct, pParam); break; - case PROT_CUT: bTmp = true; // NoBreak + case PROT_CUT: bTmp = true; + SAL_FALLTHROUGH; case PROT_PASTE: if (bTmp) aOut.append("Cut from "); @@ -667,7 +670,8 @@ void SwImplProtocol::SectFunc(OStringBuffer &rOut, const SwFrame* , sal_uLong nA case ACT_MERGE: rOut.append("Merge Section "); rOut.append(static_cast<sal_Int64>(lcl_GetFrameId(static_cast<SwFrame*>(pParam)))); break; - case ACT_CREATE_MASTER: bTmp = true; // NoBreak + case ACT_CREATE_MASTER: bTmp = true; + SAL_FALLTHROUGH; case ACT_CREATE_FOLLOW: rOut.append("Create Section "); if (bTmp) rOut.append("Master to "); @@ -675,7 +679,8 @@ void SwImplProtocol::SectFunc(OStringBuffer &rOut, const SwFrame* , sal_uLong nA rOut.append("Follow from "); rOut.append(static_cast<sal_Int64>(lcl_GetFrameId(static_cast<SwFrame*>(pParam)))); break; - case ACT_DEL_MASTER: bTmp = true; // NoBreak + case ACT_DEL_MASTER: bTmp = true; + SAL_FALLTHROUGH; case ACT_DEL_FOLLOW: rOut.append("Delete Section "); if (bTmp) rOut.append("Master to "); |